From aea2f10e0fc17efbd30c0538ec8ce849d1a6480e Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sun, 31 Mar 2019 20:26:09 +0200
Subject: [PATCH 001/519] minor

---
 src/Handler/Admin.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 2ee38518b..ad3b77383 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -404,7 +404,7 @@ postAdminFeaturesR = do
             ]
           dbtSorting    = Map.fromList
             [ ("key"   , SortColumn (E.^. StudyTermsKey))
-            , ("isnew" , SortColumn (\studyTerm -> studyTerm E.^. StudyTermsKey `E.in_` E.valList (unStudyTermsKey <$> Set.toList newKeys)))
+            , ("isnew" , SortColumn (\studyTerm -> studyTerm E.^. StudyTermsKey `E.in_` E.valList (unStudyTermsKey <$> Set.toList newKeys))) -- works only once
             -- Remember: sorting with E.in_ by StudyTermsId instead will produce esqueleto-error "unsafeSqlBinOp: non-id/composite keys not expected here"
             , ("isbad" , SortColumn (\studyTerm -> studyTerm E.^. StudyTermsKey `E.in_` E.valList (unStudyTermsKey <$> Set.toList badKeys)))
             , ("name"  , SortColumn (E.^. StudyTermsName))
@@ -416,7 +416,7 @@ postAdminFeaturesR = do
                               }
           psValidator   = def
                         -- & defaultSorting [SortAscBy "name", SortAscBy "short", SortAscBy "key"]
-                        & defaultSorting [SortDescBy "isbad", SortDescBy "isnew", SortAscBy "key"]
+                        & defaultSorting [SortDescBy "isnew", SortDescBy "isbad", SortAscBy "key"]
       in dbTable psValidator DBTable{..}
 
     mkCandidateTable =

From 97800303438a361a73bb6573b506490af29940d0 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sun, 31 Mar 2019 21:15:46 +0200
Subject: [PATCH 002/519] Session: newness for StudyTerms lasts longer

---
 messages/uniworx/de.msg |  2 ++
 src/Foundation.hs       |  2 +-
 src/Handler/Admin.hs    | 29 ++++++++++++++++++-----------
 src/Utils.hs            |  4 ++--
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 2c90d5524..7d51240f3 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -1,3 +1,5 @@
+PrintDebugForStupid name@Text: Debug message "#{name}"
+
 BtnSubmit: Senden
 BtnAbort: Abbrechen
 BtnDelete: Löschen
diff --git a/src/Foundation.hs b/src/Foundation.hs
index b2ed47c49..0d8e5d909 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1001,7 +1001,7 @@ siteLayout' headingOverride widget = do
     | isModal -> getMessages
     | otherwise -> do
         applySystemMessages
-        authTagPivots <- fromMaybe Set.empty <$> getSessionJson SessionInactiveAuthTags
+        authTagPivots <- fromMaybe Set.empty <$> takeSessionJson SessionInactiveAuthTags
         forM_ authTagPivots $
           \authTag -> addMessageWidget Info $ modal [whamlet|_{MsgUnauthorizedDisabledTag authTag}|] (Left $ SomeRoute (AuthPredsR, catMaybes [(toPathPiece GetReferer, ) . toPathPiece <$> mcurrentRoute]))
         getMessages
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index ad3b77383..19b84adf3 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -286,6 +286,9 @@ 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
@@ -295,34 +298,38 @@ postAdminFeaturesR = do
           , formEncoding = btnEnctype
           , formSubmit = FormNoSubmit
           }
-    (infConflicts,infAccepted) <- case btnResult of
+    infConflicts <- case btnResult of
       FormSuccess BtnCandidatesInfer -> do
         (infConflicts, infAmbiguous, infRedundant, infAccepted) <- Candidates.inferHandler
         unless (null infAmbiguous) . addMessageI Info . MsgAmbiguousCandidatesRemoved $ length infAmbiguous
         unless (null infRedundant) . addMessageI Info . MsgRedundantCandidatesRemoved $ length infRedundant
-        if
-          | null infAccepted
-            -> addMessageI Info      MsgNoCandidatesInferred
-          | otherwise
-            -> addMessageI Success . MsgCandidatesInferred $ length infAccepted
-        return (infConflicts, infAccepted)
+        let newKeys = map (StudyTermsKey' . fst) infAccepted
+        setSessionJson sessionKeyNewStudyTerms newKeys
+        -- addMessageI Error $ MsgPrintDebugForStupid $ tshow newKeys
+        if  | null infAccepted
+              -> addMessageI Info      MsgNoCandidatesInferred
+            | otherwise
+               -> addMessageI Success . MsgCandidatesInferred $ length infAccepted
+        return infConflicts
       FormSuccess BtnCandidatesDeleteConflicts -> runDB $ do
         confs <- Candidates.conflicts
         incis <- Candidates.getIncidencesFor (entityKey <$> confs)
         deleteWhere [StudyTermCandidateIncidence <-. (E.unValue <$> incis)]
         addMessageI Success $ MsgIncidencesDeleted $ length incis
-        return ([],[])
+        return []
       FormSuccess BtnCandidatesDeleteAll -> runDB $ do
         deleteWhere ([] :: [Filter StudyTermCandidate])
         addMessageI Success MsgAllIncidencesDeleted
-        (, []) <$> Candidates.conflicts
-      _other -> (, []) <$> runDB Candidates.conflicts
+        Candidates.conflicts
+      _other -> runDB Candidates.conflicts
 
+    newStudyTermKeys <- fromMaybe [] <$> lookupSessionJson sessionKeyNewStudyTerms
+    -- addMessageI Error $ MsgPrintDebugForStupid $ tshow newStudyTermKeys
     (   (degreeResult,degreeTable)
       , (studyTermsResult,studytermsTable)
       , ((), candidateTable)) <- runDB $ (,,)
       <$> mkDegreeTable
-      <*> mkStudytermsTable (Set.fromList $ map (StudyTermsKey' . fst) infAccepted)
+      <*> mkStudytermsTable (Set.fromList newStudyTermKeys)
                             (Set.fromList $ map entityKey infConflicts)
       <*> mkCandidateTable
 
diff --git a/src/Utils.hs b/src/Utils.hs
index f6ebd76d6..bd0998561 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -610,9 +610,9 @@ modifySessionJson (toPathPiece -> key) f = lookupSessionJson key >>= maybe (dele
 tellSessionJson :: (PathPiece k, FromJSON v, ToJSON v, MonadHandler m, Monoid v) => k -> v -> m ()
 tellSessionJson key val = modifySessionJson key $ Just . (`mappend` val) . fromMaybe mempty
 
-getSessionJson :: (PathPiece k, FromJSON v, MonadHandler m) => k -> m (Maybe v)
+takeSessionJson :: (PathPiece k, FromJSON v, MonadHandler m) => k -> m (Maybe v)
 -- ^ `lookupSessionJson` followed by `deleteSession`
-getSessionJson key = lookupSessionJson key <* deleteSession (toPathPiece key)
+takeSessionJson key = lookupSessionJson key <* deleteSession (toPathPiece key)
 
 --------------------
 -- GET Parameters --

From b84032d0b9ac7b506bef42688a8fd3d8b411853d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 31 Mar 2019 20:31:07 +0200
Subject: [PATCH 003/519] dont initialize forms inside modals wihout modal
 headers

---
 static/js/utils/form.js  | 9 ++++++++-
 static/js/utils/modal.js | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index e45fd56c0..2e9bbc92b 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -20,8 +20,15 @@
   }
 
   window.utils.form = function(form, options) {
+    options = options || {};
 
-    if (form.classList.contains(JS_INITIALIZED)) {
+    // 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;
     }
 
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index 5c6c1ec43..a5971edf7 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -75,7 +75,7 @@
     function setupForm() {
       var form = modalElement.querySelector('form');
       if (form) {
-        utilInstances.push(window.utils.setup('form', form, { headers: MODAL_HEADERS }));
+        utilInstances.push(window.utils.setup('form', form, { headers: MODAL_HEADERS, force: true }));
       }
     }
 

From 44684f39985a250c8756d2ac613c026a2d1330e4 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 1 Apr 2019 22:17:43 +0200
Subject: [PATCH 004/519] clean inputs javascript

---
 static/js/utils/inputs.js | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index fd4ad906e..3a9f7ebc4 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -3,37 +3,37 @@
 
   window.utils = window.utils || {};
 
-  var JS_INITIALIZED_CLASS = 'js-initialized';
-
-  function isNotInitialized(element) {
-    return !element.classList.contains(JS_INITIALIZED_CLASS);
-  }
+  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.filter(isNotInitialized).forEach(function(checkbox) {
+    checkboxes.forEach(function(checkbox) {
       utilInstances.push(window.utils.setup('checkbox', checkbox));
     });
 
     // radios
     var radios = Array.from(wrapper.querySelectorAll('input[type="radio"]'));
-    radios.filter(isNotInitialized).forEach(function(radio) {
+    radios.forEach(function(radio) {
       utilInstances.push(window.utils.setup('radio', radio));
     });
 
     // file-uploads
     var fileUploads = Array.from(wrapper.querySelectorAll('input[type="file"]'));
-    fileUploads.filter(isNotInitialized).forEach(function(input) {
+    fileUploads.forEach(function(input) {
       utilInstances.push(window.utils.setup('fileUpload', input, options));
     });
 
     // file-checkboxes
     var fileCheckboxes = Array.from(wrapper.querySelectorAll('.file-checkbox'));
-    fileCheckboxes.filter(isNotInitialized).forEach(function(input) {
+    fileCheckboxes.forEach(function(input) {
       utilInstances.push(window.utils.setup('fileCheckbox', input, options));
     });
 
@@ -45,6 +45,8 @@
       });
     }
 
+    wrapper.classList.add(JS_INITIALIZED_CLASS);
+
     return {
       scope: wrapper,
       destroy: destroyUtils,
@@ -74,7 +76,6 @@
     if (!i18n) {
       throw new Error('window.utils.fileUpload(input, options) needs to be passed i18n object via options');
     }
-    input.classList.add(JS_INITIALIZED_CLASS);
 
     function renderFileList(files) {
       fileList.innerHTML = '';
@@ -166,8 +167,6 @@
         cont = cont.parentNode;
       }
       addListener(cont);
-      input.classList.add(JS_INITIALIZED_CLASS);
-      cont.classList.add(JS_INITIALIZED_CLASS);
     }
 
     setup();
@@ -190,7 +189,6 @@
       labelEl.setAttribute('for', input.id);
       wrapperEl.appendChild(input);
       wrapperEl.appendChild(labelEl);
-      input.classList.add(JS_INITIALIZED_CLASS);
 
       if (siblingEl) {
         parentEl.insertBefore(wrapperEl, siblingEl);
@@ -219,7 +217,6 @@
         wrapperEl.appendChild(siblingEl);
       }
 
-      input.classList.add(JS_INITIALIZED_CLASS);
       parentEl.appendChild(wrapperEl);
     }
 
@@ -233,8 +230,6 @@
   window.utils.implicitSubmit = function(input, options) {
     var submit = options.submit;
 
-    console.log('implicitSubmit', input, submit);
-
     if (!submit) {
       throw new Error('window.utils.implicitSubmit(input, options) needs to be passed a submit element via options');
     }
@@ -247,7 +242,7 @@
     };
 
     input.addEventListener('keypress', doSubmit);
-    
+
     return {
       scope: input,
       destroy: function() {

From ec50d27bd7dfa346e4e6d10cf5c9fd56d616ccc3 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 1 Apr 2019 22:32:22 +0200
Subject: [PATCH 005/519] refinement of section spacing

---
 templates/adminTest.hamlet                   | 11 ++++-------
 templates/default-layout.lucius              |  6 ++----
 templates/table/layout-filter-default.lucius |  1 -
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/templates/adminTest.hamlet b/templates/adminTest.hamlet
index 75622355e..7e59d9599 100644
--- a/templates/adminTest.hamlet
+++ b/templates/adminTest.hamlet
@@ -1,17 +1,14 @@
-<div .container>
-  <h1>Uni2work - Admin Demopage
-
+<section>
   <p data-tooltip="Solch ein Tooltip kann mit dem <em>data-tooltip</em> Attribut erzeugt werden. Funktioniert aber nur in Block-Elementen die einen sinnvollen Wrapper haben.">
     Diese interne Seite dient lediglich zum Testen diverser Funktionalitäten
     und zur Demonstration der verschiedenen Hilfsfunktionen/Module.
 
     Der Handler sollte jeweils aktuelle Beispiele für alle möglichen Funktionalitäten enthalten, so dass man immer weiß, wo man nachschlagen kann.
 
-
-<div .container.js-show-hide>
+<section>
   <h2 .js-show-hide__toggle>Teilweise funktionierende Abschnitte
 
-  <ul .js-show-hide__target>
+  <ul>
     <li .list-group-item>
       <a href=@{UsersR}>Benutzer Verwaltung
 
@@ -22,7 +19,7 @@
     <li .list-group-item>
       <a href=@{CourseNewR}>Kurse anlegen
 
-<div .container>
+<section>
   <h2>Funktionen zum Testen
 
   <ul>
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index e1ddbb2bd..7b7071228 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -527,16 +527,14 @@ ul.list--inline {
 }
 
 section {
-    padding-bottom: 20px;
-    margin-bottom: 20px;
+    padding-bottom: 30px;
     border-bottom: 1px solid #d3d3d3;
 
     + section {
         margin-top: 20px;
-        padding-top: 20px;
     }
 
-    &:last-of-type {
+    &:last-child {
         border-bottom: none;
     }
 }
diff --git a/templates/table/layout-filter-default.lucius b/templates/table/layout-filter-default.lucius
index 710bb8c6b..e2baee73a 100644
--- a/templates/table/layout-filter-default.lucius
+++ b/templates/table/layout-filter-default.lucius
@@ -1,4 +1,3 @@
 .table-filter {
-  border-bottom: 1px solid #d3d3d3;
   margin-bottom: 13px;
 }

From b7293a54044f8277537e675db67da6418d010c60 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 1 Apr 2019 22:34:04 +0200
Subject: [PATCH 006/519] hide form group errors on focus

---
 static/css/utils/inputs.scss |  8 ++++++++
 static/js/utils/form.js      | 34 ++++++++++++++++++++++++++++++++++
 static/js/utils/setup.js     |  3 +++
 3 files changed, 45 insertions(+)

diff --git a/static/css/utils/inputs.scss b/static/css/utils/inputs.scss
index 6bf5286e3..db16a94d3 100644
--- a/static/css/utils/inputs.scss
+++ b/static/css/utils/inputs.scss
@@ -66,6 +66,14 @@
   input, textarea {
     border-color: var(--color-error) !important;
   }
+
+  .form-error {
+    display: block;
+  }
+}
+
+.form-error {
+  display: none;
 }
 
 @media (max-width: 768px) {
diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 2e9bbc92b..77437a3e1 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -8,6 +8,9 @@
   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) {
@@ -52,6 +55,12 @@
     // 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() {
@@ -165,4 +174,29 @@
       destroy: function() {},
     };
   };
+
+  // listens for focus events and removes any errors on an input
+  window.utils.errorRemover = function(formGroup, options) {
+
+    var inputElement = formGroup.querySelector('input:not([type="hidden"]), textarea, select');
+    if (!inputElement) {
+      return false;
+    }
+
+    inputElement.addEventListener('focus', focusListener);
+
+    function focusListener() {
+      var hasError = formGroup.classList.contains(FORM_GROUP_WITH_ERRORS_CLASS);
+      if (hasError) {
+        formGroup.classList.remove(FORM_GROUP_WITH_ERRORS_CLASS);
+      }
+    }
+
+    return {
+      scope: formGroup,
+      destroy: function() {
+        inputElement.removeEventListener('focus', focusListener);
+      },
+    };
+  };
 })();
diff --git a/static/js/utils/setup.js b/static/js/utils/setup.js
index e9afb216b..bb3bb0e3d 100644
--- a/static/js/utils/setup.js
+++ b/static/js/utils/setup.js
@@ -37,6 +37,9 @@
 
       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;
+        }
       }
     }
 

From b2d87ec714124bb2209b9aabdcf7db064d8c8010 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 1 Apr 2019 22:35:31 +0200
Subject: [PATCH 007/519] wrap forms in a section element

---
 templates/widgets/form/form.hamlet | 33 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/templates/widgets/form/form.hamlet b/templates/widgets/form/form.hamlet
index cd076cf1f..ed15e2aea 100644
--- a/templates/widgets/form/form.hamlet
+++ b/templates/widgets/form/form.hamlet
@@ -1,18 +1,19 @@
 $newline never
 $# Wrapper for all kinds of forms
-<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 data-autosubmit>
-        ^{btnLabel BtnSubmit}
+<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 data-autosubmit>
+          ^{btnLabel BtnSubmit}

From 535b6415042a3042c38cf03ff19a9a2cf4e9a2f6 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 1 Apr 2019 22:42:12 +0200
Subject: [PATCH 008/519] wrap lecturer intro note in section

---
 templates/default-layout.lucius   | 7 +++++--
 templates/info-lecturer/de.hamlet | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 7b7071228..8a78a21fc 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -474,7 +474,7 @@ ul.list--inline {
 /* DEFINITION LIST */
 .deflist {
   display: grid;
-  grid-template-columns: 100% ;
+  grid-template-columns: 100%;
 }
 .deflist__dt,
 .deflist__dd {
@@ -488,6 +488,10 @@ ul.list--inline {
 .deflist__dd {
   font-size: 18px;
   margin-bottom: 10px;
+
+  > p {
+    margin-top: 0;
+  }
 }
 
 @media (min-width: 768px) {
@@ -507,7 +511,6 @@ ul.list--inline {
 
   .deflist__dt,
   .deflist__dd {
-    border-bottom: 1px solid #d3d3d3;
     padding: 12px 0;
     margin: 0;
     font-size: 16px;
diff --git a/templates/info-lecturer/de.hamlet b/templates/info-lecturer/de.hamlet
index 7611f1055..a8610e5ff 100644
--- a/templates/info-lecturer/de.hamlet
+++ b/templates/info-lecturer/de.hamlet
@@ -1,6 +1,7 @@
+<section>
+  UniWorX erfahrene Veranstalter finden
+  hier die wichtigsten Neuerungen.
 
-UniWorX erfahrene Veranstalter finden
-hier die wichtigsten Neuerungen.
 <section>
   <h2>Bekannte Probleme in Bearbeitung
 
@@ -178,4 +179,4 @@ hier die wichtigsten Neuerungen.
       Planmäßige Wartungen werden ohne Ankündigung
       immer um 2:00h nachts durchgeführt.
       Es wird daher empfohlen, keine kritischen Abgabefristen
-      um oder kurz nach dieser Zeit einzustellen.
\ No newline at end of file
+      um oder kurz nach dieser Zeit einzustellen.

From f75c1bdb701e4133d865d164e9597bbd188c676b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 2 Apr 2019 14:44:19 +0200
Subject: [PATCH 009/519] Flexiblere LDAP identifier via trial and error

Fixes #285
---
 src/Auth/LDAP.hs | 17 +++++++++++++----
 src/Utils.hs     |  3 +++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Auth/LDAP.hs b/src/Auth/LDAP.hs
index a399a4c52..76f12ce89 100644
--- a/src/Auth/LDAP.hs
+++ b/src/Auth/LDAP.hs
@@ -6,7 +6,7 @@ module Auth.LDAP
   , Ldap.AttrList, Ldap.Attr(..), Ldap.AttrValue
   ) where
 
-import Import.NoFoundation
+import Import.NoFoundation hiding (userEmail, userDisplayName)
 import Control.Lens
 import Network.Connection
 
@@ -39,9 +39,16 @@ data CampusMessage = MsgCampusIdentNote
 
 
 findUser :: LdapConf -> Ldap -> Text -> [Ldap.Attr] -> IO [Ldap.SearchEntry]
-findUser LdapConf{..} ldap campusIdent = Ldap.search ldap ldapBase userSearchSettings userFilter
+findUser LdapConf{..} ldap ident retAttrs = fromMaybe [] <$> findM (assertM (not . null) . lift . flip (Ldap.search ldap ldapBase userSearchSettings) retAttrs) userFilters
   where
-    userFilter = userPrincipalName Ldap.:= Text.encodeUtf8 campusIdent
+    userFilters =
+      [ userPrincipalName Ldap.:= Text.encodeUtf8 ident
+      , userPrincipalName Ldap.:= Text.encodeUtf8 [st|#{ident}@campus.lmu.de|]
+      , userEmail         Ldap.:= Text.encodeUtf8 ident
+      , userEmail         Ldap.:= Text.encodeUtf8 [st|#{ident}@lmu.de|]
+      , userEmail         Ldap.:= Text.encodeUtf8 [st|#{ident}@campus.lmu.de|]
+      , userDisplayName   Ldap.:= Text.encodeUtf8 ident
+      ]
     userSearchSettings = mconcat
       [ Ldap.scope ldapScope
       , Ldap.size 2
@@ -49,8 +56,10 @@ findUser LdapConf{..} ldap campusIdent = Ldap.search ldap ldapBase userSearchSet
       , Ldap.derefAliases Ldap.DerefAlways
       ]
 
-userPrincipalName :: Ldap.Attr
+userPrincipalName, userEmail, userDisplayName :: Ldap.Attr
 userPrincipalName = Ldap.Attr "userPrincipalName"
+userEmail         = Ldap.Attr "mail"
+userDisplayName   = Ldap.Attr "displayName"
 
 campusForm :: ( RenderMessage site FormMessage
               , RenderMessage site CampusMessage
diff --git a/src/Utils.hs b/src/Utils.hs
index bd0998561..88adf17e4 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -587,6 +587,9 @@ mconcatMapM f = foldM (\x my -> mappend x <$> my) mempty . map f . Fold.toList
 mconcatForM :: (Monoid b, Monad m, Foldable f) => f a -> (a -> m b) -> m b
 mconcatForM = flip mconcatMapM
 
+findM :: (Monad m, Foldable f) => (a -> MaybeT m b) -> f a -> m (Maybe b)
+findM f = runMaybeT . Fold.foldr (\x as -> f x <|> as) mzero
+
 -----------------
 -- Alternative --
 -----------------

From a731346656810cf480a2b3bc89c6a0780426740b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 3 Apr 2019 14:47:33 +0200
Subject: [PATCH 010/519] pgadmin in nix environment

---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index e6178f7b0..69546ffbe 100644
--- a/shell.nix
+++ b/shell.nix
@@ -19,7 +19,7 @@ let
   '';
 
   override = oldAttrs: {
-    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ postgresql ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install ]);
+    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ postgresql pgadmin ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install ]);
     shellHook = ''
       export PROMPT_INFO="${oldAttrs.name}"
 

From 37e4adc0db0b725b49480236c30f44149f272227 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 3 Apr 2019 16:02:44 +0200
Subject: [PATCH 011/519] Modularize & clean up homepage

Fixes #306
---
 messages/uniworx/de.msg              |   3 +
 src/Application.hs                   |   2 +
 src/Data/List/NonEmpty/Instances.hs  |  12 ++
 src/Handler/Help.hs                  |  67 ++++++++++
 src/Handler/Home.hs                  | 184 ++-------------------------
 src/Handler/Info.hs                  |  48 +++++++
 src/Handler/Profile.hs               |  43 ++++++-
 src/Handler/Utils.hs                 |  24 +++-
 src/Import/NoFoundation.hs           |   3 +-
 templates/home.hamlet                |   5 -
 templates/home/openCourses.hamlet    |   3 +
 templates/home/upcomingSheets.hamlet |   3 +
 templates/homeUser.hamlet            |  17 ---
 13 files changed, 216 insertions(+), 198 deletions(-)
 create mode 100644 src/Data/List/NonEmpty/Instances.hs
 create mode 100644 src/Handler/Help.hs
 create mode 100644 src/Handler/Info.hs
 delete mode 100644 templates/home.hamlet
 create mode 100644 templates/home/openCourses.hamlet
 create mode 100644 templates/home/upcomingSheets.hamlet
 delete mode 100644 templates/homeUser.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 7d51240f3..da8e563fa 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -273,6 +273,9 @@ DataProtHeading: Datenschutzerklärung
 SystemMessageHeading: Uni2work Statusmeldung
 SystemMessageListHeading: Uni2work Statusmeldungen
 
+HomeOpenCourses: Kurse mit offener Registrierung
+HomeUpcomingSheets: Anstehende Übungsblätter
+
 NumCourses num@Int64: #{display num} Kurse
 CloseAlert: Schliessen
 
diff --git a/src/Application.hs b/src/Application.hs
index 1dd037aba..20824d216 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -76,6 +76,8 @@ import qualified Database.Memcached.Binary.IO as Memcached
 -- (HPack takes care to add new modules to our cabal file nowadays.)
 import Handler.Common
 import Handler.Home
+import Handler.Info
+import Handler.Help
 import Handler.Profile
 import Handler.Users
 import Handler.Admin
diff --git a/src/Data/List/NonEmpty/Instances.hs b/src/Data/List/NonEmpty/Instances.hs
new file mode 100644
index 000000000..f151b6c18
--- /dev/null
+++ b/src/Data/List/NonEmpty/Instances.hs
@@ -0,0 +1,12 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.List.NonEmpty.Instances
+  (
+  ) where
+
+import Data.List.NonEmpty
+
+import Language.Haskell.TH.Syntax (Lift(..))
+
+instance Lift a => Lift (NonEmpty a) where
+  lift (toList -> xs) = [e|fromList xs|]
diff --git a/src/Handler/Help.hs b/src/Handler/Help.hs
new file mode 100644
index 000000000..39c1f5381
--- /dev/null
+++ b/src/Handler/Help.hs
@@ -0,0 +1,67 @@
+module Handler.Help where
+
+import Import
+import Handler.Utils
+import Jobs
+
+import qualified Data.Map as Map
+
+data HelpIdentOptions = HIUser | HIEmail | HIAnonymous
+  deriving (Eq, Ord, Bounded, Enum, Show, Read)
+
+instance Universe HelpIdentOptions
+instance Finite HelpIdentOptions
+
+nullaryPathPiece ''HelpIdentOptions (camelToPathPiece' 1)
+embedRenderMessage ''UniWorX ''HelpIdentOptions (("Help" <>) . dropPrefix "HI")
+
+data HelpForm = HelpForm
+  { hfReferer:: Maybe (Route UniWorX)
+  , hfUserId :: Either (Maybe Address) UserId
+  , hfRequest:: Text
+  }
+
+helpForm :: Maybe (Route UniWorX) -> Maybe UserId -> AForm _ HelpForm
+helpForm mReferer mUid = HelpForm
+    <$> aopt routeField (fslI MsgHelpProblemPage & inputReadonly) (Just <$> mReferer)
+    <*> multiActionA (fslI MsgHelpAnswer) identActions (HIUser <$ mUid)
+    <*> (unTextarea <$> areq textareaField (fslI MsgHelpRequest) Nothing)
+  where
+    identActions :: Map _ (AForm _ (Either (Maybe Address) UserId))
+    identActions = Map.fromList $ case mUid of
+      (Just uid) -> (HIUser, pure $ Right uid):defaultActions
+      Nothing    -> defaultActions
+
+    defaultActions =
+      [ (HIEmail, Left . Just <$> (Address <$> aopt textField (fslI MsgName) Nothing <*> apreq emailField (fslI MsgEMail) Nothing))
+      , (HIAnonymous, pure $ Left Nothing)
+      ]
+
+getHelpR, postHelpR :: Handler Html
+getHelpR = postHelpR
+postHelpR = do
+  mUid <- maybeAuthId
+  mReferer <- flip formResultMaybe return <=< runInputGetResult $ iopt routeField (toPathPiece GetReferer)
+  isModal <- hasCustomHeader HeaderIsModal
+
+  ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm 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
+    hfReferer' <- traverse toTextUrl hfReferer
+    queueJob' JobHelpRequest
+      { jSender      = hfUserId
+      , jHelpRequest = hfRequest
+      , jRequestTime = now
+      , jReferer     = hfReferer'
+      }
+    tell . pure =<< messageI Success MsgHelpSent
+
+  defaultLayout $ do
+    setTitleI MsgHelpTitle
+    $(widgetFile "help")
diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs
index 7b60a6da3..dba365b9c 100644
--- a/src/Handler/Home.hs
+++ b/src/Handler/Home.hs
@@ -4,23 +4,20 @@ import Import
 import Handler.Utils
 
 import qualified Data.Map as Map
-import qualified Data.Set as Set
 import qualified Database.Esqueleto as E
 
-import Jobs
-import Development.GitRev
-
 
 getHomeR :: Handler Html
 getHomeR = do
   muid <- maybeAuthId
-  case muid of
-    Nothing   -> homeAnonymous
-    Just uid  -> homeUser uid
+  defaultLayout $ do
+    setTitleI MsgHomeHeading
+    maybe mempty homeUpcomingSheets muid
+    homeOpenCourses
 
 
-homeAnonymous :: Handler Html
-homeAnonymous = do
+homeOpenCourses :: Widget
+homeOpenCourses = do
   cTime <- liftIO getCurrentTime
   let tableData :: E.SqlExpr (Entity Course)
                   -> E.SqlQuery (E.SqlExpr (Entity Course))
@@ -47,7 +44,7 @@ homeAnonymous = do
         , sortable (Just "deadline") (i18nCell MsgRegisterTo) $ \DBRow{ dbrOutput=Entity{entityVal = course} } ->
             cell $ traverse (formatTime SelFormatDateTime) (courseRegisterTo course) >>= maybe mempty toWidget
         ]
-  courseTable <- runDB $ dbTableWidget' def DBTable
+  courseTable <- liftHandlerT . runDB $ dbTableWidget' def DBTable
     { dbtSQLQuery  = tableData
     , dbtRowKey    = (E.^. CourseId)
     , dbtColonnade = colonnade
@@ -75,16 +72,12 @@ homeAnonymous = do
     , dbtFilterUI  = mempty
     , dbtStyle     = def
     , dbtParams    = def
-    , dbtIdent     = "upcomingdeadlines" :: Text
+    , dbtIdent     = "open-courses" :: Text
     }
-  -- let features = $(widgetFile "featureList")
-  -- addMessage Warning "Vorabversion! Die Implementierung von  Uni2work ist noch nicht abgeschlossen!"
-  defaultLayout
-    -- (widgetFile "dsgvDisclaimer")
-    $(widgetFile "home")
+  $(widgetFile "home/openCourses")
 
-homeUser :: Key User -> Handler Html
-homeUser uid = do
+homeUpcomingSheets :: UserId -> Widget
+homeUpcomingSheets uid = do
   cTime <- liftIO getCurrentTime
   let tableData :: E.LeftOuterJoin
                         (E.InnerJoin (E.InnerJoin (E.SqlExpr (Entity CourseParticipant)) (E.SqlExpr (Entity Course))) (E.SqlExpr (Entity Sheet)))
@@ -140,7 +133,7 @@ homeUser uid = do
                                         (toWidget $ hasTickmark True)
         ]
   let validator = def & defaultSorting [SortDescBy "done", SortAscBy "deadline"]
-  sheetTable <- runDB $ dbTableWidget' validator DBTable
+  sheetTable <- liftHandlerT . runDB $ dbTableWidget' validator DBTable
     { dbtSQLQuery  = tableData
     , dbtRowKey    = \((_ `E.InnerJoin` _ `E.InnerJoin` sheet) `E.LeftOuterJoin` _) -> sheet E.^. SheetId
     , dbtColonnade = colonnade
@@ -175,155 +168,6 @@ homeUser uid = do
     , dbtFilterUI  = mempty
     , dbtStyle     = def { dbsEmptyStyle = DBESNoHeading, dbsEmptyMessage = MsgNoUpcomingSheetDeadlines }
     , dbtParams    = def
-    , dbtIdent     = "upcomingdeadlines" :: Text
+    , dbtIdent     = "upcoming-sheets" :: Text
     }
-  -- addMessage Warning "Vorabversion! Die Implementierung von  Uni2work ist noch nicht abgeschlossen."
-  defaultLayout $
-    -- setTitle "Willkommen zum Uni2work Test!"
-    $(widgetFile "homeUser")
-    -- (widgetFile "dsgvDisclaimer")
-
--- | Versionsgeschichte
-getVersionR :: Handler TypedContent
-getVersionR = getInfoR -- TODO
-
--- | Impressum
-getImpressumR :: Handler Html
-getImpressumR = -- do
-  siteLayoutMsg' MsgMenuImpressum $ do
-    setTitleI MsgImpressumHeading
-    $(i18nWidgetFile "imprint")
-
-
--- | Hinweise zu Datenschutz und Aufbewahrungspflichten
-getDataProtR :: Handler Html
-getDataProtR = -- do
-  siteLayoutMsg' MsgMenuDataProt $ do
-    setTitleI MsgDataProtHeading
-    $(i18nWidgetFile "data-protection")
-
-
--- | Allgemeine Informationen
-getInfoR :: Handler TypedContent
-getInfoR = selectRep $ do
-    let infoHeading = [whamlet|Re-Implementierung von <a href="https://uniworx.ifi.lmu.de/">UniWorX</a>|]
-    provideRep . siteLayout infoHeading $ do
-      let features = $(widgetFile "featureList")
-          gitInfo :: Text
-          gitInfo  = $gitDescribe <> " (" <> $gitCommitDate <> ")"
-      changeLog <- withUrlRenderer $(textFile "ChangeLog.md")
-      $(widgetFile "versionHistory")
-    provideRep $
-      return ($gitDescribe :: Text)
-
-
-
-
-data HelpIdentOptions = HIUser | HIEmail | HIAnonymous
-  deriving (Eq, Ord, Bounded, Enum, Show, Read)
-
-instance Universe HelpIdentOptions
-instance Finite HelpIdentOptions
-
-nullaryPathPiece ''HelpIdentOptions (camelToPathPiece' 1)
-embedRenderMessage ''UniWorX ''HelpIdentOptions (("Help" <>) . dropPrefix "HI")
-
-data HelpForm = HelpForm
-  { hfReferer:: Maybe (Route UniWorX)
-  , hfUserId :: Either (Maybe Address) UserId
-  , hfRequest:: Text
-  }
-
-helpForm :: Maybe (Route UniWorX) -> Maybe UserId -> AForm _ HelpForm
-helpForm mReferer mUid = HelpForm
-    <$> aopt routeField (fslI MsgHelpProblemPage & inputReadonly) (Just <$> mReferer)
-    <*> multiActionA (fslI MsgHelpAnswer) identActions (HIUser <$ mUid)
-    <*> (unTextarea <$> areq textareaField (fslI MsgHelpRequest) Nothing)
-  where
-    identActions :: Map _ (AForm _ (Either (Maybe Address) UserId))
-    identActions = Map.fromList $ case mUid of
-      (Just uid) -> (HIUser, pure $ Right uid):defaultActions
-      Nothing    -> defaultActions
-
-    defaultActions =
-      [ (HIEmail, Left . Just <$> (Address <$> aopt textField (fslI MsgName) Nothing <*> apreq emailField (fslI MsgEMail) Nothing))
-      , (HIAnonymous, pure $ Left Nothing)
-      ]
-
-getHelpR, postHelpR :: Handler Html
-getHelpR = postHelpR
-postHelpR = do
-  mUid <- maybeAuthId
-  mReferer <- flip formResultMaybe return <=< runInputGetResult $ iopt routeField (toPathPiece GetReferer)
-  isModal <- hasCustomHeader HeaderIsModal
-
-  ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm 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
-    hfReferer' <- traverse toTextUrl hfReferer
-    queueJob' JobHelpRequest
-      { jSender      = hfUserId
-      , jHelpRequest = hfRequest
-      , jRequestTime = now
-      , jReferer     = hfReferer'
-      }
-    tell . pure =<< messageI Success MsgHelpSent
-
-  defaultLayout $ do
-    setTitleI MsgHelpTitle
-    $(widgetFile "help")
-
-
-getInfoLecturerR :: Handler Html
-getInfoLecturerR =
-  siteLayoutMsg' MsgInfoLecturerTitle $ do
-    setTitleI MsgInfoLecturerTitle
-    $(i18nWidgetFile "info-lecturer")
-
-
-getAuthPredsR, postAuthPredsR :: Handler Html
-getAuthPredsR = postAuthPredsR
-postAuthPredsR = do
-  (AuthTagActive authTagCurrentActive) <- fromMaybe def <$> lookupSessionJson SessionActiveAuthTags
-
-  let
-    blacklist = Set.fromList [ AuthFree, AuthDevelopment, AuthDeprecated ]
-    taForm authTag
-      | authTag `Set.member` blacklist = aforced checkBoxField (fslI authTag) (authTagIsActive def authTag)
-      | otherwise = fromMaybe False <$> aopt checkBoxField (fslI authTag) (Just . Just $ authTagCurrentActive authTag)
-
-  ((authActiveRes, authActiveWidget), authActiveEnctype) <- runFormPost . renderAForm FormStandard
-    $ AuthTagActive <$> funcForm taForm (fslI MsgActiveAuthTags) True
-
-  mReferer <- runMaybeT $ do
-    param <- MaybeT (lookupGetParam $ toPathPiece GetReferer) <|> MaybeT (lookupPostParam $ toPathPiece GetReferer)
-    MaybeT . return $ fromPathPiece param
-
-  let authActiveForm = wrapForm authActiveWidget' def
-        { formAction = Just $ SomeRoute AuthPredsR
-        , formEncoding = authActiveEnctype
-        , formSubmit = FormDualSubmit
-        }
-      authActiveWidget'
-        = [whamlet|
-            $newline never
-            $maybe referer <- mReferer
-              <input type=hidden name=#{toPathPiece GetReferer} value=#{toPathPiece referer}>
-            ^{authActiveWidget}
-          |]
-
-  formResult authActiveRes $ \authTagActive -> do
-    setSessionJson SessionActiveAuthTags authTagActive
-    modifySessionJson SessionInactiveAuthTags . fmap $ Set.filter (not . authTagIsActive authTagActive)
-    addMessageI Success MsgAuthPredsActiveChanged
-    redirect $ fromMaybe AuthPredsR mReferer
-
-  siteLayoutMsg MsgAuthPredsActive $ do
-    setTitleI MsgAuthPredsActive
-    $(widgetFile "authpreds")
+  $(widgetFile "home/upcomingSheets")
diff --git a/src/Handler/Info.hs b/src/Handler/Info.hs
new file mode 100644
index 000000000..9790ed143
--- /dev/null
+++ b/src/Handler/Info.hs
@@ -0,0 +1,48 @@
+module Handler.Info where
+
+import Import
+import Handler.Utils
+
+import Development.GitRev
+
+-- | Versionsgeschichte
+getVersionR :: Handler TypedContent
+getVersionR = selectRep $ do
+  provideRep $
+    return ($gitDescribe :: Text)
+  provideRep getInfoR
+
+-- | Impressum
+getImpressumR :: Handler Html
+getImpressumR = -- do
+  siteLayoutMsg' MsgMenuImpressum $ do
+    setTitleI MsgImpressumHeading
+    $(i18nWidgetFile "imprint")
+
+
+-- | Hinweise zu Datenschutz und Aufbewahrungspflichten
+getDataProtR :: Handler Html
+getDataProtR = -- do
+  siteLayoutMsg' MsgMenuDataProt $ do
+    setTitleI MsgDataProtHeading
+    $(i18nWidgetFile "data-protection")
+
+
+-- | Allgemeine Informationen
+getInfoR :: Handler Html
+getInfoR = do
+  let infoHeading = [whamlet|Re-Implementierung von <a href="https://uniworx.ifi.lmu.de/">UniWorX</a>|]
+  siteLayout infoHeading $ do
+    let features = $(widgetFile "featureList")
+        gitInfo :: Text
+        gitInfo  = $gitDescribe <> " (" <> $gitCommitDate <> ")"
+    changeLog <- withUrlRenderer $(textFile "ChangeLog.md")
+    $(widgetFile "versionHistory")
+
+  
+getInfoLecturerR :: Handler Html
+getInfoLecturerR =
+  siteLayoutMsg' MsgInfoLecturerTitle $ do
+    setTitleI MsgInfoLecturerTitle
+    $(i18nWidgetFile "info-lecturer")
+
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index d582abf41..5de418a34 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -10,7 +10,7 @@ import Utils.Lens
 -- import Yesod.Colonnade
 import Data.Monoid (Any(..))
 import qualified Data.Map as Map
--- import qualified Data.Set as Set
+import qualified Data.Set as Set
 import qualified Database.Esqueleto as E
 -- import           Database.Esqueleto      ((^.))
 
@@ -491,3 +491,44 @@ mkCorrectionsTable =
   in \uid ->  let dbtSQLQuery = dbtSQLQuery' uid
               in  dbTableWidget' validator DBTable{..}
 
+
+getAuthPredsR, postAuthPredsR :: Handler Html
+getAuthPredsR = postAuthPredsR
+postAuthPredsR = do
+  (AuthTagActive authTagCurrentActive) <- fromMaybe def <$> lookupSessionJson SessionActiveAuthTags
+
+  let
+    blacklist = Set.fromList [ AuthFree, AuthDevelopment, AuthDeprecated ]
+    taForm authTag
+      | authTag `Set.member` blacklist = aforced checkBoxField (fslI authTag) (authTagIsActive def authTag)
+      | otherwise = fromMaybe False <$> aopt checkBoxField (fslI authTag) (Just . Just $ authTagCurrentActive authTag)
+
+  ((authActiveRes, authActiveWidget), authActiveEnctype) <- runFormPost . renderAForm FormStandard
+    $ AuthTagActive <$> funcForm taForm (fslI MsgActiveAuthTags) True
+
+  mReferer <- runMaybeT $ do
+    param <- MaybeT (lookupGetParam $ toPathPiece GetReferer) <|> MaybeT (lookupPostParam $ toPathPiece GetReferer)
+    MaybeT . return $ fromPathPiece param
+
+  let authActiveForm = wrapForm authActiveWidget' def
+        { formAction = Just $ SomeRoute AuthPredsR
+        , formEncoding = authActiveEnctype
+        , formSubmit = FormDualSubmit
+        }
+      authActiveWidget'
+        = [whamlet|
+            $newline never
+            $maybe referer <- mReferer
+              <input type=hidden name=#{toPathPiece GetReferer} value=#{toPathPiece referer}>
+            ^{authActiveWidget}
+          |]
+
+  formResult authActiveRes $ \authTagActive -> do
+    setSessionJson SessionActiveAuthTags authTagActive
+    modifySessionJson SessionInactiveAuthTags . fmap $ Set.filter (not . authTagIsActive authTagActive)
+    addMessageI Success MsgAuthPredsActiveChanged
+    redirect $ fromMaybe AuthPredsR mReferer
+
+  siteLayoutMsg MsgAuthPredsActive $ do
+    setTitleI MsgAuthPredsActive
+    $(widgetFile "authpreds")
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 7683950d1..3d6f1d4d4 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -10,7 +10,8 @@ import qualified Data.Set as Set
 import Data.CaseInsensitive (original)
 -- import qualified Data.CaseInsensitive as CI
 
-import Language.Haskell.TH (Q, Exp)
+import Language.Haskell.TH
+import Language.Haskell.TH.Syntax (qRunIO)
 -- import Language.Haskell.TH.Datatype
 
 import Text.Hamlet (shamletFile)
@@ -26,6 +27,12 @@ import Handler.Utils.Rating     as Handler.Utils hiding (extractRatings)
 import Handler.Utils.Sheet      as Handler.Utils
 import Handler.Utils.Mail       as Handler.Utils
 
+import System.Directory (listDirectory)
+import System.FilePath.Posix (takeBaseName)
+
+import qualified Data.List as List
+import qualified Data.List.NonEmpty as NonEmpty
+
 
 downloadFiles :: (MonadHandler m, HandlerSite m ~ UniWorX) => m Bool
 downloadFiles = do
@@ -140,6 +147,15 @@ warnTermDays tid times = do
 --   which contains a file for each language,
 --   eg. /templates/imprint/de.hamlet and /templates/imprint/en.hamlet
 i18nWidgetFile :: FilePath -> Q Exp
-i18nWidgetFile =
-  -- TODO write code to distinguish languages here
-  widgetFile . (</> "de")
+i18nWidgetFile basename = do
+  let i18nDirectory = "templates" </> basename
+  availableFiles <- qRunIO $ listDirectory i18nDirectory
+  let availableTranslations = sortWith (NTop . flip List.elemIndex (NonEmpty.toList appLanguages)) . List.nub $ pack . takeBaseName <$> availableFiles
+  availableTranslations' <- maybe (fail $ "‘" <> i18nDirectory <> "’ is empty") return $ NonEmpty.nonEmpty availableTranslations
+
+  ws <- newName "ws"
+  letE
+    [ funD ws $ [ clause [litP $ stringL l] (normalB . widgetFile $ basename </> l) []
+                | l <- unpack <$> NonEmpty.toList availableTranslations'
+                ] ++ [ clause [wildP] (normalB [e| error "selectLanguage returned an invalid translation" |]) [] ]
+    ] [e|selectLanguage availableTranslations' >>= $(varE ws)|]
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index dd0861ab9..457682087 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -42,7 +42,8 @@ import GHC.Exts               as Import (IsList)
 
 import Data.Hashable          as Import
 import Data.List.NonEmpty     as Import (NonEmpty(..))
-import Data.Text.Encoding.Error    as Import(UnicodeException(..))
+import Data.List.NonEmpty.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.Instances  as Import ()
diff --git a/templates/home.hamlet b/templates/home.hamlet
deleted file mode 100644
index 3995b864f..000000000
--- a/templates/home.hamlet
+++ /dev/null
@@ -1,5 +0,0 @@
-<div .container>
-  <h2>
-    Kurse mit offener Registrierung
-  <div .container>
-    ^{courseTable}
diff --git a/templates/home/openCourses.hamlet b/templates/home/openCourses.hamlet
new file mode 100644
index 000000000..d578cf404
--- /dev/null
+++ b/templates/home/openCourses.hamlet
@@ -0,0 +1,3 @@
+<section>
+  <h2>_{MsgHomeOpenCourses}
+  ^{courseTable}
diff --git a/templates/home/upcomingSheets.hamlet b/templates/home/upcomingSheets.hamlet
new file mode 100644
index 000000000..d109294c9
--- /dev/null
+++ b/templates/home/upcomingSheets.hamlet
@@ -0,0 +1,3 @@
+<section>
+  <h2>_{MsgHomeUpcomingSheets}
+  ^{sheetTable}
diff --git a/templates/homeUser.hamlet b/templates/homeUser.hamlet
deleted file mode 100644
index 479d27ab9..000000000
--- a/templates/homeUser.hamlet
+++ /dev/null
@@ -1,17 +0,0 @@
-<div .container>
-  <h2>
-    Anstehende Übungsblätter
-  <div .container>
-    ^{sheetTable}
-
-<!--
-<div .container>
-  <h1>
-    Anstehende Klausuren
-  TODO
-
-<div .container>
-  <h1>
-    Anstehende Kursanmeldungen
-  TODO
--->

From 8bedeeffa790849c0364111a4b44142c87384df9 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 3 Apr 2019 18:51:34 +0200
Subject: [PATCH 012/519] Enhance documentation

---
 src/Handler/Utils.hs | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 3d6f1d4d4..46abeddd5 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -142,20 +142,30 @@ warnTermDays tid times = do
   forM_ outoftermdays $ warnI MsgDayIsOutOfTerm
 
 -- | Add language dependent template files
---   For large files which are translated as a whole.
---   Argument musst be a directory under templates,
---   which contains a file for each language,
---   eg. /templates/imprint/de.hamlet and /templates/imprint/en.hamlet
+--
+-- For large files which are translated as a whole.
+--
+-- Argument musst be a directory under @/templates@,
+-- which contains a file for each language,
+-- eg. @imprint@ for choosing between
+-- @/templates/imprint/de.hamlet@, @/templates/imprint/de-at.hamlet@,
+-- and @/templates/imprint/en.hamlet@
+--
+-- Dependency detection cannot work properly (no `addDependentFile`-equivalent
+-- for directories)
+-- @$ stack clean@ is required so new translations show up
 i18nWidgetFile :: FilePath -> Q Exp
 i18nWidgetFile basename = do
+  -- Construct list of available translations (@de@, @en@, ...) at compile time
   let i18nDirectory = "templates" </> basename
   availableFiles <- qRunIO $ listDirectory i18nDirectory
   let availableTranslations = sortWith (NTop . flip List.elemIndex (NonEmpty.toList appLanguages)) . List.nub $ pack . takeBaseName <$> availableFiles
   availableTranslations' <- maybe (fail $ "‘" <> i18nDirectory <> "’ is empty") return $ NonEmpty.nonEmpty availableTranslations
 
-  ws <- newName "ws"
+  -- Dispatch to correct language (depending on user settings via `selectLanguage`) at run time
+  ws <- newName "ws" -- Name for dispatch function
   letE
     [ funD ws $ [ clause [litP $ stringL l] (normalB . widgetFile $ basename </> l) []
-                | l <- unpack <$> NonEmpty.toList availableTranslations'
-                ] ++ [ clause [wildP] (normalB [e| error "selectLanguage returned an invalid translation" |]) [] ]
+                | 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)|]

From 8bf9e44c8222f7248009b54e84800709dac557d5 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 3 Apr 2019 20:26:30 +0200
Subject: [PATCH 013/519] Fix login troubles and make it behave as advertised

---
 shell.nix        |  2 +-
 src/Auth/LDAP.hs | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/shell.nix b/shell.nix
index 69546ffbe..f98506e41 100644
--- a/shell.nix
+++ b/shell.nix
@@ -19,7 +19,7 @@ let
   '';
 
   override = oldAttrs: {
-    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ postgresql pgadmin ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install ]);
+    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ postgresql pgadmin openldap ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install ]);
     shellHook = ''
       export PROMPT_INFO="${oldAttrs.name}"
 
diff --git a/src/Auth/LDAP.hs b/src/Auth/LDAP.hs
index 76f12ce89..5233faaf3 100644
--- a/src/Auth/LDAP.hs
+++ b/src/Auth/LDAP.hs
@@ -88,9 +88,14 @@ campusLogin conf@LdapConf{..} pool = AuthPlugin{..}
         FormMissing -> redirect LoginR
         FormSuccess CampusLogin{ campusIdent = CI.original -> campusIdent, ..} -> do
           ldapResult <- withLdap pool $ \ldap -> do
-            Ldap.bind ldap (Ldap.Dn campusIdent) (Ldap.Password $ Text.encodeUtf8 campusPassword)
             Ldap.bind ldap ldapDn ldapPassword
-            findUser conf ldap campusIdent [userPrincipalName]
+            searchResults <- findUser conf ldap campusIdent [userPrincipalName]
+            case searchResults of
+              [Ldap.SearchEntry (Ldap.Dn userDN) userAttrs] 
+                | Just [principalName] <- lookup userPrincipalName userAttrs
+                , Right credsIdent <- Text.decodeUtf8' principalName
+                -> Right (userDN, credsIdent) <$ Ldap.bind ldap (Ldap.Dn credsIdent) (Ldap.Password $ Text.encodeUtf8 campusPassword)
+              other -> return $ Left other
           case ldapResult of
             Left err
               | LdapError (Ldap.ResponseError (Ldap.ResponseErrorCode _ Ldap.InvalidCredentials _ _)) <- err
@@ -100,16 +105,11 @@ campusLogin conf@LdapConf{..} pool = AuthPlugin{..}
               | otherwise -> do
                   $logErrorS "LDAP" $ "Error during login: " <> tshow err
                   loginErrorMessageI LoginR Msg.AuthError
-            Right searchResults
-              | [Ldap.SearchEntry (Ldap.Dn userDN) userAttrs] <- searchResults
-              , Just [principalName] <- lookup userPrincipalName userAttrs
-              , Right credsIdent <- Text.decodeUtf8' principalName
-                -> do
-                  $logDebugS "LDAP" $ tshow searchResults
-                  lift . setCredsRedirect $ Creds apName credsIdent [("DN", userDN)]
-              | otherwise -> do
-                  $logWarnS "LDAP" $ "Could not extract principal name: " <> tshow searchResults
-                  loginErrorMessageI LoginR Msg.AuthError
+            Right (Right (userDN, credsIdent)) ->
+              lift . setCredsRedirect $ Creds apName credsIdent [("DN", userDN)]
+            Right (Left searchResults) -> do
+              $logWarnS "LDAP" $ "Could not extract principal name: " <> tshow searchResults
+              loginErrorMessageI LoginR Msg.AuthError
     apDispatch _ _ = notFound
     apLogin toMaster = do
       (login, loginEnctype) <- handlerToWidget . generateFormPost $ renderAForm FormStandard campusForm

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 014/519] 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 015/519] 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 016/519] 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 017/519] 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 90c18b50cd81edf2859074ac7a836d47b3456dcd Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 4 Apr 2019 10:50:55 +0200
Subject: [PATCH 018/519] minor

---
 messages/uniworx/de.msg | 4 ++--
 src/Handler/Admin.hs    | 2 --
 src/Handler/Course.hs   | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index da8e563fa..93ab4b266 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -65,8 +65,8 @@ 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.
 CourseNotEmpty: In diesem Kurs sind momentan Teilnehmer angemeldet.
-CourseRegisterOk: Sie wurden angemeldet
-CourseDeregisterOk: Sie wurden abgemeldet
+CourseRegisterOk: Anmeldung erfolgreich
+CourseDeregisterOk: Erfolgreich abgemeldet
 CourseStudyFeature: Assoziiertes Hauptfach
 CourseStudyFeatureTooltip: Korrekte Angabe kann Notenweiterleitungen beschleunigen
 CourseSecretWrong: Falsches Kennwort
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 19b84adf3..4d53f5eed 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -305,7 +305,6 @@ postAdminFeaturesR = do
         unless (null infRedundant) . addMessageI Info . MsgRedundantCandidatesRemoved $ length infRedundant
         let newKeys = map (StudyTermsKey' . fst) infAccepted
         setSessionJson sessionKeyNewStudyTerms newKeys
-        -- addMessageI Error $ MsgPrintDebugForStupid $ tshow newKeys
         if  | null infAccepted
               -> addMessageI Info      MsgNoCandidatesInferred
             | otherwise
@@ -324,7 +323,6 @@ postAdminFeaturesR = do
       _other -> runDB Candidates.conflicts
 
     newStudyTermKeys <- fromMaybe [] <$> lookupSessionJson sessionKeyNewStudyTerms
-    -- addMessageI Error $ MsgPrintDebugForStupid $ tshow newStudyTermKeys
     (   (degreeResult,degreeTable)
       , (studyTermsResult,studytermsTable)
       , ((), candidateTable)) <- runDB $ (,,)
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index fd7ae019e..aa9e37fde 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -705,7 +705,7 @@ validateCourse CourseForm{..} = do
   uid <- liftHandlerT requireAuthId
   userAdmin <- liftHandlerT . runDB . getBy $ UniqueUserAdmin uid cfSchool -- FIXME: This /needs/ to be a call to `isAuthorized` on a route
   MsgRenderer mr <- getMsgRenderer
-  
+
   return
     [ mr msg | (False, msg) <-
         [
@@ -852,8 +852,8 @@ makeCourseUserTable cid colChoices psValidator =
         , fltrUserMatriclenr  queryUser
         , fltrUserNameEmail   queryUser
         -- , ("course-user-degree", error "TODO") -- TODO
-        -- , ("course-user-field" , error "TODO") -- TODO
-        , ("course-user-semesternr", FilterColumn $ E.mkExactFilter $ queryFeaturesStudy  >>> (E.?. StudyFeaturesSemester))
+        -- , ("field" , FilterColumn $ queryFeaturesField error "TODO") -- TODO
+        , ("semesternr", FilterColumn $ E.mkExactFilter $ queryFeaturesStudy  >>> (E.?. StudyFeaturesSemester))
         -- , ("course-registration", error "TODO") -- TODO
         -- , ("course-user-note", error "TODO") -- TODO
         ]

From 431affe6ec06f9bad6307212fdc079b7cba0456a Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 4 Apr 2019 14:20:20 +0200
Subject: [PATCH 019/519] Course User Deregister

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

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 93ab4b266..e5eed4900 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -112,6 +112,9 @@ CourseUserNote: Notiz
 CourseUserNoteTooltip: Nur für Dozenten dieses Kurses einsehbar
 CourseUserNoteSaved: Notizänderungen gespeichert
 CourseUserNoteDeleted: Teilnehmernotiz gelöscht
+CourseUserDeregister: Abmelden
+CourseUsersDeregistered count@Int64: #{show count} Teilnehmer abgemeldet
+
 CourseLecturers: Kursverwalter
 CourseLecturer: Dozent
 CourseAssistant: Assistent
diff --git a/routes b/routes
index f76fd47b7..d558de967 100644
--- a/routes
+++ b/routes
@@ -75,7 +75,7 @@
   /register                   CRegisterR          POST        !timeANDcapacity
   /edit                       CEditR          GET POST
   /delete                     CDeleteR        GET POST        !lecturerANDempty
-  /users                      CUsersR         GET
+  /users                      CUsersR         GET POST
   /users/#CryptoUUIDUser      CUserR          GET POST        !lecturerANDparticipant
   /correctors                 CHiWisR         GET
   /notes                      CNotesR         GET POST        !corrector
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index aa9e37fde..5d4ec2bf9 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -14,6 +14,7 @@ import Handler.Utils.Delete
 import Handler.Utils.Database
 import Handler.Utils.Table.Cells
 import Handler.Utils.Table.Columns
+import Database.Persist.Sql (deleteWhereCount)
 import qualified Database.Esqueleto.Utils as E
 import Database.Esqueleto.Utils.TH
 
@@ -819,57 +820,87 @@ colUserDegreeShort :: IsDBTable m c => Colonnade Sortable UserTableData (DBCell
 colUserDegreeShort = sortable (Just "degree-short") (i18nCell MsgStudyFeatureDegree) $
     foldMap (i18nCell . ShortStudyDegree) . preview (_userTableFeatures . _2 . _Just)
 
-makeCourseUserTable :: CourseId -> _ -> _ -> DB Widget
-makeCourseUserTable cid colChoices psValidator =
-  -- -- psValidator has default sorting and filtering
-  let dbtIdent     = "courseUsers" :: Text
-      dbtStyle     = def { dbsFilterLayout = defaultDBSFilterLayout }
-      dbtSQLQuery  = userTableQuery cid
-      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
-      dbtSorting   = Map.fromList
-        [ sortUserNameLink    queryUser -- slower sorting through clicking name column header
-        , sortUserSurname     queryUser -- needed for initial sorting
-        , sortUserDisplayName queryUser -- needed for initial sorting
-        , sortUserEmail       queryUser
-        , sortUserMatriclenr  queryUser
-        , ("degree"      , SortColumn $ queryFeaturesDegree >>> (E.?. StudyDegreeName))
-        , ("degree-short", SortColumn $ queryFeaturesDegree >>> (E.?. StudyDegreeShorthand))
-        , ("field"       , SortColumn $ queryFeaturesField  >>> (E.?. StudyTermsName))
-        , ("field-short" , SortColumn $ queryFeaturesField  >>> (E.?. StudyTermsShorthand))
-        , ("semesternr"  , SortColumn $ queryFeaturesStudy  >>> (E.?. StudyFeaturesSemester))
-        , ("registration", SortColumn $ queryParticipant    >>> (E.^. CourseParticipantRegistration))
-        , ("note"        , SortColumn $ queryUserNote >>> \note -> -- sort by last edit date
-              E.sub_select . E.from $ \edit -> do
-                E.where_ $ note E.?. CourseUserNoteId E.==. E.just (edit E.^. CourseUserNoteEditNote)
-                return . E.max_ $ edit E.^. CourseUserNoteEditTime
-          )
-        ]
-      dbtFilter    = Map.fromList
-        [ fltrUserNameLink    queryUser
-        , fltrUserEmail       queryUser
-        , fltrUserMatriclenr  queryUser
-        , fltrUserNameEmail   queryUser
-        -- , ("course-user-degree", error "TODO") -- TODO
-        -- , ("field" , FilterColumn $ queryFeaturesField error "TODO") -- TODO
-        , ("semesternr", FilterColumn $ E.mkExactFilter $ queryFeaturesStudy  >>> (E.?. StudyFeaturesSemester))
-        -- , ("course-registration", error "TODO") -- TODO
-        -- , ("course-user-note", error "TODO") -- TODO
-        ]
-      dbtFilterUI mPrev = mconcat
-        [ fltrUserNameEmailUI  mPrev
-        , fltrUserMatriclenrUI mPrev
-        ]
-      dbtParams    = def
-  in dbTableWidget' psValidator DBTable{..}
 
+data CourseUserAction = CourseUserDeregister
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
-getCUsersR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
-getCUsersR tid ssh csh = do
-  (course, numParticipants, participantTable) <- runDB $ do
+instance Universe CourseUserAction
+instance Finite CourseUserAction
+nullaryPathPiece ''CourseUserAction $ camelToPathPiece' 2
+embedRenderMessage ''UniWorX ''CourseUserAction id
+
+makeCourseUserTable :: CourseId -> _ -> _ -> DB (FormResult (CourseUserAction, Set UserId), Widget)
+makeCourseUserTable cid colChoices psValidator = do
+    Just currentRoute <- liftHandlerT getCurrentRoute
+    -- -- psValidator has default sorting and filtering
+    let dbtIdent     = "courseUsers" :: Text
+        dbtStyle     = def { dbsFilterLayout = defaultDBSFilterLayout }
+        dbtSQLQuery  = userTableQuery cid
+        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
+        dbtSorting   = Map.fromList
+          [ sortUserNameLink    queryUser -- slower sorting through clicking name column header
+          , sortUserSurname     queryUser -- needed for initial sorting
+          , sortUserDisplayName queryUser -- needed for initial sorting
+          , sortUserEmail       queryUser
+          , sortUserMatriclenr  queryUser
+          , ("degree"      , SortColumn $ queryFeaturesDegree >>> (E.?. StudyDegreeName))
+          , ("degree-short", SortColumn $ queryFeaturesDegree >>> (E.?. StudyDegreeShorthand))
+          , ("field"       , SortColumn $ queryFeaturesField  >>> (E.?. StudyTermsName))
+          , ("field-short" , SortColumn $ queryFeaturesField  >>> (E.?. StudyTermsShorthand))
+          , ("semesternr"  , SortColumn $ queryFeaturesStudy  >>> (E.?. StudyFeaturesSemester))
+          , ("registration", SortColumn $ queryParticipant    >>> (E.^. CourseParticipantRegistration))
+          , ("note"        , SortColumn $ queryUserNote >>> \note -> -- sort by last edit date
+                E.sub_select . E.from $ \edit -> do
+                  E.where_ $ note E.?. CourseUserNoteId E.==. E.just (edit E.^. CourseUserNoteEditNote)
+                  return . E.max_ $ edit E.^. CourseUserNoteEditTime
+            )
+          ]
+        dbtFilter    = Map.fromList
+          [ fltrUserNameLink    queryUser
+          , fltrUserEmail       queryUser
+          , fltrUserMatriclenr  queryUser
+          , fltrUserNameEmail   queryUser
+          -- , ("course-user-degree", error "TODO") -- TODO
+          -- , ("field" , FilterColumn $ queryFeaturesField error "TODO") -- TODO
+          , ("semesternr", FilterColumn $ E.mkExactFilter $ queryFeaturesStudy  >>> (E.?. StudyFeaturesSemester))
+          -- , ("course-registration", error "TODO") -- TODO
+          -- , ("course-user-note", error "TODO") -- TODO
+          ]
+        dbtFilterUI mPrev = mconcat
+          [ fltrUserNameEmailUI  mPrev
+          , fltrUserMatriclenrUI mPrev
+          ]
+        dbtParams    = DBParamsForm
+          { dbParamsFormMethod = POST
+          , dbParamsFormAction = Just $ SomeRoute currentRoute
+          , dbParamsFormAttrs  = []
+          , dbParamsFormSubmit = FormSubmit
+          , dbParamsFormAdditional = \csrf -> do
+              (res,vw) <- mreq (selectField optionsFinite) "" Nothing
+              let formWgt = toWidget csrf <> fvInput vw
+                  formRes = (, mempty) . First . Just <$> res
+              return (formRes,formWgt)
+          , dbParamsFormEvaluate = liftHandlerT . runFormPost
+          , dbParamsFormResult   = id
+          , dbParamsFormIdent    = def
+          }
+    over _1 postprocess <$> dbTable psValidator DBTable{..}
+  where
+    postprocess :: FormResult (First CourseUserAction, DBFormResult UserId Bool  UserTableData) -> FormResult (CourseUserAction, Set UserId)
+    postprocess inp = do
+      (First (Just act), usrMap) <- inp
+      let usrSet = Map.keysSet . Map.filter id $ getDBFormResult (const False) usrMap
+      return (act, usrSet)
+
+getCUsersR, postCUsersR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCUsersR = postCUsersR
+postCUsersR tid ssh csh = do
+  (Entity cid course, numParticipants, (participantRes,participantTable)) <- runDB $ do
     let colChoices  = mconcat
-          [ colUserNameLink (CourseR tid ssh csh . CUserR)
+          [ dbSelect (applying _2) id (return . view (hasEntity . _entityKey))
+          , colUserNameLink (CourseR tid ssh csh . CUserR)
           , colUserEmail
           , colUserMatriclenr
           , colUserDegreeShort
@@ -879,10 +910,18 @@ getCUsersR tid ssh csh = do
           , colUserComment tid ssh csh
           ]
         psValidator = def & defaultSortingByName
-    Entity cid course <- getBy404 $ TermSchoolCourseShort tid ssh csh
+    ent@(Entity cid _) <- getBy404 $ TermSchoolCourseShort tid ssh csh
     numParticipants <- count [CourseParticipantCourse ==. cid]
-    participantTable <- makeCourseUserTable cid colChoices psValidator
-    return (course, numParticipants, participantTable)
+    table <- makeCourseUserTable cid colChoices psValidator
+    return (ent, numParticipants, table)
+  formResult participantRes $ \case
+    (CourseUserDeregister,selectedUsers) -> do
+        nrDel <- runDB $ deleteWhereCount
+          [ CourseParticipantCourse ==. cid
+          , CourseParticipantUser <-. Set.toList selectedUsers
+          ]
+        addMessageI Success $ MsgCourseUsersDeregistered nrDel
+        redirect $ CourseR tid ssh csh CUsersR
   let headingLong  = [whamlet|_{MsgMenuCourseMembers} #{courseName course} #{display tid}|]
       headingShort = prependCourseTitle tid ssh csh MsgCourseMembers
   siteLayout headingLong $ do

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 020/519] 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 6da0850add13840203ac7d4eec71a5ce90262099 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 4 Apr 2019 18:01:46 +0200
Subject: [PATCH 021/519] Filter-UI course participants improved

---
 src/Database/Esqueleto/Utils.hs | 41 +++++++++++++++++++++++++--------
 src/Handler/Course.hs           | 19 ++++++++++++---
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/src/Database/Esqueleto/Utils.hs b/src/Database/Esqueleto/Utils.hs
index f3aec73aa..6c89e6c96 100644
--- a/src/Database/Esqueleto/Utils.hs
+++ b/src/Database/Esqueleto/Utils.hs
@@ -5,8 +5,9 @@ module Database.Esqueleto.Utils
   , isInfixOf, hasInfix
   , any, all
   , SqlIn(..)
-  , mkExactFilter, mkContainsFilter
-  , anyFilter
+  , mkExactFilter, mkExactFilterWith
+  , mkContainsFilter
+  , anyFilter, allFilter
   ) where
 
 import ClassyPrelude.Yesod hiding (isInfixOf, any, all)
@@ -74,13 +75,22 @@ _queryFeaturesDegree  = $(sqlIJproj 3 2)
 --   Given a lens-like function, make filter for exact matches in a collection
 --   (Generalizing from Set to Foldable ok here, but gives ambigouus types elsewhere)
 mkExactFilter :: (PersistField a)
-  =>  (t -> E.SqlExpr (E.Value a)) -- ^ getter from query to searched element
+  => (t -> E.SqlExpr (E.Value a))  -- ^ getter from query to searched element
   -> t                             -- ^ query row
   -> Set.Set a                     -- ^ needle collection
   -> E.SqlExpr (E.Value Bool)
-mkExactFilter lenslike row criterias
+mkExactFilter = mkExactFilterWith id
+
+-- | 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
+  -> t                             -- ^ query row
+  -> Set.Set a                     -- ^ needle collection
+  -> E.SqlExpr (E.Value Bool)
+mkExactFilterWith cast lenslike row criterias
   | Set.null criterias = true
-  | otherwise = lenslike row `E.in_` E.valList (Set.toList criterias)
+  | otherwise = lenslike row `E.in_` E.valList (cast <$> Set.toList criterias)
 
 -- | generic filter creation for dbTable
 --   Given a lens-like function, make filter searching for needles in String-like elements
@@ -94,9 +104,22 @@ mkContainsFilter lenslike row criterias
   | Set.null criterias = true
   | otherwise = any (hasInfix $ lenslike row) criterias
 
-
-anyFilter :: (Foldable f) => f (t -> Set.Set Text-> E.SqlExpr (E.Value Bool))
-                   -> t -> Set.Set Text-> E.SqlExpr (E.Value Bool)
+-- | Combine several filters, using logical or
+anyFilter :: (Foldable f)
+  => f (t -> Set.Set Text-> E.SqlExpr (E.Value Bool))
+  -> t
+  -> Set.Set Text
+  -> E.SqlExpr (E.Value Bool)
 anyFilter fltrs needle criterias = F.foldr aux false fltrs
   where
-    aux fltr acc = fltr needle criterias E.||. acc
\ No newline at end of file
+    aux fltr acc = fltr needle criterias E.||. acc
+
+-- | Combine several filters, using logical and
+allFilter :: (Foldable f)
+  => f (t -> Set.Set Text-> E.SqlExpr (E.Value Bool))
+  -> t
+  -> Set.Set Text
+  -> 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
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 5d4ec2bf9..98016ca8e 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -862,15 +862,28 @@ makeCourseUserTable cid colChoices psValidator = do
           , fltrUserEmail       queryUser
           , fltrUserMatriclenr  queryUser
           , fltrUserNameEmail   queryUser
-          -- , ("course-user-degree", error "TODO") -- TODO
-          -- , ("field" , FilterColumn $ queryFeaturesField error "TODO") -- TODO
-          , ("semesternr", FilterColumn $ E.mkExactFilter $ queryFeaturesStudy  >>> (E.?. StudyFeaturesSemester))
+          , ("field-name"  , FilterColumn $ E.mkContainsFilter $ queryFeaturesField >>> (E.?. StudyTermsName))
+          , ("field-short" , FilterColumn $ E.mkContainsFilter $ queryFeaturesField >>> (E.?. StudyTermsShorthand))
+          , ("field-key"   , FilterColumn $ E.mkExactFilter    $ queryFeaturesField >>> (E.?. StudyTermsKey))
+          , ("field"       , FilterColumn $ E.anyFilter
+                                 [ E.mkContainsFilter          $ queryFeaturesField >>> (E.?. StudyTermsName)
+                                 , E.mkContainsFilter          $ queryFeaturesField >>> (E.?. StudyTermsShorthand)
+                                 , E.mkExactFilterWith readMay $ queryFeaturesField >>> (E.?. StudyTermsKey)
+                                 ] )
+          , ("degree"      , FilterColumn $ E.anyFilter
+                                 [ E.mkContainsFilter          $ queryFeaturesDegree >>> (E.?. StudyDegreeName)
+                                 , E.mkContainsFilter          $ queryFeaturesDegree >>> (E.?. StudyDegreeShorthand)
+                                 , E.mkExactFilterWith readMay $ queryFeaturesDegree >>> (E.?. StudyDegreeKey)
+                                 ] )
+          , ("semesternr"  , FilterColumn $ E.mkExactFilter    $ queryFeaturesStudy >>> (E.?. StudyFeaturesSemester))
           -- , ("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)
           ]
         dbtParams    = DBParamsForm
           { dbParamsFormMethod = POST

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 022/519] 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 023/519] 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 40c6f1296860b20945472bb6afc0a926cf8bd0e6 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 13:31:01 +0200
Subject: [PATCH 024/519] Only set submission rated if it was assigned to
 uploader

Fixes #330
---
 src/Handler/Utils/Submission.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 124da1b83..67c8fab75 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -462,10 +462,10 @@ sinkSubmission userId mExists isUpdate = do
             case isUpdate of
               False -> lift . insert_ $ SubmissionEdit userId now submissionId
               True  -> do
-                Submission{submissionRatingTime} <- lift $ getJust submissionId
-                when (isNothing submissionRatingTime) $ tellSt mempty { sinkSubmissionNotifyRating = Any True }
-                lift $ update submissionId [ SubmissionRatingBy =. Just userId, SubmissionRatingTime =. Just now ]
-                -- TODO: Should submissionRatingAssigned change here if userId changes?
+                Submission{submissionRatingTime, submissionRatingBy} <- lift $ getJust submissionId
+                when (submissionRatingBy == Just userId) $ do
+                  when (isNothing submissionRatingTime) $ tellSt mempty { sinkSubmissionNotifyRating = Any True }
+                  lift $ update submissionId [ SubmissionRatingTime =. Just now ]
             tellSt $ mempty{ sinkSubmissionTouched = Any True }
 
         finalize :: SubmissionSinkState -> YesodJobDB UniWorX ()

From eedd4714f994b27f16370b34447583aef8c6a778 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 13:56:32 +0200
Subject: [PATCH 025/519] Fix `colRated` to use `submissionRatingDone`, as it
 should

---
 src/Handler/Corrections.hs             | 1 +
 src/Handler/Sheet.hs                   | 3 ++-
 templates/widgets/rating/rating.hamlet | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 9381e0829..42c21d62a 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -161,6 +161,7 @@ colRating = sortable (Just "rating") (i18nCell MsgRating) $ \DBRow{ dbrOutput=(E
       mkRoute = do
         cid <- encrypt subId
         return $ CSubmissionR tid ssh csh sheetName cid CorrectionR
+      mTuple mA mB = (,) <$> mA <*> mB -- Hamlet does not support enough haskell-syntax for this
   in mconcat
      [ anchorCellM mkRoute $(widgetFile "widgets/rating/rating")
      , writerCell $ do
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 7faa02e29..cc5bc7718 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -199,11 +199,12 @@ getSheetListR tid ssh csh = do
             let stats = sheetTypeSum sheetType in -- for statistics over all shown rows
             case mbSub of
               Nothing -> cellTell mempty $ stats Nothing
-              (Just (Entity sid Submission{..})) ->
+              (Just (Entity sid sub@Submission{..})) ->
                 let mkCid = encrypt sid
                     mkRoute = do
                       cid' <- mkCid
                       return $ CSubmissionR tid ssh csh sheetName cid' CorrectionR
+                    mTuple mA mB = (,) <$> mA <*> mB -- Hamlet does not support enough haskell-syntax for this
                     acell = anchorCellM mkRoute $(widgetFile "widgets/rating/rating")
                 in cellTell acell $ stats submissionRatingPoints
 
diff --git a/templates/widgets/rating/rating.hamlet b/templates/widgets/rating/rating.hamlet
index 5c42595e2..a2fb74fe0 100644
--- a/templates/widgets/rating/rating.hamlet
+++ b/templates/widgets/rating/rating.hamlet
@@ -1,8 +1,10 @@
 $# Display Rating, expects
+$#  sub :: Submission
+$#  submissionRatingDone :: Submission -> Bool
 $#  submissionRatingPoints :: Maybe points
 
-$maybe points <- submissionRatingPoints
-  $maybe grading <- preview _grading sheetType
+$if submissionRatingDone sub
+  $maybe (grading, points) <- mTuple (preview _grading sheetType) submissionRatingPoints
     $case grading
       $of Points{..}
         _{MsgAchievedOf points maxPoints}

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 026/519] 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 027/519] 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 028/519] 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 819ec36073700913549d63117214998b641ff0a8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 20:48:31 +0200
Subject: [PATCH 029/519] autofocus on campus login

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

diff --git a/src/Auth/LDAP.hs b/src/Auth/LDAP.hs
index 5233faaf3..2131bf527 100644
--- a/src/Auth/LDAP.hs
+++ b/src/Auth/LDAP.hs
@@ -66,7 +66,7 @@ campusForm :: ( RenderMessage site FormMessage
               , Button site ButtonSubmit
               ) => AForm (HandlerT site IO) CampusLogin
 campusForm = CampusLogin
-  <$> areq ciField (fslpI MsgCampusIdent "user.name@campus.lmu.de" & setTooltip MsgCampusIdentNote) Nothing
+  <$> areq ciField (fslpI MsgCampusIdent "user.name@campus.lmu.de" & setTooltip MsgCampusIdentNote & addAttr "autofocus" "") Nothing
   <*> areq passwordField (fslI MsgCampusPassword) Nothing
 
 campusLogin :: forall site.

From efac923cc292b938e6aebcc8e0eed75444dba5f8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 21:08:39 +0200
Subject: [PATCH 030/519] headerMessagesMiddleware

---
 src/Foundation.hs    | 12 +++++++++++-
 src/Handler/Admin.hs |  1 +
 src/Utils.hs         |  8 ++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0d8e5d909..032d630a2 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -83,6 +83,8 @@ import Data.Bits (Bits(zeroBits))
 
 import Network.Wai.Parse (lbsBackEnd)
 
+import qualified Data.Aeson as JSON
+
 
 instance DisplayAble b => DisplayAble (E.CryptoID a b) where
   display = display . ciphertext
@@ -814,7 +816,7 @@ instance Yesod UniWorX where
     --   b) Validates that incoming write requests include that token in either a header or POST parameter.
     -- To add it, chain it together with the defaultMiddleware: yesodMiddleware = defaultYesodMiddleware . defaultCsrfMiddleware
     -- For details, see the CSRF documentation in the Yesod.Core.Handler module of the yesod-core package.
-    yesodMiddleware = defaultYesodMiddleware . normalizeRouteMiddleware . defaultCsrfMiddleware . updateFavouritesMiddleware
+    yesodMiddleware = defaultYesodMiddleware . normalizeRouteMiddleware . defaultCsrfMiddleware . updateFavouritesMiddleware . headerMessagesMiddleware
       where
         updateFavouritesMiddleware :: Handler a -> Handler a
         updateFavouritesMiddleware handler = (*> handler) . runMaybeT $ do
@@ -854,6 +856,14 @@ instance Yesod UniWorX where
           when changed $ do
             $logDebugS "normalizeRouteMiddleware" [st|Redirecting to #{tshow route'}|]
             redirectWith movedPermanently301 route'
+        headerMessagesMiddleware :: Handler a -> Handler a
+        headerMessagesMiddleware handler = (*> handler) . runMaybeT $ do
+          isModal <- hasCustomHeader HeaderIsModal
+          dbTableShortcircuit <- hasCustomHeader HeaderDBTableShortcircuit
+          guard $ isModal || dbTableShortcircuit
+
+          msgs <- MaybeT $ mapM (\(msgState, content) -> Message <$> fromPathPiece msgState <*> Just content) <$> getMessages 
+          addCustomHeader HeaderAlerts . decodeUtf8 $ JSON.encode msgs
 
     -- Since we implement `errorHandler` ourselves we don't need `defaultMessageWidget`
     defaultMessageWidget _title _body = error "defaultMessageWidget: undefined"
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 4d53f5eed..855640144 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -117,6 +117,7 @@ postAdminTestR = do
       tell . pure $ Message Success [shamlet|Email-test gestartet (Job ##{tshow (fromSqlKey jId)})|]
       return jId
     writeJobCtl $ JobCtlPerform jId
+    addMessage Warning [shamlet|Inkorrekt ausgegebener Alert|] -- For testing alert handling when short circuiting; for proper (not fallback-solution) handling always use `tell` within `formResultModal`
 
   let emailWidget' = wrapForm emailWidget def
         { formAction = Just . SomeRoute $ AdminTestR
diff --git a/src/Utils.hs b/src/Utils.hs
index 88adf17e4..ccec0178a 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -624,10 +624,10 @@ takeSessionJson key = lookupSessionJson key <* deleteSession (toPathPiece key)
 -- Moved to Utils.Parameters
 
 ---------------------------------
--- Custom HTTP Request-Headers --
+-- Custom HTTP Headers --
 ---------------------------------
 
-data CustomHeader = HeaderIsModal | HeaderDBTableShortcircuit
+data CustomHeader = HeaderIsModal | HeaderDBTableShortcircuit | HeaderAlerts
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe CustomHeader
@@ -640,6 +640,10 @@ lookupCustomHeader ident = (>>= fromPathPiece . decodeUtf8) <$> lookupHeader (CI
 hasCustomHeader :: MonadHandler m => CustomHeader -> m Bool
 hasCustomHeader ident = isJust <$> lookupHeader (CI.mk . encodeUtf8 $ toPathPiece ident)
 
+addCustomHeader, replaceOrAddCustomHeader :: (MonadHandler m, PathPiece payload) => CustomHeader -> payload -> m ()
+addCustomHeader ident payload = addHeader (toPathPiece ident) (toPathPiece payload)
+replaceOrAddCustomHeader ident payload = replaceOrAddHeader (toPathPiece ident) (toPathPiece payload)
+
 ------------------
 -- Cryptography --
 ------------------

From 2daffaedb35ac54ff14a5a255784a59d79f67180 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 21:12:38 +0200
Subject: [PATCH 031/519] Set headerMessageMiddleware to run _after_ rest of
 handler

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

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 032d630a2..c5800a3ed 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -857,7 +857,7 @@ instance Yesod UniWorX where
             $logDebugS "normalizeRouteMiddleware" [st|Redirecting to #{tshow route'}|]
             redirectWith movedPermanently301 route'
         headerMessagesMiddleware :: Handler a -> Handler a
-        headerMessagesMiddleware handler = (*> handler) . runMaybeT $ do
+        headerMessagesMiddleware handler = (handler <*) . runMaybeT $ do
           isModal <- hasCustomHeader HeaderIsModal
           dbTableShortcircuit <- hasCustomHeader HeaderDBTableShortcircuit
           guard $ isModal || dbTableShortcircuit

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 032/519] 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 033/519] 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 af1b7200f4aec8626b9b6488e22cd849f4276252 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 21:40:25 +0200
Subject: [PATCH 034/519] Fancy exception handling

---
 src/Foundation.hs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index c5800a3ed..6921850cd 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -5,6 +5,7 @@
 module Foundation where
 
 import Import.NoFoundation
+import qualified ClassyPrelude.Yesod as Yesod (addMessage)
 import Database.Persist.Sql (ConnectionPool, runSqlPool)
 import Text.Hamlet          (hamletFile)
 
@@ -816,7 +817,7 @@ instance Yesod UniWorX where
     --   b) Validates that incoming write requests include that token in either a header or POST parameter.
     -- To add it, chain it together with the defaultMiddleware: yesodMiddleware = defaultYesodMiddleware . defaultCsrfMiddleware
     -- For details, see the CSRF documentation in the Yesod.Core.Handler module of the yesod-core package.
-    yesodMiddleware = defaultYesodMiddleware . normalizeRouteMiddleware . defaultCsrfMiddleware . updateFavouritesMiddleware . headerMessagesMiddleware
+    yesodMiddleware = headerMessagesMiddleware . defaultYesodMiddleware . normalizeRouteMiddleware . defaultCsrfMiddleware . updateFavouritesMiddleware
       where
         updateFavouritesMiddleware :: Handler a -> Handler a
         updateFavouritesMiddleware handler = (*> handler) . runMaybeT $ do
@@ -857,13 +858,15 @@ instance Yesod UniWorX where
             $logDebugS "normalizeRouteMiddleware" [st|Redirecting to #{tshow route'}|]
             redirectWith movedPermanently301 route'
         headerMessagesMiddleware :: Handler a -> Handler a
-        headerMessagesMiddleware handler = (handler <*) . runMaybeT $ do
+        headerMessagesMiddleware handler = (handler `finally`) . runMaybeT $ do
           isModal <- hasCustomHeader HeaderIsModal
           dbTableShortcircuit <- hasCustomHeader HeaderDBTableShortcircuit
+          $logDebugS "headerMessagesMiddleware" $ tshow (isModal, dbTableShortcircuit)
           guard $ isModal || dbTableShortcircuit
 
-          msgs <- MaybeT $ mapM (\(msgState, content) -> Message <$> fromPathPiece msgState <*> Just content) <$> getMessages 
-          addCustomHeader HeaderAlerts . decodeUtf8 $ JSON.encode msgs
+          lift . bracketOnError getMessages (mapM_ $ uncurry Yesod.addMessage) $ \msgs -> do
+            Just msgs' <- return . forM msgs $ \(msgState, content) -> Message <$> fromPathPiece msgState <*> return content
+            addCustomHeader HeaderAlerts . decodeUtf8 $ JSON.encode msgs'
 
     -- Since we implement `errorHandler` ourselves we don't need `defaultMessageWidget`
     defaultMessageWidget _title _body = error "defaultMessageWidget: undefined"

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 035/519] =?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 036/519] 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 037/519] 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 038/519] 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 039/519] 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 040/519] 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 041/519] 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 042/519] 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 043/519] 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 044/519] 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 045/519] 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 046/519] 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 047/519] 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 048/519] 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 049/519] 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 050/519] 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 051/519] 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 052/519] 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 053/519] 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 054/519] 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 055/519] 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 056/519] 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 057/519] 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 058/519] 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 059/519] 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 060/519] 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 061/519] 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 062/519] 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 063/519] 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 064/519] 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 065/519] 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 066/519] 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 067/519] 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 068/519] 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 069/519] 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 070/519] 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 071/519] 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 072/519] 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 073/519] 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 074/519] 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 075/519] 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 076/519] 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 077/519] 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 078/519] 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 079/519] 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 080/519] 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 081/519] 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 082/519] 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 083/519] 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 084/519] 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 085/519] 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 086/519] 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 087/519] 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 088/519] 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 089/519] 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 090/519] 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 091/519] 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 092/519] 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 093/519] 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 094/519] 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 095/519] 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 096/519] 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 097/519] 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 098/519] 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 099/519] 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 100/519] 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 101/519] 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 102/519] 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 103/519] 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 104/519] 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 105/519] 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 106/519] 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 107/519] 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 108/519] 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 109/519] 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 110/519] 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 111/519] 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 112/519] 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 113/519] 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 114/519] 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 115/519] 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 116/519] 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 117/519] 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 118/519] 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 119/519] 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 120/519] 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 121/519] 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 122/519] 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 123/519] 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 124/519] 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 125/519] 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 126/519] 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 127/519] 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 128/519] 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 129/519] 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 130/519] 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 131/519] 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 132/519] 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 133/519] 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 134/519] 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 135/519] 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 136/519] 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 137/519] 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 138/519] 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 139/519] 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 140/519] 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 141/519] 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 142/519] 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 143/519] 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 144/519] 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 145/519] 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 146/519] 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 147/519] 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 148/519] 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 149/519] 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 150/519] 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 151/519] 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 152/519] 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 153/519] 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 154/519] 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 155/519] 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 156/519] 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 157/519] 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 158/519] 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 159/519] 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 160/519] 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 161/519] 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 162/519] 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 163/519] 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 164/519] 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 165/519] 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 166/519] 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 167/519] 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 168/519] 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 169/519] 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 170/519] 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 171/519] 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 172/519] 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 173/519] 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 174/519] 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 175/519] 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 176/519] 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 177/519] 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 178/519] 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 179/519] 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 180/519] 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 181/519] 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 182/519] 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 183/519] 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 184/519] 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 185/519] 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 186/519] 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 187/519] 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 188/519] 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 189/519] 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 190/519] 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 191/519] 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 192/519] 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 193/519] 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 194/519] 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 195/519] 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 196/519] 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 197/519] 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 198/519] 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 199/519] =?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 200/519] 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 201/519] 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 202/519] 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 203/519] 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 204/519] 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 205/519] 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 206/519] 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 207/519] 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 208/519] 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 209/519] 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 210/519] 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 211/519] 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 212/519] 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 213/519] 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 214/519] 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 215/519] 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 216/519] 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 217/519] 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 218/519] 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 219/519] 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 220/519] 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 221/519] 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 222/519] 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 223/519] 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 224/519] 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 225/519] 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 226/519] 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 227/519] 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 228/519] 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 229/519] 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 230/519] 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 231/519] 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 232/519] 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 233/519] 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 234/519] 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 235/519] 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 236/519] 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 237/519] 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 238/519] 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 239/519] 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 240/519] 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 241/519] 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 242/519] 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 243/519] 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 244/519] 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 245/519] 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 246/519] 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 247/519] 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 248/519] 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 249/519] 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 250/519] 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 251/519] 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 252/519] 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 253/519] 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 254/519] 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 255/519] 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 256/519] 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 257/519] 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 258/519] 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 259/519] 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 260/519] 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}>

From d1a8d9cc173cd6a4a7c4655de02cf6c58e205c0e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 6 May 2019 18:47:01 +0200
Subject: [PATCH 261/519] Minor reformulations

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

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 19941107c..d6657f2f3 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -293,11 +293,12 @@ AddCorrector: Zusätzlicher Korrektor
 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
+CountTutPropTip: Wenn Abgaben nach Tutorium zugeteilt werden, zählen diese Zuteilungen in Bezug auf den jeweiligen Anteil?
 AutoAssignCorrs: Korrekturen nach Ablauf des Abgabezeitraums automatisch zuteilen
 Corrector: Korrektor
 Correctors: Korrektoren
 CorState: Status
-CorByTut: Nach Tutorium
+CorByTut: Zuteilung nach Tutorium
 CorProportion: Anteil
 CorByProportionOnly proportion@Rational: #{display proportion} Anteile
 CorByProportionIncludingTutorial proportion@Rational: #{display proportion} Anteile - Tutorium
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index b4d549d49..5a9448177 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -655,7 +655,7 @@ correctorForm shid = wFormToAForm $ do
   when (not (Map.null loads) && applyDefaultLoads) $
     addMessageI Warning MsgCorrectorsDefaulted
 
-  countTutRes <- wreq checkBoxField (fsm MsgCountTutProp) . Just . any (\(_, Load{..}) -> fromMaybe False byTutorial) $ Map.elems loads
+  countTutRes <- wreq checkBoxField (fslI MsgCountTutProp & setTooltip MsgCountTutPropTip) . Just . any (\(_, Load{..}) -> fromMaybe False byTutorial) $ Map.elems loads
 
   let
     previousCorrectors :: E.SqlQuery (E.SqlExpr (Entity User))

From 6743e3b4d7099d4813bf940f1ba924dfba82d3f7 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 7 May 2019 10:26:19 +0200
Subject: [PATCH 262/519] Fixes #337

---
 messages/uniworx/de.msg            |  1 +
 src/Handler/Material.hs            | 35 +++++++++++++++++++++++++-----
 src/Handler/Utils/Table/Cells.hs   |  6 ++++-
 src/Handler/Utils/Table/Columns.hs |  5 +++++
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index d6657f2f3..945497b01 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -223,6 +223,7 @@ 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
+MaterialVisibleFromEditWarning: Das Datum der Veröffentlichung liegt in der Vergangenheit und sollte nicht mehr verändert werden, da dies die Benutzer verwirren könnte.
 MaterialInvisible: Dieses Material ist für Teilnehmer momentan unsichtbar!
 MaterialInvisibleUntil date@Text: Dieses Material ist für Teilnehmer momentan unsichtbar bis #{date}!
 MaterialFiles: Dateien
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 86b1789e6..0f84131ad 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -53,7 +53,13 @@ makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
               return $ material E.^. MaterialType
         return $ defaults <> Set.fromList (mapMaybe E.unValue previouslyUsed)
 
-  ctime <- ceilingQuarterHour <$> liftIO getCurrentTime
+  now <- liftIO getCurrentTime
+  let ctime = ceilingQuarterHour now
+  let visibleToolTip = case mfVisibleFrom <$> template of
+        (Just (Just vistime))  |  vistime <= now
+          -> MsgMaterialVisibleFromEditWarning
+        _ -> MsgMaterialVisibleFromTip
+
   flip (renderAForm FormStandard) html $ MaterialForm
       <$> areq ciField        (fslI MsgMaterialName)         (mfName        <$> template)
       <*> aopt (textField & addDatalist typeOptions)
@@ -61,8 +67,8 @@ makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
                                                              (mfType        <$> template)
       <*> aopt htmlField      (fslpI MsgMaterialDescription "Html")
                                                              (mfDescription <$> template)
-      <*> aopt utcTimeField   (fslI MsgMaterialVisibleFrom
-            & setTooltip MsgMaterialVisibleFromTip)         ((mfVisibleFrom  <$> template) <|> pure (Just ctime))
+      <*> aopt utcTimeField   (fslI MsgMaterialVisibleFrom & setTooltip visibleToolTip)
+                                                            ((mfVisibleFrom <$> template) <|> pure (Just ctime))
       <*> aopt (multiFileField oldFileIds)
                               (fslI MsgMaterialFiles)        (mfFiles <$> template)
 
@@ -83,7 +89,15 @@ getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getMaterialListR tid ssh csh = do
   let matLink :: MaterialName -> Route UniWorX
       matLink = CourseR tid ssh csh . flip MaterialR MShowR
+
+      materialModDateCell :: IsDBTable m a => Material -> DBCell m a
+      materialModDateCell Material{materialVisibleFrom, materialLastEdit}
+        | NTop materialVisibleFrom >= NTop (Just materialLastEdit)
+            = mempty -- empty cells mean no modification after publication
+        | otherwise = dateTimeCell materialLastEdit -- modification after publication is highlighted by being shown
+
   now <- liftIO getCurrentTime
+  seeAllModificationTimestamps <- hasWriteAccessTo $ CourseR tid ssh csh MaterialNewR -- ordinary users should not see modification dates older than visibility
   table <- runDB $ do
     cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
     let row2material = entityVal . dbrOutput -- no inner join, just Entity Material
@@ -109,7 +123,9 @@ getMaterialListR tid ssh csh = do
             , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
                 $ foldMap (dateTimeCellVisible now) . materialVisibleFrom . row2material
             , sortable (Just "last-edit") (i18nCell MsgFileModified)
-                $ dateTimeCell . materialLastEdit . row2material
+                $ if seeAllModificationTimestamps
+                    then dateTimeCell . materialLastEdit . row2material
+                    else materialModDateCell . row2material
             ]
       , dbtSorting   = Map.fromList
             [ ( "type"         , SortColumn (E.^. MaterialType)        )
@@ -128,6 +144,8 @@ getMaterialListR tid ssh csh = do
     $(widgetFile "material-list")
 
 
+
+
 getMFileR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> FilePath -> Handler TypedContent
 getMFileR tid ssh csh mnm title = serveOneFile fileQuery
   where
@@ -151,9 +169,16 @@ 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
+
+  seeAllModificationTimestamps <- hasWriteAccessTo $ CourseR tid ssh csh MaterialNewR -- ordinary users should not see modification dates older than visibility
+
   ( Entity _mid material@Material{materialType, materialDescription}
     , (Any hasFiles,fileTable)) <- runDB $ do
     matEnt <- fetchMaterial tid ssh csh mnm
+    let materialModDateCell :: (IsDBTable m c) => (t -> E.Value UTCTime) -> Colonnade Sortable t (DBCell m c)
+        materialModDateCell = if seeAllModificationTimestamps
+          then colFileModification
+          else colFileModificationWhen $ \t -> NTop (Just t) > NTop (materialVisibleFrom $ entityVal matEnt)
     let psValidator = def & defaultSortingByFileTitle
     fileTable' <- dbTable psValidator DBTable
       { dbtSQLQuery = \(matFile `E.InnerJoin` file) -> do
@@ -165,7 +190,7 @@ getMShowR tid ssh csh mnm = do
       , dbtColonnade = widgetColonnade $ mconcat
             [ dbRowIndicator -- important: contains writer to indicate that the tables is not empty
             , colFilePathSimple   (view $ _dbrOutput . _1) matLink
-            , colFileModification (view $ _dbrOutput . _2)
+            , materialModDateCell (view $ _dbrOutput . _2)
             ]
       , dbtProj = \dbr -> guardAuthorizedFor (matLink $ dbr ^. _dbrOutput . _1 . _Value) dbr
       , dbtStyle    = def
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 84580b219..7d559fd64 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -53,11 +53,15 @@ pathPieceCell = cell . toWidget . toPathPiece
 sqlCell :: (IsDBTable (YesodDB UniWorX) a) => YesodDB UniWorX Widget -> DBCell (YesodDB UniWorX) a
 sqlCell act = mempty & cellContents .~ lift act
 
-markCell :: (IsDBTable m a) => (a -> Bool) -> (a -> DBCell m a) -> a -> DBCell m a
+markCell :: (IsDBTable m a) => (t -> Bool) -> (t -> DBCell m a) -> (t -> DBCell m a)
 markCell condition normal x
   | condition x = normal x <> cell (isVisibleWidget False)
   | otherwise   = normal x
 
+ifCell :: (IsDBTable m a) => (t -> Bool) -> (t -> DBCell m a) -> (t -> DBCell m a) -> (t -> DBCell m a)
+ifCell decision cTrue cFalse x
+  | decision x = cTrue  x
+  | otherwise  = cFalse x
 
 -- Recall: for line numbers, use dbRow
 
diff --git a/src/Handler/Utils/Table/Columns.hs b/src/Handler/Utils/Table/Columns.hs
index 1c125344b..390741925 100644
--- a/src/Handler/Utils/Table/Columns.hs
+++ b/src/Handler/Utils/Table/Columns.hs
@@ -69,6 +69,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) (dateTimeCell . E.unValue . row2time)
 
+colFileModificationWhen :: (IsDBTable m c) => (UTCTime -> Bool) -> (t -> E.Value UTCTime) -> Colonnade Sortable t (DBCell m c)
+colFileModificationWhen condition row2time = sortable (Just "time") (i18nCell MsgFileModified) (conDTCell . E.unValue . row2time)
+  where conDTCell = ifCell condition dateTimeCell $ const mempty
+
+
 sortFilePath :: IsString s => (r -> E.SqlExpr (Entity File)) -> (s, SortColumn r)
 sortFilePath queryPath = ("path", SortColumn $ queryPath >>> (E.^. FileTitle))
 

From 2aa73b769484a40d246d5b76560177021f198487 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 8 May 2019 10:14:49 +0200
Subject: [PATCH 263/519] Minor clarifications

---
 src/Handler/Utils/Form/MassInput.hs   |  4 +++-
 src/Handler/Utils/Table/Cells.hs      | 12 +++++++-----
 src/Handler/Utils/Table/Pagination.hs |  2 +-
 templates/info-lecturer/de.hamlet     | 20 +++++++++++++++-----
 templates/versionHistory.hamlet       |  4 +---
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index abec6f300..2c6560876 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -269,6 +269,8 @@ type MassInputLayout liveliness cellData cellResult
     -> Map (Natural, BoxCoord liveliness) Widget -- Addition forms
     -> Widget
 
+-- | Multiple multi-layerd input fields
+--   May short-circuit a handler if the frontend only asks for the content, i.e. handler actions after calls to massInput may not happen at all.
 massInput :: forall handler cellData cellResult liveliness.
            ( MonadHandler handler, HandlerSite handler ~ UniWorX
            , ToJSON cellData, FromJSON cellData
@@ -443,7 +445,7 @@ defaultMiLayout liveliness _ cellResults delResults addResults = miWidget' boxOr
           cells
             | [] <- remDims = do
                 coord <- coords
-                Just cellWdgt <- return $ Map.lookup coord cellResults 
+                Just cellWdgt <- return $ Map.lookup coord cellResults
                 let deleteButton = Map.lookup coord delResults
                 return (coord, $(widgetFile "widgets/massinput/cell"))
             | otherwise =
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 7d559fd64..139d13dc6 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -53,10 +53,11 @@ pathPieceCell = cell . toWidget . toPathPiece
 sqlCell :: (IsDBTable (YesodDB UniWorX) a) => YesodDB UniWorX Widget -> DBCell (YesodDB UniWorX) a
 sqlCell act = mempty & cellContents .~ lift act
 
+-- | Highlight table cells with warning: Is not yet implemented in frontend.
 markCell :: (IsDBTable m a) => (t -> Bool) -> (t -> DBCell m a) -> (t -> DBCell m a)
 markCell condition normal x
-  | condition x = normal x <> cell (isVisibleWidget False)
-  | otherwise   = normal x
+   | condition x = normal x & cellAttrs <>~ [("class","urgency__warning")] ---TODO: handle existing classe akin to Form.addAttr/addClass
+   | otherwise   = normal x
 
 ifCell :: (IsDBTable m a) => (t -> Bool) -> (t -> DBCell m a) -> (t -> DBCell m a) -> (t -> DBCell m a)
 ifCell decision cTrue cFalse x
@@ -103,9 +104,10 @@ 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
+    let tfw = formatTimeW SelFormatDateTime t
+        icn :: Widget
+        icn = bool mempty (toWidget $ isVisible False) $ watershed < t
+    [whamlet|^{tfw}&nbsp;^{icn}|]
 
 userCell :: IsDBTable m a => Text -> Text -> DBCell m a
 userCell displayName surname = cell $ nameWidget displayName surname
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 36d2cfaca..65716bc11 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -613,7 +613,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
+-- | DB-backed tables with pagination, may short-circuit a handler if the frontend only asks for the table content, i.e. handler actions after calls to dbTable may not happen at all.
 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 5ad4a1192..e766ef7da 100644
--- a/templates/info-lecturer/de.hamlet
+++ b/templates/info-lecturer/de.hamlet
@@ -175,12 +175,22 @@ $newline text
             Studierenden ein neues Pseudonym
             erstellen, damit eine anonyme Korrektur
             gewährleistet werden kann.
+            Dadurch wird aber noch keine Abgabe im System angelegt,
+            da ich nicht alle Teilnehmer, welche ein Pseudonym anfordern,
+            auch tatsächlich abgeben.
         <li>
-          Korrektoren bekommen die externen Abgaben
-          ausgehändigt.
-          Anhand der Pseudonyme werden
-          in Uni2work Abgaben angelegt,
-          welche wie üblich korrigiert werden können.
+          <p>
+            Korrektoren bekommen die externen Abgaben
+            ausgehändigt.
+            Anhand der Pseudonyme
+            muss der Korrektor dann in Uni2work
+            <a href="@{CorrectionsCreateR}">
+              Abgaben anlegen
+            , welche danach wie üblich korrigiert werden können.
+          <p>
+            Solche angelgten Abgaben werden bei der nächsten
+            Verteilung von Übungsblättern
+            dem jeweiligen Korrektor zum Arbeitspensum angerechnet.
 
 <section>
   <h2>Tutorien
diff --git a/templates/versionHistory.hamlet b/templates/versionHistory.hamlet
index 994c553ce..295fb0094 100644
--- a/templates/versionHistory.hamlet
+++ b/templates/versionHistory.hamlet
@@ -7,10 +7,8 @@
     <h2>
       Bekannte Bugs
     <h3>
-      Stand: März 2019
+      Stand: Mai 2019
     <ul>
-      <li>
-        Login ist u.U. anders als im alten System, z.B. momentan geht nur <span style="font-family:monospace">@campus.lmu.de</span> aber nicht die Abkürzung <span style="font-family:monospace">@lmu.de</span>
       <li>
         Format von Bewertungsdateien ist noch provisorisch
 

From d2f0ffc899049ede97f5bc986788f21de38b7bb2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 8 May 2019 10:27:30 +0200
Subject: [PATCH 264/519] Document `deleteR`

---
 src/Handler/Utils/Delete.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Handler/Utils/Delete.hs b/src/Handler/Utils/Delete.hs
index e4e1cbff1..149ab8285 100644
--- a/src/Handler/Utils/Delete.hs
+++ b/src/Handler/Utils/Delete.hs
@@ -32,11 +32,11 @@ 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)
-  , 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
+  { drRecords :: Set (Key record) -- ^ Records to be deleted
+  , drGetInfo :: tables -> E.SqlQuery infoExpr -- ^ SQL-Query to get necessary information to render identifing information about records to the user (`drRenderRecord`, `drRecordConfirmString`); @tables@ is an arbitrary join, see `E.from`; @infoExpr@ gets converted to @info@ by esqueleto
+  , drUnjoin :: tables -> E.SqlExpr (Entity record) -- ^ `E.SqlExpr` of @Key record@ extracted from @tables@, `deleteR` restricts `drGetInfo` to `drRecords` automatically
+  , drRenderRecord :: info -> ReaderT SqlBackend (HandlerT UniWorX IO) Widget -- ^ Present a single record, to be deleted, to the user for inspection prior to deletion
+  , drRecordConfirmString :: info -> ReaderT SqlBackend (HandlerT UniWorX IO) Text -- ^ Text for the user to copy to confirm deletion; should probably contain all information from `drRenderRecord` so user gets prompted to think about what they're deleting
   , drCaption
   , drSuccessMessage :: SomeMessage UniWorX
   , drAbort

From f6e29a7fa74ddd2de7838e778d935c98ec33d616 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 8 May 2019 10:52:21 +0200
Subject: [PATCH 265/519] Material Delete implemented

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

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 945497b01..7030d0c15 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -235,7 +235,9 @@ 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?
+MaterialDeleteCaption: Wollen Sie das unten aufgeführte Material wirklich löschen?
+MaterialDelHasFiles count@Int64: inklusive #{tshow count} #{pluralDE count "Datei" "Dateien"}
+MaterialIsVisible: Achtung, dieses Material wurde bereits veröffentlicht.
 MaterialDeleted materialName@MaterialName: Material "#{materialName}" gelöscht
 
 
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 0f84131ad..b641b8ec3 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -16,7 +16,7 @@ import Database.Esqueleto.Utils.TH
 import Utils.Lens
 import Utils.Form
 import Handler.Utils
--- import Handler.Utils.Delete
+import Handler.Utils.Delete
 import Handler.Utils.Table.Cells
 import Handler.Utils.Table.Columns
 
@@ -309,18 +309,31 @@ handleMaterialEdit tid ssh csh cid template dbMaterial = do
 getMDelR, postMDelR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html
 getMDelR = postMDelR
 postMDelR tid ssh csh mnm = do
-  _matEnt <- runDB $ fetchMaterial tid ssh csh mnm
-  error "todo" -- CONTINUE HERE
-  {-
+  matEnt <- runDB $ fetchMaterial tid ssh csh mnm
   deleteR DeleteRoute
     { drRecords = Set.singleton $ entityKey matEnt
-    , drGetInfo = error "todo"
-    , drUnjoin  = error "todo"
-    , drRenderRecord = error "todo"
-    , drRecordConfirmString = error "todo"
-    , drCaption        = SomeMessage   MsgMaterialDeleteQuestion
+    , drGetInfo = \(material `E.InnerJoin` course) -> do
+        E.on $ material E.^. MaterialCourse E.==. course E.^. CourseId
+        let filecount = E.sub_select . E.from $ \matfile -> do
+                E.where_ $ matfile E.^. MaterialFileMaterial E.==. material E.^. MaterialId
+                return (E.countRows :: E.SqlExpr (E.Value Int64))
+        return (material,course,filecount)
+    , drUnjoin  = \(material `E.InnerJoin` _course) -> material
+    , drRenderRecord  = \(Entity _ Material{..}, Entity _ Course{..}, E.Value fileCount) -> do
+        now <- liftIO getCurrentTime
+        let isPublished = NTop (Just now)  >=  NTop materialVisibleFrom
+            pCT = prependCourseTitle courseTerm courseSchool courseShorthand
+        return [whamlet|
+          _{SomeMessage $ pCT $ MsgMaterialHeading materialName}
+          $if fileCount /= 0
+            &nbsp;<i>_{SomeMessage $ MsgMaterialDelHasFiles fileCount}
+          $if isPublished
+            &nbsp;_{SomeMessage $ MsgMaterialIsVisible}
+        |]
+    , drRecordConfirmString = \(Entity _ Material{..}, Entity _ Course{..}, E.Value fileCount) ->
+        return $ [st|#{termToText (unTermKey courseTerm)}/#{unSchoolKey courseSchool}/#{courseShorthand}/#{materialName}|] <> bool mempty [st| + #{tshow fileCount} Files|] (fileCount /= 0)
+    , drCaption        = SomeMessage   MsgMaterialDeleteCaption
     , drSuccessMessage = SomeMessage $ MsgMaterialDeleted mnm
     , drSuccess = SomeRoute $ CourseR tid ssh csh   MaterialListR
     , drAbort   = SomeRoute $ CourseR tid ssh csh $ MaterialR mnm MShowR
     }
-  -}

From 36347aa832801ee0f365edf87b6bdfe9be442e8d Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 8 May 2019 11:00:10 +0200
Subject: [PATCH 266/519] flipMaybe moved to Utils

---
 src/Import/NoFoundation.hs |  1 +
 src/Utils.hs               | 14 ++++++++------
 src/Utils/DB.hs            |  7 +------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 266ad727b..73e1dbe8d 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -18,6 +18,7 @@ import Yesod.Default.Config2  as Import
 import Utils                  as Import
 import Utils.Frontend.Modal   as Import
 import Utils.Frontend.I18n    as Import
+import Utils.DB               as Import
 import Yesod.Core.Json        as Import (provideJson)
 import Yesod.Core.Types.Instances as Import (CachedMemoT(..))
 
diff --git a/src/Utils.hs b/src/Utils.hs
index 7a4758f4a..4ca14e49c 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -19,7 +19,7 @@ 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.DB as Utils
 import Utils.TH as Utils
 import Utils.DateTime as Utils
 import Utils.PathPiece as Utils
@@ -420,11 +420,13 @@ 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
+-- | 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
+
 
 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)
diff --git a/src/Utils/DB.hs b/src/Utils/DB.hs
index b6e7b9950..de6a3c0fa 100644
--- a/src/Utils/DB.hs
+++ b/src/Utils/DB.hs
@@ -10,13 +10,8 @@ import qualified Data.Set as Set
 import qualified Database.Esqueleto as E
 -- import Database.Persist -- currently not needed here
 
+import Utils
 
--- | 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
 
 
 

From e5dbbe38ad38a11191e0ad672c8feb9dd3cf9b31 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 8 May 2019 14:58:40 +0200
Subject: [PATCH 267/519] Introduce wrapForm'

---
 src/Utils/Form.hs                  | 19 +++++++++++++------
 templates/widgets/form/form.hamlet |  8 ++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index d4d0ba97e..862c204fb 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -351,11 +351,15 @@ autosubmitButton = combinedButtonFieldF_ (Proxy @ButtonSubmit) $ "" & addAutosub
 
 -- | just Html for a Submit-Button
 submitButtonView :: forall site . Button site ButtonSubmit => WidgetT site IO ()
-submitButtonView = do
-  let bField :: Field (HandlerT site IO) ButtonSubmit
-      bField = buttonField BtnSubmit
+submitButtonView = buttonView BtnSubmit
+  
+buttonView :: forall site button. Button site button => button -> WidgetT site IO ()
+buttonView btn = do
+  let bField :: Field (HandlerT site IO) button
+      bField = buttonField btn
   btnId <- newIdent
-  fieldView bField btnId "" mempty (Right BtnSubmit) False
+  fieldView bField btnId "" mempty (Right btn) False
+
 
 
 buttonForm :: (Button site a, Finite a) => Html -> MForm (HandlerT site IO) (FormResult a, WidgetT site IO ())
@@ -478,8 +482,11 @@ instance Default (FormSettings site) where
     , formAnchor   = Nothing :: Maybe Text
     }
 
-wrapForm :: (Button site ButtonSubmit) => WidgetT site IO () -> FormSettings site -> WidgetT site IO ()
-wrapForm formWidget FormSettings{..} = do
+wrapForm :: Button site ButtonSubmit => WidgetT site IO () -> FormSettings site -> WidgetT site IO ()
+wrapForm = wrapForm' BtnSubmit
+
+wrapForm' :: Button site button => button -> WidgetT site IO () -> FormSettings site -> WidgetT site IO ()
+wrapForm' btn formWidget FormSettings{..} = do
   formId <- maybe newIdent (return . toPathPiece) formAnchor
   formActionUrl <- traverse toTextUrl formAction
   $(widgetFile "widgets/form/form")
diff --git a/templates/widgets/form/form.hamlet b/templates/widgets/form/form.hamlet
index 1046f79b5..123717b08 100644
--- a/templates/widgets/form/form.hamlet
+++ b/templates/widgets/form/form.hamlet
@@ -7,12 +7,12 @@ $# Wrapper for all kinds of forms
       ^{formWidget}
     $of FormSubmit
       ^{formWidget}
-      ^{submitButtonView}
+      ^{buttonView btn}
     $of FormDualSubmit
-      ^{submitButtonView}
+      ^{buttonView btn}
       ^{formWidget}
-      ^{submitButtonView}
+      ^{buttonView btn}
     $of FormAutoSubmit
       ^{formWidget}
       <button type=submit uw-auto-submit-button>
-        ^{btnLabel BtnSubmit}
+        ^{btnLabel btn}

From 6daaf6894904a523a048d695f68d98eb603bf317 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 8 May 2019 15:04:57 +0200
Subject: [PATCH 268/519] initial stub, does not compile

---
 messages/uniworx/de.msg          |   8 +++
 routes                           |   2 +
 src/Handler/Course.hs            | 104 ++++++++++++++++++++++++++++++-
 src/Handler/Sheet.hs             |   4 +-
 src/Handler/Tutorial.hs          |  10 +--
 src/Handler/Utils/Invitations.hs |  12 ++--
 src/Utils/Form.hs                |   6 +-
 7 files changed, 130 insertions(+), 16 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 7030d0c15..f35f195af 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -582,6 +582,8 @@ CommCourseSubject: Kursmitteilung
 MailSubjectLecturerInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Kursverwalter
 InvitationAcceptDecline: Einladung annehmen/ablehnen
 
+MailSubjectParticipantInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Kursteilname
+
 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}
@@ -853,6 +855,12 @@ LecturerInvitationDeclined csh@CourseShorthand: Sie haben die Einladung, Kursver
 CourseLecInviteHeading courseName@Text: Einladung zum Kursverwalter für #{courseName}
 CourseLecInviteExplanation: Sie wurden eingeladen, Verwalter für einen Kurs zu sein.
 
+CourseParticipantInviteHeading courseName@Text: Einladung zum Kursteilnahmer für #{courseName}
+CourseParticipantInviteExplanation: Sie wurden eingeladen, an einem Kurs teilzunehmen.
+CourseParticipantEnlistDirectly: bekannte Teilnehmer sofort als Teilnehmer eintragen
+CourseParticipantInviteField: einzuladende EMail Adressen
+
+
 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}
diff --git a/routes b/routes
index 747207cc0..e61a0f2f4 100644
--- a/routes
+++ b/routes
@@ -85,6 +85,8 @@
   /lecturer-invite            CLecInviteR      GET POST
   /delete                     CDeleteR         GET POST        !lecturerANDempty
   /users                      CUsersR          GET POST
+  !/users/new                 CAddUserR        GET POST
+  !/users/invite              CInviteR         GET POST
   /users/#CryptoUUIDUser      CUserR           GET POST        !lecturerANDparticipant
   /correctors                 CHiWisR          GET
   /communication              CCommR           GET POST
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 003fdfcdc..9cdd21810 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -40,7 +40,7 @@ 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)
@@ -1355,7 +1355,107 @@ postCCommR tid ssh csh = do
         evalAccessDB (CourseR tid ssh csh $ CUserR cID) False
     }
 
- 
+
 getCLecInviteR, postCLecInviteR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCLecInviteR = postCLecInviteR
 postCLecInviteR = invitationR lecturerInvitationConfig
+
+
+
+-- Invitations for ordinary participants of this course
+instance IsInvitableJunction CourseParticipant where
+  type InvitationFor CourseParticipant = Course
+  data InvitableJunction CourseParticipant = JunctionParticipant
+    { jParticipantRegistration :: UTCTime
+    , jParticipantFild         :: Maybe StudyFeaturesId
+    } deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationDBData CourseParticipant = InvDBDataParticipant
+    -- no data needed in DB to manage participant invitation
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationTokenData CourseParticipant = InvTokenDataParticipant
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+  _InvitableJunction = iso
+    (\CourseParticipant{..} -> (courseParticipantUser, courseParticipantCourse, JunctionParticipant courseParticipantRegistration courseParticipantField))
+    (\(courseParticipantUser, courseParticipantCourse, JunctionParticipant courseParticipantRegistration courseParticipantField) -> CourseParticipant{..})
+
+  ephemeralInvitation = Just (iso (const InvDBDataParticipant) (const ()))
+
+instance ToJSON (InvitableJunction CourseParticipant) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+instance FromJSON (InvitableJunction CourseParticipant) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+
+instance ToJSON (InvitationDBData CourseParticipant) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+instance FromJSON (InvitationDBData CourseParticipant) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+
+instance ToJSON (InvitationTokenData CourseParticipant) where
+  toJSON = genericToJSON defaultOptions { constructorTagModifier = camelToPathPiece' 3 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+instance FromJSON (InvitationTokenData CourseParticipant) where
+  parseJSON = genericParseJSON defaultOptions { constructorTagModifier = camelToPathPiece' 3 }
+
+participantInvitationConfig :: InvitationConfig CourseParticipant
+participantInvitationConfig = InvitationConfig{..}
+  where
+    invitationRoute Course{..} _ = return $ CourseR courseTerm courseSchool courseShorthand CInviteR
+    invitationResolveFor = do
+      Just (CourseR tid csh ssh CInviteR) <- getCurrentRoute
+      getKeyBy404 $ TermSchoolCourseShort tid csh ssh
+    invitationSubject     Course{..} _ = return . SomeMessage $ MsgMailSubjectParticipantInvitation courseTerm courseSchool courseShorthand
+    invitationHeading     Course{..} _ = return . SomeMessage $ MsgCourseParticipantInviteHeading $ CI.original courseName
+    invitationExplanation _          _ = [ihamlet|_{SomeMessage MsgParticipantInviteExplanation}|]
+    -- Keine besonderen Einschränkungen beim Einlösen der Token
+    -- ACHTUNG: Mit einem Token könnten sich deshalb mehrere Benutzer anmelden!
+    invitationTokenConfig _ _ = do
+      itAuthority <- liftHandlerT requireAuthId
+      return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
+    invitationRestriction _ _ = return Authorized
+    invitationForm Course{..} _ uid = wFormToAForm $ do
+      now <- liftIO getCurrentTime
+      studyFeatures <- wreq (studyFeaturesPrimaryFieldFor [ ] (Just uid))
+          (fslI MsgCourseStudyFeature & setTooltip  MsgCourseStudyFeatureTooltip) Nothing
+      return $ JunctionParticipant <$> pure now <*> studyFeatures
+    invitationSuccessMsg Course{..} _ =
+      return . SomeMessage $ MsgParticipantInvitationAccepted courseTerm courseSchool courseShorthand
+    invitationUltDest Course{..} _ = return . SomeRoute $ CourseR courseTerm courseSchool courseShorthand CShowR
+
+getCAddUserR, postCAddUserR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCAddUserR = postCAddUserR
+postCAddUserR tid ssh csh = do
+    cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+    ((usersToEnlist,formWgt),formEcnoding) <- runFormPost . renderWForm FormStandard $ do
+      enlist <- wreq checkBoxField  (fslI MsgCourseParticipantEnlistDirectly) (Just False)
+      areq (multiUserField (fromMaybe False $ formResultToMaybe enlist)  Nothing)
+              (fslI MsgCourseParticipantInviteField) Nothing
+    formResult usersToEnlist processUsers
+  where
+    processUsers :: Set (Either UserEmail UserId) -> Handler ()
+    processUsers users = do
+      error "TODO"
+      {-}
+      let (emails,uids) = partionEithers $ Set.toList users
+      runDB $ do
+        -- send Invitation eMails to unkown users
+        sinkInvitationsF participantInvitationConfig [(mail,cid,(InvDBDataParticipant,InvTokenDataParticipant)) | mail <- emails]
+        -- register known users
+        (alreadyRegistered,registeredNoField,registeredOneField) <- execWriterT $ mapM registerUser uids
+      let statusMsg = modal _linkText (Right _widgetmessage)
+          statusTy  = Info -- Success -- TODO
+      addMessageWidget statusTy statusMsg
+      redirect $ CourseR tid ssh csh CUsersR
+
+    registerUser :: UserId -> WriterT ([UserEmail],[UserEmail],[UserEmail]) (YesodDB UniWorX) ()
+    registerUser uid = do
+
+      tell ([],[],[])
+      -}
+
+
+getCInviteR, postCInviteR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCInviteR = postCInviteR
+postCInviteR = invitationR participantInvitationConfig
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 5a9448177..751b77f48 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -763,7 +763,7 @@ 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 ]
@@ -836,7 +836,7 @@ correctorInvitationConfig = InvitationConfig{..}
       itAuthority <- liftHandlerT requireAuthId
       return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
     invitationRestriction _ _ = return Authorized
-    invitationForm _ (InvDBDataSheetCorrector load state, _) = pure $ JunctionSheetCorrector load state
+    invitationForm _ (InvDBDataSheetCorrector load state, _) _ = pure $ JunctionSheetCorrector load state
     invitationSuccessMsg Sheet{..} _ = return . SomeMessage $ MsgCorrectorInvitationAccepted sheetName
     invitationUltDest Sheet{..} _ = do
       Course{..} <- get404 sheetCourse
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 255f26aea..f870b43db 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -249,7 +249,7 @@ tutorInvitationConfig = InvitationConfig{..}
       itAuthority <- liftHandlerT requireAuthId
       return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
     invitationRestriction _ _ = return Authorized
-    invitationForm _ _ = pure JunctionTutor
+    invitationForm _ _ _ = pure JunctionTutor
     invitationSuccessMsg Tutorial{..} _ = return . SomeMessage $ MsgCorrectorInvitationAccepted tutorialName
     invitationUltDest Tutorial{..} _ = do
       Course{..} <- get404 tutorialCourse
@@ -279,7 +279,7 @@ tutorialForm cid template html = do
   Just cRoute <- getCurrentRoute
   uid <- liftHandlerT requireAuthId
 
-  let 
+  let
     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 ([Either UserEmail UserId] -> FormResult [Either UserEmail UserId])
@@ -306,7 +306,7 @@ tutorialForm cid template html = do
 
         miLayout' :: MassInputLayout ListLength (Either UserEmail 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)
@@ -345,7 +345,7 @@ getCTutorialNewR, postCTutorialNewR :: TermId -> SchoolId -> CourseShorthand ->
 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
@@ -436,7 +436,7 @@ postTEditR tid ssh csh tutn = do
         }
       when (is _Nothing insertRes) $ do
         let (invites, adds) = partitionEithers $ Set.toList tfTutors
-        
+
         deleteWhere [ TutorTutorial ==. tutid ]
         insertMany_ $ map (Tutor tutid) adds
 
diff --git a/src/Handler/Utils/Invitations.hs b/src/Handler/Utils/Invitations.hs
index a256a7a99..25aef86fc 100644
--- a/src/Handler/Utils/Invitations.hs
+++ b/src/Handler/Utils/Invitations.hs
@@ -48,7 +48,7 @@ class ( PersistRecordBackend junction (YesodPersistBackend UniWorX)
   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`
@@ -129,7 +129,7 @@ data InvitationConfig junction = InvitationConfig
     -- ^ 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)
+  , invitationForm        :: InvitationFor junction -> InvitationData junction -> Key User -> 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
@@ -158,7 +158,7 @@ $(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)
 
@@ -198,7 +198,7 @@ sinkInvitations InvitationConfig{..} = determineExists .| C.foldMap pure >>= lif
         ur <- getUrlRenderParams
 
         fRec <- get404 fid
-        
+
         jInviter <- liftHandlerT requireAuthId
         route <- mapReaderT liftHandlerT $ invitationRoute fRec dat
         InvitationTokenConfig{..} <- mapReaderT liftHandlerT $ invitationTokenConfig fRec dat
@@ -284,7 +284,7 @@ invitationR' InvitationConfig{..} = liftHandlerT $ do
       iData = review _InvitationData (dbData, itData)
     guardAuthResult =<< invitationRestriction fRec iData
     ((dataRes, dataWidget), dataEnctype) <- runFormPost . formEmbedJwtPost . renderAForm FormStandard . wFormToAForm $ do
-      dataRes <- aFormToWForm $ invitationForm fRec iData
+      dataRes <- aFormToWForm $ invitationForm fRec iData invitee
       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
@@ -333,7 +333,7 @@ instance InvitationR (Handler Html) where
 
 instance InvitationR b => InvitationR (a -> b) where
   invitationR cfg _ = invitationR cfg
-  
+
 
 -- $procedure
 --
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index d4d0ba97e..465ef1cd4 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -8,7 +8,7 @@ import Settings
 
 import Utils.Parameters
 
--- import Text.Blaze (toMarkup) -- for debugging
+import Text.Blaze (Markup)
 import qualified Text.Blaze.Internal as Blaze (null)
 import qualified Data.Text as T
 
@@ -498,6 +498,10 @@ renderAForm formLayout aform fragment = do
   let widget = $(widgetFile "widgets/aform/aform")
   return (res, widget)
 
+renderWForm :: MonadHandler m => FormLayout -> WForm m (FormResult a) -> -- Form a   -- (Synonym unavailable here)
+  (Markup -> MForm m (FormResult a, WidgetT (HandlerSite m) IO ()))
+renderWForm formLayout = renderAForm formLayout . wFormToAForm
+
 
 -- | special id to identify form section headers, see 'aformSection' and 'formSection'
 --   currently only treated by form generation through 'renderAForm'

From 6182e9414395fbfba2c303d546f2eeaa48ca1801 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 8 May 2019 21:02:05 +0200
Subject: [PATCH 269/519] Sheet: unpublished files marked with icon and class

---
 src/Handler/Sheet.hs                          |  5 ++--
 src/Handler/Utils/Table/Cells.hs              | 18 ++++++------
 src/Utils.hs                                  |  2 +-
 src/Utils/Form.hs                             | 28 ++++++++++---------
 src/Utils/Message.hs                          |  3 ++
 .../widgets/date-time/yet-invisible.hamlet    |  1 +
 6 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 templates/widgets/date-time/yet-invisible.hamlet

diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 5a9448177..6187c4580 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -296,6 +296,7 @@ instance Button UniWorX ButtonGeneratePseudonym where
 -- Show single sheet
 getSShowR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSShowR tid ssh csh shn = do
+  now <- liftIO getCurrentTime
   Entity sid sheet <- runDB $ fetchSheet tid ssh csh shn
   -- without Colonnade
 --   fileNameTypes <- runDB $ E.select $ E.from $
@@ -325,7 +326,7 @@ getSShowR tid ssh csh shn = do
              (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
+        , sortable (Just "time") (i18nCell MsgFileModified) $ \(_,E.Value modified,_) -> dateTimeCellVisible now modified
         ]
   let psValidator = def & defaultSorting [SortAscBy "type", SortAscBy "path"]
   (Any hasFiles, fileTable) <- runDB $ dbTable psValidator DBTable
@@ -763,7 +764,7 @@ 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 ]
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 139d13dc6..e5906e993 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -54,9 +54,9 @@ sqlCell :: (IsDBTable (YesodDB UniWorX) a) => YesodDB UniWorX Widget -> DBCell (
 sqlCell act = mempty & cellContents .~ lift act
 
 -- | Highlight table cells with warning: Is not yet implemented in frontend.
-markCell :: (IsDBTable m a) => (t -> Bool) -> (t -> DBCell m a) -> (t -> DBCell m a)
-markCell condition normal x
-   | condition x = normal x & cellAttrs <>~ [("class","urgency__warning")] ---TODO: handle existing classe akin to Form.addAttr/addClass
+markCell :: (IsDBTable m a) => MessageStatus -> (t -> Bool) -> (t -> DBCell m a) -> (t -> DBCell m a)
+markCell status condition normal x
+   | condition x = normal x & over cellAttrs (insertAttr "class" $ statusToUrgencyClass status)
    | otherwise   = normal x
 
 ifCell :: (IsDBTable m a) => (t -> Bool) -> (t -> DBCell m a) -> (t -> DBCell m a) -> (t -> DBCell m a)
@@ -102,12 +102,14 @@ dateCell t = cell $ formatTime SelFormatDate t >>= toWidget
 dateTimeCell :: IsDBTable m a => UTCTime -> DBCell m a
 dateTimeCell t = cell $ formatTime SelFormatDateTime t >>= toWidget
 
+-- | Show a date, and highlight date earlier than given watershed with an icon
 dateTimeCellVisible :: IsDBTable m a => UTCTime -> UTCTime -> DBCell m a
-dateTimeCellVisible watershed t = cell $ do
-    let tfw = formatTimeW SelFormatDateTime t
-        icn :: Widget
-        icn = bool mempty (toWidget $ isVisible False) $ watershed < t
-    [whamlet|^{tfw}&nbsp;^{icn}|]
+dateTimeCellVisible watershed t
+    | watershed < t = cell $(widgetFile "widgets/date-time/yet-invisible") & addUrgencyClass
+    | otherwise     = cell timeStampWgt
+  where
+    timeStampWgt    = formatTimeW SelFormatDateTime t
+    addUrgencyClass = over cellAttrs $ insertAttr "class" $ statusToUrgencyClass Warning
 
 userCell :: IsDBTable m a => Text -> Text -> DBCell m a
 userCell displayName surname = cell $ nameWidget displayName surname
diff --git a/src/Utils.hs b/src/Utils.hs
index 4ca14e49c..7f85d43a7 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -335,7 +335,7 @@ lastMaybe (_:t) = lastMaybe t
 lastMaybe' :: [a] -> Maybe a
 lastMaybe' l = fmap snd $ l ^? _Snoc
 
-
+-- | Merge two lists of attribures, also see `Utils.Form.insertAttrs`
 mergeAttrs :: [(Text, Text)] -> [(Text, Text)] -> [(Text, Text)]
 mergeAttrs = mergeAttrs' `on` sort
   where
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 862c204fb..b0b4413ac 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -82,23 +82,25 @@ fslpI lbl placeholder
                   , fsAttrs    = [("placeholder", placeholder)]
                   }
 
-addAttr :: Text -> Text -> FieldSettings site -> FieldSettings site
-addAttr attr valu fs = fs { fsAttrs = newAttrs $ fsAttrs fs }
+-- | Merge/Add an attribute-value Pair to an existing list of such pairs.
+--   If the attribute exists, the new valu will be prepended, separated by a single empty space
+--   Also see `Utils.mergeAttrs`
+insertAttr :: Text -> Text -> [(Text,Text)] -> [(Text,Text)]
+insertAttr attr valu = aux
   where
-    newAttrs :: [(Text,Text)] -> [(Text,Text)]
-    newAttrs [] = [(attr, valu)]
-    newAttrs (p@(a,v) : t)
+    aux :: [(Text,Text)] -> [(Text,Text)]
+    aux [] = [(attr,valu)]
+    aux (p@(a,v) : t)
       | attr==a   = (a, T.append valu $ cons ' ' v) : t
-      | otherwise = p : newAttrs t
+      | otherwise = p : aux t
+
+addAttr :: Text -> Text -> FieldSettings site -> FieldSettings site
+addAttr attr valu fs = fs { fsAttrs = insertAttr attr valu $ fsAttrs fs }
 
 addAttrs :: Text -> [Text] -> FieldSettings site -> FieldSettings site
-addAttrs attr valus fs = fs { fsAttrs = newAttrs $ fsAttrs fs }
+addAttrs attr valus fs = fs { fsAttrs = insertAttr attr valu $ fsAttrs fs }
   where
-    newAttrs :: [(Text, Text)] -> [(Text, Text)]
-    newAttrs [] = [(attr, T.intercalate " " valus)]
-    newAttrs (p@(a,v) : t)
-      | attr==a   = ( a, T.intercalate " " $ v : valus ) : t
-      | otherwise = p : newAttrs t
+    valu = T.intercalate " " valus
 
 addPlaceholder :: Text -> FieldSettings site -> FieldSettings site
 addPlaceholder placeholder fs = fs { fsAttrs = (placeholderAttr, placeholder) : filter ((/= placeholderAttr) . fst) (fsAttrs fs) }
@@ -352,7 +354,7 @@ autosubmitButton = combinedButtonFieldF_ (Proxy @ButtonSubmit) $ "" & addAutosub
 -- | just Html for a Submit-Button
 submitButtonView :: forall site . Button site ButtonSubmit => WidgetT site IO ()
 submitButtonView = buttonView BtnSubmit
-  
+
 buttonView :: forall site button. Button site button => button -> WidgetT site IO ()
 buttonView btn = do
   let bField :: Field (HandlerT site IO) button
diff --git a/src/Utils/Message.hs b/src/Utils/Message.hs
index 69ce9e45e..7a9e492bc 100644
--- a/src/Utils/Message.hs
+++ b/src/Utils/Message.hs
@@ -2,6 +2,7 @@ module Utils.Message
   ( MessageStatus(..)
   , UnknownMessageStatus(..)
   , addMessage, addMessageI, addMessageIHamlet, addMessageFile, addMessageWidget
+  , statusToUrgencyClass
   , Message(..)
   , messageI, messageIHamlet, messageFile, messageWidget
   ) where
@@ -67,6 +68,8 @@ instance FromJSON Message where
     messageContent <- preEscapedText . sanitizeBalance <$> o .: "content"
     return Message{..}
 
+statusToUrgencyClass :: MessageStatus -> Text
+statusToUrgencyClass status = "urgency__" <> toPathPiece status
 
 addMessage :: MonadHandler m => MessageStatus -> Html -> m ()
 addMessage mc  = ClassyPrelude.Yesod.addMessage  (toPathPiece mc)
diff --git a/templates/widgets/date-time/yet-invisible.hamlet b/templates/widgets/date-time/yet-invisible.hamlet
new file mode 100644
index 000000000..ea24583d5
--- /dev/null
+++ b/templates/widgets/date-time/yet-invisible.hamlet
@@ -0,0 +1 @@
+^{timeStampWgt}&nbsp;#{isVisible False}
\ No newline at end of file

From db71a699eb5adfbc26baae2c6f9880aa4443639f Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 8 May 2019 21:23:25 +0200
Subject: [PATCH 270/519] fix show hide toggle button for small screens

---
 static/css/utils/showHide.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/static/css/utils/showHide.scss b/static/css/utils/showHide.scss
index 1f85fbf36..04143d0ae 100644
--- a/static/css/utils/showHide.scss
+++ b/static/css/utils/showHide.scss
@@ -23,6 +23,12 @@ $show-hide-toggle-size: 6px;
   border-top: 2px solid currentColor;
   transition: transform .2s ease;
   transform: translateY(-50%) rotate(-45deg);
+
+  @media (max-width: 768px) {
+    left: auto;
+    right: 20px;
+    color: var(--color-font);
+  }
 }
 
 .show-hide__toggle--right::before {

From f1e95daaec200c2c4f87ac515d4df711432380f1 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 8 May 2019 21:31:01 +0200
Subject: [PATCH 271/519] fix navbar being unnecessarily scrollable on small
 screens

---
 templates/widgets/navbar/navbar.lucius | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/widgets/navbar/navbar.lucius b/templates/widgets/navbar/navbar.lucius
index c80900934..ce25a3588 100644
--- a/templates/widgets/navbar/navbar.lucius
+++ b/templates/widgets/navbar/navbar.lucius
@@ -136,7 +136,7 @@
   .navbar__list {
     + .navbar__list {
       margin-left: 0;
-      padding-right: 80px;
+      padding-right: 40px;
     }
   }
 }

From 7dc414e233557828bbdd282e797da2683b0a9e37 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 8 May 2019 22:16:35 +0200
Subject: [PATCH 272/519] keep table filter inputs focused even after response
 arrived

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

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index a8021817b..13598904b 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -161,7 +161,7 @@
       tableFilterInputs.search.forEach(function(input) {
         var debouncedInput = debounce(function() {
           if (input.value.length === 0 || input.value.length > 2) {
-            updateFromTableFilter();
+            updateFromTableFilter(tableFilterForm);
           }
         }, INPUT_DEBOUNCE);
         input.addEventListener('input', debouncedInput);
@@ -170,7 +170,7 @@
       tableFilterInputs.input.forEach(function(input) {
         var debouncedInput = debounce(function() {
           if (input.value.length === 0 || input.value.length > 2) {
-            updateFromTableFilter();
+            updateFromTableFilter(tableFilterForm);
           }
         }, INPUT_DEBOUNCE);
         input.addEventListener('input', debouncedInput);
@@ -178,37 +178,36 @@
 
       tableFilterInputs.change.forEach(function(input) {
         input.addEventListener('change', function() {
-          updateFromTableFilter();
+          updateFromTableFilter(tableFilterForm);
         });
       });
 
       tableFilterInputs.select.forEach(function(input) {
         input.addEventListener('change', function() {
-          updateFromTableFilter();
+          updateFromTableFilter(tableFilterForm);
         });
       });
 
       tableFilterForm.addEventListener('submit', function(event) {
         event.preventDefault();
-        updateFromTableFilter();
+        updateFromTableFilter(tableFilterForm);
       });
     }
 
-    function updateFromTableFilter() {
+    function updateFromTableFilter(tableFilterForm) {
       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;
+      var focusedInput = tableFilterForm.querySelector(':focus, :active');
+      // focus previously focused input
+      if (focusedInput) {
+        var selectionStart = focusedInput.selectionStart;
+        var focusId = focusedInput.id;
         callback = function(wrapper) {
-          var search = wrapper.querySelector('input[type="search"]');
-          if (search) {
-            search.focus();
-            search.selectionStart = selectionStart;
+          var toBeFocused = wrapper.querySelector('#' + focusId);
+          if (toBeFocused) {
+            toBeFocused.focus();
+            toBeFocused.selectionStart = selectionStart;
           }
         };
       }

From b908fc4cf3422872b2195b7c33f36e552e0e6202 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 9 May 2019 14:49:56 +0200
Subject: [PATCH 273/519] Sheet: icon mark unpublished files works now

---
 routes                           |  3 ++-
 src/Handler/Course.hs            |  9 +++----
 src/Handler/Material.hs          |  8 +++----
 src/Handler/Sheet.hs             | 41 +++++++++++++++++++++-----------
 src/Handler/Utils/Sheet.hs       |  9 +++++++
 src/Handler/Utils/Table/Cells.hs |  8 ++++++-
 src/Utils.hs                     | 21 +++++++++++++++-
 src/Utils/Form.hs                | 20 +++++-----------
 templates/table/cell/body.hamlet |  2 +-
 9 files changed, 81 insertions(+), 40 deletions(-)

diff --git a/routes b/routes
index 747207cc0..228583752 100644
--- a/routes
+++ b/routes
@@ -88,7 +88,7 @@
   /users/#CryptoUUIDUser      CUserR           GET POST        !lecturerANDparticipant
   /correctors                 CHiWisR          GET
   /communication              CCommR           GET POST
-  /notes                      CNotesR          GET POST        !corrector
+  /notes                      CNotesR          GET POST        !corrector -- THIS route is used to check for overall course corrector access!
   /subs                       CCorrectionsR    GET POST
   /ex                         SheetListR       GET             !course-registered !materials !corrector
   /ex/new                     SheetNewR        GET POST
@@ -109,6 +109,7 @@
       /correction               CorrectionR    GET POST        !corrector !ownerANDreadANDrated
       !/#SubmissionFileType/*FilePath SubDownloadR  GET        !owner !corrector
     /correctors                 SCorrR         GET POST
+    /iscorrector                SIsCorrR       GET             !corrector -- Route is used to check for corrector access to this sheet
     /pseudonym                  SPseudonymR    GET POST        !course-registeredANDcorrector-submissions
     /corrector-invite/          SCorrInviteR   GET POST
     !/#SheetFileType/*FilePath  SFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 003fdfcdc..b73e6a1bb 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -40,7 +40,7 @@ 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)
@@ -1298,8 +1298,9 @@ getCNotesR, postCNotesR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 -- NOTE: The route getNotesR is abused for correctorORlecturer access rights!
 -- PROBLEM: Correctors usually don't know Participants by name (anonymous), maybe notes are not shared?
 -- If they are shared, adjust MsgCourseUserNoteTooltip
-getCNotesR  = error "CNotesR: Not implemented"
-postCNotesR = error "CNotesR: Not implemented"
+getCNotesR = postCNotesR
+postCNotesR _ _ _ = do
+  defaultLayout $ [whamlet|You have corrector access to this course.|]
 
 
 getCCommR, postCCommR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
@@ -1355,7 +1356,7 @@ postCCommR tid ssh csh = do
         evalAccessDB (CourseR tid ssh csh $ CUserR cID) False
     }
 
- 
+
 getCLecInviteR, postCLecInviteR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCLecInviteR = postCLecInviteR
 postCLecInviteR = invitationR lecturerInvitationConfig
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index b641b8ec3..b12b3b9af 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -170,13 +170,13 @@ getMShowR tid ssh csh mnm = do
   let matLink :: FilePath -> Route UniWorX
       matLink = CourseR tid ssh csh . MaterialR mnm . MFileR
 
-  seeAllModificationTimestamps <- hasWriteAccessTo $ CourseR tid ssh csh MaterialNewR -- ordinary users should not see modification dates older than visibility
+  seeAllModificationTimestamps <- hasReadAccessTo $ CourseR tid ssh csh CNotesR -- ordinary users should not see modification dates older than visibility
 
   ( Entity _mid material@Material{materialType, materialDescription}
     , (Any hasFiles,fileTable)) <- runDB $ do
     matEnt <- fetchMaterial tid ssh csh mnm
-    let materialModDateCell :: (IsDBTable m c) => (t -> E.Value UTCTime) -> Colonnade Sortable t (DBCell m c)
-        materialModDateCell = if seeAllModificationTimestamps
+    let materialModDateCol :: (IsDBTable m c) => (t -> E.Value UTCTime) -> Colonnade Sortable t (DBCell m c)
+        materialModDateCol = if seeAllModificationTimestamps
           then colFileModification
           else colFileModificationWhen $ \t -> NTop (Just t) > NTop (materialVisibleFrom $ entityVal matEnt)
     let psValidator = def & defaultSortingByFileTitle
@@ -190,7 +190,7 @@ getMShowR tid ssh csh mnm = do
       , dbtColonnade = widgetColonnade $ mconcat
             [ dbRowIndicator -- important: contains writer to indicate that the tables is not empty
             , colFilePathSimple   (view $ _dbrOutput . _1) matLink
-            , materialModDateCell (view $ _dbrOutput . _2)
+            , materialModDateCol  (view $ _dbrOutput . _2)
             ]
       , dbtProj = \dbr -> guardAuthorizedFor (matLink $ dbr ^. _dbrOutput . _1 . _Value) dbr
       , dbtStyle    = def
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 6187c4580..749cd9a09 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -298,18 +298,18 @@ getSShowR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSShowR tid ssh csh shn = do
   now <- liftIO getCurrentTime
   Entity sid sheet <- runDB $ fetchSheet tid ssh csh shn
-  -- without Colonnade
---   fileNameTypes <- runDB $ E.select $ E.from $
---     \(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)
---       -- filter to requested file
---       E.where_ (sheet     E.^. SheetId      E.==. E.val sid )
---       -- return desired columns
---       return $ (file E.^. FileTitle, file E.^. FileModified, sheetFile E.^. SheetFileType)
---   let fileLinks = map (\(E.Value fName, E.Value modified, E.Value fType) -> (CSheetR tid ssh csh (SheetFileR shn fType fName),modified)) fileNameTypes
-  -- with Colonnade
+  seeAllModificationTimestamps <- hasReadAccessTo $ CSheetR tid ssh csh shn SIsCorrR -- ordinary users should not see modification dates older than visibility
+
+  let sftVisible :: IsDBTable m a => SheetFileType -> DBCell m a
+      sftVisible sft | Just dts <- sheetFileTypeDates sheet sft
+                        = dateTimeCellVisible now dts
+                     | otherwise = isVisibleCell False
+
+      sftModification :: IsDBTable m a => SheetFileType -> UTCTime -> DBCell m a
+      sftModification sft mtime
+        | seeAllModificationTimestamps  =  dateTimeCell mtime
+        | NTop (Just mtime) > NTop (sheetFileTypeDates sheet sft)  =  dateTimeCell mtime
+        | otherwise  =  mempty
 
   let fileData (sheetFile `E.InnerJoin` file) = do
         -- Restrict to consistent rows that correspond to each other
@@ -321,12 +321,15 @@ getSShowR tid ssh csh shn = do
         return $ (file E.^. FileTitle, file E.^. FileModified, sheetFile E.^. SheetFileType)
   let colonnadeFiles = widgetColonnade $ mconcat
         [ sortable (Just "type") (i18nCell MsgSheetFileTypeHeader) $ \(_,_, E.Value ftype) -> i18nCell ftype & cellContents %~ (\act -> act <* tell (Any True))
+        -- , 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))))
         , 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))))
+        , sortable (toNothing "visible") (i18nCell MsgVisibleFrom)
+            $ \(_,              _ , E.Value ftype) -> sftVisible ftype
+        , sortable (Just "time")        (i18nCell MsgFileModified)
+            $ \(_,E.Value modified, E.Value ftype) -> sftModification ftype modified
         -- , colFileModification (view _2)
-        , sortable (Just "time") (i18nCell MsgFileModified) $ \(_,E.Value modified,_) -> dateTimeCellVisible now modified
         ]
   let psValidator = def & defaultSorting [SortAscBy "type", SortAscBy "path"]
   (Any hasFiles, fileTable) <- runDB $ dbTable psValidator DBTable
@@ -346,6 +349,9 @@ getSShowR tid ssh csh shn = do
       , ( "path"
         , SortColumn $ \(_sheetFile `E.InnerJoin` file) -> file E.^. FileTitle
         )
+      -- , ( "visible"
+      --   , SortColumn $ \(sheetFile `E.InnerJoin` _file) ->  sheetFileTypeDates sheet $ sheetFile E.^. SheetFileType -- not possible without another join for the sheet
+      --   )
       , ( "time"
         , SortColumn $ \(_sheetFile `E.InnerJoin` file) -> file E.^. FileModified
         )
@@ -846,3 +852,10 @@ correctorInvitationConfig = InvitationConfig{..}
 getSCorrInviteR, postSCorrInviteR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSCorrInviteR = postSCorrInviteR
 postSCorrInviteR = invitationR correctorInvitationConfig
+
+
+getSIsCorrR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
+-- NOTE: The route SIsCorrR is only used to verfify corrector access rights to given sheet!
+getSIsCorrR _ _ _ shn = do
+  defaultLayout $ [whamlet|You have corrector access to #{shn}.|]
+
diff --git a/src/Handler/Utils/Sheet.hs b/src/Handler/Utils/Sheet.hs
index 0dbef5706..9909f0e7d 100644
--- a/src/Handler/Utils/Sheet.hs
+++ b/src/Handler/Utils/Sheet.hs
@@ -7,6 +7,15 @@ import qualified Database.Esqueleto as E
 import qualified Database.Esqueleto.Internal.Sql as E
 
 
+-- | Map sheet file types to their visibily dates of a given sheet, for convenience
+sheetFileTypeDates :: Sheet -> SheetFileType -> Maybe UTCTime
+sheetFileTypeDates Sheet{..} = \case
+  SheetExercise -> Just sheetActiveFrom
+  SheetHint     -> sheetHintFrom
+  SheetSolution -> sheetSolutionFrom
+  SheetMarking  -> Nothing
+
+
 fetchSheetAux ::  ( BaseBackend backend ~ SqlBackend
                   , E.SqlSelect b a
                   , Typeable a, MonadHandler m, IsPersistBackend backend
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index e5906e993..c135e851b 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -87,6 +87,12 @@ commentCell Nothing     = mempty
 commentCell (Just link) = anchorCell link icon
   where icon = toWidget $ hasComment True
 
+isVisibleCell :: (IsDBTable m a) => Bool -> DBCell m a
+isVisibleCell True  =  cell . toWidget $ isVisible True
+isVisibleCell False = (cell . toWidget $ isVisible False) & addUrgencyClass
+  where
+    addUrgencyClass = over cellAttrs $ insertClass $ statusToUrgencyClass Warning
+
 -- | 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)
@@ -109,7 +115,7 @@ dateTimeCellVisible watershed t
     | otherwise     = cell timeStampWgt
   where
     timeStampWgt    = formatTimeW SelFormatDateTime t
-    addUrgencyClass = over cellAttrs $ insertAttr "class" $ statusToUrgencyClass Warning
+    addUrgencyClass = over cellAttrs $ insertClass $ statusToUrgencyClass Warning
 
 userCell :: IsDBTable m a => Text -> Text -> DBCell m a
 userCell displayName surname = cell $ nameWidget displayName surname
diff --git a/src/Utils.hs b/src/Utils.hs
index 7f85d43a7..64e352bd1 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -335,7 +335,26 @@ lastMaybe (_:t) = lastMaybe t
 lastMaybe' :: [a] -> Maybe a
 lastMaybe' l = fmap snd $ l ^? _Snoc
 
--- | Merge two lists of attribures, also see `Utils.Form.insertAttrs`
+
+-- | Merge/Add any attribute-value pair to an existing list of such pairs.
+--   If the attribute exists, the new valu will be prepended, separated by a single empty space
+--   Also see `Utils.mergeAttrs`
+insertAttr :: Text -> Text -> [(Text,Text)] -> [(Text,Text)]
+insertAttr attr valu = aux
+  where
+    aux :: [(Text,Text)] -> [(Text,Text)]
+    aux [] = [(attr,valu)]
+    aux (p@(a,v) : t)
+      | attr==a   = (a, Text.append valu $ Text.cons ' ' v) : t
+      | otherwise = p : aux t
+
+-- | Add another class attribute; special function for a frequent case to avoid mistyping "class".
+--  Also see `Utils.insertAttrs`
+insertClass :: Text -> [(Text,Text)] -> [(Text,Text)]
+insertClass = insertAttr "class"
+
+-- | Append two lists of attributes, merging the class attribute only.
+--   Also see `Utils.insertAttr` to merge any attribute
 mergeAttrs :: [(Text, Text)] -> [(Text, Text)] -> [(Text, Text)]
 mergeAttrs = mergeAttrs' `on` sort
   where
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index b0b4413ac..15f824b08 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -33,9 +33,10 @@ import Web.PathPieces
 
 import Data.UUID
 
-import Utils.Message
-import Utils.PathPiece
-import Utils.Route
+import Utils
+-- import Utils.Message
+-- import Utils.PathPiece
+-- import Utils.Route
 
 import Data.Proxy
 
@@ -82,17 +83,8 @@ fslpI lbl placeholder
                   , fsAttrs    = [("placeholder", placeholder)]
                   }
 
--- | Merge/Add an attribute-value Pair to an existing list of such pairs.
---   If the attribute exists, the new valu will be prepended, separated by a single empty space
---   Also see `Utils.mergeAttrs`
-insertAttr :: Text -> Text -> [(Text,Text)] -> [(Text,Text)]
-insertAttr attr valu = aux
-  where
-    aux :: [(Text,Text)] -> [(Text,Text)]
-    aux [] = [(attr,valu)]
-    aux (p@(a,v) : t)
-      | attr==a   = (a, T.append valu $ cons ' ' v) : t
-      | otherwise = p : aux t
+
+-- NOTE: see Utils.insertAttrs for inserting/merging generic [[(Text,Text)] attributes
 
 addAttr :: Text -> Text -> FieldSettings site -> FieldSettings site
 addAttr attr valu fs = fs { fsAttrs = insertAttr attr valu $ fsAttrs fs }
diff --git a/templates/table/cell/body.hamlet b/templates/table/cell/body.hamlet
index 46bf50fd1..0928779b9 100644
--- a/templates/table/cell/body.hamlet
+++ b/templates/table/cell/body.hamlet
@@ -1,4 +1,4 @@
 $newline never
-<td *{mergeAttrs attrs [("class", "table__td")]}>
+<td *{insertClass "table__td" attrs}>
   <div .table__td-content>
     ^{widget}

From 06df42e43b8d6abc9d4692903687b889383b7ddb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 9 May 2019 14:53:48 +0200
Subject: [PATCH 274/519] Better UI for submission users & submission user
 invitations

---
 messages/uniworx/de.msg                       |  14 +-
 routes                                        |   1 +
 src/Foundation.hs                             |  27 +-
 src/Handler/Admin.hs                          |   6 +-
 src/Handler/Course.hs                         |   6 +-
 src/Handler/Sheet.hs                          |   6 +-
 src/Handler/Submission.hs                     | 327 ++++++++++++++----
 src/Handler/Tutorial.hs                       |   4 +-
 src/Handler/Utils/Communication.hs            |   2 +-
 src/Handler/Utils/Form/MassInput.hs           |  32 +-
 src/Handler/Utils/Invitations.hs              |   4 +-
 src/Handler/Utils/Tokens.hs                   |   4 +-
 src/Import/NoFoundation.hs                    |   2 +-
 src/Model/Types.hs                            |   5 +-
 src/Utils.hs                                  |   8 +-
 src/Utils/Form.hs                             |   4 +
 src/Utils/Lens.hs                             |   7 +
 static/js/utils/massInput.js                  |  10 +-
 templates/submission.hamlet                   |  10 +-
 .../massinput/submissionUsers/add.hamlet      |   6 +
 .../submissionUsers/cellInvitation.hamlet     |  10 +
 .../submissionUsers/cellKnown.hamlet          |   4 +
 .../massinput/submissionUsers/layout.hamlet   |  13 +
 test/FoundationSpec.hs                        |  58 ++++
 test/Model/TypesSpec.hs                       |   6 +
 test/Test/QuickCheck/Classes/Binary.hs        |  17 +
 test/TestImport.hs                            |   1 +
 27 files changed, 485 insertions(+), 109 deletions(-)
 create mode 100644 templates/widgets/massinput/submissionUsers/add.hamlet
 create mode 100644 templates/widgets/massinput/submissionUsers/cellInvitation.hamlet
 create mode 100644 templates/widgets/massinput/submissionUsers/cellKnown.hamlet
 create mode 100644 templates/widgets/massinput/submissionUsers/layout.hamlet
 create mode 100644 test/FoundationSpec.hs
 create mode 100644 test/Test/QuickCheck/Classes/Binary.hs

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 7030d0c15..ed32f7571 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -198,11 +198,13 @@ SubmissionWrongSheet: Abgabenummer gehört nicht zum angegebenen Übungsblatt.
 SubmissionAlreadyExists: Sie haben bereits eine Abgabe zu diesem Übungsblatt.
 SubmissionEditHead tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{display tid}-#{display ssh}-#{csh} #{sheetName}: Abgabe editieren/anlegen
 CorrectionHead     tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName cid@CryptoFileNameSubmission: #{display tid}-#{display ssh}-#{csh} #{sheetName}: Korrektur
-SubmissionMember n@Int: Mitabgebende(r) ##{display n}
+SubmissionMembers: Abgebende
 SubmissionArchive: Zip-Archiv der Abgabedatei(en)
 SubmissionFile: Datei zur Abgabe
 SubmissionFiles: Abgegebene Dateien
-SubmissionAlreadyExistsFor email@UserEmail: #{email} hat bereits eine Abgabe zu diesem bÜbungsblatt.
+SubmissionAlreadyExistsFor email@UserEmail: #{email} hat bereits eine Abgabe zu diesem Übungsblatt.
+SubmissionUsersEmpty: Es kann keine Abgabe ohne Abgebende erstellt werden
+SubmissionUserAlreadyAdded: Dieser Nutzer ist bereits als Mitabgebende(r) eingetragen
 
 SubmissionsDeleteQuestion n@Int: Wollen Sie #{pluralDE n "die unten aufgeführte Abgabe" "die unten aufgeführten Abgaben"} wirklich löschen?
 SubmissionsDeleted n@Int: #{pluralDE n "Abgabe gelöscht" "Abgaben gelöscht"}
@@ -508,6 +510,7 @@ 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.
 
 SubmissionNoUploadExpected: Es ist keine Abgabe von Dateien vorgesehen.
+SubmissionReplace: Abgabe ersetzen
 
 AdminFeaturesHeading: Studiengänge
 StudyTerms: Studiengänge
@@ -586,6 +589,8 @@ MailSubjectCorrectorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@S
 
 MailSubjectTutorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand tutn@TutorialName: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Tutor für #{tutn}
 
+MailSubjectSubmissionUserInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@SheetName: [#{display tid}-#{display ssh}-#{csh}] Einladung zu einer Abgabe für #{shn}
+
 SheetGrading: Bewertung
 SheetGradingPoints maxPoints@Points: #{tshow maxPoints} Punkte
 SheetGradingPassPoints maxPoints@Points passingPoints@Points: Bestanden ab #{tshow passingPoints} von #{tshow maxPoints} Punkten
@@ -863,6 +868,11 @@ TutorInvitationDeclined tutn@TutorialName: Sie haben die Einladung, Tutor für #
 TutorInviteHeading tutn@TutorialName: Einladung zum Tutor für #{tutn}
 TutorInviteExplanation: Sie wurden eingeladen, Tutor zu sein.
 
+SubmissionUserInvitationAccepted shn@SheetName: Sie wurden als Mitabgebende(r) für eine Abgabe zu #{shn} eingetragen
+SubmissionUserInvitationDeclined shn@SheetName: Sie haben die Einladung, Mitabgebende(r) für #{shn} zu werden, abgelehnt
+SubmissionUserInviteHeading shn@SheetName: Einladung zu einer Abgabe für #{shn}
+SubmissionUserInviteExplanation: Sie wurden eingeladen, Mitabgebende(r) bei einer Abgabe zu sein.
+
 InvitationAction: Aktion
 InvitationActionTip: Abgelehnte Einladungen können nicht mehr angenommen werden
 InvitationMissingRestrictions: Authorisierungs-Token fehlen benötigte Daten
diff --git a/routes b/routes
index 747207cc0..68a910db0 100644
--- a/routes
+++ b/routes
@@ -107,6 +107,7 @@
       /delete                   SubDelR        GET POST        !ownerANDtime
       /assign                   SAssignR       GET POST        !lecturerANDtime
       /correction               CorrectionR    GET POST        !corrector !ownerANDreadANDrated
+      /invite                   SInviteR       GET POST        !ownerANDtime
       !/#SubmissionFileType/*FilePath SubDownloadR  GET        !owner !corrector
     /correctors                 SCorrR         GET POST
     /pseudonym                  SPseudonymR    GET POST        !course-registeredANDcorrector-submissions
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 9161ef86a..d9ec45191 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -155,6 +155,11 @@ instance HasAppSettings UniWorX where
 -- type Widget    = WidgetT  UniWorX IO ()
 mkYesodData "UniWorX" $(parseRoutesFile "routes")
 
+deriving instance Generic CourseR
+deriving instance Generic SheetR
+deriving instance Generic SubmissionR
+deriving instance Generic MaterialR
+deriving instance Generic TutorialR
 deriving instance Generic (Route UniWorX)
 
 -- | Convenient Type Synonyms:
@@ -503,13 +508,19 @@ validateToken mAuthId' route' isWrite' token' = runCachedMemoT $ for4 memo valid
       User{userTokensIssuedAfter} <- maybeMExceptT (unauthorizedI MsgUnauthorizedTokenInvalidAuthority) $ get tokenAuthority
       guardMExceptT (Just tokenIssuedAt >= userTokensIssuedAfter) (unauthorizedI MsgUnauthorizedTokenExpired)
 
+      let
+        -- Prevent infinite loops
+        noTokenAuth :: AuthDNF -> AuthDNF
+        noTokenAuth = over _dnfTerms . Set.filter . noneOf (re _nullable . folded) $ (== AuthToken) . plVar
+
       authorityVal <- do
         dnf <- either throwM return $ routeAuthTags route
-        fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ (/=) AuthToken) dnf (Just tokenAuthority) route isWrite
+        fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ const True) (noTokenAuth 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
+        $logDebugS "validateToken" $ tshow addDNF
+        additionalVal <- fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ const True) (noTokenAuth addDNF) mAuthId route isWrite
         guardExceptT (is _Authorized additionalVal) additionalVal
 
       return Authorized
@@ -2108,6 +2119,14 @@ pageActions (CSheetR tid ssh csh shn SSubsR) =
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
+  , MenuItem
+      { menuItemType = PageActionPrime
+      , menuItemLabel = MsgMenuSubmissionNew
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SubmissionNewR
+      , menuItemModal = True
+      , menuItemAccessCallback' = return True
+      }
   ]
 pageActions (CSubmissionR tid ssh csh shn cid SubShowR) =
   [ MenuItem
@@ -2409,7 +2428,9 @@ routeNormalizers =
 -- How to run database actions.
 instance YesodPersist UniWorX where
     type YesodPersistBackend UniWorX = SqlBackend
-    runDB action = runSqlPool action =<< appConnPool <$> getYesod
+    runDB action = do
+      $logDebugS "YesodPersist" "runDB"
+      runSqlPool action =<< appConnPool <$> getYesod
 instance YesodPersistRunner UniWorX where
     getDBRunner = defaultGetDBRunner appConnPool
 
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 3e5306383..b727e912e 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -191,12 +191,10 @@ postAdminTestR = do
       (intRes, intView) <- mreq intField ("" & addName (nudge "int")) $ initial <|> Just cData
       return (intRes, toWidget csrf >> fvInput intView)
     -- | How does the shape (`ListLength`) change if a certain cell is deleted?
-    deleteCell :: ListLength -- ^ Current shape
+    deleteCell :: Map ListPosition Int -- ^ Current shape, including initialisation data
                -> ListPosition -- ^ Coordinate to delete
                -> MaybeT (MForm (HandlerT UniWorX IO)) (Map ListPosition ListPosition) -- ^ Monadically compute a set of new positions and their associated old positions
-    deleteCell l pos
-      | l >= 2 = return . Map.fromSet (\pos' -> bool pos' (succ pos') $ pos' >= pos) $ Set.fromList [0..fromIntegral (l - 2)] -- Close gap left by deleted position with values from further down the list; try prohibiting certain deletions by utilising `guard`
-      | otherwise = return Map.empty
+    deleteCell = miDeleteList
     -- | Make a decision on whether an add widget should be allowed to further cells, given the current @liveliness@ (i.e. before performing the addition)
     allowAdd :: ListPosition -> Natural -> ListLength -> Bool
     allowAdd _ _ l = l < 7 -- Limit list length; much more complicated checks are possible (this could in principle be monadic, but @massInput@ is probably already complicated enough to cover just current (2019-03) usecases)
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 003fdfcdc..24fe8fb2a 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -686,14 +686,14 @@ instance FromJSON (InvitationDBData Lecturer) where
 
 instance ToJSON (InvitationTokenData Lecturer) where
   toJSON = genericToJSON defaultOptions { constructorTagModifier = camelToPathPiece' 3 }
-  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+  toEncoding = genericToEncoding defaultOptions { constructorTagModifier = 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
+    invitationRoute (Entity _ Course{..}) _ = return . CourseR courseTerm courseSchool courseShorthand $ CLecInviteR
     invitationResolveFor = do
       Just (CourseR tid csh ssh CLecInviteR) <- getCurrentRoute
       getKeyBy404 $ TermSchoolCourseShort tid csh ssh
@@ -802,7 +802,7 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
           let lrwView' = $(widgetFile "course/lecturerMassInput/cellInvitation")
           return (lrwRes,lrwView')
 
-        miDelete :: ListLength   -- ^ Current shape
+        miDelete :: Map ListPosition (Either UserEmail UserId) -- ^ Current shape
                  -> ListPosition -- ^ Coordinate to delete
                  -> MaybeT (MForm (HandlerT UniWorX IO)) (Map ListPosition ListPosition)
         miDelete = miDeleteList
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 5a9448177..308cb95b4 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -705,7 +705,7 @@ correctorForm shid = wFormToAForm $ do
       return (res, $(widgetFile "sheetCorrectors/cell"))
 
 
-    miDelete :: ListLength
+    miDelete :: Map ListPosition (Either UserEmail UserId)
              -> ListPosition
              -> MaybeT (MForm Handler) (Map ListPosition ListPosition)
     miDelete = miDeleteList
@@ -814,14 +814,14 @@ instance FromJSON (InvitationDBData SheetCorrector) where
 
 instance ToJSON (InvitationTokenData SheetCorrector) where
   toJSON = genericToJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
-  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+  toEncoding = genericToEncoding defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
 instance FromJSON (InvitationTokenData SheetCorrector) where
   parseJSON = genericParseJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
 
 correctorInvitationConfig :: InvitationConfig SheetCorrector
 correctorInvitationConfig = InvitationConfig{..}
   where
-    invitationRoute Sheet{..} _ = do
+    invitationRoute (Entity _ Sheet{..}) _ = do
       Course{..} <- get404 sheetCourse
       return $ CSheetR courseTerm courseSchool courseShorthand sheetName SCorrInviteR
     invitationResolveFor = do
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 99149b23c..080ac9667 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -1,15 +1,21 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
 module Handler.Submission where
 
 import Import
 
 import Jobs
 
+import Utils.Lens
+
 -- import Yesod.Form.Bootstrap3
 
 import Handler.Utils
 import Handler.Utils.Delete
 import Handler.Utils.Submission
 import Handler.Utils.Table.Cells
+import Handler.Utils.Form.MassInput
+import Handler.Utils.Invitations
 
 import Network.Mime
 
@@ -22,9 +28,6 @@ import Data.Maybe (fromJust)
 -- import qualified Data.Maybe
 import qualified Data.Text.Encoding as Text
 
-import Data.CaseInsensitive (CI)
--- import qualified Data.CaseInsensitive as CI
-
 import qualified Database.Esqueleto as E
 import qualified Database.Esqueleto.Internal.Sql as E (unsafeSqlFunction)
 
@@ -33,12 +36,16 @@ import qualified Data.Conduit.List as Conduit
 
 -- import Data.Set (Set)
 import qualified Data.Set as Set
-import Data.Map (Map)
+import Data.Map (Map, (!), (!?))
 import qualified Data.Map as Map
 -- import Data.Bifunctor
 
 import System.FilePath
 
+import Text.Blaze (Markup)
+import Data.Aeson hiding (Result(..))
+import Text.Hamlet (ihamlet)
+
 -- import Colonnade hiding (bool, fromMaybe)
 -- import qualified Yesod.Colonnade as Yesod
 -- import qualified Text.Blaze.Html5.Attributes as HA
@@ -48,30 +55,203 @@ import System.FilePath
 -- numberOfSubmissionEditDates = 3 -- for debugging only, should be 1 in production.
 
 
-makeSubmissionForm :: Maybe SubmissionId -> UploadMode -> SheetGroup -> NonEmpty UserEmail -> Form (Maybe (Source Handler File), NonEmpty UserEmail)
-makeSubmissionForm msmid uploadMode grouping (self :| buddies) = identifyForm FIDsubmission $ \html -> do
-    let
-      fileUploadForm = case uploadMode of
-        NoUpload -> pure Nothing
-        (Upload unpackZips) -> (bool (\f fs _ -> Just <$> areq f fs Nothing) aopt $ isJust msmid) (zipFileField unpackZips) (fsm $ bool MsgSubmissionFile MsgSubmissionArchive unpackZips) Nothing
-    flip (renderAForm FormStandard) html $ (,)
-      <$> fileUploadForm
-      <*> ( (:|)
-        -- #227 Part I: change aforced to areq if the user is the lecturer or an admin (lecturer can upload for students)
-        <$> aforced ciField (fslpI (MsgSubmissionMember 1) "user@campus.lmu.de" ) self
-        <*> (catMaybes <$> sequenceA [bool aforced' aopt editableBuddies ciField (fslpI (MsgSubmissionMember g) "user@campus.lmu.de" ) buddy
-                                      | g <- [2..(fromIntegral groupNr)]
-                                      | buddy <- map (Just . Just) buddies ++ repeat Nothing -- show current buddies
-                                      ])
-        )
-  where
-    (groupNr, editableBuddies)
-      | Arbitrary{..} <- grouping = (maxParticipants, True)
-      | RegisteredGroups <- grouping = (fromIntegral $ length buddies, False)
-      | otherwise = (0, False)
+instance IsInvitableJunction SubmissionUser where
+  type InvitationFor SubmissionUser = Submission
+  data InvitableJunction SubmissionUser = JunctionSubmissionUser
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationDBData SubmissionUser = InvDBDataSubmissionUser
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationTokenData SubmissionUser = InvTokenDataSubmissionUser
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
-    aforced' f fs (Just (Just v)) = Just <$> aforced f fs v
-    aforced' _ _  _ = error "Cannot happen since groupNr==0 if grouping/=Arbitrary"
+  _InvitableJunction = iso
+    (\SubmissionUser{..} -> (submissionUserUser, submissionUserSubmission, JunctionSubmissionUser))
+    (\(submissionUserUser, submissionUserSubmission, JunctionSubmissionUser) -> SubmissionUser{..})
+
+instance ToJSON (InvitableJunction SubmissionUser) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+instance FromJSON (InvitableJunction SubmissionUser) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+
+instance ToJSON (InvitationDBData SubmissionUser) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+instance FromJSON (InvitationDBData SubmissionUser) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+
+instance ToJSON (InvitationTokenData SubmissionUser) where
+  toJSON = genericToJSON defaultOptions { constructorTagModifier = camelToPathPiece' 3 }
+  toEncoding = genericToEncoding defaultOptions { constructorTagModifier = camelToPathPiece' 3 }
+instance FromJSON (InvitationTokenData SubmissionUser) where
+  parseJSON = genericParseJSON defaultOptions { constructorTagModifier = camelToPathPiece' 3 }
+
+submissionUserInvitationConfig :: InvitationConfig SubmissionUser
+submissionUserInvitationConfig = InvitationConfig{..}
+  where
+    invitationRoute (Entity subId Submission{..}) _ = do
+      Sheet{..} <- getJust submissionSheet
+      Course{..} <- getJust sheetCourse
+      cID <- encrypt subId
+      return $ CSubmissionR courseTerm courseSchool courseShorthand sheetName cID SInviteR
+    invitationResolveFor = do
+      Just (CSubmissionR _tid _ssh _csh _shn cID SInviteR) <- getCurrentRoute
+      subId <- decrypt cID
+      bool notFound (return subId) =<< existsKey subId
+    invitationSubject Submission{..} _ = do
+      Sheet{..} <- getJust submissionSheet
+      Course{..} <- getJust sheetCourse
+      return . SomeMessage $ MsgMailSubjectSubmissionUserInvitation courseTerm courseSchool courseShorthand sheetName
+    invitationHeading Submission{..} _ = do
+      Sheet{..} <- getJust submissionSheet
+      return . SomeMessage $ MsgSubmissionUserInviteHeading sheetName
+    invitationExplanation _ _ = [ihamlet|_{SomeMessage MsgSubmissionUserInviteExplanation}|]
+    invitationTokenConfig Submission{..} _ = do
+      Sheet{..} <- getJust submissionSheet
+      Course{..} <- getJust sheetCourse
+      itAuthority <- liftHandlerT requireAuthId
+      itAddAuth <- either throwM (return . Just) $ routeAuthTags (CSheetR courseTerm courseSchool courseShorthand sheetName SubmissionNewR)
+      let itExpiresAt = Nothing
+          itStartsAt = Nothing
+      return InvitationTokenConfig{..}
+    invitationRestriction _ _ = return Authorized
+    invitationForm _ _ = pure JunctionSubmissionUser
+    invitationSuccessMsg Submission{..} _ = do
+      Sheet{..} <- getJust submissionSheet
+      return . SomeMessage $ MsgSubmissionUserInvitationAccepted sheetName
+    invitationUltDest Submission{..} (Entity _ SubmissionUser{..}) = do
+      Sheet{..} <- getJust submissionSheet
+      Course{..} <- getJust sheetCourse
+      cID <- encrypt submissionUserSubmission
+      return . SomeRoute $ CSubmissionR courseTerm courseSchool courseShorthand sheetName cID SubShowR
+
+
+makeSubmissionForm :: CourseId -> Maybe SubmissionId -> UploadMode -> SheetGroup -> Bool -> Set (Either UserEmail UserId) -> Form (Maybe (Source Handler File), Set (Either UserEmail UserId))
+makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = identifyForm FIDsubmission . renderAForm FormStandard $ (,)
+  <$> fileUploadForm
+  <*> wFormToAForm submittorsForm
+  where
+    fileUploadForm = case uploadMode of
+      NoUpload
+        -> pure Nothing
+      (Upload unpackZips)
+        -> (bool (\f fs _ -> Just <$> areq f fs Nothing) aopt $ isJust msmid) (zipFileField unpackZips) (fsm $ bool MsgSubmissionFile MsgSubmissionArchive unpackZips) Nothing
+
+    miCell' :: Markup -> Either UserEmail UserId -> Widget
+    miCell' csrf (Left email) = $(widgetFile "widgets/massinput/submissionUsers/cellInvitation")
+    miCell' csrf (Right uid) = do
+      User{..} <- liftHandlerT . runDB $ getJust uid
+      $(widgetFile "widgets/massinput/submissionUsers/cellKnown")
+
+    miLayout :: ListLength
+             -> Map ListPosition (Either UserEmail UserId, FormResult ()) -- ^ 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 "widgets/massinput/submissionUsers/layout")
+
+    miIdent :: Text
+    miIdent = "submittors"
+
+    courseUsers :: E.SqlQuery (E.SqlExpr (Entity User))
+    courseUsers = 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
+      E.orderBy [E.asc $ user E.^. UserEmail]
+      return user
+
+    addField :: (MonadHandler m, HandlerSite m ~ UniWorX) => Bool -> Field m (Set (Either UserEmail UserId))
+    addField isAdmin = multiUserField True $ courseUsers <$ guard isAdmin
+
+    addFieldSettings, submittorSettings :: FieldSettings UniWorX
+    addFieldSettings = fslI MsgSubmissionMembers
+    submittorSettings = fslI MsgSubmissionMembers & setTooltip MsgMassInputTip
+
+    miButtonAction' :: forall p. PathPiece p => Maybe (Route UniWorX) -> p -> Maybe (SomeRoute UniWorX)
+    miButtonAction' mCurrent frag = mCurrent <&> \current -> SomeRoute (current :#: frag)
+
+    submittorsForm 
+      | isLecturer = do-- Form is being used by lecturer; allow Everything™
+        let
+          miAdd :: (Text -> Text) -> FieldView UniWorX -> Form ([Either UserEmail UserId] -> FormResult [Either UserEmail UserId])
+          miAdd nudge btn csrf = do
+            MsgRenderer mr <- getMsgRenderer
+            (addRes, addView) <- mpreq (addField True) (addFieldSettings & addName (nudge "emails")) Nothing
+            let addRes' = addRes <&> \newData oldData -> if
+                  | existing <- newData `Set.intersection` Set.fromList oldData
+                  , not $ Set.null existing
+                    -> FormFailure [mr MsgSubmissionUserAlreadyAdded]
+                  | otherwise
+                    -> FormSuccess $ Set.toList newData
+            return (addRes', $(widgetFile "widgets/massinput/submissionUsers/add"))
+        
+        mRoute <- getCurrentRoute
+        submittors <- massInputAccumW miAdd (miCell' mempty) (miButtonAction' mRoute) miLayout miIdent submittorSettings True (Just $ Set.toList prefillUsers)
+        MsgRenderer mr <- getMsgRenderer
+        return $ submittors >>= \submittors' -> if
+          | null submittors' -> FormFailure [mr MsgSubmissionUsersEmpty]
+          | otherwise -> FormSuccess $ Set.fromList submittors'
+      | otherwise = do
+        uid <- liftHandlerT requireAuthId
+        mRoute <- getCurrentRoute
+        
+        let
+          maxSize
+            | Arbitrary{..} <- grouping = Just maxParticipants
+            | otherwise = Nothing
+          mayEdit = is _Arbitrary grouping
+
+          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
+            MsgRenderer mr <- getMsgRenderer
+            (addRes, addView) <- mpreq (addField True) (addFieldSettings & addName (nudge "emails")) Nothing
+            let addRes' = addRes <&> \newData oldData -> if
+                  | existing <- newData `Set.intersection` setOf folded oldData
+                  , not $ Set.null existing
+                    -> FormFailure [mr MsgSubmissionUserAlreadyAdded]
+                  | otherwise -> let numStart = maybe 0 (succ . fst) $ Map.lookupMax oldData
+                                  in FormSuccess . Map.fromList . zip [numStart..] $ Set.toList newData
+            return (addRes', $(widgetFile "widgets/massinput/submissionUsers/add"))
+
+          miCell :: ListPosition
+                 -> Either UserEmail UserId
+                 -> Maybe ()
+                 -> (Text -> Text)
+                 -> Form ()
+          miCell _ dat _ _ csrf = return (FormSuccess (), miCell' csrf dat)
+
+          miDelete :: Map ListPosition (Either UserEmail UserId)
+                   -> ListPosition
+                   -> MaybeT (MForm Handler) (Map ListPosition ListPosition)
+          miDelete dat delPos = do
+            guard mayEdit
+            guard $ Map.size dat > 1
+
+            -- User may drop from submission only if it already exists; no directly creating submissions for other people
+            guard $ maybe True (/= Right uid) (dat !? delPos) || isJust msmid 
+
+            miDeleteList dat delPos
+
+          miAllowAdd :: ListPosition
+                     -> Natural
+                     -> ListLength
+                     -> Bool
+          miAllowAdd _ _ l = mayEdit && maybe False ((l <) . fromIntegral) maxSize
+
+          miAddEmpty _ _ _ = Set.empty
+
+          miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX)
+          miButtonAction = miButtonAction' mRoute
+
+          postProcess :: Map ListPosition (Either UserEmail UserId, ()) -> Set (Either UserEmail UserId)
+          postProcess = setOf $ folded . _1
+        fmap postProcess <$> massInputW MassInput{..} submittorSettings True (Just . Map.fromList . zip [0..] . map (, ()) $ Set.toList prefillUsers)
+        
 
 getSubmissionNewR, postSubmissionNewR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSubmissionNewR = postSubmissionNewR
@@ -100,13 +280,14 @@ getSubmissionOwnR tid ssh csh shn = do
 
 submissionHelper :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Maybe CryptoFileNameSubmission -> Handler Html
 submissionHelper tid ssh csh shn mcid = do
-  (Entity uid userData) <- requireAuth
+  uid <- requireAuthId
   msmid     <- traverse decrypt mcid
-  actionUrl <- Data.Maybe.fromJust <$> getCurrentRoute
-  maySubmit <- (== Authorized) <$> isAuthorized actionUrl True -- affects visibility of Edit-Dates, Submission-Button, etc.
+  Just actionUrl <- getCurrentRoute
 
-  (Entity shid Sheet{..}, buddies, lastEdits)  <- runDB $ do
+  (Entity shid Sheet{..}, buddies, lastEdits, maySubmit, isLecturer, isOwner)  <- runDB $ do
     csheet@(Entity shid Sheet{..})  <- fetchSheet tid ssh csh shn
+    maySubmit  <- (== Authorized) <$> evalAccessDB actionUrl True
+    isLecturer <- (== Authorized) <$> evalAccessDB (CSheetR tid ssh csh shn SSubsR) True
     case msmid of
       Nothing     -> do
         submissions <- E.select . E.from $ \(submission `E.InnerJoin` submissionUser) -> do
@@ -132,8 +313,8 @@ submissionHelper tid ssh csh shn mcid = do
               E.where_ $  submissionUser E.^. SubmissionUserSubmission `E.in_` oldids
                     E.&&. submissionUser E.^. SubmissionUserUser E.!=. E.val uid
               E.orderBy  [E.asc $ user E.^. UserEmail]
-              return $ user E.^. UserEmail
-            return (csheet, map E.unValue buddies, [])
+              return $ user E.^. UserId
+            return (csheet, Set.fromList $ map (Right . E.unValue) buddies, [], maySubmit, isLecturer, not isLecturer)
           (E.Value smid:_) -> do
             cID <- encrypt smid
             addMessageI Info MsgSubmissionAlreadyExists
@@ -146,15 +327,18 @@ submissionHelper tid ssh csh shn mcid = do
           invalidArgsI [MsgSubmissionWrongSheet]
         -- fetch buddies from current submission
         (Any isOwner, buddies) <- do
-          submitters <- E.select . E.from $ \(submissionUser `E.InnerJoin` user) -> do
+          submittors <- E.select . E.from $ \(submissionUser `E.InnerJoin` user) -> do
             E.on (submissionUser E.^. SubmissionUserUser E.==. user E.^. UserId)
             E.where_ $  submissionUser E.^. SubmissionUserSubmission E.==. E.val smid
             E.orderBy  [E.asc $ user E.^. UserEmail]
-            return (user E.^. UserId, user E.^. UserEmail)
-          let breakUserFromBuddies (E.Value userID, E.Value email)
-                | uid == userID  =  (Any True ,      [])
-                | otherwise      =  (Any False, [email])
-          return $ foldMap breakUserFromBuddies submitters
+            return $ user E.^. UserId
+          let breakUserFromBuddies (E.Value userID)
+                | uid == userID  =  (Any True , mempty                      )
+                | otherwise      =  (mempty   , Set.singleton $ Right userID)
+
+          invites <- sourceInvitationsList smid <&> Set.fromList . map (\(email, InvDBDataSubmissionUser) -> Left email)
+          
+          return . over _2 (Set.union invites) $ foldMap breakUserFromBuddies submittors
 
         lastEdits <- do
             raw <- E.select . E.from $ \(user `E.InnerJoin` submissionEdit) -> do
@@ -167,38 +351,38 @@ submissionHelper tid ssh csh shn mcid = do
                               else E.nothing
               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 (fromMaybe (Upload True) . submissionModeUser $ sheetSubmissionMode) sheetGrouping (userEmail userData :| buddies)
+        return (csheet,buddies,lastEdits,maySubmit,isLecturer,isOwner)
+  ((res,formWidget'), formEnctype) <- runFormPost . makeSubmissionForm sheetCourse msmid (fromMaybe (Upload True) . submissionModeUser $ sheetSubmissionMode) sheetGrouping isLecturer $ bool id (Set.insert $ Right uid) isOwner buddies
   let formWidget = wrapForm formWidget' def
         { formAction = Just $ SomeRoute actionUrl
         , formEncoding = formEnctype
         }
+
   mCID <- fmap join . msgSubmissionErrors . runDBJobs $ do
     res' <- case res of
       FormMissing              -> return   FormMissing
       (FormFailure failmsgs)   -> return $ FormFailure failmsgs
       -- #227 Part II: no longer ignore submitter, if the user is lecturer or admin (allow lecturers to submit for their students)
-      (FormSuccess (mFiles,_submitter:|[])) -> return $ FormSuccess (mFiles,[]) -- Type change
-      (FormSuccess (mFiles,_submitter:|gEMails@(_:_))) -- Validate AdHoc Group Members
-        | Arbitrary{..} <- sheetGrouping -> do
+      (FormSuccess res'@(_, groupMembers))
+        | Set.null groupMembers -> return $ FormSuccess res'
+        | Arbitrary{..} <- sheetGrouping -> do -- Validate AdHoc Group Members
           -- , length gEMails < maxParticipants -> do -- < since submitting user is already accounted for
-          let prep :: [(E.Value UserEmail, (E.Value UserId, E.Value Bool, E.Value Bool))] -> Map (CI Text) (Maybe (UserId, Bool, Bool))
+          let (gEMails, gIds) = partitionEithers $ Set.toList groupMembers
+              prep :: [(E.Value UserEmail, (E.Value UserId, E.Value Bool, E.Value Bool))] -> Map UserEmail (Maybe (UserId, Bool, Bool))
               prep ps = Map.filter (maybe True $ \(i,_,_) -> i /= uid) . Map.fromList $ map (, Nothing) gEMails ++ [(m, Just (i,p,s))|(E.Value m, (E.Value i, E.Value p, E.Value s)) <- ps]
           participants <- fmap prep . E.select . E.from $ \user -> do
-            E.where_ $ (user E.^. UserEmail) `E.in_` E.valList gEMails
+            E.where_ $ (user E.^. UserId) `E.in_` E.valList gIds
             let
-              isParticipant = E.sub_select . E.from $ \courseParticipant -> do
+              isParticipant = E.exists . E.from $ \courseParticipant -> do
                 E.where_ $ user E.^. UserId E.==. courseParticipant E.^. CourseParticipantUser
                      E.&&. courseParticipant E.^. CourseParticipantCourse E.==. E.val sheetCourse
-                return $ E.countRows E.>. E.val (0 :: Int64)
-              hasSubmitted = E.sub_select . E.from $ \(submissionUser `E.InnerJoin` submission) -> do
+              hasSubmitted = E.exists . E.from $ \(submissionUser `E.InnerJoin` submission) -> do
                 E.on $ submissionUser E.^. SubmissionUserSubmission E.==. submission E.^. SubmissionId
                 E.where_ $ submissionUser E.^. SubmissionUserUser E.==. user E.^. UserId
                      E.&&. submission E.^. SubmissionSheet E.==. E.val shid
                 case msmid of -- Multiple `E.where_`-Statements are merged with `&&` in esqueleto 2.5.3
                   Nothing   -> return ()
                   Just smid -> E.where_ $ submission E.^. SubmissionId E.!=. E.val smid
-                return $ E.countRows E.>. E.val (0 :: Int64)
             return (user E.^. UserEmail, (user E.^. UserId, isParticipant, hasSubmitted))
 
           $logDebugS "SUBMISSION.AdHocGroupValidation" $ tshow participants
@@ -207,22 +391,22 @@ submissionHelper tid ssh csh shn mcid = do
           let
             failmsgs = (concat :: [[Text]] -> [Text])
               [ flip Map.foldMapWithKey participants $ \email -> \case
-                  Nothing            -> pure . mr $ MsgEMailUnknown email
+                  -- Nothing            -> pure . mr $ MsgEMailUnknown email
                   (Just (_,False,_)) -> pure . mr $ MsgNotAParticipant email tid csh
                   (Just (_,_, True)) -> pure . mr $ MsgSubmissionAlreadyExistsFor email
                   _other             -> mempty
-              , case fromIntegral (length participants) `compare` maxParticipants of
+              , case fromIntegral (Map.size participants) `compare` maxParticipants of
                   LT -> mempty
                   _  -> pure $ mr MsgTooManyParticipants
               ]
           return $ if null failmsgs
-            then FormSuccess (mFiles, foldMap (\(Just (i,_,_)) -> [i]) participants)
+            then FormSuccess res'
             else FormFailure failmsgs
         | otherwise -> return $ FormFailure ["Mismatching number of group participants"]
 
 
     case res' of
-      (FormSuccess (mFiles, setFromList -> adhocIds)) -> do
+      (FormSuccess (mFiles, adhocMembers)) -> do
         smid <- do
           smid <- case (mFiles, msmid) of
             (Nothing, Just smid)   -- no new files, existing submission partners updated
@@ -238,19 +422,24 @@ submissionHelper tid ssh csh shn mcid = do
                   , submissionRatingAssigned = Nothing
                   , submissionRatingTime     = Nothing
                   }
-          -- Determine members of pre-registered group
-          groupUids <- fmap (setFromList . map E.unValue) . E.select . E.from $ \(submissionGroupUser `E.InnerJoin` submissionGroup `E.InnerJoin` submissionGroupUser') -> do
-            E.on $ submissionGroup E.^. SubmissionGroupId  E.==. submissionGroupUser' E.^. SubmissionGroupUserSubmissionGroup
-            E.on $ submissionGroupUser E.^. SubmissionGroupUserSubmissionGroup E.==. submissionGroup E.^. SubmissionGroupId
-            E.where_ $ submissionGroupUser E.^. SubmissionGroupUserUser E.==. E.val uid
-                E.&&.  submissionGroup     E.^. SubmissionGroupCourse   E.==. E.val sheetCourse
-            return $ submissionGroupUser' E.^. SubmissionGroupUserUser
-          -- SubmissionUser for all group members (pre-registered & ad-hoc)
-          let subUsers = Set.insert uid $ groupUids `Set.union` adhocIds
-          -- remove obsolete old entries
-          deleteWhere [SubmissionUserSubmission ==. smid, SubmissionUserUser /<-. setToList subUsers]
-          -- maybe add current users
-          forM_ subUsers $ \uid' -> void . insertUnique $ SubmissionUser uid' smid
+          subUsers <- if
+            | isLecturer -> return adhocMembers
+            | otherwise -> do
+                -- Determine members of pre-registered group
+                groupUids <- fmap (setFromList . map (Right . E.unValue)) . E.select . E.from $ \(submissionGroupUser `E.InnerJoin` submissionGroup `E.InnerJoin` submissionGroupUser') -> do
+                  E.on $ submissionGroup E.^. SubmissionGroupId  E.==. submissionGroupUser' E.^. SubmissionGroupUserSubmissionGroup
+                  E.on $ submissionGroupUser E.^. SubmissionGroupUserSubmissionGroup E.==. submissionGroup E.^. SubmissionGroupId
+                  E.where_ $ submissionGroupUser E.^. SubmissionGroupUserUser E.==. E.val uid
+                      E.&&.  submissionGroup     E.^. SubmissionGroupCourse   E.==. E.val sheetCourse
+                  return $ submissionGroupUser' E.^. SubmissionGroupUserUser
+                -- SubmissionUser for all group members (pre-registered & ad-hoc)
+                return $ groupUids `Set.union` adhocMembers
+          let (subEmails, subUids) = partitionEithers $ Set.toList subUsers
+
+          deleteWhere [SubmissionUserSubmission ==. smid]
+          deleteWhere [InvitationFor ==. invRef @SubmissionUser smid, InvitationEmail /<-. subEmails]
+          insertMany_ $ map (flip SubmissionUser smid) subUids
+          sinkInvitationsF submissionUserInvitationConfig $ map (\lEmail -> (lEmail, smid, (InvDBDataSubmissionUser, InvTokenDataSubmissionUser))) subEmails
           return smid
         cID <- encrypt smid
         return $ Just cID
@@ -327,6 +516,10 @@ submissionHelper tid ssh csh shn mcid = do
         urlOriginal cID = CSubmissionR tid ssh csh shn cID (SubArchiveR (ZIPArchiveName SubmissionOriginal))
     $(widgetFile "submission")
 
+getSInviteR, postSInviteR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> Handler Html
+getSInviteR = postSInviteR
+postSInviteR = invitationR submissionUserInvitationConfig
+
 
 getSubDownloadR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> SubmissionFileType -> FilePath -> Handler TypedContent
 getSubDownloadR tid ssh csh shn cID (submissionFileTypeIsUpdate -> isUpdate) path = runDB $ do
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 255f26aea..b3b12fad3 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -227,14 +227,14 @@ instance FromJSON (InvitationDBData Tutor) where
 
 instance ToJSON (InvitationTokenData Tutor) where
   toJSON = genericToJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
-  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+  toEncoding = genericToEncoding defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
 instance FromJSON (InvitationTokenData Tutor) where
   parseJSON = genericParseJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
 
 tutorInvitationConfig :: InvitationConfig Tutor
 tutorInvitationConfig = InvitationConfig{..}
   where
-    invitationRoute Tutorial{..} _ = do
+    invitationRoute (Entity _ Tutorial{..}) _ = do
       Course{..} <- get404 tutorialCourse
       return $ CTutorialR courseTerm courseSchool courseShorthand tutorialName TInviteR
     invitationResolveFor = do
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index c82c574ee..31a8cbb89 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -162,7 +162,7 @@ commR CommunicationRoute{..} =  do
                 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))
+          miDelete :: Map (EnumPosition RecipientCategory, ListPosition) (Either UserEmail UserId) -> (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
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index 2c6560876..9119b031a 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -8,7 +8,7 @@ module Handler.Utils.Form.MassInput
   , module Handler.Utils.Form.MassInput.Liveliness
   , massInputA, massInputW
   , massInputList
-  , massInputAccum, massInputAccumA
+  , massInputAccum, massInputAccumA, massInputAccumW
   , ListLength(..), ListPosition(..), miDeleteList
   , EnumLiveliness(..), EnumPosition(..)
   , MapLiveliness(..)
@@ -144,10 +144,11 @@ instance (Liveliness l1, Liveliness l2) => Liveliness (MapLiveliness l1 l2) wher
 
 
 
-miDeleteList :: Applicative m => ListLength -> ListPosition -> m (Map ListPosition ListPosition)
-miDeleteList l pos
+miDeleteList :: Applicative m => Map ListPosition a -> ListPosition -> m (Map ListPosition ListPosition)
+miDeleteList dat pos
     -- Close gap left by deleted position with values from further down the list; try prohibiting certain deletions by utilising `guard`
-  | l >= 2 = pure . Map.fromSet (\pos' -> bool pos' (succ pos') $ pos' >= pos) $ Set.fromList [0..fromIntegral (l - 2)]
+  | Just l <- preview liveCoords $ Map.keysSet dat :: Maybe ListLength
+  , l >= 2 = pure . Map.fromSet (\pos' -> bool pos' (succ pos') $ pos' >= pos) $ Set.fromList [0..fromIntegral (l - 2)]
   | otherwise = pure Map.empty
 
 data ButtonMassInput coord
@@ -245,7 +246,7 @@ data MassInput handler liveliness cellData cellResult = forall i. PathPiece i =>
            -> Maybe cellResult -- Initial result from Argument to @massInput@
            -> (Text -> Text) -- Nudge deterministic field ids
            -> (Markup -> MForm handler (FormResult cellResult, Widget)) -- ^ Construct a singular cell
-  , miDelete :: liveliness
+  , miDelete :: Map (BoxCoord liveliness) cellData
              -> BoxCoord liveliness
              -> MaybeT (MForm handler) (Map (BoxCoord liveliness) (BoxCoord liveliness)) -- ^ Decide whether a deletion-operation should be permitted and produce a finite map of new coordinates to their old correspondants
   , miAllowAdd :: BoxCoord liveliness
@@ -349,13 +350,12 @@ massInput MassInput{ miIdent = toPathPiece -> miIdent, ..} FieldSettings{..} fvR
   addedShape <- if
     | Just s <- addShape -> return s
     | otherwise -> return sentShape'
-  addedLiveliness <- maybe (throwM MassInputInvalidShape) return $ Map.keysSet addedShape ^? liveCoords :: MForm handler liveliness
 
   let
     delForm :: BoxCoord liveliness -> MaybeT (MForm handler) (FormResult (Map (BoxCoord liveliness) (BoxCoord liveliness)), FieldView UniWorX)
     delForm miCoord = do
       (delRes, delView) <- lift $ mopt (buttonField $ MassInputDeleteCell miCoord) ("" & addName MassInputDeleteButton{..} & addFormAction) Nothing
-      shapeUpdate <- miDelete addedLiveliness miCoord
+      shapeUpdate <- miDelete addedShape miCoord
       guard $ isJust (Map.keysSet shapeUpdate ^? liveCoords :: Maybe liveliness)
       return (shapeUpdate <$ assertM (is _Just) delRes, delView)
 
@@ -545,6 +545,24 @@ massInputAccumA :: forall handler cellData ident.
 massInputAccumA miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev
   = formToAForm $ over _2 pure <$> massInputAccum miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev mempty
 
+massInputAccumW :: 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]
+               -> WForm handler (FormResult [cellData])
+massInputAccumW miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev
+  = mFormToWForm $ massInputAccum miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev mempty
+
 
 massInputA :: forall handler cellData cellResult liveliness.
            ( MonadHandler handler, HandlerSite handler ~ UniWorX
diff --git a/src/Handler/Utils/Invitations.hs b/src/Handler/Utils/Invitations.hs
index a256a7a99..a8d0223ae 100644
--- a/src/Handler/Utils/Invitations.hs
+++ b/src/Handler/Utils/Invitations.hs
@@ -113,7 +113,7 @@ invRef = toJSON . InvRef @junction
 --
 -- 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)
+  { invitationRoute       :: Entity (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`
@@ -200,7 +200,7 @@ sinkInvitations InvitationConfig{..} = determineExists .| C.foldMap pure >>= lif
         fRec <- get404 fid
         
         jInviter <- liftHandlerT requireAuthId
-        route <- mapReaderT liftHandlerT $ invitationRoute fRec dat
+        route <- mapReaderT liftHandlerT $ invitationRoute (Entity fid 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)
diff --git a/src/Handler/Utils/Tokens.hs b/src/Handler/Utils/Tokens.hs
index 8ca5ad400..736bb929a 100644
--- a/src/Handler/Utils/Tokens.hs
+++ b/src/Handler/Utils/Tokens.hs
@@ -27,8 +27,8 @@ requireBearerToken = liftHandlerT $ do
   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 :: (MonadHandler m, HandlerSite m ~ UniWorX, MonadCatch m, MonadLogger m, FromJSON a, ToJSON a) => m (Maybe a)
 currentTokenRestrictions = runMaybeT $ do
-  token <- MaybeT maybeBearerToken
+  token <- requireBearerToken
   route <- MaybeT getCurrentRoute
   hoistMaybe $ preview (_tokenRestrictionIx route) token
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 73e1dbe8d..7006bd5e5 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -49,7 +49,7 @@ import GHC.Generics           as Import (Generic)
 import GHC.Exts               as Import (IsList)
 
 import Data.Hashable          as Import
-import Data.List.NonEmpty     as Import (NonEmpty(..))
+import Data.List.NonEmpty     as Import (NonEmpty(..), nonEmpty)
 import Data.List.NonEmpty.Instances as Import ()
 import Data.NonNull.Instances as Import ()
 import Data.Text.Encoding.Error as Import(UnicodeException(..))
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 0791bb218..1086b40ec 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -557,7 +557,7 @@ derivePersistField "Theme"
 
 
 newtype ZIPArchiveName obj = ZIPArchiveName { unZIPArchiveName :: obj }
-  deriving (Show, Read, Eq)
+  deriving (Show, Read, Eq, Ord, Generic, Typeable)
 
 instance PathPiece obj => PathPiece (ZIPArchiveName obj) where
     fromPathPiece = fmap ZIPArchiveName . fromPathPiece <=< (stripSuffix `on` CI.foldCase) ".zip"
@@ -832,8 +832,7 @@ data PredLiteral a = PLVariable { plVar :: a } | PLNegated { plVar :: a }
 instance Hashable a => Hashable (PredLiteral a)
 deriveJSON defaultOptions
   { constructorTagModifier = camelToPathPiece' 1
-  , sumEncoding = ObjectWithSingleField
-  , unwrapUnaryRecords = True
+  , sumEncoding = TaggedObject "val" "var"
   } ''PredLiteral
 
 instance PathPiece a => PathPiece (PredLiteral a) where
diff --git a/src/Utils.hs b/src/Utils.hs
index 4ca14e49c..1cad95098 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -77,6 +77,8 @@ import Network.Wai (requestMethod)
 
 import Data.Time.Clock
 
+import Data.List.NonEmpty (NonEmpty, nonEmpty)
+
 {-# ANN choice ("HLint: ignore Use asum" :: String) #-}
 
 
@@ -363,6 +365,9 @@ partitionWith f (x:xs) = case f x of
                          Right c -> (bs, c:cs)
     where (bs,cs) = partitionWith f xs
 
+nonEmpty' :: Alternative f => [a] -> f (NonEmpty a)
+nonEmpty' = maybe empty pure . nonEmpty
+
 ----------
 -- Sets --
 ----------
@@ -372,7 +377,8 @@ setIntersections :: Ord a => [Set a] -> Set a
 setIntersections []    = Set.empty
 setIntersections (h:t) = foldl' Set.intersection h t
 
-
+setMapMaybe :: (Ord a, Ord b) => (a -> Maybe b) -> Set a -> Set b
+setMapMaybe f = Set.fromList . mapMaybe f . Set.toList
 
 ----------
 -- Maps --
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 862c204fb..3d63b4f4a 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -636,6 +636,10 @@ aFormToWForm = mapRWST mFormToWForm' . over (mapped . _2) ($ []) . aFormToForm
       ((a, vs), ints, enctype) <- lift f
       writer ((a, ints, enctype), vs)
 
+infixl 4 `fmapAForm`
+  
+fmapAForm :: Functor m => (FormResult a -> FormResult b) -> (AForm m a -> AForm m b)
+fmapAForm f (AForm act) = AForm $ \app env ints -> over _1 f <$> act app env ints
 
 ---------------------------------------------
 -- Special variants of @mopt@, @mreq@, ... --
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 7a7c6a4db..d52b852c8 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -27,6 +27,9 @@ _InnerJoinLeft  f (E.InnerJoin l r) = (`E.InnerJoin` r) <$> f l
 _InnerJoinRight :: Lens' (E.InnerJoin l r) r
 _InnerJoinRight f (E.InnerJoin l r) = (l `E.InnerJoin`) <$> f r
 
+_nullable :: MonoFoldable mono => Prism' mono (NonNull mono)
+_nullable = prism' toNullable fromNullable
+
 
 -----------------------------------
 -- Lens Definitions for our Types
@@ -80,6 +83,8 @@ makeLenses_ ''SheetGrading
 
 makeLenses_ ''SheetType
 
+makePrisms ''SheetGroup
+
 makePrisms ''AuthResult
 
 makePrisms ''FormResult
@@ -112,6 +117,8 @@ makePrisms ''OccurenceException
 
 makeLenses_ ''Occurences
 
+makeLenses_ ''PredDNF
+
 
 -- makeClassy_ ''Load
 
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index d77a4b942..5d75a7c6c 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -116,12 +116,14 @@
         var requestBody = serializeForm(submitButton, enctype);
 
         if (requestFn && requestBody) {
+          var headers = {'Mass-Input-Shortcircuit': massInputId};
+
+          if (enctype !== 'multipart/form-data')
+            headers['Content-Type'] = enctype;
+          
           requestFn(
             url,
-            {
-              'Content-Type': enctype,
-              'Mass-Input-Shortcircuit': massInputId,
-            },
+            headers,
             requestBody,
           ).then(function(response) {
             return response.text();
diff --git a/templates/submission.hamlet b/templates/submission.hamlet
index b64a9a41c..c48654517 100644
--- a/templates/submission.hamlet
+++ b/templates/submission.hamlet
@@ -22,7 +22,9 @@ $maybe cID <- mcid
           $nothing
             <li>#{display time}
 
-
-$if maySubmit
-  <section>
-    ^{formWidget}
+  $if maySubmit
+    <section>
+      <h2>_{MsgSubmissionReplace}
+      ^{formWidget}
+$nothing
+  ^{formWidget}
diff --git a/templates/widgets/massinput/submissionUsers/add.hamlet b/templates/widgets/massinput/submissionUsers/add.hamlet
new file mode 100644
index 000000000..7986b68e3
--- /dev/null
+++ b/templates/widgets/massinput/submissionUsers/add.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<td colspan=2>
+  #{csrf}
+  ^{fvInput addView}
+<td>
+  ^{fvInput btn}
diff --git a/templates/widgets/massinput/submissionUsers/cellInvitation.hamlet b/templates/widgets/massinput/submissionUsers/cellInvitation.hamlet
new file mode 100644
index 000000000..6050ac678
--- /dev/null
+++ b/templates/widgets/massinput/submissionUsers/cellInvitation.hamlet
@@ -0,0 +1,10 @@
+ $newline never
+ <td>
+   #{csrf}
+   <span style="font-family: monospace">
+     #{email}
+ <td>
+   <div .tooltip>
+     <div .tooltip__handle>
+     <div .tooltip__content>
+       _{MsgEmailInvitationWarning}
diff --git a/templates/widgets/massinput/submissionUsers/cellKnown.hamlet b/templates/widgets/massinput/submissionUsers/cellKnown.hamlet
new file mode 100644
index 000000000..f6d3beaef
--- /dev/null
+++ b/templates/widgets/massinput/submissionUsers/cellKnown.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<td colspan=2>
+  #{csrf}
+  ^{nameEmailWidget userEmail userDisplayName userSurname}
diff --git a/templates/widgets/massinput/submissionUsers/layout.hamlet b/templates/widgets/massinput/submissionUsers/layout.hamlet
new file mode 100644
index 000000000..f1842a72f
--- /dev/null
+++ b/templates/widgets/massinput/submissionUsers/layout.hamlet
@@ -0,0 +1,13 @@
+$newline never
+<table>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput__cell>
+        ^{cellWdgts ! coord}
+        <td>
+          $maybe delButton <- delButtons !? coord
+            ^{fvInput delButton}
+  $maybe addWdgt <- addWdgts !? (0, 0)
+    <tfoot>
+      <tr .massinput__cell.massinput__cell--add>
+        ^{addWdgt}
diff --git a/test/FoundationSpec.hs b/test/FoundationSpec.hs
new file mode 100644
index 000000000..04081f1b9
--- /dev/null
+++ b/test/FoundationSpec.hs
@@ -0,0 +1,58 @@
+module FoundationSpec where
+
+import TestImport
+
+import ModelSpec ()
+
+import qualified Data.CryptoID as CID
+import Yesod.EmbeddedStatic
+
+instance Arbitrary TermId where
+  arbitrary = TermKey <$> arbitrary
+  
+instance Arbitrary SchoolId where
+  arbitrary = SchoolKey <$> arbitrary
+
+instance Arbitrary (Route Auth) where
+  arbitrary = oneof
+    [ return CheckR
+    , return LoginR
+    , return LogoutR
+    , PluginR <$> arbitrary <*> arbitrary
+    ]
+
+instance Arbitrary (Route EmbeddedStatic) where
+  arbitrary = embeddedResourceR <$> arbitrary <*> arbitrary
+
+instance Arbitrary CourseR where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary SheetR where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary SubmissionR where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary MaterialR where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary TutorialR where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary (Route UniWorX) where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary a => Arbitrary (CID.CryptoID ns a) where
+  arbitrary = CID.CryptoID <$> arbitrary
+
+spec :: Spec
+spec = do
+  parallel $ 
+    lawsCheckHspec (Proxy @(Route UniWorX))
+      [ eqLaws, hashableLaws, jsonLaws, jsonKeyLaws, pathPieceLaws ]
diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index b042b2aa6..7e725c166 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -148,6 +148,10 @@ instance Arbitrary AuthenticationMode where
 instance Arbitrary LecturerType where
   arbitrary = genericArbitrary
   shrink = genericShrink
+
+instance Arbitrary a => Arbitrary (ZIPArchiveName a) where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
   
 
 spec :: Spec
@@ -211,6 +215,8 @@ spec = do
       [ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws ]
     lawsCheckHspec (Proxy @LecturerType)
       [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, finiteLaws, jsonLaws, pathPieceLaws, persistFieldLaws ]
+    lawsCheckHspec (Proxy @(ZIPArchiveName (CI Text)))
+      [ eqLaws, ordLaws, showReadLaws, pathPieceLaws ]
 
   describe "TermIdentifier" $ do
     it "has compatible encoding/decoding to/from Text" . property $
diff --git a/test/Test/QuickCheck/Classes/Binary.hs b/test/Test/QuickCheck/Classes/Binary.hs
new file mode 100644
index 000000000..1261ce44b
--- /dev/null
+++ b/test/Test/QuickCheck/Classes/Binary.hs
@@ -0,0 +1,17 @@
+module Test.QuickCheck.Classes.Binary
+  ( binaryLaws
+  ) where
+
+import ClassyPrelude
+import Test.QuickCheck
+import Test.QuickCheck.Classes
+
+import Data.Proxy (Proxy(..))
+import Data.Binary
+import Data.Binary.Put
+
+binaryLaws :: forall a. (Arbitrary a, Binary a, Eq a, Show a) => Proxy a -> Laws
+binaryLaws _ = Laws "Binary"
+  [ ("Partial Isomorphism", property $ \(a :: a) -> decode (encode a) == Just a)
+  , ("Valid list encoding", property $ \(as :: [a]) -> runPut (putList as) == runPut (put as))
+  ]
diff --git a/test/TestImport.hs b/test/TestImport.hs
index 4ba8082bd..522201f4c 100644
--- a/test/TestImport.hs
+++ b/test/TestImport.hs
@@ -26,6 +26,7 @@ import Test.QuickCheck.Classes.Hashable as X
 import Test.QuickCheck.Classes.JSON as X
 import Test.QuickCheck.Classes.HttpApiData as X
 import Test.QuickCheck.Classes.Universe as X
+import Test.QuickCheck.Classes.Binary as X
 import Data.Proxy as X
 import Data.UUID as X (UUID)
 import System.IO as X (hPrint, hPutStrLn, stderr)

From 1981c3b9d07b8811337a20147fbbaad23c71226f Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 9 May 2019 14:55:19 +0200
Subject: [PATCH 275/519] grant tutors at least timed sheet access

---
 routes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routes b/routes
index 228583752..5ecd799a0 100644
--- a/routes
+++ b/routes
@@ -95,7 +95,7 @@
   /ex/current                 SheetCurrentR    GET             !course-registered !materials !corrector
   /ex/unassigned              SheetOldUnassigned    GET
   /ex/#SheetName SheetR:
-    /show                       SShowR         GET             !timeANDcourse-registered !timeANDmaterials !corrector
+    /show                       SShowR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
     /edit                       SEditR         GET POST
     /delete                     SDelR          GET POST
     /subs                       SSubsR         GET POST        -- for lecturer only
@@ -112,7 +112,7 @@
     /iscorrector                SIsCorrR       GET             !corrector -- Route is used to check for corrector access to this sheet
     /pseudonym                  SPseudonymR    GET POST        !course-registeredANDcorrector-submissions
     /corrector-invite/          SCorrInviteR   GET POST
-    !/#SheetFileType/*FilePath  SFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector
+    !/#SheetFileType/*FilePath  SFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
   /file                          MaterialListR GET             !course-registered !materials !corrector !tutor
   /file/new                      MaterialNewR  GET POST
   /file/#MaterialName MaterialR:

From 5123ca27497c35c316a76d85a2242a6470eaaa81 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 9 May 2019 14:59:45 +0200
Subject: [PATCH 276/519] #357 corrections upload limit noted

---
 templates/corrections-upload-instructions/de.hamlet | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/corrections-upload-instructions/de.hamlet b/templates/corrections-upload-instructions/de.hamlet
index 0a04c6c4f..f21254519 100644
--- a/templates/corrections-upload-instructions/de.hamlet
+++ b/templates/corrections-upload-instructions/de.hamlet
@@ -20,3 +20,8 @@
     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.
+
+<section>
+  <p>
+    <em>Achtung:
+    Das Limit für die Dateigröße beträgt momentan ungefähr 52MB
\ No newline at end of file

From b0d23bca7991dbdb7bdf4d4401a586d5ceb74167 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 9 May 2019 15:54:32 +0200
Subject: [PATCH 277/519] Fixes #357

---
 config/settings.yml                           |  2 +-
 src/Handler/Corrections.hs                    |  1 +
 src/Utils.hs                                  | 23 +++++++++++++++++++
 .../corrections-upload-instructions/de.hamlet |  7 +++---
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/config/settings.yml b/config/settings.yml
index 974b2e7e2..aba8f93c3 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -29,7 +29,7 @@ notification-expiration: 259201
 session-timeout: 7200
 jwt-expiration: 604800
 jwt-encoding: HS256
-maximum-content-length: 52428800
+maximum-content-length: 134217728
 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/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 4ef07e77d..01af2b880 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -721,6 +721,7 @@ postCorrectionsUploadR = do
         , formEncoding = uploadEncoding
         }
 
+  maxUploadMB <- appMaximumContentLength <$> getsYesod appSettings'
 
   defaultLayout $ do
     let uploadInstruction = $(i18nWidgetFile "corrections-upload-instructions")
diff --git a/src/Utils.hs b/src/Utils.hs
index 4fee6e818..9b764fc12 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -262,6 +262,22 @@ textPercent x = lz <> pack (show rx) <> "%"
 textPercentInt :: Integral a => a -> a -> Text -- slow, maybe use Data.Double.Conversion.Text.toFixed instead?
 textPercentInt part whole = textPercent $ fromIntegral part % fromIntegral whole
 
+-- | Convert number of bytes to human readable format
+textBytes :: Integral a => a -> Text
+textBytes x
+  | v < kb    = rshow  v     <>  "B"
+  | v < mb    = rshow (v/kb) <> "KB"
+  | v < gb    = rshow (v/mb) <> "MB"
+  | otherwise = rshow (v/gb) <> "GB"
+ where
+  v  = fromIntegral x
+  kb = 1024
+  mb = 1024 * kb
+  gb = 1024 * mb
+  rshow :: Double -> Text
+  rshow = tshow . floorToDigits 1
+
+
 stepTextCounterCI :: CI Text -> CI Text -- find and increment rightmost-number, preserving leading zeroes
 stepTextCounterCI = CI.map stepTextCounter
 
@@ -294,6 +310,13 @@ notUsedT = notUsed
 roundToNearestMultiple :: Int -> Int -> Int
 roundToNearestMultiple m n = (n `div` m + 1) * m
 
+roundToDigits :: (RealFrac a, Integral b) => b -> a -> a
+roundToDigits d x = fromInteger (round $ x * prec) / prec
+  where prec = 10^d
+
+floorToDigits :: (RealFrac a, Integral b) => b -> a -> a
+floorToDigits d x = fromInteger (floor $ x * prec) / prec
+  where prec = 10^d
 
 
 
diff --git a/templates/corrections-upload-instructions/de.hamlet b/templates/corrections-upload-instructions/de.hamlet
index f21254519..44e5deb4d 100644
--- a/templates/corrections-upload-instructions/de.hamlet
+++ b/templates/corrections-upload-instructions/de.hamlet
@@ -21,7 +21,6 @@
     Korrekturen des letzten Korrektors gelöscht werden, falls diese den Abgabenden
     nicht zur Verfügung gestellt werden sollen.
 
-<section>
-  <p>
-    <em>Achtung:
-    Das Limit für die Dateigröße beträgt momentan ungefähr 52MB
\ No newline at end of file
+  $maybe maxUpload <- maxUploadMB
+    <p>
+      Das Limit für die Dateigröße beträgt momentan #{textBytes maxUpload}
\ No newline at end of file

From caef74e95541b2d6900e609778d9deb50fc5c551 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 9 May 2019 16:17:43 +0200
Subject: [PATCH 278/519] Make maximum-content-length easier configurable at
 runtime

See #357
---
 config/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/settings.yml b/config/settings.yml
index aba8f93c3..592b09ca1 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -29,7 +29,7 @@ notification-expiration: 259201
 session-timeout: 7200
 jwt-expiration: 604800
 jwt-encoding: HS256
-maximum-content-length: 134217728
+maximum-content-length: "_env:MAX_UPLOAD_SIZE:134217728"
 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"

From a0de628d9bca3b625602f97b61fb410da6cc6c42 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 9 May 2019 17:00:01 +0200
Subject: [PATCH 279/519] display tutors on course page

---
 src/Handler/Course.hs   | 14 ++++++++++----
 templates/course.hamlet | 10 ++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 1def7e552..ef52f3c9a 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -280,7 +280,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,correctors) <- runDB . maybeT notFound $ do
+  (cid,course,schoolName,participants,registration,defSFid,lecturers,assistants,correctors,tutors) <- 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
@@ -312,7 +312,13 @@ getCShowR tid ssh csh = do
       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,correctors)
+    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
+      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,correctors,tutors)
 
   mRegFrom <- traverse (formatTime SelFormatDateTime) $ courseRegisterFrom    course
   mRegTo   <- traverse (formatTime SelFormatDateTime) $ courseRegisterTo      course
@@ -338,14 +344,14 @@ getCShowR tid ssh csh = do
           [ 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
+              tutTutors <- 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|
                        $newline never
                        <ul .list--iconless .list--inline .list--comma-separated>
-                         $forall tutor <- tutors
+                         $forall tutor <- tutTutors
                            <li>
                              ^{nameEmailWidget' tutor}
                      |]
diff --git a/templates/course.hamlet b/templates/course.hamlet
index 6f4b83866..29eac6294 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -33,6 +33,16 @@ $newline never
           <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 d6c3cc8c15f5bedd7aaf60ba3392bd77522dbdef Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 9 May 2019 17:11:23 +0200
Subject: [PATCH 280/519] SheetList-prime accessCallback from Course refactored

---
 src/Foundation.hs | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index d9ec45191..f5b4fa18c 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1825,8 +1825,8 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh MaterialListR
       , menuItemModal = False
       , 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
+          let lecturerAccess     = hasWriteAccessTo $ CourseR tid ssh csh MaterialNewR  -- Always show for lecturers to create new material
+              materialAccess mnm = hasReadAccessTo  $ CMaterialR tid ssh csh mnm MShowR -- otherwise show only if the 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
@@ -1843,17 +1843,18 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetListR
       , menuItemModal = False
-      , menuItemAccessCallback' = do --TODO always show for lecturer
-          let sheetRouteAccess shn = (== Authorized) <$> evalAccess (CSheetR tid ssh csh shn SShowR) False
-          muid <- maybeAuthId
-          (sheets,lecturer) <- runDB $ do
-            cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-            sheets <- map (sheetName.entityVal) <$> selectList [SheetCourse ==. cid] [Desc SheetActiveFrom]
-            lecturer <- case muid of
-                Nothing    -> return False
-                (Just uid) -> existsBy $ UniqueLecturer uid cid
-            return (sheets,lecturer)
-          or2M (return lecturer) $ anyM sheets sheetRouteAccess
+      , menuItemAccessCallback' =
+          let lecturerAccess  = hasWriteAccessTo $ CourseR tid ssh csh SheetNewR  -- Always show for lecturers to create new sheets
+              sheetAccess shn = hasReadAccessTo  $ CSheetR tid ssh csh shn SShowR -- othwerwise show only if the user can see at least one of the contents
+              existsVisible  = do
+                  sheetNames <- E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
+                    E.on     $ course   E.^. CourseId   E.==.   sheet E.^. SheetCourse
+                    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 $ sheet E.^. SheetName
+                  anyM sheetNames (sheetAccess . E.unValue)
+          in runDB $ lecturerAccess `or2M` existsVisible
       }
   ] ++ pageActions (CourseR tid ssh csh SheetListR) ++
   [ MenuItem

From aaedb64d36faa05411ea2e9317046428db76e918 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 9 May 2019 19:21:49 +0200
Subject: [PATCH 281/519] =?UTF-8?q?Download=20Link=20f=C3=BCr=20Material-A?=
 =?UTF-8?q?rchive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routes                           |  2 ++
 src/Handler/Material.hs          | 33 ++++++++++++++++++++++++++++----
 src/Handler/Utils/Table/Cells.hs |  9 +++++++++
 src/Utils.hs                     |  6 ++++++
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/routes b/routes
index 89b7fc369..0844f047a 100644
--- a/routes
+++ b/routes
@@ -121,6 +121,8 @@
     /delete                     MDelR          GET POST
     /show                       MShowR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
     /load/*FilePath             MFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
+    -- Besser wäre #{ZIPArchiveName MaterialName} auf höherer Ebene
+    /zip                        MArchiveR      GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
   /tuts                         CTutorialListR GET             !tutor
   /tuts/new                     CTutorialNewR  GET POST
   /tuts/#TutorialName TutorialR:
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index b12b3b9af..c9199136f 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -9,6 +9,7 @@ import qualified Data.Set as Set
 import qualified Data.Map as Map
 import qualified Data.Conduit.List as C
 -- import qualified Data.CaseInsensitive as CI
+import qualified Data.Text.Encoding as Text
 
 import qualified Database.Esqueleto as E
 import Database.Esqueleto.Utils.TH
@@ -23,8 +24,6 @@ import Handler.Utils.Table.Columns
 import Control.Monad.Writer (MonadWriter(..), execWriterT)
 
 
-
-
 data MaterialForm = MaterialForm
       { mfName         :: MaterialName
       , mfType         :: Maybe Text
@@ -72,6 +71,11 @@ makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
       <*> aopt (multiFileField oldFileIds)
                               (fslI MsgMaterialFiles)        (mfFiles <$> template)
 
+getMaterialKeyBy404 :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> DB (Key Material)
+getMaterialKeyBy404 tid ssh csh mnm = do
+  cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+  getKeyBy404 $  UniqueMaterial cid mnm
+
 fetchMaterial :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> DB (Entity Material)
 fetchMaterial tid ssh csh mnm = do
   [matEnt] <- E.select . E.from  $ -- uniqueness guaranteed by DB constraints
@@ -90,6 +94,9 @@ getMaterialListR tid ssh csh = do
   let matLink :: MaterialName -> Route UniWorX
       matLink = CourseR tid ssh csh . flip MaterialR MShowR
 
+      zipLink :: MaterialName -> Route UniWorX
+      zipLink = CourseR tid ssh csh . flip MaterialR MArchiveR
+
       materialModDateCell :: IsDBTable m a => Material -> DBCell m a
       materialModDateCell Material{materialVisibleFrom, materialLastEdit}
         | NTop materialVisibleFrom >= NTop (Just materialLastEdit)
@@ -113,13 +120,15 @@ getMaterialListR tid ssh csh = do
       -- , 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)
+            [ -- dbRow,
+              sortable (Just "type") (i18nCell MsgMaterialType)
                 $ foldMap textCell . materialType . row2material
             , sortable (Just "name") (i18nCell MsgMaterialName)
                 $ liftA2 anchorCell matLink toWgt . materialName . row2material
             , sortable (toNothingS "description") mempty
                 $ foldMap modalCell . materialDescription . row2material
+            , sortable (toNothingS "zip-archive") mempty
+                $ zipCell . zipLink . materialName . row2material
             , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
                 $ foldMap (dateTimeCellVisible now) . materialVisibleFrom . row2material
             , sortable (Just "last-edit") (i18nCell MsgFileModified)
@@ -337,3 +346,19 @@ postMDelR tid ssh csh mnm = do
     , drSuccess = SomeRoute $ CourseR tid ssh csh   MaterialListR
     , drAbort   = SomeRoute $ CourseR tid ssh csh $ MaterialR mnm MShowR
     }
+
+getMArchiveR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler TypedContent
+getMArchiveR tid ssh csh mnm = do
+  let filename = ZIPArchiveName mnm
+  addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece filename}"|]
+  respondSourceDB "application/zip" $ do
+    mid <- lift $ getMaterialKeyBy404 tid ssh csh mnm
+    -- Entity{entityKey=mid, entityVal=material} <- lift $ fetchMaterial tid ssh csh mnm
+    let
+      fileSelect = E.selectSource . E.from $ \(materialFile `E.InnerJoin` file) -> do
+        E.on     $  materialFile E.^. MaterialFileFile E.==. file E.^. FileId
+        E.where_ $  materialFile E.^. MaterialFileMaterial E.==. E.val mid
+        return file
+      fileSource' = fileSelect .| C.map entityVal
+      zipComment = Text.encodeUtf8 $ (termToText $ unTermKey tid) <> "-" <> toPathPiece (unSchoolKey ssh <> "-" <> csh <> ":" <> mnm)
+    fileSource' .| produceZip ZipInfo{..} .| C.map toFlushBuilder
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index c135e851b..e2294e46c 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -87,12 +87,21 @@ commentCell Nothing     = mempty
 commentCell (Just link) = anchorCell link icon
   where icon = toWidget $ hasComment True
 
+-- | whether something is visible or hidden
 isVisibleCell :: (IsDBTable m a) => Bool -> DBCell m a
 isVisibleCell True  =  cell . toWidget $ isVisible True
 isVisibleCell False = (cell . toWidget $ isVisible False) & addUrgencyClass
   where
     addUrgencyClass = over cellAttrs $ insertClass $ statusToUrgencyClass Warning
 
+-- | for simple file downloads
+fileCell :: IsDBTable m a => Route UniWorX -> DBCell m a
+fileCell route = anchorCell route $ toWidget fileDownload
+
+-- | for zip-archive downloads
+zipCell :: IsDBTable m a => Route UniWorX -> DBCell m a
+zipCell route = anchorCell route $ toWidget zipDownload
+
 -- | 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)
diff --git a/src/Utils.hs b/src/Utils.hs
index 9b764fc12..619fdaa81 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -163,6 +163,12 @@ boolSymbol :: Bool -> Markup
 boolSymbol True  = [shamlet|<i .fas .fa-check>|]
 boolSymbol False = [shamlet|<i .fas .fa-times>|]
 
+fileDownload :: Markup
+fileDownload = [shamlet|<i .fas .fa-file-download>|]
+
+zipDownload :: Markup
+zipDownload = [shamlet|<i .fas .fa-file-archive>|]
+
 
 ---------------------
 -- Text and String --

From 36358af8be6f0aa8a0c811c9e62d5f388eba2673 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 9 May 2019 19:24:17 +0200
Subject: [PATCH 282/519] quiet hlint

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

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index c9199136f..2c6c98c65 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -360,5 +360,5 @@ getMArchiveR tid ssh csh mnm = do
         E.where_ $  materialFile E.^. MaterialFileMaterial E.==. E.val mid
         return file
       fileSource' = fileSelect .| C.map entityVal
-      zipComment = Text.encodeUtf8 $ (termToText $ unTermKey tid) <> "-" <> toPathPiece (unSchoolKey ssh <> "-" <> csh <> ":" <> mnm)
+      zipComment = Text.encodeUtf8 $ termToText (unTermKey tid) <> "-" <> toPathPiece (unSchoolKey ssh <> "-" <> csh <> ":" <> mnm)
     fileSource' .| produceZip ZipInfo{..} .| C.map toFlushBuilder

From 6a68e1de7980959bd0c6021f0e9268bc3548128e Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 9 May 2019 19:58:03 +0200
Subject: [PATCH 283/519] show archive link on material show

---
 src/Handler/Material.hs        | 5 ++++-
 src/Handler/Utils.hs           | 3 +++
 templates/material-show.hamlet | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 2c6c98c65..54a130c79 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -127,7 +127,7 @@ getMaterialListR tid ssh csh = do
                 $ liftA2 anchorCell matLink toWgt . materialName . row2material
             , sortable (toNothingS "description") mempty
                 $ foldMap modalCell . materialDescription . row2material
-            , sortable (toNothingS "zip-archive") mempty
+            , sortable (toNothingS "zip-archive") mempty -- TODO: don't show if there are no files!
                 $ zipCell . zipLink . materialName . row2material
             , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
                 $ foldMap (dateTimeCellVisible now) . materialVisibleFrom . row2material
@@ -179,6 +179,9 @@ getMShowR tid ssh csh mnm = do
   let matLink :: FilePath -> Route UniWorX
       matLink = CourseR tid ssh csh . MaterialR mnm . MFileR
 
+      zipLink :: Route UniWorX
+      zipLink = CMaterialR tid ssh csh mnm MArchiveR
+
   seeAllModificationTimestamps <- hasReadAccessTo $ CourseR tid ssh csh CNotesR -- ordinary users should not see modification dates older than visibility
 
   ( Entity _mid material@Material{materialType, materialDescription}
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 8e2a595e2..f5a7be596 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -69,6 +69,9 @@ tidFromText = fmap TermKey . maybeRight . termFromText
 simpleLink :: Widget -> Route UniWorX -> Widget
 simpleLink lbl url = [whamlet|<a href=@{url}>^{lbl}|]
 
+simpleLinkI :: SomeMessage UniWorX -> Route UniWorX -> Widget
+simpleLinkI lbl url = [whamlet|<a href=@{url}>_{lbl}|]
+
 -- | toWidget-Version of @nameHtml@, for convenience
 nameWidget :: Text    -- ^ userDisplayName
            -> Text    -- ^ userSurname
diff --git a/templates/material-show.hamlet b/templates/material-show.hamlet
index 92dba855e..c3e00bc22 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 || True
+$if hasFiles
   <section>
-    <h2>_{MsgMaterialFiles}
+    <h2>^{simpleLinkI (SomeMessage MsgMaterialFiles) zipLink}
     ^{fileTable}

From 043de053d569f0995e82ebad4883ba771ff9f2c2 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 9 May 2019 20:35:49 +0200
Subject: [PATCH 284/519] keep left padding in asidenav for tablets as well

---
 static/css/utils/asidenav.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/css/utils/asidenav.scss b/static/css/utils/asidenav.scss
index 8af1074e8..e7ab3b50d 100644
--- a/static/css/utils/asidenav.scss
+++ b/static/css/utils/asidenav.scss
@@ -217,7 +217,7 @@
 }
 
 /* small list-item-padding for medium to large screens */
-@media (min-width: 1025px) {
+@media (min-width: 769px) {
 
   .asidenav__list-item {
     padding-left: 10px;

From 13a19e91fb6afdf4b5ae500f7b7aa2dd210bc46b Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 9 May 2019 20:36:33 +0200
Subject: [PATCH 285/519] display secondary pageactions list below the elipsis

---
 templates/widgets/pageaction/pageaction.lucius | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/templates/widgets/pageaction/pageaction.lucius b/templates/widgets/pageaction/pageaction.lucius
index ebdd5be78..2ff7297f9 100644
--- a/templates/widgets/pageaction/pageaction.lucius
+++ b/templates/widgets/pageaction/pageaction.lucius
@@ -45,9 +45,14 @@
       box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.6);
       box-sizing: border-box;
       text-align: center;
+      transition: box-shadow 0.2s ease;
     }
 
     &:hover {
+      &::after {
+        box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.8);
+      }
+
       .pagenav-secondary__list {
         display: block;
       }
@@ -58,7 +63,7 @@
     position: absolute;
     display: none;
     left: 0;
-    top: 10px;
+    top: 50px;
     width: 250px;
     background-color: white;
     box-shadow: 0 0 6px 3px var(--color-grey-light);

From ebbef3911ee0b1adea1e5d7d2adeb7a0065a0f51 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 9 May 2019 21:17:26 +0200
Subject: [PATCH 286/519] Send Alerts-Header when using async-massinput

---
 src/Foundation.hs                   | 9 +++++++--
 src/Handler/Utils/Form/MassInput.hs | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index f5b4fa18c..8b97c9317 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1103,8 +1103,13 @@ instance Yesod UniWorX where
         headerMessagesMiddleware handler = (handler `finally`) . runMaybeT $ do
           isModal <- hasCustomHeader HeaderIsModal
           dbTableShortcircuit <- hasCustomHeader HeaderDBTableShortcircuit
-          $logDebugS "headerMessagesMiddleware" $ tshow (isModal, dbTableShortcircuit)
-          guard $ isModal || dbTableShortcircuit
+          massInputShortcircuit <- hasCustomHeader HeaderMassInputShortcircuit
+          $logDebugS "headerMessagesMiddleware" $ tshow (isModal, dbTableShortcircuit, massInputShortcircuit)
+          guard $ or
+            [ isModal
+            , dbTableShortcircuit
+            , massInputShortcircuit
+            ]
 
           lift . bracketOnError getMessages (mapM_ $ uncurry Yesod.addMessage) $ \msgs -> do
             Just msgs' <- return . forM msgs $ \(msgState, content) -> Message <$> fromPathPiece msgState <*> return content
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index 9119b031a..cd5e4f5ac 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -21,7 +21,7 @@ import Handler.Utils.Form (secretJsonField)
 import Handler.Utils.Form.MassInput.Liveliness
 import Handler.Utils.Form.MassInput.TH
 
-import Data.Aeson
+import Data.Aeson hiding (Result(..))
 
 import Algebra.Lattice hiding (join)
 
@@ -423,6 +423,10 @@ massInput MassInput{ miIdent = toPathPiece -> miIdent, ..} FieldSettings{..} fvR
     PageContent{..} <- widgetToPageContent $(widgetFile "widgets/massinput/massinput-standalone")
     ur <- getUrlRenderParams
 
+    case result of
+      FormFailure errs -> forM_ errs $ addMessage Error . toHtml -- Error messages get collected by middleware and added as header to response
+      _other           -> return () -- Completely ignore non-error results; we'll short circuit below
+
     sendResponse $ $(hamletFile "templates/widgets/massinput/massinput-standalone-wrapper.hamlet") ur
 
   let

From 373c8d213d397cd8b3f38a73abe5b76348ee329c Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 9 May 2019 21:54:50 +0200
Subject: [PATCH 287/519] add interceptors to http client

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

diff --git a/static/js/services/httpClient.js b/static/js/services/httpClient.js
index 32935cb07..eacd9b6b5 100644
--- a/static/js/services/httpClient.js
+++ b/static/js/services/httpClient.js
@@ -1,8 +1,16 @@
-(function collonadeClosure() {
+(function () {
   'use strict';
 
   window.HttpClient = (function() {
 
+    var _responseInterceptors = [];
+
+    function addResponseInterceptor(interceptor) {
+      if (typeof interceptor === 'function') {
+        _responseInterceptors.push(interceptor);
+      }
+    }
+
     function _fetch(url, method, additionalHeaders, body) {
       var requestOptions = {
         credentials: 'same-origin',
@@ -15,7 +23,17 @@
         requestOptions.headers[headerKey] = additionalHeaders[headerKey];
       });
 
-      return fetch(url, requestOptions);
+      return fetch(url, requestOptions).then(
+        function(response) {
+          _responseInterceptors.forEach(function(interceptor) { interceptor(response); });
+          return Promise.resolve(response);
+        },
+        function(error) {
+          return Promise.reject(error);
+        }
+      ).catch(function(error) {
+        console.error(error);
+      });
     }
 
     return {
@@ -25,6 +43,7 @@
       post: function(url, headers, body) {
         return _fetch(url, 'POST', headers, body);
       },
+      addResponseInterceptor: addResponseInterceptor,
     }
   })();
 })();

From e0d65123399133b19641d4805138eca87a4a1382 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 9 May 2019 21:55:52 +0200
Subject: [PATCH 288/519] add http interceptor for alerts

---
 static/css/utils/alerts.scss |  4 +++
 static/js/utils/alerts.js    | 63 +++++++++++++++++++++++++++++++++---
 2 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/static/css/utils/alerts.scss b/static/css/utils/alerts.scss
index bd6b55bfd..cd0492f11 100644
--- a/static/css/utils/alerts.scss
+++ b/static/css/utils/alerts.scss
@@ -34,6 +34,10 @@
   }
 }
 
+.alerts--elevated {
+  z-index: 1000;
+}
+
 .alerts__toggler--visible {
   top: -40px;
   opacity: 1;
diff --git a/static/js/utils/alerts.js b/static/js/utils/alerts.js
index 8b2ba92fb..52f620d12 100644
--- a/static/js/utils/alerts.js
+++ b/static/js/utils/alerts.js
@@ -30,7 +30,7 @@
    * Example usage:
    *  <div .alerts uw-alerts>
    *    <div .alerts__toggler>
-   *      <div .alert.alert-info>
+   *    <div .alert.alert-info>
    *      <div .alert__closer>
    *      <div .alert__icon>
    *      <div .alert__content>
@@ -42,6 +42,7 @@
   var ALERTS_UTIL_SELECTOR = '[uw-alerts]';
 
   var ALERTS_INITIALIZED_CLASS = 'alerts--initialized';
+  var ALERTS_ELEVATED_CLASS = 'alerts--elevated';
   var ALERTS_TOGGLER_CLASS = 'alerts__toggler';
   var ALERTS_TOGGLER_VISIBLE_CLASS = 'alerts__toggler--visible';
   var ALERTS_TOGGLER_APPEAR_DELAY = 120;
@@ -49,6 +50,8 @@
   var ALERT_CLASS = 'alert';
   var ALERT_INITIALIZED_CLASS = 'alert--initialized';
   var ALERT_CLOSER_CLASS = 'alert__closer';
+  var ALERT_ICON_CLASS = 'alert__icon';
+  var ALERT_CONTENT_CLASS = 'alert__content';
   var ALERT_INVISIBLE_CLASS = 'alert--invisible';
   var ALERT_AUTO_HIDE_DELAY = 10;
   var ALERT_AUTOCLOSING_MATCHER = '.alert-info, .alert-success';
@@ -73,6 +76,9 @@
       initToggler();
       initAlerts();
 
+      // register http client interceptor to filter out Alerts Header
+      setupHttpInterceptor();
+
       // mark initialized
       element.classList.add(ALERTS_INITIALIZED_CLASS);
 
@@ -96,7 +102,6 @@
         });
         togglerElement.classList.remove(ALERTS_TOGGLER_VISIBLE_CLASS);
       });
-      element.classList.add(ALERTS_INITIALIZED_CLASS);
     }
 
     function initAlerts() {
@@ -119,8 +124,6 @@
           toggleAlert(alertElement);
         }, autoHideDelay * 1000);
       }
-
-      alertElement.classList.add(ALERTS_INITIALIZED_CLASS);
     }
 
     function toggleAlert(alertEl, visible) {
@@ -143,6 +146,58 @@
       }, ALERTS_TOGGLER_APPEAR_DELAY);
     }
 
+    function setupHttpInterceptor() {
+      if (HttpClient) {
+        HttpClient.addResponseInterceptor(responseInterceptor.bind(this));
+      }
+    }
+
+    function elevateAlerts() {
+      element.classList.add(ALERTS_ELEVATED_CLASS);
+    }
+
+    function responseInterceptor(response) {
+      var alerts;
+      for (var header of response.headers) {
+        if (header[0] === 'alerts') {
+          alerts = JSON.parse(header[1]);
+          break;
+        }
+      }
+
+      if (alerts) {
+        alerts.forEach(function(alert) {
+          var alertElement = createAlertElement(alert.status, alert.content);
+          element.appendChild(alertElement);
+          alertElements.push(alertElement);
+          initAlert(alertElement);
+        });
+
+        elevateAlerts();
+      }
+    }
+
+    function createAlertElement(type, content) {
+      var alertElement = document.createElement('div');
+      alertElement.classList.add(ALERT_CLASS, 'alert-' + type);
+
+      var alertCloser = document.createElement('div');
+      alertCloser.classList.add(ALERT_CLOSER_CLASS);
+
+      var alertIcon = document.createElement('div');
+      alertIcon.classList.add(ALERT_ICON_CLASS);
+
+      var alertContent = document.createElement('div');
+      alertContent.classList.add(ALERT_CONTENT_CLASS);
+      alertContent.innerHTML = content;
+
+      alertElement.appendChild(alertCloser);
+      alertElement.appendChild(alertIcon);
+      alertElement.appendChild(alertContent);
+
+      return alertElement;
+    }
+
     return init();
   };
 

From f63e7dbb762d18415c4008c45d238eb88c04a0a3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 9 May 2019 22:27:55 +0200
Subject: [PATCH 289/519] Remove type="search"

---
 src/Handler/Admin.hs               | 6 +++---
 src/Handler/Corrections.hs         | 2 +-
 src/Handler/Course.hs              | 8 ++++----
 src/Handler/Users.hs               | 4 ++--
 src/Handler/Utils/Table/Columns.hs | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 3e5306383..4e3845895 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -447,9 +447,9 @@ postAdminFeaturesR = do
             ]
           dbtFilterUI mPrev = mconcat
             -- [ prismAForm (singletonFilter "key")       mPrev $ aopt intField            (fslI MsgStudyTermsKey) -- Typing problem exactFilter suffices here
-            [ prismAForm (singletonFilter "key")       mPrev $ aopt (searchField False) (fslI MsgStudyTermsKey)
-            , prismAForm (singletonFilter "name")      mPrev $ aopt (searchField False) (fslI MsgStudyTermsName)
-            , prismAForm (singletonFilter "incidence") mPrev $ aopt (searchField False) (fslI MsgStudyCandidateIncidence)
+            [ prismAForm (singletonFilter "key")       mPrev $ aopt textField (fslI MsgStudyTermsKey)
+            , prismAForm (singletonFilter "name")      mPrev $ aopt textField (fslI MsgStudyTermsName)
+            , prismAForm (singletonFilter "incidence") mPrev $ aopt textField (fslI MsgStudyCandidateIncidence)
             ]
           dbtParams     = def
           psValidator   = def & defaultSorting [SortAscBy "incidence", SortAscBy "key", SortAscBy "name"]
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 4ef07e77d..59a14a556 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -514,7 +514,7 @@ postCorrectionsR = do
         [ prismAForm (singletonFilter "course" ) mPrev $ aopt (lift `hoistField` selectField courseOptions) (fslI MsgCourse)
         , prismAForm (singletonFilter "term"   ) mPrev $ aopt (lift `hoistField` selectField termOptions)   (fslI MsgTerm)
         , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` selectField schoolOptions) (fslI MsgCourseSchool)
-        , Map.singleton "sheet-search" . maybeToList <$> aopt (lift `hoistField` searchField False)         (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
+        , Map.singleton "sheet-search" . maybeToList <$> aopt (lift `hoistField` textField)                 (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
         , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField                        (fslI MsgRatingTime)
         ]
       courseOptions = runDB $ do
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 003fdfcdc..34afeefeb 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -195,7 +195,7 @@ makeCourseTable whereClause colChoices psValidator = do
           )
         ]
     , dbtFilterUI = \mPrev -> mconcat $ catMaybes
-      [ Just  $ prismAForm (singletonFilter "search") mPrev $ aopt (searchField True) (fslI MsgCourseFilterSearch)
+      [ Just  $ prismAForm (singletonFilter "search") mPrev $ aopt textField (fslI MsgCourseFilterSearch)
       , muid $> prismAForm (singletonFilter "registered" . maybePrism _PathPiece) mPrev (aopt boolField (fslI MsgCourseFilterRegistered))
       ]
     , dbtStyle = def { dbsFilterLayout = defaultDBSFilterLayout }
@@ -1096,9 +1096,9 @@ makeCourseUserTable cid restrict colChoices psValidator = do
         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 "tutorial") mPrev $ aopt (searchField False) (fslI MsgCourseTutorial)
+          , prismAForm (singletonFilter "degree")   mPrev $ aopt textField (fslI MsgStudyFeatureDegree)
+          , prismAForm (singletonFilter "field")    mPrev $ aopt textField (fslI MsgCourseStudyFeature)
+          , prismAForm (singletonFilter "tutorial") mPrev $ aopt textField (fslI MsgCourseTutorial)
           ]
         dbtParams    = DBParamsForm
           { dbParamsFormMethod = POST
diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs
index 546e3bf91..8af2f6620 100644
--- a/src/Handler/Users.hs
+++ b/src/Handler/Users.hs
@@ -131,8 +131,8 @@ getUsersR = do
             )
           ]
       , dbtFilterUI  = \mPrev -> mconcat
-          [ prismAForm (singletonFilter "user-search")    mPrev $ aopt (searchField True)  (fslI MsgName)
-          -- , prismAForm (singletonFilter "matriculation" ) mPrev $ aopt (searchField False) (fslI MsgMatrikelNr)
+          [ prismAForm (singletonFilter "user-search")    mPrev $ aopt textField  (fslI MsgName)
+          -- , prismAForm (singletonFilter "matriculation" ) mPrev $ aopt textField (fslI MsgMatrikelNr)
           , prismAForm (singletonFilter "matriculation" ) mPrev $ aopt matriculationField  (fslI MsgMatrikelNr)
 
           , prismAForm (singletonFilter "school" )        mPrev $ aopt (lift `hoistField` selectFieldList schoolOptions) (fslI MsgCourseSchool)
diff --git a/src/Handler/Utils/Table/Columns.hs b/src/Handler/Utils/Table/Columns.hs
index 390741925..c4e4d7081 100644
--- a/src/Handler/Utils/Table/Columns.hs
+++ b/src/Handler/Utils/Table/Columns.hs
@@ -167,11 +167,11 @@ fltrUserNameLinkUI = fltrUserNameUI
 
 fltrUserNameUI :: Maybe (Map FilterKey [Text]) -> AForm (YesodDB UniWorX) (Map FilterKey [Text])
 fltrUserNameUI mPrev =
-  prismAForm (singletonFilter "user-name") mPrev $ aopt (searchField True) (fslI MsgCourseMembers)
+  prismAForm (singletonFilter "user-name") mPrev $ aopt textField (fslI MsgCourseMembers)
 
 fltrUserNameEmailUI :: Maybe (Map FilterKey [Text]) -> AForm (YesodDB UniWorX) (Map FilterKey [Text])
 fltrUserNameEmailUI mPrev =
-  prismAForm (singletonFilter "user-name-email") mPrev $ aopt (searchField True) (fslI MsgCourseMembers)
+  prismAForm (singletonFilter "user-name-email") mPrev $ aopt textField (fslI MsgCourseMembers)
 
 -------------------
 -- Matriclenumber
@@ -188,7 +188,7 @@ fltrUserMatriclenr queryUser = ( "user-matriclenumber", FilterColumn $ mkContain
 
 fltrUserMatriclenrUI :: Maybe (Map FilterKey [Text]) -> AForm (YesodDB UniWorX) (Map FilterKey [Text])
 fltrUserMatriclenrUI mPrev =
-  prismAForm (singletonFilter "user-matriclenumber") mPrev $ aopt (searchField False) (fslI MsgMatrikelNr)
+  prismAForm (singletonFilter "user-matriclenumber") mPrev $ aopt textField (fslI MsgMatrikelNr)
 
 
 ----------------
@@ -206,6 +206,6 @@ fltrUserEmail queryUser = ( "user-email", FilterColumn $ mkContainsFilter $ quer
 
 fltrUserEmailUI :: Maybe (Map FilterKey [Text]) -> AForm (YesodDB UniWorX) (Map FilterKey [Text])
 fltrUserEmailUI mPrev =
-  prismAForm (singletonFilter "user-email") mPrev $ aopt (searchField False) (fslI MsgEMail)
+  prismAForm (singletonFilter "user-email") mPrev $ aopt textField (fslI MsgEMail)
 
 

From 86f10ae1bac8d8a45cb1e5fa1062c7cc42024a58 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 10 May 2019 11:25:43 +0200
Subject: [PATCH 290/519] Sheet List Convenience like in UniWorX

---
 messages/uniworx/de.msg               |  1 +
 routes                                |  1 +
 src/Foundation.hs                     | 15 ++++--
 src/Handler/Material.hs               |  3 +-
 src/Handler/Sheet.hs                  | 75 +++++++++++++++------------
 src/Handler/Utils.hs                  | 22 ++++++++
 src/Handler/Utils/Table/Pagination.hs | 21 ++++++++
 src/Model/Types.hs                    |  7 +++
 src/Utils.hs                          | 28 ++++++++--
 src/Utils/Sheet.hs                    | 47 +++++++++++++++++
 10 files changed, 176 insertions(+), 44 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index ed32f7571..f6de18a46 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -410,6 +410,7 @@ RatingPointsDone: Abgabe zählt als korrigiert, gdw. Punktezahl gesetzt ist
 ColumnRatingPoints: Punktzahl
 Pseudonyms: Pseudonyme
 
+Files: Dateien
 FileTitle: Dateiname
 FileModified: Letzte Änderung
 VisibleFrom: Veröffentlicht
diff --git a/routes b/routes
index 0844f047a..42f6c5934 100644
--- a/routes
+++ b/routes
@@ -114,6 +114,7 @@
     /pseudonym                  SPseudonymR    GET POST        !course-registeredANDcorrector-submissions
     /corrector-invite/          SCorrInviteR   GET POST
     !/#SheetFileType/*FilePath  SFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
+    !/#{ZIPArchiveName SheetFileType}  SZipR   GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
   /file                          MaterialListR GET             !course-registered !materials !corrector !tutor
   /file/new                      MaterialNewR  GET POST
   /file/#MaterialName MaterialR:
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 8b97c9317..e6202d49a 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -671,10 +671,17 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
     guard visible
 
     case subRoute of
-      SFileR SheetExercise _ -> guard $ sheetActiveFrom <= cTime
-      SFileR SheetHint     _ -> guard $ maybe False (<= cTime) sheetHintFrom
-      SFileR SheetSolution _ -> guard $ maybe False (<= cTime) sheetSolutionFrom
-      SFileR _             _ -> mzero
+      -- Single Files
+      SFileR                SheetExercise _ -> guard $ sheetActiveFrom <= cTime
+      SFileR                SheetHint     _ -> guard $ maybe False (<= cTime) sheetHintFrom
+      SFileR                SheetSolution _ -> guard $ maybe False (<= cTime) sheetSolutionFrom
+      SFileR                _             _ -> mzero
+      -- Archives of SheetFileType
+      SZipR (ZIPArchiveName SheetExercise)  -> guard $ sheetActiveFrom <= cTime
+      SZipR (ZIPArchiveName SheetHint    )  -> guard $ maybe False (<= cTime) sheetHintFrom
+      SZipR (ZIPArchiveName SheetSolution)  -> guard $ maybe False (<= cTime) sheetSolutionFrom
+      SZipR _                               -> mzero
+      -- Submissions
       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
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 54a130c79..f97743157 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -362,6 +362,5 @@ getMArchiveR tid ssh csh mnm = do
         E.on     $  materialFile E.^. MaterialFileFile E.==. file E.^. FileId
         E.where_ $  materialFile E.^. MaterialFileMaterial E.==. E.val mid
         return file
-      fileSource' = fileSelect .| C.map entityVal
       zipComment = Text.encodeUtf8 $ termToText (unTermKey tid) <> "-" <> toPathPiece (unSchoolKey ssh <> "-" <> csh <> ":" <> mnm)
-    fileSource' .| produceZip ZipInfo{..} .| C.map toFlushBuilder
+    fileSelect .| C.map entityVal .| produceZip ZipInfo{..} .| C.map toFlushBuilder
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 97ce8b441..a87a70d70 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -163,6 +163,14 @@ getSheetListR tid ssh csh = do
   now <- liftIO getCurrentTime
   cid <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
   let
+    hasSFT :: (E.Value Bool, E.Value Bool, E.Value Bool, E.Value Bool) -> [SheetFileType]
+    hasSFT (E.Value hasExercise, E.Value hasHint, E.Value hasSolution, E.Value hasMarking)
+      = [ sft | sft <- [minBound..maxBound]
+              , sft /= SheetExercise || hasExercise
+              , sft /= SheetHint     || hasHint
+              , sft /= SheetSolution || hasSolution
+              , sft /= SheetMarking  || hasMarking
+        ]
     lastSheetEdit sheet = E.sub_select . E.from $ \sheetEdit -> do
         E.where_ $ sheetEdit E.^. SheetEditSheet E.==. sheet E.^. SheetId
         return . E.max_ $ sheetEdit E.^. SheetEditTime
@@ -178,21 +186,27 @@ getSheetListR tid ssh csh = do
     sheetFilter sheetName = (== Authorized) <$> evalAccessDB (CSheetR tid ssh csh sheetName SShowR) False
 
     sheetCol = widgetColonnade . mconcat $
-      [ dbRow
-      , sortable (Just "name") (i18nCell MsgSheet)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> anchorCell (CSheetR tid ssh csh sheetName SShowR) (toWidget sheetName)
+      [ -- dbRow ,
+        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, _)} -> foldMap dateTimeCell mEditTime
+          $ \DBRow{dbrOutput=(_, E.Value mEditTime, _, _)} -> foldMap dateTimeCell mEditTime
       , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> foldMap (dateTimeCellVisible now) sheetVisibleFrom
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> foldMap (dateTimeCellVisible now) sheetVisibleFrom
+      , sortable (toNothing "downloads") (i18nCell MsgFiles)
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, existFiles)} -> mconcat
+              [ linkEmptyCell link icn | sft <- hasSFT existFiles
+              , let link = CSheetR tid ssh csh sheetName $ SZipR $ ZIPArchiveName sft
+              , let icn  = toWidget $ sheetFile2markup sft
+              ]
       , sortable (Just "submission-since") (i18nCell MsgSheetActiveFrom)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> dateTimeCell sheetActiveFrom
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> dateTimeCell sheetActiveFrom
       , sortable (Just "submission-until") (i18nCell MsgSheetActiveTo)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> dateTimeCell sheetActiveTo
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> dateTimeCell sheetActiveTo
       , sortable Nothing (i18nCell MsgSheetType)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> i18nCell sheetType
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> i18nCell sheetType
       , sortable Nothing (i18nCell MsgSubmission)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub)} -> case mbSub of
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub, _)} -> case mbSub of
               Nothing -> mempty
               (Just (Entity sid Submission{..})) ->
                 let mkCid = encrypt sid -- TODO: executed twice
@@ -201,7 +215,7 @@ getSheetListR tid ssh csh = do
                       return $ CSubmissionR tid ssh csh sheetName cid' SubShowR
                 in anchorCellM mkRoute (mkCid >>= \cid2 -> [whamlet|#{display cid2}|])
       , sortable (Just "rating") (i18nCell MsgRating)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub)} ->
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub,_)} ->
             let stats = sheetTypeSum sheetType in -- for statistics over all shown rows
             case mbSub of
               Nothing -> cellTell mempty $ stats Nothing
@@ -216,7 +230,7 @@ getSheetListR tid ssh csh = do
 
       , sortable Nothing -- (Just "percent")
                         (i18nCell MsgRatingPercent)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{sheetType=sType}, _, mbSub)} -> case mbSub of
+          $ \DBRow{dbrOutput=(Entity _ Sheet{sheetType=sType}, _, mbSub,_)} -> case mbSub of
               (Just (Entity _ Submission{submissionRatingPoints=Just sPoints})) ->
                 case preview (_grading . _maxPoints) sType of
                   Just maxPoints
@@ -228,14 +242,21 @@ getSheetListR tid ssh csh = do
       ]
 
     psValidator = def
-      & defaultSorting [SortDescBy "submission-since"]
+      & defaultSorting [SortDescBy "submission-until", SortDescBy "submission-since"]
 
   (raw_statistics,table) <- runDB $ dbTableWidget psValidator DBTable
       { dbtColonnade = sheetCol
-      , dbtSQLQuery  = \dt@(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` _submissionUser))
-                          -> sheetData dt *> return (sheet, lastSheetEdit sheet, submission)
+      , dbtSQLQuery  = \dt@(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` _submissionUser)) -> do
+                          sheetData dt
+                          let existFiles = -- check whether files exist for given type
+                                ( hasSheetFileQuery sheet SheetExercise
+                                , hasSheetFileQuery sheet SheetHint
+                                , hasSheetFileQuery sheet SheetSolution
+                                , hasSheetFileQuery sheet SheetMarking
+                                )
+                          return (sheet, lastSheetEdit sheet, submission, existFiles)
       , dbtRowKey = \(sheet `E.LeftOuterJoin` _) -> sheet E.^. SheetId
-      , dbtProj = \dbr@DBRow{ dbrOutput=(Entity _ Sheet{..}, _, _) }
+      , dbtProj = \dbr@DBRow{ dbrOutput=(Entity _ Sheet{..}, _, _, _) }
                     -> dbr <$ guardM (lift $ sheetFilter sheetName)
       , dbtSorting   = Map.fromList
         [ ( "name"
@@ -412,24 +433,12 @@ postSPseudonymR tid ssh csh shn = do
 
 
 getSFileR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> FilePath -> Handler TypedContent
-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
+getSFileR tid ssh csh shn sft file = serveOneFile $ sheetFileQuery tid ssh csh shn sft file
+
+getSZipR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> ZIPArchiveName SheetFileType -> Handler TypedContent
+getSZipR tid ssh csh shn filename@(ZIPArchiveName sft)
+  = serveSomeFiles (toPathPiece filename) $ sheetFilesAllQuery tid ssh csh shn sft
+
 
 getSheetNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getSheetNewR tid ssh csh = do
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index f5a7be596..b98ca50ff 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -7,10 +7,12 @@ import Import
 import Utils.Lens
 
 import qualified Data.Text as T
+import qualified Data.Text.Encoding as T
 -- import qualified Data.Set (Set)
 import qualified Data.Set as Set
 import Data.CaseInsensitive (original)
 -- import qualified Data.CaseInsensitive as CI
+import qualified Data.Conduit.List as Conduit
 
 import Language.Haskell.TH
 import Language.Haskell.TH.Syntax (qRunIO)
@@ -63,6 +65,26 @@ serveOneFile query = do
       $logErrorS "SFileR" $ "Multiple matching files: " <> tshow other
       error "Multiple matching files found."
 
+-- | Serve one file directly or a zip-archive of files, identified through a given DB query
+-- Like `serveOneFile`, but sends a zip-archive if multiple results are returned
+serveSomeFiles :: Text -> DB [Entity File] -> Handler TypedContent
+serveSomeFiles archiveName query = do
+  results <- runDB query
+  case results of
+    [] -> notFound
+    [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 ()
+    files -> do
+      addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece archiveName}"|]
+      respondSourceDB "application/zip" $ do
+        let zipComment = T.encodeUtf8 archiveName
+        yieldMany files .| Conduit.map entityVal .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
+
+
 tidFromText :: Text -> Maybe TermId
 tidFromText = fmap TermKey . maybeRight . termFromText
 
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 65716bc11..5fe533e21 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -23,6 +23,7 @@ module Handler.Utils.Table.Pagination
   , widgetColonnade, formColonnade, dbColonnade
   , cell, textCell, stringCell, i18nCell
   , anchorCell, anchorCell', anchorCellM, anchorCellM'
+  , linkEmptyCell, linkEmptyCellM, linkEmptyCellM'
   , cellTooltip
   , listCell
   , formCell, DBFormResult, getDBFormResult
@@ -863,6 +864,8 @@ cellTooltip msg = cellContents.mapped %~ (<> tipWdgt)
           <div .tooltip__content>_{msg}
       |]
 
+-- | Always display widget; maybe a link if user is Authorized.
+--   Also see variant `linkEmptyCell`
 anchorCell :: IsDBTable m a => Route UniWorX -> Widget -> DBCell m a
 anchorCell = anchorCellM . return
 
@@ -886,6 +889,24 @@ anchorCellM' xM x2route x2widget = cell $ do
     Authorized -> $(widgetFile "table/cell/link") -- show allowed link
     _otherwise -> widget                          -- don't show prohibited link
 
+-- | Variant of `anchorCell` that returns `mempty` for unauthorized links
+linkEmptyCell :: IsDBTable m a => Route UniWorX -> Widget -> DBCell m a
+linkEmptyCell = linkEmptyCellM . return
+
+linkEmptyCellM :: IsDBTable m a => WidgetT UniWorX IO (Route UniWorX) -> Widget -> DBCell m a
+linkEmptyCellM routeM widget = linkEmptyCellM' routeM id (const widget)
+
+linkEmptyCellM' :: IsDBTable m a => WidgetT UniWorX IO x -> (x -> Route UniWorX) -> (x -> Widget) -> DBCell m a
+linkEmptyCellM' xM x2route x2widget = cell $ do
+  x <- xM
+  let route  = x2route  x
+      widget = x2widget x
+  authResult <- liftHandlerT $ isAuthorized route False
+  case authResult of
+    Authorized -> $(widgetFile "table/cell/link") -- show allowed link
+    _otherwise -> mempty                          -- don't show anything for prohibited links
+
+
 
 listCell :: (IsDBTable m a, Traversable f) => f r' -> (r' -> DBCell m a) -> DBCell m a
 listCell xs mkCell = review dbCell . ([], ) $ do
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 1086b40ec..aa1c91037 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -42,6 +42,7 @@ import Database.Persist.Sql
 import Web.HttpApiData
 import Web.PathPieces
 
+import Text.Blaze (Markup)
 import Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.Lens as Text
@@ -250,6 +251,12 @@ instance PathPiece SheetFileType where
   toPathPiece SheetMarking  = "marking"
   fromPathPiece = finiteFromPathPiece
 
+sheetFile2markup :: SheetFileType -> Markup
+sheetFile2markup SheetExercise = iconQuestion
+sheetFile2markup SheetHint     = iconHint
+sheetFile2markup SheetSolution = iconSolution
+sheetFile2markup SheetMarking  = iconMarking
+
 -- $(deriveSimpleWith ''DisplayAble 'display (drop 17) ''SheetFileType)
 instance DisplayAble SheetFileType where -- deprecated, see RenderMessage instance in Foundation
   display SheetExercise = "Aufgabenstellung"
diff --git a/src/Utils.hs b/src/Utils.hs
index 619fdaa81..c45171ed5 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -123,6 +123,29 @@ type WidgetSiteless = forall site. forall m. (MonadIO m, MonadThrow m, MonadBase
 -- Icons --
 -----------
 
+-- We collect all used icons here for an overview.
+-- For consistency, some conditional icons are also provided, e.g. `isIvisble`
+
+iconQuestion :: Markup
+iconQuestion = [shamlet|<i .fas .fa-question-circle>|]
+
+iconHint :: Markup
+iconHint = [shamlet|<i .fas .fa-life-ring>|]
+
+iconSolution :: Markup
+iconSolution = [shamlet|<i .fas .fa-exclamation-circle>|]
+
+iconMarking :: Markup
+iconMarking = [shamlet|<i .fas .fa-check-circle>|]
+
+fileDownload :: Markup
+fileDownload = [shamlet|<i .fas .fa-file-download>|]
+
+zipDownload :: Markup
+zipDownload = [shamlet|<i .fas .fa-file-archive>|]
+
+-- Conditional icons
+
 isVisible :: Bool -> Markup
 -- ^ Display an icon that denotes that something™ is visible or invisible
 isVisible True  = [shamlet|<i .fas .fa-eye>|]
@@ -163,11 +186,6 @@ boolSymbol :: Bool -> Markup
 boolSymbol True  = [shamlet|<i .fas .fa-check>|]
 boolSymbol False = [shamlet|<i .fas .fa-times>|]
 
-fileDownload :: Markup
-fileDownload = [shamlet|<i .fas .fa-file-download>|]
-
-zipDownload :: Markup
-zipDownload = [shamlet|<i .fas .fa-file-archive>|]
 
 
 ---------------------
diff --git a/src/Utils/Sheet.hs b/src/Utils/Sheet.hs
index 595c0729e..241947549 100644
--- a/src/Utils/Sheet.hs
+++ b/src/Utils/Sheet.hs
@@ -3,6 +3,7 @@ module Utils.Sheet where
 import Import.NoFoundation
 import qualified Database.Esqueleto as E
 
+import Database.Esqueleto.Internal.Language (From) -- How to avoid this import?
 
 -- DB Queries for Sheets that are used in several places
 
@@ -44,3 +45,49 @@ sheetOldUnassigned tid ssh csh = do
     [] -> Nothing
     [E.Value shn] -> Just shn
     _ -> error "SQL Query with limit 1 returned more than one result"
+
+-- | Return a specfic file from  a `Sheet`
+sheetFileQuery :: MonadIO m => TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> FilePath -> SqlReadT m [Entity File]
+sheetFileQuery tid ssh csh shn sft title = E.select $ E.from $
+  \(course `E.InnerJoin` sheet `E.InnerJoin` sFile `E.InnerJoin` file) -> do
+  -- Restrict to consistent rows that correspond to each other
+  E.on (file  E.^. FileId         E.==. sFile  E.^. SheetFileFile)
+  E.on (sFile 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.&&.   (sFile  E.^. SheetFileType   E.==. E.val sft  )
+    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
+
+-- | Return all files of a certain `SheetFileType` for a `Sheet`
+sheetFilesAllQuery :: MonadIO m => TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> SqlReadT m [Entity File]
+sheetFilesAllQuery tid ssh csh shn sft = E.select $ E.from $
+  \(course `E.InnerJoin` sheet `E.InnerJoin` sFile `E.InnerJoin` file) -> do
+  -- Restrict to consistent rows that correspond to each other
+  E.on (file  E.^. FileId         E.==. sFile  E.^. SheetFileFile)
+  E.on (sFile E.^. SheetFileSheet E.==. sheet  E.^. SheetId)
+  E.on (sheet E.^. SheetCourse    E.==. course E.^. CourseId)
+  -- filter to requested file
+  E.where_ ((sFile  E.^. SheetFileType   E.==. E.val sft  )
+    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
+
+-- | Check whether a sheet has any files for a given file type
+hasSheetFileQuery :: Database.Esqueleto.Internal.Language.From query expr backend (expr (Entity SheetFile))
+-- hasSheetFileQuery :: (E.Esqueleto query expr backend)
+  => expr (Entity Sheet) -> SheetFileType -> expr (E.Value Bool)
+hasSheetFileQuery sheet sft =
+  E.exists $ E.from $ \sFile ->
+    E.where_ ((sFile E.^. SheetFileSheet E.==. sheet E.^. SheetId)
+      E.&&.   (sFile E.^. SheetFileType  E.==. E.val sft  ))
\ No newline at end of file

From 97140775d87c4a8d9fa80c0b78381ac8929e8e58 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 10 May 2019 12:05:23 +0200
Subject: [PATCH 291/519] SheetList even icon spacing @hamannf to check

---
 src/Handler/Sheet.hs                  |  9 +++++++--
 src/Handler/Utils/Table/Cells.hs      | 14 ++++++++++++++
 src/Handler/Utils/Table/Pagination.hs | 23 ++++++++++++-----------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index a87a70d70..cf8ad5455 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -194,10 +194,15 @@ getSheetListR tid ssh csh = do
       , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> foldMap (dateTimeCellVisible now) sheetVisibleFrom
       , sortable (toNothing "downloads") (i18nCell MsgFiles)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, existFiles)} -> mconcat
-              [ linkEmptyCell link icn | sft <- hasSFT existFiles
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, existFiles)} -> mconcat -- $ intersperse spacerCell
+              [ icnCell & addIconFixedWidth
+              | let existingSFTs = hasSFT existFiles
+              , sft <- [minBound..maxBound]
               , let link = CSheetR tid ssh csh sheetName $ SZipR $ ZIPArchiveName sft
               , let icn  = toWidget $ sheetFile2markup sft
+              , let icnCell = if sft `elem` existingSFTs
+                              then linkEmptyCell link icn
+                              else spacerCell
               ]
       , sortable (Just "submission-since") (i18nCell MsgSheetActiveFrom)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> dateTimeCell sheetActiveFrom
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index e2294e46c..5ec84c9fe 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -28,6 +28,10 @@ type CourseLink = (TermId, SchoolId, CourseShorthand) -- TODO: Refactor with Wit
 ----------------
 -- Special cells
 
+-- | Display a breakable space
+spacerCell :: (IsDBTable m a) => DBCell m a
+spacerCell = cell [whamlet|&emsp;|]
+
 tellCell :: (Monoid a, IsDBTable m a) => a -> DBCell m a -> DBCell m a
 tellCell = flip mappend . writerCell . tell
 
@@ -64,11 +68,21 @@ ifCell decision cTrue cFalse x
   | decision x = cTrue  x
   | otherwise  = cFalse x
 
+linkEmptyCell :: IsDBTable m a => Route UniWorX -> Widget -> DBCell m a
+linkEmptyCell link wgt = linkEitherCell link (wgt,mempty)
+
+
 -- Recall: for line numbers, use dbRow
 
 ---------------------
 -- Icon cells
 
+addIconFixedWidth :: (IsDBTable m a) => DBCell m a -> DBCell m a
+addIconFixedWidth = over cellAttrs $ insertClass "icon-fixed-width"
+
+iconSpacerCell :: (IsDBTable m a) => DBCell m a
+iconSpacerCell = mempty & addIconFixedWidth
+
 -- | Maybe display a tickmark/checkmark icon
 tickmarkCell :: (IsDBTable m a) => Bool -> DBCell m a
 tickmarkCell = cell . toWidget . hasTickmark
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 5fe533e21..574866084 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -23,7 +23,7 @@ module Handler.Utils.Table.Pagination
   , widgetColonnade, formColonnade, dbColonnade
   , cell, textCell, stringCell, i18nCell
   , anchorCell, anchorCell', anchorCellM, anchorCellM'
-  , linkEmptyCell, linkEmptyCellM, linkEmptyCellM'
+  , linkEitherCell, linkEitherCellM, linkEitherCellM'
   , cellTooltip
   , listCell
   , formCell, DBFormResult, getDBFormResult
@@ -889,22 +889,23 @@ anchorCellM' xM x2route x2widget = cell $ do
     Authorized -> $(widgetFile "table/cell/link") -- show allowed link
     _otherwise -> widget                          -- don't show prohibited link
 
--- | Variant of `anchorCell` that returns `mempty` for unauthorized links
-linkEmptyCell :: IsDBTable m a => Route UniWorX -> Widget -> DBCell m a
-linkEmptyCell = linkEmptyCellM . return
+-- | Variant of `anchorCell` that displays different widgets depending whether the route is authorized for current user
+linkEitherCell :: IsDBTable m a => Route UniWorX -> (Widget, Widget) -> DBCell m a
+linkEitherCell = linkEitherCellM . return
 
-linkEmptyCellM :: IsDBTable m a => WidgetT UniWorX IO (Route UniWorX) -> Widget -> DBCell m a
-linkEmptyCellM routeM widget = linkEmptyCellM' routeM id (const widget)
+linkEitherCellM :: IsDBTable m a => WidgetT UniWorX IO (Route UniWorX) -> (Widget, Widget) -> DBCell m a
+linkEitherCellM routeM (widgetAuth,widgetUnauth) = linkEitherCellM' routeM id (const widgetAuth, const widgetUnauth)
 
-linkEmptyCellM' :: IsDBTable m a => WidgetT UniWorX IO x -> (x -> Route UniWorX) -> (x -> Widget) -> DBCell m a
-linkEmptyCellM' xM x2route x2widget = cell $ do
+linkEitherCellM' :: IsDBTable m a => WidgetT UniWorX IO x -> (x -> Route UniWorX) -> (x -> Widget, x -> Widget) -> DBCell m a
+linkEitherCellM' xM x2route (x2widgetAuth,x2widgetUnauth) = cell $ do
   x <- xM
-  let route  = x2route  x
-      widget = x2widget x
+  let route        = x2route        x
+      widget       = x2widgetAuth   x
+      widgetUnauth = x2widgetUnauth x
   authResult <- liftHandlerT $ isAuthorized route False
   case authResult of
     Authorized -> $(widgetFile "table/cell/link") -- show allowed link
-    _otherwise -> mempty                          -- don't show anything for prohibited links
+    _otherwise -> widgetUnauth                    -- show alternative widget
 
 
 

From 08d5d818ef55dfc5d7cc89ecf2a2bb6b9234694e Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 10 May 2019 12:16:02 +0200
Subject: [PATCH 292/519] minor comment

---
 routes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes b/routes
index 42f6c5934..063daa99b 100644
--- a/routes
+++ b/routes
@@ -122,7 +122,7 @@
     /delete                     MDelR          GET POST
     /show                       MShowR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
     /load/*FilePath             MFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
-    -- Besser wäre #{ZIPArchiveName MaterialName} auf höherer Ebene
+    -- Besser wäre #{ZIPArchiveName MaterialName} auf höherer Ebene, aber dann muss evalAccess angepasst werden um beide Top-Level routen zu behandeln
     /zip                        MArchiveR      GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
   /tuts                         CTutorialListR GET             !tutor
   /tuts/new                     CTutorialNewR  GET POST

From 0129e6d534f172c1b31c476bec3c753598908b2d Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 10 May 2019 12:51:00 +0200
Subject: [PATCH 293/519] avoid single file zip for material as well

---
 routes                  |  4 ++--
 src/Handler/Material.hs | 29 +++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/routes b/routes
index 063daa99b..dfbc06ace 100644
--- a/routes
+++ b/routes
@@ -122,8 +122,8 @@
     /delete                     MDelR          GET POST
     /show                       MShowR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
     /load/*FilePath             MFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
-    -- Besser wäre #{ZIPArchiveName MaterialName} auf höherer Ebene, aber dann muss evalAccess angepasst werden um beide Top-Level routen zu behandeln
-    /zip                        MArchiveR      GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
+    /download                   MArchiveR      GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
+    /zip                        MZipR          GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
   /tuts                         CTutorialListR GET             !tutor
   /tuts/new                     CTutorialNewR  GET POST
   /tuts/#TutorialName TutorialR:
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index f97743157..f9cfa6a2c 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -94,8 +94,8 @@ getMaterialListR tid ssh csh = do
   let matLink :: MaterialName -> Route UniWorX
       matLink = CourseR tid ssh csh . flip MaterialR MShowR
 
-      zipLink :: MaterialName -> Route UniWorX
-      zipLink = CourseR tid ssh csh . flip MaterialR MArchiveR
+      filesLink :: MaterialName -> Route UniWorX
+      filesLink = CourseR tid ssh csh . flip MaterialR MArchiveR
 
       materialModDateCell :: IsDBTable m a => Material -> DBCell m a
       materialModDateCell Material{materialVisibleFrom, materialLastEdit}
@@ -128,7 +128,7 @@ getMaterialListR tid ssh csh = do
             , sortable (toNothingS "description") mempty
                 $ foldMap modalCell . materialDescription . row2material
             , sortable (toNothingS "zip-archive") mempty -- TODO: don't show if there are no files!
-                $ zipCell . zipLink . materialName . row2material
+                $ fileCell . filesLink . materialName . row2material
             , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
                 $ foldMap (dateTimeCellVisible now) . materialVisibleFrom . row2material
             , sortable (Just "last-edit") (i18nCell MsgFileModified)
@@ -180,7 +180,7 @@ getMShowR tid ssh csh mnm = do
       matLink = CourseR tid ssh csh . MaterialR mnm . MFileR
 
       zipLink :: Route UniWorX
-      zipLink = CMaterialR tid ssh csh mnm MArchiveR
+      zipLink = CMaterialR tid ssh csh mnm MZipR
 
   seeAllModificationTimestamps <- hasReadAccessTo $ CourseR tid ssh csh CNotesR -- ordinary users should not see modification dates older than visibility
 
@@ -350,8 +350,9 @@ postMDelR tid ssh csh mnm = do
     , drAbort   = SomeRoute $ CourseR tid ssh csh $ MaterialR mnm MShowR
     }
 
-getMArchiveR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler TypedContent
-getMArchiveR tid ssh csh mnm = do
+-- | Variant of getMArchiveR that always serves a Zip Archive, even for single files. Kept, since we might change this according to UX feedback.
+getMZipR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler TypedContent
+getMZipR tid ssh csh mnm = do
   let filename = ZIPArchiveName mnm
   addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece filename}"|]
   respondSourceDB "application/zip" $ do
@@ -364,3 +365,19 @@ getMArchiveR tid ssh csh mnm = do
         return file
       zipComment = Text.encodeUtf8 $ termToText (unTermKey tid) <> "-" <> toPathPiece (unSchoolKey ssh <> "-" <> csh <> ":" <> mnm)
     fileSelect .| C.map entityVal .| produceZip ZipInfo{..} .| C.map toFlushBuilder
+
+-- | Variant of getMZipR that does not serve single file Zip Archives. Maybe confusing to users.
+getMArchiveR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler TypedContent
+getMArchiveR tid ssh csh mnm = serveSomeFiles archivename getMatQuery
+  where
+    archivename = termToText (unTermKey tid) <> "-" <> toPathPiece (unSchoolKey ssh <> "-" <> csh <> "-" <> mnm)
+    getMatQuery = E.select . E.from $
+      \(course `E.InnerJoin` material `E.InnerJoin` materialFile `E.InnerJoin` file) -> do
+        E.on $ file     E.^. FileId         E.==. materialFile E.^. MaterialFileFile
+        E.on $ material E.^. MaterialId     E.==. materialFile E.^. MaterialFileMaterial
+        E.on $ material E.^. MaterialCourse E.==. course       E.^. CourseId
+        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 file

From a341e9d4267dd6ef3cb9b7bcaf11ac9264a5d3f8 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 10 May 2019 12:56:55 +0200
Subject: [PATCH 294/519] Fix haddock

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

diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index cf8ad5455..22ba8ada5 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -194,7 +194,7 @@ getSheetListR tid ssh csh = do
       , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> foldMap (dateTimeCellVisible now) sheetVisibleFrom
       , sortable (toNothing "downloads") (i18nCell MsgFiles)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, existFiles)} -> mconcat -- $ intersperse spacerCell
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, existFiles)} -> mconcat
               [ icnCell & addIconFixedWidth
               | let existingSFTs = hasSFT existFiles
               , sft <- [minBound..maxBound]

From 8abce76af6ded55c6867de0ff0adc818c1fb3caa Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 10 May 2019 13:09:01 +0200
Subject: [PATCH 295/519] Bump ChangeLog

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

diff --git a/ChangeLog.md b/ChangeLog.md
index c50e244b7..e45c75736 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,9 @@
+  * Version 10.05.2019
+  
+    Besseres Interface zum Einstellen von Abgebenden
+    
+    Download von allen Dateien pro Kursmaterial/Übungsblatt
+    
   * Version 04.05.2019
   
     Kursmaterial

From e62780e6f390aa065434bede6e1a825266221244 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 10 May 2019 14:50:39 +0200
Subject: [PATCH 296/519] Address #360

---
 messages/uniworx/de.msg | 1 +
 src/Foundation.hs       | 8 ++++++++
 src/Handler/Tutorial.hs | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index f6de18a46..39bd3310d 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -790,6 +790,7 @@ MenuCorrectionsGrade: Abgaben bewerten
 MenuAuthPreds: Authorisierungseinstellungen
 MenuTutorialDelete: Tutorium löschen
 MenuTutorialEdit: Tutorium editieren
+MenuTutorialComm: Mitteilung an Teilnehmer
 
 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
diff --git a/src/Foundation.hs b/src/Foundation.hs
index e6202d49a..f9f837606 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2029,6 +2029,14 @@ pageActions (CTutorialR tid ssh csh tutn TEditR) =
   ]
 pageActions (CTutorialR tid ssh csh tutn TUsersR) =
   [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuTutorialComm
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CTutorialR tid ssh csh tutn TCommR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  , MenuItem
       { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuTutorialEdit
       , menuItemIcon  = Nothing
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index b3b12fad3..e68dd5194 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -184,6 +184,7 @@ postTCommR tid ssh csh tutn = 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
+                   E.&&. corrector E.^. SheetCorrectorUser E.==. user E.^. UserId
             return user
         )
       , ( RGCourseTutors
@@ -191,6 +192,7 @@ postTCommR tid ssh csh tutn = 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
+                   E.&&. tutor E.^. TutorUser E.==. user E.^. UserId
             return user
         )
       ]

From 7c4f577b78194e70e11245d8e4e4c0a8712bd90b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 10 May 2019 15:40:03 +0200
Subject: [PATCH 297/519] More links to TUsersR

---
 src/Handler/Course.hs   | 2 +-
 src/Handler/Tutorial.hs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index ef52f3c9a..6fcc56968 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -342,7 +342,7 @@ getCShowR tid ssh csh = do
         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 "name") (i18nCell MsgTutorialName) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> indicatorCell <> anchorCell (CTutorialR tid ssh csh tutorialName TUsersR) [whamlet|#{tutorialName}|]
           , sortable Nothing (i18nCell MsgTutorialTutors) $ \DBRow{ dbrOutput = Entity tutid _ } -> sqlCell $ do
               tutTutors <- fmap (map $(unValueN 3)) . E.select . E.from $ \(tutor `E.InnerJoin` user) -> do
                 E.on $ tutor E.^. TutorUser E.==. user E.^. UserId
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index e68dd5194..47d71ec86 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -49,7 +49,7 @@ getCTutorialListR tid ssh csh = do
         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 (Just "name") (i18nCell MsgTutorialName) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> anchorCell (CTutorialR tid ssh csh tutorialName TUsersR) [whamlet|#{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

From 1b0a4762c91bc070a53df0cef2a81670b65fbcb8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 10 May 2019 16:16:48 +0200
Subject: [PATCH 298/519] Fix Submission

---
 src/Handler/Submission.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 080ac9667..74e1e92e1 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -364,7 +364,6 @@ submissionHelper tid ssh csh shn mcid = do
       (FormFailure failmsgs)   -> return $ FormFailure failmsgs
       -- #227 Part II: no longer ignore submitter, if the user is lecturer or admin (allow lecturers to submit for their students)
       (FormSuccess res'@(_, groupMembers))
-        | Set.null groupMembers -> return $ FormSuccess res'
         | Arbitrary{..} <- sheetGrouping -> do -- Validate AdHoc Group Members
           -- , length gEMails < maxParticipants -> do -- < since submitting user is already accounted for
           let (gEMails, gIds) = partitionEithers $ Set.toList groupMembers
@@ -402,7 +401,7 @@ submissionHelper tid ssh csh shn mcid = do
           return $ if null failmsgs
             then FormSuccess res'
             else FormFailure failmsgs
-        | otherwise -> return $ FormFailure ["Mismatching number of group participants"]
+        | otherwise -> return $ FormSuccess res'
 
 
     case res' of

From 9f9312661d51032fab14b0adc77a815678d14367 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 10 May 2019 19:19:15 +0200
Subject: [PATCH 299/519] Slightly better system messages

---
 src/Foundation.hs               | 4 ++++
 src/Handler/SystemMessage.hs    | 2 +-
 templates/system-message.hamlet | 6 +++---
 test/Database.hs                | 5 +++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index f9f837606..33b54d844 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1379,6 +1379,10 @@ applySystemMessages = liftHandlerT . runDB . runConduit $ selectSource [] [] .|
       cID <- encrypt smId
       void . assertM (== Authorized) . lift $ evalAccessDB (MessageR cID) False
 
+      now <- liftIO getCurrentTime
+      guard $ NTop systemMessageFrom <= NTop (Just now)
+      guard $ NTop (Just now) < NTop systemMessageTo
+
       let sessionKey = "sm-" <> tshow (ciphertext cID)
       _ <- assertM isNothing $ lookupSessionJson sessionKey :: MaybeT (YesodDB UniWorX) (Maybe ())
       setSessionJson sessionKey ()
diff --git a/src/Handler/SystemMessage.hs b/src/Handler/SystemMessage.hs
index 8228136d4..48a0a9337 100644
--- a/src/Handler/SystemMessage.hs
+++ b/src/Handler/SystemMessage.hs
@@ -121,7 +121,7 @@ postMessageR cID = do
   maySubmit <- (== Authorized) <$> evalAccess (MessageR cID) True
   forms <- traverse (const mkForm) $ () <$ guard maySubmit
 
-  defaultLayout
+  siteLayout' (toWidget <$> summary)
     $(widgetFile "system-message")
   where
     modifySystemMessage smId SystemMessage{..} = do
diff --git a/templates/system-message.hamlet b/templates/system-message.hamlet
index 577723162..4b45d7a63 100644
--- a/templates/system-message.hamlet
+++ b/templates/system-message.hamlet
@@ -1,7 +1,7 @@
 <section>
-  $maybe summary' <- summary
-    <h2>
-      #{summary'}
+  $# $maybe summary' <- summary
+  $#   <h2>
+  $#     #{summary'}
   <p>
     #{content}
 
diff --git a/test/Database.hs b/test/Database.hs
index fe8e9842c..7281036f3 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -571,3 +571,8 @@ fillDb = do
   void . insert' $ DegreeCourse dbs sdBsc sdMath
   void . insert' $ Lecturer gkleen dbs CourseLecturer
   void . insert' $ Lecturer jost   dbs CourseAssistant
+
+  void . insert $ SystemMessage (Just now) Nothing False Success "de" "System-Nachrichten werden angezeigt" Nothing
+  void . insert $ SystemMessage (Just now) Nothing False Info "de" "System-Nachrichten können längeren Inhalt enthalten" (Just "System-Nachricht Zusammenfassung")
+  void . insert $ SystemMessage (Just now) (Just now) False Info "de" "System-Nachrichten haben Ablaufdaten" Nothing
+  void . insert $ SystemMessage Nothing Nothing False Error "de" "System-Nachrichten können Inaktiv sein" Nothing

From 8679131cecd8565b0a049f7d91c5b71d1437a937 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 10 May 2019 19:59:55 +0200
Subject: [PATCH 300/519] i18n refactor; html field description added

---
 src/Handler/Material.hs                                  | 1 +
 src/Handler/Sheet.hs                                     | 2 +-
 src/Handler/Utils.hs                                     | 4 ++--
 src/Handler/Utils/Communication.hs                       | 9 +++++----
 .../{ => i18n}/corrections-upload-instructions/de.hamlet | 0
 templates/{ => i18n}/data-protection/de.hamlet           | 0
 templates/i18n/html-input/de.hamlet                      | 8 ++++++++
 templates/{ => i18n}/imprint/de.hamlet                   | 0
 templates/{ => i18n}/info-lecturer/de.hamlet             | 0
 templates/{ => i18n}/profile/tokenExplanation/de.hamlet  | 0
 templates/{ => i18n}/sheet-edit/de.hamlet                | 0
 11 files changed, 17 insertions(+), 7 deletions(-)
 rename templates/{ => i18n}/corrections-upload-instructions/de.hamlet (100%)
 rename templates/{ => i18n}/data-protection/de.hamlet (100%)
 create mode 100644 templates/i18n/html-input/de.hamlet
 rename templates/{ => i18n}/imprint/de.hamlet (100%)
 rename templates/{ => i18n}/info-lecturer/de.hamlet (100%)
 rename templates/{ => i18n}/profile/tokenExplanation/de.hamlet (100%)
 rename templates/{ => i18n}/sheet-edit/de.hamlet (100%)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index f9cfa6a2c..7ae50af56 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -267,6 +267,7 @@ postMaterialNewR tid ssh csh = do
   siteLayoutMsg headingLong $ do
     setTitleI headingShort
     editWidget
+    $(i18nWidgetFile "html-input")
 
 handleMaterialEdit :: TermId -> SchoolId -> CourseShorthand -> CourseId -> Maybe MaterialForm -> (Material -> DB (Maybe MaterialId)) -> Handler Widget
 handleMaterialEdit tid ssh csh cid template dbMaterial = do
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 22ba8ada5..53bd24028 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -127,7 +127,7 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
       <*> aopt (multiFileField $ oldFileIds SheetSolution) (fslI MsgSheetSolution) (sfSolutionF <$> template)
       <*> aopt (multiFileField $ oldFileIds SheetMarking)  (fslI MsgSheetMarking
             & setTooltip MsgSheetMarkingTip)   (sfMarkingF <$> template)
-      <*> aopt htmlField      (fslI MsgSheetMarking)      (sfMarkingText <$> template)
+      <*> aopt htmlField    (fslpI MsgSheetMarking "Html") (sfMarkingText <$> template)
     return $ case result of
       FormSuccess sheetResult
         | errorMsgs <- validateSheet mr sheetResult
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index b98ca50ff..e7cf7dabb 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -202,7 +202,7 @@ warnTermDays tid times = do
 i18nWidgetFile :: FilePath -> Q Exp
 i18nWidgetFile basename = do
   -- Construct list of available translations (@de@, @en@, ...) at compile time
-  let i18nDirectory = "templates" </> basename
+  let i18nDirectory = "templates" </> "i18n" </> basename
   availableFiles <- qRunIO $ listDirectory i18nDirectory
   let availableTranslations = sortWith (NTop . flip List.elemIndex (NonEmpty.toList appLanguages)) . List.nub $ pack . takeBaseName <$> availableFiles
   availableTranslations' <- maybe (fail $ "‘" <> i18nDirectory <> "’ is empty") return $ NonEmpty.nonEmpty availableTranslations
@@ -210,7 +210,7 @@ i18nWidgetFile basename = do
   -- Dispatch to correct language (depending on user settings via `selectLanguage`) at run time
   ws <- newName "ws" -- Name for dispatch function
   letE
-    [ funD ws $ [ clause [litP $ stringL l] (normalB . widgetFile $ basename </> l) []
+    [ funD ws $ [ clause [litP $ stringL l] (normalB . widgetFile $ "i18n" </> basename </> l) []
                 | 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)|]
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 31a8cbb89..955e841a6 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -91,7 +91,7 @@ data Communication = Communication
 commR :: CommunicationRoute -> Handler Html
 commR CommunicationRoute{..} =  do
   cUser <- maybeAuth
-  
+
   MsgRenderer mr <- getMsgRenderer
   mbCurrentRoute <- getCurrentRoute
 
@@ -140,7 +140,7 @@ commR CommunicationRoute{..} =  do
           miCell _ (Left (CI.original -> email)) initRes nudge csrf = do
             (tickRes, tickView) <- mpreq checkBoxField ("" & addName (nudge "tick")) $ initRes <|> Just True
             return (tickRes, $(widgetFile "widgets/communication/recipientEmail"))
-          miCell _ (Right (lookupUser -> User{..})) initRes nudge csrf = do 
+          miCell _ (Right (lookupUser -> User{..})) initRes nudge csrf = do
             (tickRes, tickView) <- mpreq checkBoxField ("" & addName (nudge "tick")) $ initRes <|> Just True
             return (tickRes, $(widgetFile "widgets/communication/recipientName"))
           miAllowAdd (EnumPosition RecipientCustom, 0) 1 _ = True
@@ -172,8 +172,8 @@ commR CommunicationRoute{..} =  do
 
   ((commRes,commWdgt),commEncoding) <- runFormPost . identifyForm FIDCommunication . renderAForm FormStandard $ Communication
     <$> recipientAForm
-    <*> aopt textField (fslI MsgCommSubject) Nothing
-    <*> areq htmlField (fslI MsgCommBody)    Nothing
+    <*> aopt textField (fslI  MsgCommSubject)     Nothing
+    <*> areq htmlField (fslpI MsgCommBody "Html") Nothing
   formResult commRes $ \comm -> do
     runDBJobs . runConduit $ hoist (mapReaderT lift) (crJobs comm) .| sinkDBJobs
     addMessageI Success . MsgCommSuccess . Set.size $ cRecipients comm
@@ -188,3 +188,4 @@ commR CommunicationRoute{..} =  do
   siteLayoutMsg crHeading $ do
     setTitleI crHeading
     formWdgt
+    $(i18nWidgetFile "html-input")
diff --git a/templates/corrections-upload-instructions/de.hamlet b/templates/i18n/corrections-upload-instructions/de.hamlet
similarity index 100%
rename from templates/corrections-upload-instructions/de.hamlet
rename to templates/i18n/corrections-upload-instructions/de.hamlet
diff --git a/templates/data-protection/de.hamlet b/templates/i18n/data-protection/de.hamlet
similarity index 100%
rename from templates/data-protection/de.hamlet
rename to templates/i18n/data-protection/de.hamlet
diff --git a/templates/i18n/html-input/de.hamlet b/templates/i18n/html-input/de.hamlet
new file mode 100644
index 000000000..71e8396e2
--- /dev/null
+++ b/templates/i18n/html-input/de.hamlet
@@ -0,0 +1,8 @@
+<h3>Hinweis: Leerzeilen werden entfernt!
+<p>
+  Das Eingabefeld für Mitteilungstext/Beschreibung akzeptiert derzeit nur Html.
+  Zeilumbrüche spielen dementsprechend keine Rolle, können aber mit
+  <code>&lt;br&gt;
+  eingefügt werden.
+<p>
+  Für die Zukunft ist Markdown Unterstützung inklusive Editor geplant.
diff --git a/templates/imprint/de.hamlet b/templates/i18n/imprint/de.hamlet
similarity index 100%
rename from templates/imprint/de.hamlet
rename to templates/i18n/imprint/de.hamlet
diff --git a/templates/info-lecturer/de.hamlet b/templates/i18n/info-lecturer/de.hamlet
similarity index 100%
rename from templates/info-lecturer/de.hamlet
rename to templates/i18n/info-lecturer/de.hamlet
diff --git a/templates/profile/tokenExplanation/de.hamlet b/templates/i18n/profile/tokenExplanation/de.hamlet
similarity index 100%
rename from templates/profile/tokenExplanation/de.hamlet
rename to templates/i18n/profile/tokenExplanation/de.hamlet
diff --git a/templates/sheet-edit/de.hamlet b/templates/i18n/sheet-edit/de.hamlet
similarity index 100%
rename from templates/sheet-edit/de.hamlet
rename to templates/i18n/sheet-edit/de.hamlet

From bf287a4a99ee490623d18988ed0033e79e1e303a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 10 May 2019 21:32:16 +0200
Subject: [PATCH 301/519] Redesign course-user

---
 messages/uniworx/de.msg               |   5 +-
 src/Handler/Course.hs                 | 118 +++++++++++++++++++-------
 src/Handler/Utils/Form.hs             |  14 +--
 src/Handler/Utils/Table/Pagination.hs |   2 +-
 src/Utils/Form.hs                     |   7 +-
 static/js/utils/form.js               |  55 ++++++++++++
 templates/course-user.hamlet          |  28 +++---
 templates/course.hamlet               |   2 +-
 8 files changed, 173 insertions(+), 58 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 39bd3310d..918c007d9 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -19,8 +19,7 @@ BtnCorrInvDecline: Ablehnen
 Aborted: Abgebrochen
 Remarks: Hinweise
 Registered: Angemeldet
-RegisteredHeader: Anmeldung
-RegisteredSince date@Text: Angemeldet seit #{date}
+RegisteredSince: Angemeldet seit
 RegisterFrom: Anmeldungen von
 RegisterTo: Anmeldungen bis
 DeRegUntil: Abmeldungen bis
@@ -74,7 +73,9 @@ TutorialNoCapacity: In dieser Übung sind keine Plätze mehr frei.
 CourseNotEmpty: In diesem Kurs sind momentan Teilnehmer angemeldet.
 CourseRegisterOk: Anmeldung erfolgreich
 CourseDeregisterOk: Erfolgreich abgemeldet
+CourseDeregisterLecturerTip: Wenn Sie den Teilnehmer vom Kurs abmelden kann es sein, dass sie Zugriff auf diese Daten verlieren
 CourseStudyFeature: Assoziiertes Hauptfach
+CourseStudyFeatureUpdated: Assoziiertes Hauptfach geändert
 CourseTutorial: Tutorium
 CourseStudyFeatureTooltip: Korrekte Angabe kann Notenweiterleitungen beschleunigen
 CourseSecretWrong: Falsches Kennwort
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 6fcc56968..c50780b77 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -423,8 +423,8 @@ registerForm loggedin participant defSFid msecret = identifyForm FIDcourseRegist
       Nothing -> return (Nothing,Nothing)
       Just _  -> bimap Just Just <$> case participant of
         Just CourseParticipant{courseParticipantField=Just sfid}
-                -> mforced (studyFeaturesPrimaryFieldFor [sfid] loggedin) (fslI MsgCourseStudyFeature) (Just sfid)
-        _other  -> mreq    (studyFeaturesPrimaryFieldFor [ ]    loggedin) (fslI MsgCourseStudyFeature
+                -> mforced (studyFeaturesPrimaryFieldFor False [sfid] loggedin) (fslI MsgCourseStudyFeature) (Just sfid)
+        _other  -> mreq    (studyFeaturesPrimaryFieldFor False [ ]    loggedin) (fslI MsgCourseStudyFeature
                                                                  & setTooltip  MsgCourseStudyFeatureTooltip) (Just defSFid)
     -- button de-/register
     (btnRes, btnView) <- mreq (buttonField $ bool BtnRegister BtnDeregister isRegistered) "buttonField ignores settings anyway" Nothing
@@ -1140,7 +1140,7 @@ postCUsersR tid ssh csh = do
           , colUserDegreeShort
           , colUserField
           , colUserSemester
-          , sortable (Just "registration") (i18nCell MsgRegisteredHeader) (dateCell . view _userTableRegistration)
+          , sortable (Just "registration") (i18nCell MsgRegisteredSince) (dateCell . view _userTableRegistration)
           , colUserComment tid ssh csh
           ]
         psValidator = def & defaultSortingByName
@@ -1225,11 +1225,11 @@ postCUserR tid ssh csh uCId = do
   dozentId <- requireAuthId
   uid <- decrypt uCId
   -- DB reads
-  (cid, User{..}, registration, thisUniqueNote, noteText, noteEdits, studies ) <- runDB $ do
+  (cid, User{..}, mRegistration, thisUniqueNote, noteText, noteEdits, studies) <- runDB $ do
     cid  <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
     -- Abfrage Benutzerdaten
     user <- get404 uid
-    registration <- fmap entityVal <$> getBy (UniqueParticipant uid cid)
+    registration <- getBy (UniqueParticipant uid cid)
     -- Abfrage Teilnehmernotiz
     let thisUniqueNote = UniqueCourseUserNote uid cid
     mbNoteEnt <- getBy thisUniqueNote
@@ -1249,8 +1249,7 @@ postCUserR tid ssh csh uCId = do
       E.on $ studyfeat E.^. StudyFeaturesField  E.==. studyterms  E.^. StudyTermsId
       E.on $ studyfeat E.^. StudyFeaturesDegree E.==. studydegree E.^. StudyDegreeId
       return  (studyfeat, studydegree, studyterms)
-
-    return (cid,user,registration,thisUniqueNote,noteText,noteEdits,studies)
+    return (cid, user, registration, thisUniqueNote, noteText, noteEdits, studies)
   let editByWgt = [whamlet|
           $forall (etime,_eemail,ename,_esurname) <- noteEdits
             <br>
@@ -1259,36 +1258,93 @@ postCUserR tid ssh csh uCId = do
 
   ((noteRes, noteView), noteEnctype) <- runFormPost . identifyForm FIDcUserNote . renderAForm FormStandard $
       aopt (annotateField editByWgt htmlField') (fslpI MsgCourseUserNote "HTML" & setTooltip MsgCourseUserNoteTooltip) (Just noteText)
-      <*  saveButton
-  formResult noteRes $ \mbNote -> (do
+  let noteFrag :: Text
+      noteFrag = "notes"
+      noteWidget = wrapForm noteView FormSettings
+        { formMethod = POST
+        , formAction = Just . SomeRoute $ currentRoute :#: noteFrag
+        , formEncoding = noteEnctype
+        , formAttrs = []
+        , formSubmit = FormSubmit
+        , formAnchor = Just noteFrag
+        }
+  formResult noteRes $ \mbNote -> do
     now <- liftIO getCurrentTime
-    case mbNote of
+    runDB $ case mbNote of
       Nothing -> do
-        runDB $ do
-          -- must delete all edits due to foreign key constraints, which does not make sense -> refactor!
-          maybeM (return ()) (\nk -> deleteWhere [CourseUserNoteEditNote ==. nk]) (getKeyBy thisUniqueNote)
-          deleteBy thisUniqueNote
+        -- must delete all edits due to foreign key constraints, which does not make sense -> refactor!
+        maybeM (return ()) (\nk -> deleteWhere [CourseUserNoteEditNote ==. nk]) (getKeyBy thisUniqueNote)
+        deleteBy thisUniqueNote
         addMessageI Info MsgCourseUserNoteDeleted
-        redirect currentRoute -- reload page after post
-      _ | (renderHtml <$> mbNote) == (renderHtml <$> noteText) -> return() -- no changes
+      _ | (renderHtml <$> mbNote) == (renderHtml <$> noteText) -> return () -- no changes
       (Just note) -> do
-        runDB $ do
-          (Entity noteKey _) <- upsertBy thisUniqueNote (CourseUserNote cid uid note) [CourseUserNoteNote =. note]
-          void . insert $ CourseUserNoteEdit dozentId now noteKey
+        (Entity noteKey _) <- upsertBy thisUniqueNote (CourseUserNote cid uid note) [CourseUserNoteNote =. note]
+        void . insert $ CourseUserNoteEdit dozentId now noteKey
         addMessageI Success MsgCourseUserNoteSaved
-        redirect currentRoute -- reload page after post
-    )
-  -- De-/Register Button for Lecturer
-  mRegAt   <- traverse (formatTime SelFormatDateTime) $ courseParticipantRegistration <$> registration
-  ((registerRes,registerView), registerEnctype) <- runFormPost $ registerForm (Just uid) registration Nothing Nothing -- Lecturers are never asked their own register secret
-  formResult registerRes $ \(mbSfId, _secretCorrect) -> if -- lecturers need no secret verification
-      | isJust registration -> do
-          runDB $ deleteBy $ UniqueParticipant uid cid
+    redirect $ currentRoute :#: noteFrag -- reload page after post
+
+  ((regFieldRes, regFieldView), regFieldEnctype) <- runFormPost . identifyForm FIDcRegField $ \csrf ->
+    let currentField :: Maybe (Maybe StudyFeaturesId)
+        currentField = courseParticipantField . entityVal <$> mRegistration
+     in over _2 ((toWidget csrf <>) . fvInput) <$> mreq (studyFeaturesPrimaryFieldFor True (maybeToList $ join currentField) $ Just uid) ("" & addAutosubmit) currentField
+
+  let registrationFieldFrag :: Text
+      registrationFieldFrag = "registration-field"
+      regFieldWidget = wrapForm regFieldView FormSettings
+        { formMethod = POST
+        , formAction = Just . SomeRoute $ currentRoute :#: registrationFieldFrag
+        , formEncoding = regFieldEnctype
+        , formAttrs = []
+        , formSubmit = FormAutoSubmit
+        , formAnchor = Just registrationFieldFrag
+        }
+  for_ mRegistration $ \(Entity pId CourseParticipant{..}) ->
+    formResult regFieldRes $ \courseParticipantField' -> do
+      runDB $ do
+        update pId [ CourseParticipantField =. courseParticipantField' ]
+        addMessageI Success MsgCourseStudyFeatureUpdated
+      redirect $ currentRoute :#: registrationFieldFrag
+
+  let regButton
+        | Just _ <- mRegistration = BtnDeregister
+        | otherwise = BtnRegister
+  ((regButtonRes, regButtonView), regButtonEnctype) <- runFormPost . identifyForm FIDcRegButton $ buttonForm' [regButton]
+
+  let registrationButtonFrag :: Text
+      registrationButtonFrag = "registration-button"
+      regButtonWidget = wrapForm regButtonView FormSettings
+        { formMethod = POST
+        , formAction = Just . SomeRoute $ currentRoute :#: registrationButtonFrag
+        , formEncoding = regButtonEnctype
+        , formAttrs = []
+        , formSubmit = FormNoSubmit
+        , formAnchor = Just registrationButtonFrag
+        }
+  formResult regButtonRes $ \case
+    BtnDeregister
+      | Just (Entity pId _) <- mRegistration
+        -> do
+          runDB $ delete pId
           addMessageI Info MsgCourseDeregisterOk
-      | otherwise -> do
-          actTime <- liftIO getCurrentTime
-          regOk <- runDB $ insertUnique $ CourseParticipant cid uid actTime mbSfId
-          when (isJust regOk) $ addMessageI Success MsgCourseRegisterOk
+          redirect $ CourseR tid ssh csh CUsersR
+      | otherwise
+        -> invalidArgs ["User not registered"]
+    BtnRegister -> do
+      now <- liftIO getCurrentTime
+      let primaryField
+            | [(Entity featId _, _, _)] <- filter (\(Entity _ StudyFeatures{..}, _, _) -> studyFeaturesType == FieldPrimary && studyFeaturesValid) studies
+            = Just featId
+            | otherwise
+            = Nothing
+      pId <- runDB . insertUnique $ CourseParticipant cid uid now primaryField
+      case pId of
+        Just _  -> do
+          addMessageI Success MsgCourseRegisterOk
+          redirect currentRoute
+        Nothing -> invalidArgs ["User already registered"]
+
+  mRegAt <- for (courseParticipantRegistration . entityVal <$> mRegistration) $ formatTime SelFormatDateTime
+
   -- generate output
   let headingLong  = [whamlet|^{nameWidget userDisplayName userSurname} - _{MsgCourseMemberOf} #{csh} #{display tid}|]
       headingShort = prependCourseTitle tid ssh csh $ SomeMessage userDisplayName
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 225886a1a..aa3828422 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -287,8 +287,9 @@ schoolFieldFor :: [SchoolId] -> Field Handler SchoolId
 schoolFieldFor userSchools = selectField $ optionsPersistKey [SchoolShorthand <-. map unSchoolKey userSchools] [Asc SchoolName] schoolName
 
 -- | Select one of the user's primary active courses, or from a given list of StudyFeatures (regardless of user)
-studyFeaturesPrimaryFieldFor :: [StudyFeaturesId] -> Maybe UserId -> Field Handler (Maybe StudyFeaturesId)
-studyFeaturesPrimaryFieldFor oldFeatures mbuid = selectField $ do
+studyFeaturesPrimaryFieldFor :: Bool -- ^ Allow user to select `Nothing` (only applies if set of options is nonempty)?
+                             -> [StudyFeaturesId] -> Maybe UserId -> Field Handler (Maybe StudyFeaturesId)
+studyFeaturesPrimaryFieldFor isOptional oldFeatures mbuid = selectField $ do
     -- we need a join, so we cannot just use optionsPersistCryptoId
     rawOptions <- runDB $ E.select $ E.from $ \(feature `E.InnerJoin` degree `E.InnerJoin` field) -> do
         E.on     $   feature E.^. StudyFeaturesField  E.==. field  E.^. StudyTermsId
@@ -316,12 +317,15 @@ studyFeaturesPrimaryFieldFor oldFeatures mbuid = selectField $ do
 
     nonEmptyOptions :: Text -> [Option (Maybe StudyFeaturesId)] -> [Option (Maybe StudyFeaturesId)]
     nonEmptyOptions emptyOpt opts
-      | null opts = [ Option
+      | null opts  = pure nullOption
+      | isOptional = nullOption : opts
+      | otherwise  = opts
+      where
+        nullOption = Option
           { optionDisplay       = emptyOpt
           , optionInternalValue = Nothing
           , optionExternalValue = "NoPrimaryStudyField"
-          } ]
-      | otherwise = opts
+          }
 
 
 uploadModeField :: Field Handler UploadMode
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 574866084..88e08be1f 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -657,7 +657,7 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db
     (filterRes'@((filterRes, _), _)) <- runFormGet . identifyForm FIDDBTableFilter . addPIHiddenField dbtable (prevPi & _piFilter .~ Nothing & _piPage .~ Nothing & _piLimit .~ (formResult' pagesizeRes <|> piLimit prevPi)) . renderAForm FormDBTableFilter $ dbtFilterUI (piFilter prevPi)
 
     (pagesizeRes'@((pagesizeRes, _), _)) <- lift . runFormGet . identifyForm FIDDBTablePagesize . addPIHiddenField dbtable (prevPi & _piPage .~ Nothing & _piLimit .~ Nothing & _piFilter .~ (formResult' filterRes <|> piFilter prevPi)) . renderAForm FormDBTablePagesize $
-          areq (pagesizeField referencePagesize) (fslI MsgDBTablePagesize & addAutosubmit & addName (wIdent "pagesize") & addClass "select--pagesize") (Just referencePagesize)
+          areq (pagesizeField referencePagesize) (fslI MsgDBTablePagesize & addName (wIdent "pagesize") & addClass "select--pagesize") (Just referencePagesize)
     return (filterRes', pagesizeRes')
 
   let
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 412dd5b0c..daab376d3 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -153,7 +153,7 @@ inputReadonly :: FieldSettings site -> FieldSettings site
 inputReadonly = addAttr "readonly" ""
 
 addAutosubmit :: FieldSettings site -> FieldSettings site
-addAutosubmit = addAttr "data-autosubmit" ""
+addAutosubmit = addAttr "uw-auto-submit-input" ""
 
 ------------------------------------------------
 -- Unique Form Identifiers to avoid accidents --
@@ -183,6 +183,8 @@ data FormIdentifier
   | FIDCourseRegister
   | FIDuserRights
   | FIDcUserNote
+  | FIDcRegField
+  | FIDcRegButton
   | FIDAdminDemo
   | FIDUserDelete
   | FIDCommunication
@@ -340,9 +342,6 @@ combinedButtonFieldF_ _ = void . combinedButtonFieldF @m @a
 submitButton :: (Button (HandlerSite m) ButtonSubmit, MonadHandler m) => AForm m ()
 submitButton = combinedButtonFieldF_ (Proxy @ButtonSubmit) ""
 
-autosubmitButton :: (Button (HandlerSite m) ButtonSubmit, MonadHandler m) => AForm m ()
-autosubmitButton = combinedButtonFieldF_ (Proxy @ButtonSubmit) $ "" & addAutosubmit
-
 -- | just Html for a Submit-Button
 submitButtonView :: forall site . Button site ButtonSubmit => WidgetT site IO ()
 submitButtonView = buttonView BtnSubmit
diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 4312b5099..f19b27f52 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -286,6 +286,61 @@
     setup: autoSubmitButtonUtil,
   });
 
+  /**
+   *
+   * Auto Submit Input Utility
+   *  Programmatically submits forms when a certain input changes value
+   *
+   * Attribute: uw-auto-submit-input
+   *
+   * Example usage:
+   *  <input type="text" uw-auto-submit-input />
+   */
+
+  var AUTO_SUBMIT_INPUT_UTIL_NAME = 'autoSubmitInput';
+  var AUTO_SUBMIT_INPUT_UTIL_SELECTOR = '[uw-auto-submit-input]';
+
+  var AUTO_SUBMIT_INPUT_INITIALIZED_CLASS = 'auto-submit-input--initialized';
+
+  var autoSubmitInputUtil = function(element) {
+    var form;
+    
+    function autoSubmit() {
+      form.submit();
+    }
+
+    function init() {
+      if (!element) {
+        throw new Error('Auto Submit Input utility needs to be passed an element!');
+      }
+
+      form = element.form;
+      if (!form) {
+        throw new Error('Could not determine associated form for auto submit input');
+      }
+
+      element.addEventListener('change', autoSubmit);
+      
+      element.classList.add(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS);
+
+      return {
+        name: AUTO_SUBMIT_INPUT_UTIL_NAME,
+        element: element,
+        destroy: function() { 
+          element.removeEventListener('change', autoSubmit);
+        },
+      };
+    }
+
+    return init();
+  };
+
+  formUtilities.push({
+    name: AUTO_SUBMIT_INPUT_UTIL_NAME,
+    selector: AUTO_SUBMIT_INPUT_UTIL_SELECTOR,
+    setup: autoSubmitInputUtil,
+  });
+
   /**
    *
    * Form Error Remover Utility
diff --git a/templates/course-user.hamlet b/templates/course-user.hamlet
index c7ae5a0c6..dd0bac222 100644
--- a/templates/course-user.hamlet
+++ b/templates/course-user.hamlet
@@ -9,17 +9,16 @@
             #{matnr}
           $nothing
             _{MsgNoMatrikelKnown}
-        <dt .deflist__dt>_{MsgRegisteredHeader}
+        $maybe date <- mRegAt
+          <dt .deflist__dt>_{MsgRegisteredSince}
+          <dd .deflist__dd>#{date}
+        <dt .deflist__dt>
         <dd .deflist__dd>
-          <div .course__registration>
-            <a id="register-form">
-            <form method=post action=@{currentRoute}#register-form enctype=#{registerEnctype}>
-              ^{registerView}
-            $maybe date <- mRegAt
-              _{MsgRegisteredSince date}
-
-
-        <dt .deflist__dt> _{MsgStudyTerms}
+          ^{regButtonWidget}
+          $maybe _ <- mRegistration
+            <p>
+              _{MsgCourseDeregisterLecturerTip}
+        <dt .deflist__dt>_{MsgStudyTerms}
         <dd .deflist__dd>
           $if null studies
             _{MsgNoStudyTermsKnown}
@@ -35,15 +34,16 @@
                   <th .table__th>_{MsgStudyFeatureUpdate}
                 $forall ((Entity _ StudyFeatures{..}), (Entity _ degree), (Entity _ field)) <- studies
                   $with _ <- notUsedT studyFeaturesUser
-                  <tr.table__row>
+                  <tr .table__row>
                     <td .table__td>_{field}#{notUsedT studyFeaturesField}
                     <td .table__td>_{degree}#{notUsedT studyFeaturesDegree}
                     <td .table__td>_{studyFeaturesType}
                     <td .table__td>#{display studyFeaturesSemester}
                     <td .table__td>#{hasTickmark studyFeaturesValid}
                     <td .table__td>^{formatTimeW SelFormatDate studyFeaturesUpdated}
+        $maybe _ <- mRegistration
+          <dt .deflist__dt>_{MsgCourseStudyFeature}
+          <dd .deflist__dd>^{regFieldWidget}
 
 <section>
-  <a id="note-form">
-  <form method=post action=@{currentRoute}#note-form enctype=#{noteEnctype}>
-    ^{noteView}
+  ^{noteWidget}
diff --git a/templates/course.hamlet b/templates/course.hamlet
index 29eac6294..93d788a26 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -83,7 +83,7 @@ $#    $if NTop (Just 0) < NTop (courseCapacity course)
           $# regForm is defined through templates/widgets/registerForm
           ^{regForm}
         $maybe date <- mRegAt
-          _{MsgRegisteredSince date}
+          _{MsgRegisteredSince} #{date}
   <dt .deflist__dt>
     Material
   <dd .deflist__dd>

From 801b92bccf5442c1415d641e725947d664287861 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 10 May 2019 21:43:47 +0200
Subject: [PATCH 302/519] Loosen tutorial-communication-recipient restrictions

---
 routes                             |  2 +-
 src/Handler/Tutorial.hs            | 10 ++++++++--
 src/Handler/Utils/Communication.hs |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/routes b/routes
index dfbc06ace..16c16692e 100644
--- a/routes
+++ b/routes
@@ -88,7 +88,7 @@
   /users/#CryptoUUIDUser      CUserR           GET POST        !lecturerANDparticipant
   /correctors                 CHiWisR          GET
   /communication              CCommR           GET POST
-  /notes                      CNotesR          GET POST        !corrector -- THIS route is used to check for overall course corrector access!
+  /notes                      CNotesR          GET POST        !corrector !tutor -- THIS route is used to check for overall course corrector access!
   /subs                       CCorrectionsR    GET POST
   /ex                         SheetListR       GET             !course-registered !materials !corrector
   /ex/new                     SheetNewR        GET POST
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 47d71ec86..b5743fb2c 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -197,8 +197,14 @@ postTCommR tid ssh csh tutn = do
         )
       ]
     , crRecipientAuth = Just $ \uid -> do
-        cID <- encrypt uid
-        evalAccessDB (CourseR tid ssh csh $ CUserR cID) False
+        [E.Value isTutorialUser] <- E.select . return . E.exists . E.from $ \tutorialUser ->
+          E.where_ $ tutorialUser E.^. TutorialParticipantUser E.==. E.val uid
+               E.&&. tutorialUser E.^. TutorialParticipantTutorial E.==. E.val tutid
+        
+        isAssociated <- evalAccessForDB (Just uid) (CourseR tid ssh csh CNotesR) False
+        return $ if
+          | isTutorialUser -> Authorized
+          | otherwise -> isAssociated
     }
 
 
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 31a8cbb89..d56dc8fd1 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -75,7 +75,7 @@ instance RenderMessage UniWorX RecipientCategory where
 
 data CommunicationRoute = CommunicationRoute
   { crRecipients    :: Map RecipientGroup (E.SqlQuery (E.SqlExpr (Entity User)))
-  , crRecipientAuth :: Maybe (UserId -> DB AuthResult)
+  , crRecipientAuth :: Maybe (UserId -> DB AuthResult) -- ^ Only resolve userids given as GET-Parameter if they fulfil this criterion
   , crJobs          :: Communication -> Source (YesodDB UniWorX) Job
   , crHeading       :: SomeMessage UniWorX
   , crUltDest       :: SomeRoute UniWorX

From 4270e0a3477976fba9db10cfafbb39af2657afb5 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 10 May 2019 21:49:52 +0200
Subject: [PATCH 303/519] Re-tighten permissions on CNotesR

---
 routes                  | 4 ++--
 src/Handler/Tutorial.hs | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/routes b/routes
index 16c16692e..711599b14 100644
--- a/routes
+++ b/routes
@@ -88,7 +88,7 @@
   /users/#CryptoUUIDUser      CUserR           GET POST        !lecturerANDparticipant
   /correctors                 CHiWisR          GET
   /communication              CCommR           GET POST
-  /notes                      CNotesR          GET POST        !corrector !tutor -- THIS route is used to check for overall course corrector access!
+  /notes                      CNotesR          GET POST        !corrector -- THIS route is used to check for overall course corrector access!
   /subs                       CCorrectionsR    GET POST
   /ex                         SheetListR       GET             !course-registered !materials !corrector
   /ex/new                     SheetNewR        GET POST
@@ -124,7 +124,7 @@
     /load/*FilePath             MFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
     /download                   MArchiveR      GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
     /zip                        MZipR          GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
-  /tuts                         CTutorialListR GET             !tutor
+  /tuts                         CTutorialListR GET             !tutor -- THIS route is used to check for overall course tutor access!
   /tuts/new                     CTutorialNewR  GET POST
   /tuts/#TutorialName TutorialR:
     /edit                     TEditR           GET POST
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index b5743fb2c..140743ce8 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -201,10 +201,13 @@ postTCommR tid ssh csh tutn = do
           E.where_ $ tutorialUser E.^. TutorialParticipantUser E.==. E.val uid
                E.&&. tutorialUser E.^. TutorialParticipantTutorial E.==. E.val tutid
         
-        isAssociated <- evalAccessForDB (Just uid) (CourseR tid ssh csh CNotesR) False
+        isAssociatedCorrector <- evalAccessForDB (Just uid) (CourseR tid ssh csh CNotesR) False
+        isAssociatedTutor <- evalAccessForDB (Just uid) (CourseR tid ssh csh CTutorialListR) False
+
+        mr <- getMsgRenderer
         return $ if
           | isTutorialUser -> Authorized
-          | otherwise -> isAssociated
+          | otherwise -> orAR mr isAssociatedCorrector isAssociatedTutor
     }
 
 

From 78de0ee5bb2e305e924e1ecbf45148031f5769bb Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 10 May 2019 23:22:45 +0200
Subject: [PATCH 304/519] debounce auto-submit ajax calls

---
 static/js/utils/form.js | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index f19b27f52..da02abd5d 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -304,7 +304,8 @@
 
   var autoSubmitInputUtil = function(element) {
     var form;
-    
+    var debouncedHandler;
+
     function autoSubmit() {
       form.submit();
     }
@@ -319,15 +320,17 @@
         throw new Error('Could not determine associated form for auto submit input');
       }
 
-      element.addEventListener('change', autoSubmit);
-      
+      debouncedHandler = debounce(autoSubmit, 500);
+
+      element.addEventListener('input', debouncedHandler);
+
       element.classList.add(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS);
 
       return {
         name: AUTO_SUBMIT_INPUT_UTIL_NAME,
         element: element,
-        destroy: function() { 
-          element.removeEventListener('change', autoSubmit);
+        destroy: function() {
+          element.removeEventListener('input', debouncedHandler);
         },
       };
     }
@@ -471,7 +474,7 @@
       };
     }
 
-    return init();   
+    return init();
   };
 
   formUtilities.push({
@@ -480,6 +483,22 @@
     setup: datepickerUtil,
   });
 
+  // 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 the collected form utilities
   if (UtilRegistry) {
     formUtilities.forEach(UtilRegistry.register);

From 2874d7a8477b8cabc72b970d3b28c0112704b2b2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 11 May 2019 20:14:59 +0200
Subject: [PATCH 305/519] Deployment tweaks (working socket activation)

---
 config/settings.yml    |  2 ++
 models/courses         |  2 +-
 models/tutorials       |  2 +-
 models/users           |  4 ++--
 package.yaml           |  2 +-
 src/Application.hs     | 22 +++++++++++++-----
 src/Jobs.hs            | 23 ++++++++++---------
 src/Model/Migration.hs | 52 +++++++++++++++++++++++++++++++++++-------
 src/Settings.hs        |  2 ++
 stack.yaml             |  6 +++--
 test/Database.hs       |  8 +++----
 11 files changed, 89 insertions(+), 36 deletions(-)

diff --git a/config/settings.yml b/config/settings.yml
index 592b09ca1..049692e5b 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -64,6 +64,8 @@ database:
   database: "_env:PGDATABASE:uniworx"
   poolsize: "_env:PGPOOLSIZE:10"
 
+auto-db-migrate: '_env:AUTO_DB_MIGRATE:true'
+
 ldap:
   host:    "_env:LDAPHOST:"
   tls:     "_env:LDAPTLS:"
diff --git a/models/courses b/models/courses
index 4fcf67d65..5be19103a 100644
--- a/models/courses
+++ b/models/courses
@@ -33,7 +33,7 @@ CourseFavourite           -- which user accessed which course when, only display
 Lecturer                       -- course ownership
     user         UserId
     course       CourseId
-    type         LecturerType  default='"lecturer"'
+    type         LecturerType  default='"lecturer"'::jsonb
     UniqueLecturer user course -- note: multiple lecturers per course are allowed, but no duplicated rows in this table
 CourseParticipant                      -- course enrolement
     course       CourseId
diff --git a/models/tutorials b/models/tutorials
index 78571389c..444d988cd 100644
--- a/models/tutorials
+++ b/models/tutorials
@@ -9,7 +9,7 @@ Tutorial json
     registerFrom    UTCTime Maybe
     registerTo      UTCTime Maybe
     deregisterUntil UTCTime Maybe
-    lastChanged     UTCTime default='NOW()'
+    lastChanged     UTCTime default=now()
     UniqueTutorial course name
 Tutor
     tutorial    TutorialId
diff --git a/models/users b/models/users
index cd08164d1..f0b3e683e 100644
--- a/models/users
+++ b/models/users
@@ -22,7 +22,7 @@ User json    -- Each Uni2work user has a corresponding row in this table; create
     dateFormat     DateTimeFormat "default='%d.%m.%Y'"       -- preferred Date-only display format for user; user-defined
     timeFormat     DateTimeFormat "default='%R'"             -- preferred Time-only display format for user; user-defined
     downloadFiles  Bool default=false          -- Should files be opened in browser or downloaded? (users often oblivious that their browser has a setting for this)
-    mailLanguages  MailLanguages default='[]'  -- Preferred language for eMail; i18n not yet implemented; user-defined
+    mailLanguages  MailLanguages "default='[]'::jsonb"  -- Preferred language for eMail; i18n not yet implemented; user-defined
     notificationSettings NotificationSettings  -- Bit-array for which events email notifications are requested by user; user-defined
     UniqueAuthentication ident                 -- Column 'ident' can be used as a row-key in this table
     UniqueEmail email                          -- Column 'email' can be used as a row-key in this table
@@ -41,7 +41,7 @@ StudyFeatures  -- multiple entries possible for students pursuing several degree
     field         StudyTermsId    -- Fach, i.e. Informatics, Philosophy, etc.
     type          StudyFieldType  -- Major or minor, i.e. Haupt-/Nebenfach
     semester      Int
-    updated       UTCTime default='NOW()' -- last update from LDAP
+    updated       UTCTime default=now() -- last update from LDAP
     valid         Bool default=true       -- marked as active in LDAP (students may switch, but LDAP never forgets)
     UniqueStudyFeatures user degree field type semester
     -- UniqueUserSubject ubuser degree field -- There exists a counterexample
diff --git a/package.yaml b/package.yaml
index 4edc4d864..5dd414b33 100644
--- a/package.yaml
+++ b/package.yaml
@@ -197,7 +197,7 @@ when:
 library:
   source-dirs: src
   when:
-    - condition: (flag(dev)) || (flag(library-only))
+    - condition: flag(dev)
       then:
         ghc-options:
           - -O0
diff --git a/src/Application.hs b/src/Application.hs
index cc8843303..675c11d92 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -70,7 +70,7 @@ import Data.Proxy
 
 import qualified Data.Aeson as Aeson
 
-import System.Exit (exitFailure)
+import System.Exit
 
 import qualified Database.Memcached.Binary.IO as Memcached
 
@@ -81,6 +81,8 @@ import System.Posix.Process (getProcessID)
 
 import Control.Monad.Trans.State (execStateT)
 
+import Network (socketPort)
+
 -- Import all relevant handler modules here.
 -- (HPack takes care to add new modules to our cabal file nowadays.)
 import Handler.Common
@@ -192,8 +194,13 @@ makeFoundation appSettings'@AppSettings{..} = do
         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
+      if
+        | appAutoDbMigrate -> do
+            $logDebugS "setup" "Migration"
+            migrateAll `runSqlPool` sqlPool
+        | otherwise -> whenM (requiresMigration `runSqlPool` sqlPool) $ do
+            $logErrorS "setup" "Migration required"
+            liftIO . exitWith $ ExitFailure 2
       $logDebugS "setup" "Cluster-Config"
       appCryptoIDKey <- clusterSetting (Proxy :: Proxy 'ClusterCryptoIDKey) `runSqlPool` sqlPool
       appSessionKey <- clusterSetting (Proxy :: Proxy 'ClusterClientSessionKey) `runSqlPool` sqlPool
@@ -385,9 +392,10 @@ appMain = runResourceT $ do
       -- 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 $ fst <$> socks
+        Just socks
+          | not $ null socks -> do
+            $logInfoS "bind" [st|Ignoring configuration and listening on #{intercalate ", " (fmap (tshow . snd) socks)}|]
+            return $ fst <$> socks
         _other -> do
           let
             host = foundation ^. _appHost
@@ -395,6 +403,8 @@ appMain = runResourceT $ do
           $logInfoS "bind" [st|Listening on #{tshow host} port #{tshow port} as per configuration|]
           liftIO $ pure <$> bindPortTCP port host
 
+      $logDebugS "bind" . tshow =<< mapM (liftIO . socketPort) sockets
+
       let runWarp socket = runSettingsSocket (warpSettings foundation) socket app
       case sockets of
         []  -> $logErrorS "bind" "No sockets to listen on"
diff --git a/src/Jobs.hs b/src/Jobs.hs
index 641d3e100..efbe126b6 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -99,17 +99,18 @@ handleJobs foundation@UniWorX{..} = do
     atomically . modifyTVar' appJobCtl $ Map.insert tId bChan
 
   -- Start cron operation
-  registeredCron <- liftIO newEmptyTMVarIO
-  let execCrontab' = whenM (atomically $ readTMVar registeredCron) $
-        unsafeHandler foundation $ runReaderT execCrontab JobContext{..}
-      unregister = atomically . whenM (fromMaybe False <$> tryReadTMVar registeredCron) . void $ tryTakeTMVar appCronThread
-  cData <- allocate (liftIO . forkFinally execCrontab' $ \_ -> unregister) (\_ -> liftIO . atomically . void $ tryTakeTMVar jobCrontab)
-  registeredCron' <- atomically $ do
-    registeredCron' <- tryPutTMVar appCronThread cData
-    registeredCron' <$ putTMVar registeredCron registeredCron'
-  when registeredCron' $
-    liftIO . unsafeHandler foundation . flip runReaderT JobContext{..} $
-      writeJobCtlBlock JobCtlDetermineCrontab
+  when (num > 0) $ do
+    registeredCron <- liftIO newEmptyTMVarIO
+    let execCrontab' = whenM (atomically $ readTMVar registeredCron) $
+          unsafeHandler foundation $ runReaderT execCrontab JobContext{..}
+        unregister = atomically . whenM (fromMaybe False <$> tryReadTMVar registeredCron) . void $ tryTakeTMVar appCronThread
+    cData <- allocate (liftIO . forkFinally execCrontab' $ \_ -> unregister) (\_ -> liftIO . atomically . void $ tryTakeTMVar jobCrontab)
+    registeredCron' <- atomically $ do
+      registeredCron' <- tryPutTMVar appCronThread cData
+      registeredCron' <$ putTMVar registeredCron registeredCron'
+    when registeredCron' $
+      liftIO . unsafeHandler foundation . flip runReaderT JobContext{..} $
+        writeJobCtlBlock JobCtlDetermineCrontab
 
 stopJobCtl :: MonadIO m => UniWorX -> m ()
 -- ^ Stop all worker threads currently running
diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index 6f6970ac3..f55638835 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -1,5 +1,6 @@
 module Model.Migration
   ( migrateAll
+  , requiresMigration
   ) where
 
 import ClassyPrelude.Yesod
@@ -23,6 +24,10 @@ import Data.CaseInsensitive (CI)
 
 import Text.Shakespeare.Text (st)
 
+import Control.Monad.Trans.Reader (mapReaderT)
+import Control.Monad.Except (MonadError(..))
+import Utils (exceptT)
+
 -- 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)
@@ -55,16 +60,10 @@ 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"
+  mapM_ ($logInfoS "Migration") =<< runMigrationSilent initialMigration
 
-    migrateDBVersioning
-
-  $logDebugS "Migration" "Retrieve applied migrations"
-  appliedMigrations <- selectKeysList [] []
+  missingMigrations <- getMissingMigrations
   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}|]
@@ -78,6 +77,43 @@ migrateAll = do
   $logDebugS "Migration" "Persistent automatic migration"
   mapM_ ($logInfoS "Migration") =<< runMigrationSilent migrateAll'
 
+requiresMigration :: forall m. (MonadLogger m, MonadBaseControl IO m, MonadIO m) => ReaderT SqlBackend m Bool
+requiresMigration = mapReaderT (exceptT return return) $ do
+  initial <- getMigration initialMigration
+  when (not $ null initial) $ do
+    $logInfoS "Migration" $ intercalate "; " initial
+    throwError True
+
+  customs <- getMissingMigrations @_ @m
+  when (not $ Map.null customs) $ do
+    $logInfoS "Migration" . intercalate ", " . map tshow $ Map.keys customs
+    throwError True
+    
+  automatic <- getMigration migrateAll'
+  when (not $ null automatic) $ do
+    $logInfoS "Migration" $ intercalate "; " automatic
+    throwError True
+  
+  return False
+
+initialMigration :: Migration
+-- ^ Manual migrations to go to InitialVersion below:
+initialMigration = do
+  migrateEnableExtension "citext"
+  migrateDBVersioning
+
+getMissingMigrations :: forall m m'.
+                        ( MonadLogger m
+                        , MonadBaseControl IO m
+                        , MonadIO m
+                        , MonadIO m'
+                        )
+                     => ReaderT SqlBackend m (Map (Key AppliedMigration) (ReaderT SqlBackend m' ()))
+getMissingMigrations = do
+  $logDebugS "Migration" "Retrieve applied migrations"
+  appliedMigrations <- selectKeysList [] []
+  return $ customMigrations `Map.withoutKeys` Set.fromList appliedMigrations
+
 {-
   Confusion about quotes, from the PostgreSQL Manual:
     Single quotes for string constants, double quotes for table/column names.
diff --git a/src/Settings.hs b/src/Settings.hs
index d9798caea..06b2fa836 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -77,6 +77,7 @@ data AppSettings = AppSettings
     -- ^ Directory from which to serve static files.
     , appDatabaseConf           :: PostgresConf
     -- ^ Configuration settings for accessing the database.
+    , appAutoDbMigrate          :: Bool
     , appLdapConf               :: Maybe LdapConf
     -- ^ Configuration settings for accessing the LDAP-directory
     , appSmtpConf               :: Maybe SmtpConf
@@ -345,6 +346,7 @@ instance FromJSON AppSettings where
 #endif
         appStaticDir              <- o .: "static-dir"
         appDatabaseConf           <- o .: "database"
+        appAutoDbMigrate          <- o .: "auto-db-migrate"
         let nonEmptyHost LdapConf{..} = case ldapHost of
               Ldap.Tls host _ -> not $ null host
               Ldap.Plain host -> not $ null host
diff --git a/stack.yaml b/stack.yaml
index df8eb7fb3..b6c31fd66 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -21,6 +21,10 @@ packages:
       git: https://github.com/pngwjpgh/memcached-binary.git
       commit: b5461747e7be226d3b67daebc3c9aefe8a4490ad
     extra-dep: true
+  - location:
+      git: https://github.com/pngwjpgh/systemd.git
+      commit: 53d7ce6bd241ed4bedd25f1ae9383fd1856f9b77
+    extra-dep: true
 
 extra-deps:
   - colonnade-1.2.0
@@ -49,6 +53,4 @@ extra-deps:
   - quickcheck-classes-0.4.14
   - semirings-0.2.1.1
 
-  - systemd-1.1.2
-
 resolver: lts-10.5
diff --git a/test/Database.hs b/test/Database.hs
index 7281036f3..5f9140cb0 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -33,10 +33,10 @@ data DBAction = DBClear
 
 argsDescr :: [OptDescr DBAction]
 argsDescr =
-  [ Option ['c'] ["clear"]   (NoArg DBClear)    "Delete everything accessable by the current database user"
-  , Option ['t'] ["truncate"]    (NoArg DBTruncate) "Truncate all tables mentioned in the current schema (This cannot be run concurrently with any other activity accessing the database)"
-  , Option ['m'] ["migrate"] (NoArg DBMigrate)  "Perform database migration"
-  , Option ['f'] ["fill"]    (NoArg DBFill)     "Fill database with example data"
+  [ Option ['c'] ["clear"]    (NoArg DBClear)    "Delete everything accessable by the current database user"
+  , Option ['t'] ["truncate"] (NoArg DBTruncate) "Truncate all tables mentioned in the current schema (This cannot be run concurrently with any other activity accessing the database)"
+  , Option ['m'] ["migrate"]  (NoArg DBMigrate)  "Perform database migration"
+  , Option ['f'] ["fill"]     (NoArg DBFill)     "Fill database with example data"
   ]
 
 

From e6e92ad42e62816a6e2aaab3b5a5c3198049fdca Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 12 May 2019 13:59:08 +0200
Subject: [PATCH 306/519] Fix #361

---
 src/Handler/Submission.hs       | 2 ++
 src/Handler/Utils/Submission.hs | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 74e1e92e1..3077a1554 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -485,6 +485,7 @@ submissionHelper tid ssh csh shn mcid = do
 
         E.where_ $ (sf1 E.?. SubmissionFileIsUpdate E.==. E.val (Just False) E.||. E.isNothing (sf1 E.?. SubmissionFileIsUpdate))
              E.&&. (sf2 E.?. SubmissionFileIsUpdate E.==. E.val (Just True)  E.||. E.isNothing (sf2 E.?. SubmissionFileIsUpdate))
+             E.&&. (sf2 E.?. SubmissionFileIsDeletion E.==. E.val (Just False)  E.||. E.isNothing (sf2 E.?. SubmissionFileIsDeletion))
              E.&&. (sf1 E.?. SubmissionFileSubmission E.==. E.val (Just smid) E.||. sf2 E.?. SubmissionFileSubmission E.==. E.val (Just smid))
 
         return ((sf1, f1), (sf2, f2))
@@ -546,6 +547,7 @@ getSubDownloadR tid ssh csh shn cID (submissionFileTypeIsUpdate -> isUpdate) pat
         return f
 
       case results of
+        [] -> notFound
         [Entity _ File{ fileContent = Just c, fileTitle }] -> do
           whenM downloadFiles $
             addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index c65ae308b..b8d158f06 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -510,7 +510,6 @@ sinkSubmission userId mExists isUpdate = do
               -> update submissionId
               [ SubmissionRatingTime =. Nothing
               , SubmissionRatingPoints =. Nothing
-              , SubmissionRatingBy =. Nothing
               , SubmissionRatingComment =. Nothing
               ]
             | isUpdate

From 38e32b56fb53f7ae8fd70bd93017c07b5cae9bd7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 12 May 2019 15:02:06 +0200
Subject: [PATCH 307/519] Don't hide submission files that have no corrected
 version

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

diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 3077a1554..2f7d5404d 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -481,6 +481,7 @@ submissionHelper tid ssh csh shn mcid = do
         E.on $ f1 E.?. FileTitle E.==. f2 E.?. FileTitle
          E.&&. sf1 E.?. SubmissionFileSubmission E.==. sf2 E.?. SubmissionFileSubmission
          E.&&. sf1 E.?. SubmissionFileId E.!=. sf2 E.?. SubmissionFileId
+         E.&&. sf2 E.?. SubmissionFileIsDeletion E.==. E.val (Just False)
         E.on $ f1 E.?. FileId E.==. sf1 E.?. SubmissionFileFile
 
         E.where_ $ (sf1 E.?. SubmissionFileIsUpdate E.==. E.val (Just False) E.||. E.isNothing (sf1 E.?. SubmissionFileIsUpdate))

From 4468519808b5d07461d2463fd5765d278fb54ebf Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 12 May 2019 18:03:05 +0200
Subject: [PATCH 308/519] Debug output for sourceFiles

---
 src/Handler/Utils/Zip.hs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Utils/Zip.hs b/src/Handler/Utils/Zip.hs
index 5df1d3ba7..1bacbda1e 100644
--- a/src/Handler/Utils/Zip.hs
+++ b/src/Handler/Utils/Zip.hs
@@ -95,10 +95,14 @@ modifyFileTitle :: Monad m => (FilePath -> FilePath) -> Conduit File m File
 modifyFileTitle f = mapC $ \x@File{..} -> x{ fileTitle = f fileTitle }
 
 -- Takes FileInfo and if it is a ZIP-Archive, extract files, otherwiese yield fileinfo
-sourceFiles :: (MonadResource m, MonadThrow m, MonadIO m) => FileInfo -> Source m File
+sourceFiles :: (MonadLogger m, MonadResource m, MonadThrow m, MonadIO m) => FileInfo -> Source m File
 sourceFiles fInfo
-    | mimeType == "application/zip" = fileSource fInfo =$= void consumeZip
-    | otherwise = yieldM $ acceptFile fInfo
+    | mimeType == "application/zip" = do
+        $logInfoS "sourceFiles" "Unpacking ZIP"
+        fileSource fInfo =$= void consumeZip
+    | otherwise = do
+        $logDebugS "sourceFiles" [st|Not unpacking file of type #{decodeUtf8 mimeType}|]
+        yieldM $ acceptFile fInfo
   where
     mimeType = defaultMimeLookup (fileName fInfo)
 

From a50c31dd88f6bebb3eb81bf815f451774070c5a4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 12 May 2019 19:43:57 +0200
Subject: [PATCH 309/519] Allow customisation of file extension -> mimetype
 mapping

---
 config/mimetypes                | 788 ++++++++++++++++++++++++++++++++
 src/Handler/Submission.hs       |   4 +-
 src/Handler/Utils.hs            |   6 +-
 src/Handler/Utils/Mail.hs       |   3 +-
 src/Handler/Utils/Submission.hs |   4 -
 src/Handler/Utils/Zip.hs        |   4 +-
 src/Network/Mime/TH.hs          |  46 ++
 src/Settings.hs                 |  12 +
 8 files changed, 851 insertions(+), 16 deletions(-)
 create mode 100644 config/mimetypes
 create mode 100644 src/Network/Mime/TH.hs

diff --git a/config/mimetypes b/config/mimetypes
new file mode 100644
index 000000000..dd3fe4224
--- /dev/null
+++ b/config/mimetypes
@@ -0,0 +1,788 @@
+# Mapping of mime-types to file extensions
+#
+# Comments are empty lines and any line for which the first non-whitespace symbol is ‘#’
+#
+# Format is a single mime-type per line (may not contain whitespace) followed by a whitespace separated list of zero or more file extension (without leading ‘.’)
+# Any file extension may occur at most once within this file
+#
+# Extensions are compared case-insensitive (see `Data.Text.toLower`)
+
+application/andrew-inset ez
+application/applixware aw
+application/atom+xml atom
+application/atomcat+xml atomcat
+application/atomsvc+xml atomsvc
+application/ccxml+xml ccxml
+application/cdmi-capability cdmia
+application/cdmi-container cdmic
+application/cdmi-domain cdmid
+application/cdmi-object cdmio
+application/cdmi-queue cdmiq
+application/cu-seeme cu
+application/davmount+xml davmount
+application/docbook+xml dbk
+application/dssc+der dssc
+application/dssc+xml xdssc
+application/ecmascript ecma
+application/emma+xml emma
+application/epub+zip epub
+application/exi exi
+application/font-tdpfr pfr
+application/font-woff woff
+application/font-woff2 woff2
+application/futuresplash spl
+application/gml+xml gml
+application/gpx+xml gpx
+application/gxf gxf
+application/hyperstudio stk
+application/inkml+xml inkml ink
+application/ipfix ipfix
+application/java-archive war jar ear
+application/java-serialized-object ser
+application/java-vm class
+application/javascript js
+application/json json
+application/jsonml+json jsonml
+application/lost+xml lostxml
+application/mac-binhex40 hqx
+application/mac-compactpro cpt
+application/mads+xml mads
+application/marc mrc
+application/marcxml+xml mrcx
+application/mathematica nb mb ma
+application/mathml+xml mathml
+application/mbox mbox
+application/mediaservercontrol+xml mscml
+application/metalink+xml metalink
+application/metalink4+xml meta4
+application/mets+xml mets
+application/mods+xml mods
+application/mp21 mp21 m21
+application/mp4 mp4s
+application/msword dot doc
+application/mxf mxf
+application/octet-stream so pkg msp msm mar lrf img elc dump dms distz dist deploy bpk bin
+application/oda oda
+application/oebps-package+xml opf
+application/ogg ogx
+application/omdoc+xml omdoc
+application/onenote onetoc2 onetoc onetmp onepkg
+application/oxps oxps
+application/patch-ops-error+xml xer
+application/pdf pdf
+application/pgp-encrypted pgp
+application/pgp-signature sig
+application/pics-rules prf
+application/pkcs10 p10
+application/pkcs7-mime p7m p7c
+application/pkcs7-signature p7s
+application/pkcs8 p8
+application/pkix-attr-cert ac
+application/pkix-cert cer
+application/pkix-crl crl
+application/pkix-pkipath pkipath
+application/pkixcmp pki
+application/pls+xml pls
+application/postscript ps eps ai
+application/prs.cww cww
+application/pskc+xml pskcxml
+application/rdf+xml rdf
+application/reginfo+xml rif
+application/relax-ng-compact-syntax rnc
+application/resource-lists+xml rl
+application/resource-lists-diff+xml rld
+application/rls-services+xml rs
+application/rpki-ghostbusters gbr
+application/rpki-manifest mft
+application/rpki-roa roa
+application/rsd+xml rsd
+application/rss+xml rss
+application/rtf rtf
+application/sbml+xml sbml
+application/scvp-cv-request scq
+application/scvp-cv-response scs
+application/scvp-vp-request spq
+application/scvp-vp-response spp
+application/sdp sdp
+application/set-payment-initiation setpay
+application/set-registration-initiation setreg
+application/shf+xml shf
+application/smil+xml smil smi
+application/sparql-query rq
+application/sparql-results+xml srx
+application/srgs gram
+application/srgs+xml grxml
+application/sru+xml sru
+application/ssdl+xml ssdl
+application/ssml+xml ssml
+application/tei+xml teicorpus tei
+application/thraud+xml tfi
+application/timestamped-data tsd
+application/vnd.3gpp.pic-bw-large plb
+application/vnd.3gpp.pic-bw-small psb
+application/vnd.3gpp.pic-bw-var pvb
+application/vnd.3gpp2.tcap tcap
+application/vnd.3m.post-it-notes pwn
+application/vnd.accpac.simply.aso aso
+application/vnd.accpac.simply.imp imp
+application/vnd.acucobol acu
+application/vnd.acucorp atc acutc
+application/vnd.adobe.air-application-installer-package+zip air
+application/vnd.adobe.formscentral.fcdt fcdt
+application/vnd.adobe.fxp fxpl fxp
+application/vnd.adobe.xdp+xml xdp
+application/vnd.adobe.xfdf xfdf
+application/vnd.ahead.space ahead
+application/vnd.airzip.filesecure.azf azf
+application/vnd.airzip.filesecure.azs azs
+application/vnd.amazon.ebook azw
+application/vnd.americandynamics.acc acc
+application/vnd.amiga.ami ami
+application/vnd.android.package-archive apk
+application/vnd.anser-web-certificate-issue-initiation cii
+application/vnd.anser-web-funds-transfer-initiation fti
+application/vnd.antix.game-component atx
+application/vnd.apple.installer+xml mpkg
+application/vnd.apple.mpegurl m3u8
+application/vnd.aristanetworks.swi swi
+application/vnd.astraea-software.iota iota
+application/vnd.audiograph aep
+application/vnd.blueice.multipass mpm
+application/vnd.bmi bmi
+application/vnd.businessobjects rep
+application/vnd.chemdraw+xml cdxml
+application/vnd.chipnuts.karaoke-mmd mmd
+application/vnd.cinderella cdy
+application/vnd.claymore cla
+application/vnd.cloanto.rp9 rp9
+application/vnd.clonk.c4group c4u c4p c4g c4f c4d
+application/vnd.cluetrust.cartomobile-config c11amc
+application/vnd.cluetrust.cartomobile-config-pkg c11amz
+application/vnd.commonspace csp
+application/vnd.contact.cmsg cdbcmsg
+application/vnd.cosmocaller cmc
+application/vnd.crick.clicker clkx
+application/vnd.crick.clicker.keyboard clkk
+application/vnd.crick.clicker.palette clkp
+application/vnd.crick.clicker.template clkt
+application/vnd.crick.clicker.wordbank clkw
+application/vnd.criticaltools.wbs+xml wbs
+application/vnd.ctc-posml pml
+application/vnd.cups-ppd ppd
+application/vnd.curl.car car
+application/vnd.curl.pcurl pcurl
+application/vnd.dart dart
+application/vnd.data-vision.rdz rdz
+application/vnd.dece.data uvvf uvvd uvf uvd
+application/vnd.dece.ttml+xml uvvt uvt
+application/vnd.dece.unspecified uvx uvvx
+application/vnd.dece.zip uvz uvvz
+application/vnd.denovo.fcselayout-link fe_launch
+application/vnd.dna dna
+application/vnd.dolby.mlp mlp
+application/vnd.dpgraph dpg
+application/vnd.dreamfactory dfac
+application/vnd.ds-keypoint kpxx
+application/vnd.dvb.ait ait
+application/vnd.dvb.service svc
+application/vnd.dynageo geo
+application/vnd.ecowin.chart mag
+application/vnd.enliven nml
+application/vnd.epson.esf esf
+application/vnd.epson.msf msf
+application/vnd.epson.quickanime qam
+application/vnd.epson.salt slt
+application/vnd.epson.ssf ssf
+application/vnd.eszigno3+xml et3 es3
+application/vnd.ezpix-album ez2
+application/vnd.ezpix-package ez3
+application/vnd.fdf fdf
+application/vnd.fdsn.mseed mseed
+application/vnd.fdsn.seed seed dataless
+application/vnd.flographit gph
+application/vnd.fluxtime.clip ftc
+application/vnd.framemaker maker frame fm book
+application/vnd.frogans.fnc fnc
+application/vnd.frogans.ltf ltf
+application/vnd.fsc.weblaunch fsc
+application/vnd.fujitsu.oasys oas
+application/vnd.fujitsu.oasys2 oa2
+application/vnd.fujitsu.oasys3 oa3
+application/vnd.fujitsu.oasysgp fg5
+application/vnd.fujitsu.oasysprs bh2
+application/vnd.fujixerox.ddd ddd
+application/vnd.fujixerox.docuworks xdw
+application/vnd.fujixerox.docuworks.binder xbd
+application/vnd.fuzzysheet fzs
+application/vnd.genomatix.tuxedo txd
+application/vnd.geogebra.file ggb
+application/vnd.geogebra.tool ggt
+application/vnd.geometry-explorer gre gex
+application/vnd.geonext gxt
+application/vnd.geoplan g2w
+application/vnd.geospace g3w
+application/vnd.gmx gmx
+application/vnd.google-earth.kml+xml kml
+application/vnd.google-earth.kmz kmz
+application/vnd.grafeq gqs gqf
+application/vnd.groove-account gac
+application/vnd.groove-help ghf
+application/vnd.groove-identity-message gim
+application/vnd.groove-injector grv
+application/vnd.groove-tool-message gtm
+application/vnd.groove-tool-template tpl
+application/vnd.groove-vcard vcg
+application/vnd.hal+xml hal
+application/vnd.handheld-entertainment+xml zmm
+application/vnd.hbci hbci
+application/vnd.hhe.lesson-player les
+application/vnd.hp-hpgl hpgl
+application/vnd.hp-hpid hpid
+application/vnd.hp-hps hps
+application/vnd.hp-jlyt jlt
+application/vnd.hp-pcl pcl
+application/vnd.hp-pclxl pclxl
+application/vnd.hydrostatix.sof-data sfd-hdstx
+application/vnd.ibm.minipay mpy
+application/vnd.ibm.modcap listafp list3820 afp
+application/vnd.ibm.rights-management irm
+application/vnd.ibm.secure-container sc
+application/vnd.iccprofile icm icc
+application/vnd.igloader igl
+application/vnd.immervision-ivp ivp
+application/vnd.immervision-ivu ivu
+application/vnd.insors.igm igm
+application/vnd.intercon.formnet xpx xpw
+application/vnd.intergeo i2g
+application/vnd.intu.qbo qbo
+application/vnd.intu.qfx qfx
+application/vnd.ipunplugged.rcprofile rcprofile
+application/vnd.irepository.package+xml irp
+application/vnd.is-xpr xpr
+application/vnd.isac.fcs fcs
+application/vnd.jam jam
+application/vnd.jcp.javame.midlet-rms rms
+application/vnd.jisp jisp
+application/vnd.joost.joda-archive joda
+application/vnd.kahootz ktz ktr
+application/vnd.kde.karbon karbon
+application/vnd.kde.kchart chrt
+application/vnd.kde.kformula kfo
+application/vnd.kde.kivio flw
+application/vnd.kde.kontour kon
+application/vnd.kde.kpresenter kpt kpr
+application/vnd.kde.kspread ksp
+application/vnd.kde.kword kwt kwd
+application/vnd.kenameaapp htke
+application/vnd.kidspiration kia
+application/vnd.kinar knp kne
+application/vnd.koan skt skp skm skd
+application/vnd.kodak-descriptor sse
+application/vnd.las.las+xml lasxml
+application/vnd.llamagraphics.life-balance.desktop lbd
+application/vnd.llamagraphics.life-balance.exchange+xml lbe
+application/vnd.lotus-1-2-3 123
+application/vnd.lotus-approach apr
+application/vnd.lotus-freelance pre
+application/vnd.lotus-notes nsf
+application/vnd.lotus-organizer org
+application/vnd.lotus-screencam scm
+application/vnd.lotus-wordpro lwp
+application/vnd.macports.portpkg portpkg
+application/vnd.mcd mcd
+application/vnd.medcalcdata mc1
+application/vnd.mediastation.cdkey cdkey
+application/vnd.mfer mwf
+application/vnd.mfmp mfm
+application/vnd.micrografx.flo flo
+application/vnd.micrografx.igx igx
+application/vnd.mif mif
+application/vnd.mobius.daf daf
+application/vnd.mobius.dis dis
+application/vnd.mobius.mbk mbk
+application/vnd.mobius.mqy mqy
+application/vnd.mobius.msl msl
+application/vnd.mobius.plc plc
+application/vnd.mobius.txf txf
+application/vnd.mophun.application mpn
+application/vnd.mophun.certificate mpc
+application/vnd.mozilla.xul+xml xul
+application/vnd.ms-artgalry cil
+application/vnd.ms-cab-compressed cab
+application/vnd.ms-excel xlw xlt xls xlm xlc xla
+application/vnd.ms-excel.addin.macroenabled.12 xlam
+application/vnd.ms-excel.sheet.binary.macroenabled.12 xlsb
+application/vnd.ms-excel.sheet.macroenabled.12 xlsm
+application/vnd.ms-excel.template.macroenabled.12 xltm
+application/vnd.ms-fontobject eot
+application/vnd.ms-htmlhelp chm
+application/vnd.ms-ims ims
+application/vnd.ms-lrm lrm
+application/vnd.ms-officetheme thmx
+application/vnd.ms-pki.seccat cat
+application/vnd.ms-pki.stl stl
+application/vnd.ms-powerpoint ppt pps pot
+application/vnd.ms-powerpoint.addin.macroenabled.12 ppam
+application/vnd.ms-powerpoint.presentation.macroenabled.12 pptm
+application/vnd.ms-powerpoint.slide.macroenabled.12 sldm
+application/vnd.ms-powerpoint.slideshow.macroenabled.12 ppsm
+application/vnd.ms-powerpoint.template.macroenabled.12 potm
+application/vnd.ms-project mpt mpp
+application/vnd.ms-word.document.macroenabled.12 docm
+application/vnd.ms-word.template.macroenabled.12 dotm
+application/vnd.ms-works wps wks wdb wcm
+application/vnd.ms-wpl wpl
+application/vnd.ms-xpsdocument xps
+application/vnd.mseq mseq
+application/vnd.musician mus
+application/vnd.muvee.style msty
+application/vnd.mynfc taglet
+application/vnd.neurolanguage.nlu nlu
+application/vnd.nitf ntf nitf
+application/vnd.noblenet-directory nnd
+application/vnd.noblenet-sealer nns
+application/vnd.noblenet-web nnw
+application/vnd.nokia.n-gage.data ngdat
+application/vnd.nokia.n-gage.symbian.install n-gage
+application/vnd.nokia.radio-preset rpst
+application/vnd.nokia.radio-presets rpss
+application/vnd.novadigm.edm edm
+application/vnd.novadigm.edx edx
+application/vnd.novadigm.ext ext
+application/vnd.oasis.opendocument.chart odc
+application/vnd.oasis.opendocument.chart-template otc
+application/vnd.oasis.opendocument.database odb
+application/vnd.oasis.opendocument.formula odf
+application/vnd.oasis.opendocument.formula-template odft
+application/vnd.oasis.opendocument.graphics odg
+application/vnd.oasis.opendocument.graphics-template otg
+application/vnd.oasis.opendocument.image odi
+application/vnd.oasis.opendocument.image-template oti
+application/vnd.oasis.opendocument.presentation odp
+application/vnd.oasis.opendocument.presentation-template otp
+application/vnd.oasis.opendocument.spreadsheet ods
+application/vnd.oasis.opendocument.spreadsheet-template ots
+application/vnd.oasis.opendocument.text odt
+application/vnd.oasis.opendocument.text-master odm
+application/vnd.oasis.opendocument.text-template ott
+application/vnd.oasis.opendocument.text-web oth
+application/vnd.olpc-sugar xo
+application/vnd.oma.dd2+xml dd2
+application/vnd.openofficeorg.extension oxt
+application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
+application/vnd.openxmlformats-officedocument.presentationml.slide sldx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow ppsx
+application/vnd.openxmlformats-officedocument.presentationml.template potx
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx
+application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx
+application/vnd.osgeo.mapguide.package mgp
+application/vnd.osgi.dp dp
+application/vnd.osgi.subsystem esa
+application/vnd.palm pqa pdb oprc
+application/vnd.pawaafile paw
+application/vnd.pg.format str
+application/vnd.pg.osasli ei6
+application/vnd.picsel efif
+application/vnd.pmi.widget wg
+application/vnd.pocketlearn plf
+application/vnd.powerbuilder6 pbd
+application/vnd.previewsystems.box box
+application/vnd.proteus.magazine mgz
+application/vnd.publishare-delta-tree qps
+application/vnd.pvi.ptid1 ptid
+application/vnd.quark.quarkxpress qxt qxl qxd qxb qwt qwd
+application/vnd.realvnc.bed bed
+application/vnd.recordare.musicxml mxl
+application/vnd.recordare.musicxml+xml musicxml
+application/vnd.rig.cryptonote cryptonote
+application/vnd.rim.cod cod
+application/vnd.rn-realmedia rm
+application/vnd.rn-realmedia-vbr rmvb
+application/vnd.route66.link66+xml link66
+application/vnd.sailingtracker.track st
+application/vnd.seemail see
+application/vnd.sema sema
+application/vnd.semd semd
+application/vnd.semf semf
+application/vnd.shana.informed.formdata ifm
+application/vnd.shana.informed.formtemplate itp
+application/vnd.shana.informed.interchange iif
+application/vnd.shana.informed.package ipk
+application/vnd.simtech-mindmapper twds twd
+application/vnd.smaf mmf
+application/vnd.smart.teacher teacher
+application/vnd.solent.sdkm+xml sdkm sdkd
+application/vnd.spotfire.dxp dxp
+application/vnd.spotfire.sfs sfs
+application/vnd.stardivision.calc sdc
+application/vnd.stardivision.draw sda
+application/vnd.stardivision.impress sdd
+application/vnd.stardivision.math smf
+application/vnd.stardivision.writer vor sdw
+application/vnd.stardivision.writer-global sgl
+application/vnd.stepmania.package smzip
+application/vnd.stepmania.stepchart sm
+application/vnd.sun.xml.calc sxc
+application/vnd.sun.xml.calc.template stc
+application/vnd.sun.xml.draw sxd
+application/vnd.sun.xml.draw.template std
+application/vnd.sun.xml.impress sxi
+application/vnd.sun.xml.impress.template sti
+application/vnd.sun.xml.math sxm
+application/vnd.sun.xml.writer sxw
+application/vnd.sun.xml.writer.global sxg
+application/vnd.sun.xml.writer.template stw
+application/vnd.sus-calendar susp sus
+application/vnd.svd svd
+application/vnd.symbian.install sisx sis
+application/vnd.syncml+xml xsm
+application/vnd.syncml.dm+wbxml bdm
+application/vnd.syncml.dm+xml xdm
+application/vnd.tao.intent-module-archive tao
+application/vnd.tcpdump.pcap pcap dmp cap
+application/vnd.tmobile-livetv tmo
+application/vnd.trid.tpt tpt
+application/vnd.triscape.mxs mxs
+application/vnd.trueapp tra
+application/vnd.ufdl ufdl ufd
+application/vnd.uiq.theme utz
+application/vnd.umajin umj
+application/vnd.unity unityweb
+application/vnd.uoml+xml uoml
+application/vnd.vcx vcx
+application/vnd.visio vsw vst vss vsd
+application/vnd.visionary vis
+application/vnd.vsf vsf
+application/vnd.wap.wbxml wbxml
+application/vnd.wap.wmlc wmlc
+application/vnd.wap.wmlscriptc wmlsc
+application/vnd.webturbo wtb
+application/vnd.wolfram.player nbp
+application/vnd.wordperfect wpd
+application/vnd.wqd wqd
+application/vnd.wt.stf stf
+application/vnd.xara xar
+application/vnd.xfdl xfdl
+application/vnd.yamaha.hv-dic hvd
+application/vnd.yamaha.hv-script hvs
+application/vnd.yamaha.hv-voice hvp
+application/vnd.yamaha.openscoreformat osf
+application/vnd.yamaha.openscoreformat.osfpvg+xml osfpvg
+application/vnd.yamaha.smaf-audio saf
+application/vnd.yamaha.smaf-phrase spf
+application/vnd.yellowriver-custom-menu cmp
+application/vnd.zul zirz zir
+application/vnd.zzazz.deck+xml zaz
+application/voicexml+xml vxml
+application/widget wgt
+application/winhlp hlp
+application/wsdl+xml wsdl
+application/wspolicy+xml wspolicy
+application/x-7z-compressed 7z
+application/x-abiword abw
+application/x-ace-compressed ace
+application/x-apple-diskimage dmg
+application/x-authorware-bin x32 vox u32 aab
+application/x-authorware-map aam
+application/x-authorware-seg aas
+application/x-bcpio bcpio
+application/x-bittorrent torrent
+application/x-blorb blorb blb
+application/x-bzip bz2 bz
+application/x-bzip-compressed-tar tbz tar.bz2
+application/x-bzip2 boz
+application/x-cbr cbz cbt cbr cba cb7
+application/x-cdlink vcd
+application/x-cfs-compressed cfs
+application/x-chat chat
+application/x-chess-pgn pgn
+application/x-cocoa cco
+application/x-conference nsc
+application/x-cpio cpio
+application/x-csh csh
+application/x-debian-package udeb deb
+application/x-dgc-compressed dgc
+application/x-director w3d swa fgd dxr dir dcr cxt cst cct
+application/x-doom wad
+application/x-dtbncx+xml ncx
+application/x-dtbook+xml dtb
+application/x-dtbresource+xml res
+application/x-dvi dvi
+application/x-envoy evy
+application/x-eva eva
+application/x-font-bdf bdf
+application/x-font-ghostscript gsf
+application/x-font-linux-psf psf
+application/x-font-otf otf
+application/x-font-pcf pcf
+application/x-font-snf snf
+application/x-font-ttf ttf ttc
+application/x-font-type1 pfm pfb pfa afm
+application/x-freearc arc
+application/x-gca-compressed gca
+application/x-glulx ulx
+application/x-gnumeric gnumeric
+application/x-gramps-xml gramps
+application/x-gtar gtar
+application/x-gzip gz
+application/x-hdf hdf
+application/x-install-instructions install
+application/x-iso9660-image iso
+application/x-java-archive-diff jardiff
+application/x-java-jnlp-file jnlp
+application/x-latex latex
+application/x-lzh-compressed lzh lha
+application/x-makeself run
+application/x-mie mie
+application/x-mobipocket-ebook prc mobi
+application/x-ms-application application
+application/x-ms-shortcut lnk
+application/x-ms-wmd wmd
+application/x-ms-xbap xbap
+application/x-msaccess mdb
+application/x-msbinder obd
+application/x-mscardfile crd
+application/x-msclip clp
+application/x-msdownload msi exe dll com bat
+application/x-msmediaview mvb m14 m13
+application/x-msmetafile wmz wmf emz emf
+application/x-msmoney mny
+application/x-mspublisher pub
+application/x-msschedule scd
+application/x-msterminal trm
+application/x-mswrite wri
+application/x-netcdf nc cdf
+application/x-ns-proxy-autoconfig pac
+application/x-nzb nzb
+application/x-perl pm pl
+application/x-pkcs12 pfx p12
+application/x-pkcs7-certificates spc p7b
+application/x-pkcs7-certreqresp p7r
+application/x-rar-compressed rar
+application/x-redhat-package-manager rpm
+application/x-research-info-systems ris
+application/x-sea sea
+application/x-sh sh
+application/x-shar shar
+application/x-shockwave-flash swf
+application/x-silverlight-app xap
+application/x-sql sql
+application/x-stuffit sit
+application/x-stuffitx sitx
+application/x-subrip srt
+application/x-sv4cpio sv4cpio
+application/x-sv4crc sv4crc
+application/x-t3vm-image t3
+application/x-tads gam
+application/x-tar tar
+application/x-tcl tk tcl
+application/x-tex tex
+application/x-tex-tfm tfm
+application/x-texinfo texinfo texi
+application/x-tgif obj
+application/x-tgz tgz tar.gz
+application/x-ustar ustar
+application/x-wais-source src
+application/x-x509-ca-cert pem der crt
+application/x-xfig fig
+application/x-xliff+xml xlf
+application/x-xpinstall xpi
+application/x-xz xz
+application/x-zmachine z8 z7 z6 z5 z4 z3 z2 z1
+application/xaml+xml xaml
+application/xcap-diff+xml xdf
+application/xenc+xml xenc
+application/xhtml+xml xhtml xht
+application/xml xsl
+application/xml-dtd dtd
+application/xop+xml xop
+application/xproc+xml xpl
+application/xslt+xml xslt
+application/xspf+xml xspf
+application/xv+xml xvml xvm xhvml mxml
+application/yang yang
+application/yin+xml yin
+application/zip zip
+audio/adpcm adp
+audio/basic snd au
+audio/midi rmi midi mid kar
+audio/mp4 mp4a
+audio/mpeg mpga mp3 mp2a mp2 m3a m2a
+audio/ogg spx ogg oga
+audio/s3m s3m
+audio/silk sil
+audio/vnd.dece.audio uvva uva
+audio/vnd.digital-winds eol
+audio/vnd.dra dra
+audio/vnd.dts dts
+audio/vnd.dts.hd dtshd
+audio/vnd.lucent.voice lvp
+audio/vnd.ms-playready.media.pya pya
+audio/vnd.nuera.ecelp4800 ecelp4800
+audio/vnd.nuera.ecelp7470 ecelp7470
+audio/vnd.nuera.ecelp9600 ecelp9600
+audio/vnd.rip rip
+audio/webm weba
+audio/x-aac aac
+audio/x-aiff aiff aifc aif
+audio/x-caf caf
+audio/x-flac flac
+audio/x-m4a m4a
+audio/x-matroska mka
+audio/x-mpegurl m3u
+audio/x-ms-wax wax
+audio/x-ms-wma wma
+audio/x-pn-realaudio ram ra
+audio/x-pn-realaudio-plugin rmp
+audio/x-wav wav
+audio/xm xm
+chemical/x-cdx cdx
+chemical/x-cif cif
+chemical/x-cmdf cmdf
+chemical/x-cml cml
+chemical/x-csml csml
+chemical/x-xyz xyz
+image/bmp bmp
+image/cgm cgm
+image/g3fax g3
+image/gif gif
+image/ief ief
+image/jpeg jpg jpeg jpe
+image/ktx ktx
+image/png png
+image/prs.btif btif
+image/sgi sgi
+image/svg+xml svgz svg
+image/tiff tiff tif
+image/vnd.adobe.photoshop psd
+image/vnd.dece.graphic uvvi uvvg uvi uvg
+image/vnd.djvu djvu djv
+image/vnd.dwg dwg
+image/vnd.dxf dxf
+image/vnd.fastbidsheet fbs
+image/vnd.fpx fpx
+image/vnd.fst fst
+image/vnd.fujixerox.edmics-mmr mmr
+image/vnd.fujixerox.edmics-rlc rlc
+image/vnd.microsoft.icon ico
+image/vnd.ms-modi mdi
+image/vnd.ms-photo wdp
+image/vnd.net-fpx npx
+image/vnd.wap.wbmp wbmp
+image/vnd.xiff xif
+image/webp webp
+image/x-3ds 3ds
+image/x-cmu-raster ras
+image/x-cmx cmx
+image/x-freehand fhc fh7 fh5 fh4 fh
+image/x-jng jng
+image/x-mrsid-image sid
+image/x-pcx pcx
+image/x-pict pic pct
+image/x-portable-anymap pnm
+image/x-portable-bitmap pbm
+image/x-portable-graymap pgm
+image/x-portable-pixmap ppm
+image/x-rgb rgb
+image/x-tga tga
+image/x-xbitmap xbm
+image/x-xpixmap xpm
+image/x-xwindowdump xwd
+message/rfc822 mime eml
+model/iges igs iges
+model/mesh silo msh mesh
+model/vnd.collada+xml dae
+model/vnd.dwf dwf
+model/vnd.gdl gdl
+model/vnd.gtw gtw
+model/vnd.mts mts
+model/vnd.vtu vtu
+model/vrml wrl vrml
+model/x3d+binary x3dbz x3db
+model/x3d+vrml x3dvz x3dv
+model/x3d+xml x3dz x3d
+text/cache-manifest manifest appcache
+text/calendar ifb ics
+text/css less css
+text/csv csv
+text/html shtml html htm
+text/mathml mml
+text/n3 n3
+text/plain txt text log list in hs def cxx cpp conf c asc
+text/prs.lines.tag dsc
+text/richtext rtx
+text/sgml sgml sgm
+text/tab-separated-values tsv
+text/troff tr t roff ms me man
+text/turtle ttl
+text/uri-list urls uris uri
+text/vcard vcard
+text/vnd.curl curl
+text/vnd.curl.dcurl dcurl
+text/vnd.curl.mcurl mcurl
+text/vnd.curl.scurl scurl
+text/vnd.dvb.subtitle sub
+text/vnd.fly fly
+text/vnd.fmi.flexstor flx
+text/vnd.graphviz gv
+text/vnd.in3d.3dml 3dml
+text/vnd.in3d.spot spot
+text/vnd.sun.j2me.app-descriptor jad
+text/vnd.wap.wml wml
+text/vnd.wap.wmlscript wmls
+text/x-asm s asm
+text/x-c hh h dic cc
+text/x-component htc
+text/x-fortran for f90 f77 f
+text/x-java-source java
+text/x-nfo nfo
+text/x-opml opml
+text/x-pascal pas p
+text/x-setext etx
+text/x-sfv sfv
+text/x-uuencode uu
+text/x-vcalendar vcs
+text/x-vcard vcf
+text/xml xml
+video/3gpp 3gpp 3gp
+video/3gpp2 3g2
+video/h261 h261
+video/h263 h263
+video/h264 h264
+video/jpeg jpgv
+video/jpm jpm jpgm
+video/mj2 mjp2 mj2
+video/mp4 mpg4 mp4v mp4
+video/mpeg mpg mpeg mpe m2v m1v
+video/ogg ogv
+video/quicktime qt mov
+video/vnd.dece.hd uvvh uvh
+video/vnd.dece.mobile uvvm uvm
+video/vnd.dece.pd uvvp uvp
+video/vnd.dece.sd uvvs uvs
+video/vnd.dece.video uvvv uvv
+video/vnd.dvb.file dvb
+video/vnd.fvt fvt
+video/vnd.mpegurl mxu m4u
+video/vnd.ms-playready.media.pyv pyv
+video/vnd.uvvu.mp4 uvvu uvu
+video/vnd.vivo viv
+video/webm webm
+video/x-f4v f4v
+video/x-fli fli
+video/x-flv flv
+video/x-m4v m4v
+video/x-matroska mkv mks mk3d
+video/x-mng mng
+video/x-ms-asf asx asf
+video/x-ms-vob vob
+video/x-ms-wm wm
+video/x-ms-wmv wmv
+video/x-ms-wmx wmx
+video/x-ms-wvx wvx
+video/x-msvideo avi
+video/x-sgi-movie movie
+video/x-smv smv
+x-conference/x-cooltalk ice
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 2f7d5404d..d5f5961cd 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -17,8 +17,6 @@ import Handler.Utils.Table.Cells
 import Handler.Utils.Form.MassInput
 import Handler.Utils.Invitations
 
-import Network.Mime
-
 -- import Control.Monad.Trans.Maybe
 -- import Control.Monad.State.Class
 -- import Control.Monad.Trans.State.Strict (StateT)
@@ -552,7 +550,7 @@ getSubDownloadR tid ssh csh shn cID (submissionFileTypeIsUpdate -> isUpdate) pat
         [Entity _ File{ fileContent = Just c, fileTitle }] -> do
           whenM downloadFiles $
             addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
-          return $ TypedContent (defaultMimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent c)
+          return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent c)
         [Entity _ File{ fileContent = Nothing }] -> sendResponseStatus noContent204 ()
         other -> do
           $logErrorS "SubDownloadR" $ "Multiple matching files: " <> tshow other
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index e7cf7dabb..ed2334d5c 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -34,8 +34,6 @@ import Handler.Utils.Mail       as Handler.Utils
 import System.Directory (listDirectory)
 import System.FilePath.Posix (takeBaseName, takeFileName)
 
-import Network.Mime
-
 import qualified Data.List as List
 import qualified Data.List.NonEmpty as NonEmpty
 
@@ -58,7 +56,7 @@ serveOneFile query = do
       | Just fileContent' <- fileContent -> do
           whenM downloadFiles $
             addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
-          return $ TypedContent (defaultMimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
+          return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
       | otherwise -> sendResponseStatus noContent204 ()
     [] -> notFound
     other -> do
@@ -76,7 +74,7 @@ serveSomeFiles archiveName query = do
       | Just fileContent' <- fileContent -> do
           whenM downloadFiles $
             addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
-          return $ TypedContent (defaultMimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
+          return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
       | otherwise -> sendResponseStatus noContent204 ()
     files -> do
       addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece archiveName}"|]
diff --git a/src/Handler/Utils/Mail.hs b/src/Handler/Utils/Mail.hs
index 211923159..0548d341c 100644
--- a/src/Handler/Utils/Mail.hs
+++ b/src/Handler/Utils/Mail.hs
@@ -16,7 +16,6 @@ import qualified Data.ByteString.Lazy as LBS
 import qualified Data.Conduit.List as C
 
 import System.FilePath (takeBaseName)
-import Network.Mime (defaultMimeLookup)
 
 import Control.Monad.Trans.State (StateT)
 
@@ -66,7 +65,7 @@ addFileDB :: ( MonadMail m
 addFileDB fId = do
   File{fileTitle = pack . takeBaseName -> fileName, fileContent = Just fileContent} <- liftHandlerT . runDB $ getJust fId
   addPart $ do
-    _partType .= decodeUtf8 (defaultMimeLookup fileName)
+    _partType .= decodeUtf8 (mimeLookup fileName)
     _partEncoding .= Base64
     _partFilename .= Just fileName
     _partContent .= LBS.fromStrict fileContent
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index b8d158f06..33168da0e 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -40,7 +40,6 @@ import Generics.Deriving.Monoid (memptydefault, mappenddefault)
 
 import Handler.Utils
 import qualified Handler.Utils.Rating as Rating (extractRatings)
-import Handler.Utils.Submission.TH
 import Handler.Utils.Delete
 
 import qualified Database.Esqueleto as E
@@ -271,9 +270,6 @@ instance Monoid SubmissionSinkState where
   mempty = memptydefault
   mappend = mappenddefault
 
-submissionBlacklist :: [Pattern]
-submissionBlacklist = $(patternFile compDefault "config/submission-blacklist")
-
 filterSubmission :: MonadLogger m => ConduitM File File m (Set FilePath)
 -- ^ Removes all `File`s matching `submissionBlacklist`, returning their `fileTitle`s
 filterSubmission = do
diff --git a/src/Handler/Utils/Zip.hs b/src/Handler/Utils/Zip.hs
index 1bacbda1e..c1fd25524 100644
--- a/src/Handler/Utils/Zip.hs
+++ b/src/Handler/Utils/Zip.hs
@@ -27,8 +27,6 @@ import Data.Time.LocalTime (localTimeToUTC, utcToLocalTime)
 
 import Data.List (dropWhileEnd)
 
-import Network.Mime
-
 
 instance Default ZipInfo where
   def = ZipInfo
@@ -104,7 +102,7 @@ sourceFiles fInfo
         $logDebugS "sourceFiles" [st|Not unpacking file of type #{decodeUtf8 mimeType}|]
         yieldM $ acceptFile fInfo
   where
-    mimeType = defaultMimeLookup (fileName fInfo)
+    mimeType = mimeLookup $ fileName fInfo
 
 acceptFile :: (MonadResource m, MonadThrow m, MonadIO m) => FileInfo -> m File
 acceptFile fInfo = do
diff --git a/src/Network/Mime/TH.hs b/src/Network/Mime/TH.hs
new file mode 100644
index 000000000..0fd1c2beb
--- /dev/null
+++ b/src/Network/Mime/TH.hs
@@ -0,0 +1,46 @@
+module Network.Mime.TH
+  ( mimeMapFile
+  ) where
+
+import ClassyPrelude.Yesod hiding (lift)
+import Language.Haskell.TH hiding (Extension)
+import Language.Haskell.TH.Syntax (qAddDependentFile, Lift(..))
+
+import qualified Data.Map as Map
+
+import Data.Text (Text)
+import qualified Data.Text as Text
+import qualified Data.Text.IO as Text
+import qualified Data.Text.Encoding as Text
+
+import Network.Mime
+
+import Instances.TH.Lift ()
+
+
+mimeMapFile :: FilePath -> ExpQ
+mimeMapFile file = do
+  qAddDependentFile file
+  
+  mappings <- runIO $ filter (not . isComment) . Text.lines <$> Text.readFile file
+  let
+    coMappings :: [(Extension, MimeType)]
+    coMappings = do
+      (mimeType : extensions) <- filter (not . Text.null) . Text.words <$> mappings
+      ext <- extensions
+      return (ext, Text.encodeUtf8 mimeType)
+
+    mimeMap = Map.fromListWithKey duplicateError coMappings
+
+    duplicateError ext t1 t2 = error . Text.unpack $ "Duplicate mimeMap-entries for extension " <> ext <> ": " <> Text.decodeUtf8 t1 <> ", " <> Text.decodeUtf8 t2
+
+
+  lift mimeMap
+
+isComment :: Text -> Bool
+isComment line = or
+  [ commentSymbol `Text.isPrefixOf` Text.stripStart line
+  , Text.null $ Text.strip line
+  ]
+  where
+    commentSymbol = "#"
diff --git a/src/Settings.hs b/src/Settings.hs
index 06b2fa836..739ac5554 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -68,6 +68,11 @@ import qualified System.FilePath as FilePath
 
 import Jose.Jwt (JwtEncoding(..))
 
+import System.FilePath.Glob
+import Handler.Utils.Submission.TH
+import Network.Mime
+import Network.Mime.TH
+
 
 -- | Runtime settings to configure this application. These settings can be
 -- loaded from various sources: defaults, environment variables, config files,
@@ -422,6 +427,13 @@ makeClassy_ ''AppSettings
 widgetFileSettings :: WidgetFileSettings
 widgetFileSettings = def
 
+
+submissionBlacklist :: [Pattern]
+submissionBlacklist = $(patternFile compDefault "config/submission-blacklist")
+
+mimeLookup :: FileName -> MimeType
+mimeLookup = mimeByExt $(mimeMapFile "config/mimetypes") defaultMimeType
+
 -- The rest of this file contains settings which rarely need changing by a
 -- user.
 

From 487c46a1cec5769b09bb54840fe28de4d63cfd5a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 13 May 2019 00:17:12 +0200
Subject: [PATCH 310/519] Finish implementation of course participant
 invitations

Fixes #250
---
 messages/uniworx/de.msg                       |   9 ++
 src/Foundation.hs                             |  14 ++-
 src/Handler/Course.hs                         | 103 +++++++++++++-----
 src/Utils/Frontend/Modal.hs                   |  17 ++-
 .../courseInvitationAlreadyRegistered.hamlet  |   5 +
 ...rseInvitationRegisteredWithoutField.hamlet |   5 +
 6 files changed, 126 insertions(+), 27 deletions(-)
 create mode 100644 templates/messages/courseInvitationAlreadyRegistered.hamlet
 create mode 100644 templates/messages/courseInvitationRegisteredWithoutField.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index f35f195af..a4762c0b5 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -745,6 +745,7 @@ MenuLogin: Login
 MenuLogout: Logout
 MenuCourseList: Kurse
 MenuCourseMembers: Kursteilnehmer
+MenuCourseAddMembers: Kursteilnehmer hinzufügen
 MenuCourseCommunication: Kursmitteilung
 MenuTermShow: Semester
 MenuSubmissionDelete: Abgabe löschen
@@ -860,6 +861,8 @@ CourseParticipantInviteExplanation: Sie wurden eingeladen, an einem Kurs teilzun
 CourseParticipantEnlistDirectly: bekannte Teilnehmer sofort als Teilnehmer eintragen
 CourseParticipantInviteField: einzuladende EMail Adressen
 
+CourseParticipantInvitationAccepted courseName@Text: Sie wurden als Teilnehmer für #{courseName} eingetragen
+
 
 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
@@ -951,3 +954,9 @@ HealthHTTPReachable: Cluster kann an der erwarteten URL über HTTP erreicht werd
 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
+
+CourseParticipantsInvited n@Int: #{tshow n} #{pluralDE n "Einladung" "Einladungen"} per E-Mail verschickt
+CourseParticipantsAlreadyRegistered n@Int: #{tshow n} Teilnehmer #{pluralDE n "ist" "sind"} bereits angemeldet
+CourseParticipantsRegisteredWithoutField n@Int: #{tshow n} Teilnehmer #{pluralDE n "wurde ohne assoziiertes Hauptfach" "wurden assoziierte Hauptfächer"} angemeldet, da #{pluralDE n "kein eindeutiges Hauptfach bestimmt werden konnte" "keine eindeutigen Hauptfächer bestimmt werden konnten"}
+CourseParticipantsRegistered n@Int: #{tshow n} Teilnehmer erfolgreich angemeldet
+CourseParticipantsRegisterHeading: Kursteilnehmer hinzufügen
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 9161ef86a..e71ac2611 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1248,7 +1248,7 @@ siteLayout' headingOverride widget = do
         applySystemMessages
         authTagPivots <- fromMaybe Set.empty <$> takeSessionJson SessionInactiveAuthTags
         forM_ authTagPivots $
-          \authTag -> addMessageWidget Info $ modal [whamlet|_{MsgUnauthorizedDisabledTag authTag}|] (Left $ SomeRoute (AuthPredsR, catMaybes [(toPathPiece GetReferer, ) . toPathPiece <$> mcurrentRoute]))
+          \authTag -> addMessageWidget Info $ msgModal [whamlet|_{MsgUnauthorizedDisabledTag authTag}|] (Left $ SomeRoute (AuthPredsR, catMaybes [(toPathPiece GetReferer, ) . toPathPiece <$> mcurrentRoute]))
         getMessages
 
   let highlight :: Route UniWorX -> Bool -- highlight last route in breadcrumbs, favorites taking priority
@@ -1417,6 +1417,8 @@ instance YesodBreadcrumbs UniWorX where
   --         (CourseR tid ssh csh CRegisterR) -- is POST only
   breadcrumb (CourseR tid ssh csh CEditR)     = return ("Editieren"  , Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh CUsersR)    = return ("Anmeldungen", Just $ CourseR tid ssh csh CShowR)
+  breadcrumb (CourseR tid ssh csh CAddUserR)  = return ("Kursteilnehmer hinzufügen", Just $ CourseR tid ssh csh CUsersR)
+  breadcrumb (CourseR tid ssh csh CInviteR)   = return ("Einladung", Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh (CUserR _)) = return ("Teilnehmer" , Just $ CourseR tid ssh csh CUsersR)
   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)
@@ -1955,6 +1957,16 @@ pageActions (CourseR tid ssh csh SheetListR) =
       , menuItemAccessCallback' = return True
       }
   ]
+pageActions (CourseR tid ssh csh CUsersR) =
+  [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuCourseAddMembers
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh CAddUserR
+      , menuItemModal = True
+      , menuItemAccessCallback' = return True
+      }
+  ]
 pageActions (CourseR tid ssh csh MaterialListR) =
   [ MenuItem
       { menuItemType  = PageActionPrime
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 9cdd21810..7091cb0b5 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -41,6 +41,11 @@ import Data.Aeson hiding (Result(..))
 
 import Text.Hamlet (ihamlet)
 
+import Control.Monad.Trans.Writer (WriterT, execWriterT)
+import Control.Monad.Except (MonadError(..))
+
+import Generics.Deriving.Monoid (memptydefault, mappenddefault)
+
 
 -- NOTE: Outdated way to use dbTable; see ProfileDataR Handler for a more recent method.
 type CourseTableData = DBRow (Entity Course, Int, Bool, Entity School)
@@ -704,7 +709,7 @@ lecturerInvitationConfig = InvitationConfig{..}
       itAuthority <- liftHandlerT requireAuthId
       return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
     invitationRestriction _ _ = return Authorized
-    invitationForm _ (InvDBDataLecturer mlType, _) = hoistAForm liftHandlerT $ toJunction <$> case mlType of
+    invitationForm _ (InvDBDataLecturer mlType, _) _ = hoistAForm liftHandlerT $ toJunction <$> case mlType of
       Nothing    -> areq    (selectField optionsFinite) lFs Nothing
       Just lType -> aforced (selectField optionsFinite) lFs lType
       where
@@ -1408,52 +1413,100 @@ participantInvitationConfig = InvitationConfig{..}
       getKeyBy404 $ TermSchoolCourseShort tid csh ssh
     invitationSubject     Course{..} _ = return . SomeMessage $ MsgMailSubjectParticipantInvitation courseTerm courseSchool courseShorthand
     invitationHeading     Course{..} _ = return . SomeMessage $ MsgCourseParticipantInviteHeading $ CI.original courseName
-    invitationExplanation _          _ = [ihamlet|_{SomeMessage MsgParticipantInviteExplanation}|]
+    invitationExplanation _          _ = [ihamlet|_{SomeMessage MsgCourseParticipantInviteExplanation}|]
     -- Keine besonderen Einschränkungen beim Einlösen der Token
     -- ACHTUNG: Mit einem Token könnten sich deshalb mehrere Benutzer anmelden!
     invitationTokenConfig _ _ = do
       itAuthority <- liftHandlerT requireAuthId
       return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
     invitationRestriction _ _ = return Authorized
-    invitationForm Course{..} _ uid = wFormToAForm $ do
+    invitationForm Course{..} _ uid = hoistAForm lift . wFormToAForm $ do
       now <- liftIO getCurrentTime
       studyFeatures <- wreq (studyFeaturesPrimaryFieldFor [ ] (Just uid))
           (fslI MsgCourseStudyFeature & setTooltip  MsgCourseStudyFeatureTooltip) Nothing
       return $ JunctionParticipant <$> pure now <*> studyFeatures
-    invitationSuccessMsg Course{..} _ =
-      return . SomeMessage $ MsgParticipantInvitationAccepted courseTerm courseSchool courseShorthand
+    invitationSuccessMsg Course{..} _ =
+      return . SomeMessage $ MsgCourseParticipantInvitationAccepted (CI.original courseName)
     invitationUltDest Course{..} _ = return . SomeRoute $ CourseR courseTerm courseSchool courseShorthand CShowR
 
+data AddRecipientsResult = AddRecipientsResult
+  { aurAlreadyRegistered
+  , aurNoUniquePrimaryField
+  , aurSuccess              :: [UserEmail]
+  } deriving (Read, Show, Generic, Typeable)
+
+instance Monoid AddRecipientsResult where
+  mempty = memptydefault
+  mappend = mappenddefault
+
 getCAddUserR, postCAddUserR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCAddUserR = postCAddUserR
 postCAddUserR tid ssh csh = do
-    cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-    ((usersToEnlist,formWgt),formEcnoding) <- runFormPost . renderWForm FormStandard $ do
-      enlist <- wreq checkBoxField  (fslI MsgCourseParticipantEnlistDirectly) (Just False)
-      areq (multiUserField (fromMaybe False $ formResultToMaybe enlist)  Nothing)
+    cid <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+    ((usersToEnlist,formWgt),formEncoding) <- runFormPost . renderWForm FormStandard $ do
+      enlist <- wreq checkBoxField (fslI MsgCourseParticipantEnlistDirectly) (Just False)
+      wreq (multiUserField (maybe True not $ formResultToMaybe enlist) Nothing)
               (fslI MsgCourseParticipantInviteField) Nothing
-    formResult usersToEnlist processUsers
+
+    formResultModal usersToEnlist (CourseR tid ssh csh CUsersR) $ processUsers cid
+
+    let heading = prependCourseTitle tid ssh csh MsgCourseParticipantsRegisterHeading
+
+    siteLayoutMsg heading $ do
+      setTitleI heading
+      wrapForm formWgt def
+        { formEncoding
+        , formAction = Just . SomeRoute $ CourseR tid ssh csh CAddUserR
+        }
   where
-    processUsers :: Set (Either UserEmail UserId) -> Handler ()
-    processUsers users = do
-      error "TODO"
-      {-}
-      let (emails,uids) = partionEithers $ Set.toList users
-      runDB $ do
+    processUsers :: CourseId -> Set (Either UserEmail UserId) -> WriterT [Message] Handler ()
+    processUsers cid users = do
+      let (emails,uids) = partitionEithers $ Set.toList users
+      AddRecipientsResult alreadyRegistered registeredNoField registeredOneField <- lift . runDBJobs $ do
         -- send Invitation eMails to unkown users
         sinkInvitationsF participantInvitationConfig [(mail,cid,(InvDBDataParticipant,InvTokenDataParticipant)) | mail <- emails]
         -- register known users
-        (alreadyRegistered,registeredNoField,registeredOneField) <- execWriterT $ mapM registerUser uids
-      let statusMsg = modal _linkText (Right _widgetmessage)
-          statusTy  = Info -- Success -- TODO
-      addMessageWidget statusTy statusMsg
-      redirect $ CourseR tid ssh csh CUsersR
+        execWriterT $ mapM (registerUser cid) uids
 
-    registerUser :: UserId -> WriterT ([UserEmail],[UserEmail],[UserEmail]) (YesodDB UniWorX) ()
-    registerUser uid = do
+      when (not $ null emails) $
+        tell . pure <=< messageI Success . MsgCourseParticipantsInvited $ length emails
 
-      tell ([],[],[])
-      -}
+      when (not $ null alreadyRegistered) $ do
+        let modalTrigger = [whamlet|_{MsgCourseParticipantsAlreadyRegistered (length alreadyRegistered)}|]
+            modalContent = $(widgetFile "messages/courseInvitationAlreadyRegistered")
+        tell . pure <=< messageWidget Info $ msgModal modalTrigger (Right modalContent)
+
+      when (not $ null registeredNoField) $ do
+        let modalTrigger = [whamlet|_{MsgCourseParticipantsRegisteredWithoutField (length registeredNoField)}|]
+            modalContent = $(widgetFile "messages/courseInvitationRegisteredWithoutField")
+        tell . pure <=< messageWidget Warning $ msgModal modalTrigger (Right modalContent)
+
+      when (not $ null registeredOneField) $
+        tell . pure <=< messageI Success . MsgCourseParticipantsRegistered $ length registeredOneField
+
+    registerUser :: CourseId -> UserId -> WriterT AddRecipientsResult (YesodJobDB UniWorX) ()
+    registerUser cid uid = exceptT tell tell $ do
+      User{..} <- lift . lift $ getJust uid
+
+      whenM (lift . lift . existsBy $ UniqueParticipant uid cid) $
+        throwError $ mempty { aurAlreadyRegistered = pure userEmail }
+
+      features <- lift . lift $ selectKeysList [ StudyFeaturesUser ==. uid, StudyFeaturesValid ==. True, StudyFeaturesType ==. FieldPrimary ] []
+
+      let courseParticipantField
+            | [f] <- features = Just f
+            | otherwise       = Nothing
+
+      courseParticipantRegistration <- liftIO getCurrentTime
+      void . lift . lift . insert $ CourseParticipant
+        { courseParticipantCourse = cid
+        , courseParticipantUser = uid
+        , ..
+        }
+
+      return $ case courseParticipantField of
+        Nothing -> mempty { aurNoUniquePrimaryField = pure userEmail }
+        Just _  -> mempty { aurSuccess              = pure userEmail }
 
 
 getCInviteR, postCInviteR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
diff --git a/src/Utils/Frontend/Modal.hs b/src/Utils/Frontend/Modal.hs
index 79142ae4b..dd83497ea 100644
--- a/src/Utils/Frontend/Modal.hs
+++ b/src/Utils/Frontend/Modal.hs
@@ -1,7 +1,7 @@
 module Utils.Frontend.Modal
   ( Modal(..)
   , customModal
-  , modal
+  , modal, msgModal
   ) where
 
 import ClassyPrelude.Yesod
@@ -11,6 +11,9 @@ import Utils.Route
 
 import Settings (widgetFile)
 
+import Control.Monad.Random.Class (MonadRandom(..))
+import qualified Data.UUID as UUID
+
 
 data Modal site = Modal
   { modalTriggerId
@@ -37,3 +40,15 @@ modal modalTrigger' modalContent = customModal Modal{..}
     modalTriggerId = Nothing
     modalId = Nothing
     modalTrigger mRoute triggerId = $(widgetFile "widgets/modal/trigger")
+
+
+-- | Variant of `modal` for use in messages (uses a different id generator to avoid collisions)
+msgModal :: WidgetT site IO ()
+         -> Either (SomeRoute site) (WidgetT site IO ())
+         -> WidgetT site IO ()
+msgModal modalTrigger' modalContent = do
+  modalTriggerId <- Just . UUID.toText <$> liftIO getRandom
+  modalId <- Just . UUID.toText <$> liftIO getRandom
+  customModal Modal{..}
+  where
+    modalTrigger mRoute triggerId = $(widgetFile "widgets/modal/trigger")
diff --git a/templates/messages/courseInvitationAlreadyRegistered.hamlet b/templates/messages/courseInvitationAlreadyRegistered.hamlet
new file mode 100644
index 000000000..e6102976b
--- /dev/null
+++ b/templates/messages/courseInvitationAlreadyRegistered.hamlet
@@ -0,0 +1,5 @@
+<h2>
+  _{MsgCourseParticipantsAlreadyRegistered (length alreadyRegistered)}
+<ul>
+  $forall email <- alreadyRegistered
+    <li style="font-family: monospace">#{email}
diff --git a/templates/messages/courseInvitationRegisteredWithoutField.hamlet b/templates/messages/courseInvitationRegisteredWithoutField.hamlet
new file mode 100644
index 000000000..e623aab3b
--- /dev/null
+++ b/templates/messages/courseInvitationRegisteredWithoutField.hamlet
@@ -0,0 +1,5 @@
+<h2>
+  _{MsgCourseParticipantsRegisteredWithoutField (length registeredNoField)}
+<ul>
+  $forall email <- registeredNoField
+    <li style="font-family: monospace">#{email}

From 059e735d431777f9f86345366b3f08402d029605 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 13 May 2019 14:23:49 +0200
Subject: [PATCH 311/519] Use new version of systemd

---
 stack.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/stack.yaml b/stack.yaml
index b6c31fd66..7fadc6e4e 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -21,10 +21,6 @@ packages:
       git: https://github.com/pngwjpgh/memcached-binary.git
       commit: b5461747e7be226d3b67daebc3c9aefe8a4490ad
     extra-dep: true
-  - location:
-      git: https://github.com/pngwjpgh/systemd.git
-      commit: 53d7ce6bd241ed4bedd25f1ae9383fd1856f9b77
-    extra-dep: true
 
 extra-deps:
   - colonnade-1.2.0
@@ -53,4 +49,6 @@ extra-deps:
   - quickcheck-classes-0.4.14
   - semirings-0.2.1.1
 
+  - systemd-1.2.0
+
 resolver: lts-10.5

From 4a17a33b85d7e62c2cb9e43cfefcb474fc8f24b1 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 13 May 2019 14:25:08 +0200
Subject: [PATCH 312/519] Bump ChangeLog

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

diff --git a/ChangeLog.md b/ChangeLog.md
index e45c75736..9f07bd783 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+  * Version 13.05.2019
+  
+    Kursverwalter können Teilnehmer hinzufügen
+
   * Version 10.05.2019
   
     Besseres Interface zum Einstellen von Abgebenden

From 0cc1d7689f18f00b91e73b930a17b227b6f0a71e Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Mon, 13 May 2019 15:34:45 +0200
Subject: [PATCH 313/519] UX Hilfe Online Korrektur

---
 messages/uniworx/de.msg            | 3 +++
 src/Handler/Corrections.hs         | 5 +++--
 templates/submission-assign.hamlet | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 2f846eadd..a243e5297 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -7,6 +7,7 @@ BtnRegister: Anmelden
 BtnDeregister: Abmelden
 BtnHijack: Sitzung übernehmen
 BtnSave: Speichern
+PressSaveToSave: Änderungen werden erst durch Drücken des Knopfes "Speichern" gespeichert.
 BtnCandidatesInfer: Studienfachzuordnung automatisch lernen
 BtnCandidatesDeleteConflicts: Konflikte löschen
 BtnCandidatesDeleteAll: Alle Beobachtungen löschen
@@ -16,6 +17,8 @@ BtnLecInvDecline: Ablehnen
 BtnCorrInvAccept: Annehmen
 BtnCorrInvDecline: Ablehnen
 
+
+
 Aborted: Abgebrochen
 Remarks: Hinweise
 Registered: Angemeldet
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 01af2b880..0cf975867 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -617,7 +617,7 @@ postCorrectionR tid ssh csh shn cid = do
         <$> areq checkBoxField (fslI MsgRatingDone) (Just $ submissionRatingDone Submission{..})
         <*> pointsForm
         <*> (((\t -> t <$ guard (not $ null t)) =<<) . fmap (Text.strip . unTextarea) <$> aopt textareaField (fslI MsgRatingComment) (Just $ Textarea <$> submissionRatingComment))
-      let corrForm = wrapForm corrForm' def
+      let corrForm = wrapForm' BtnSave corrForm' def
             { formAction = Just . SomeRoute $ CSubmissionR tid ssh csh shn cid CorrectionR
             , formEncoding = corrEncoding
             }
@@ -948,9 +948,10 @@ postSAssignR tid ssh csh shn cID = do
                   ]
       addMessageI Success MsgCorrectorUpdated
     redirect actionUrl
-  let corrForm = wrapForm corrForm' def
+  let corrForm = wrapForm' BtnSave corrForm' def
         { formAction = Just $ SomeRoute actionUrl
         , formEncoding = corrEncoding
+        , formSubmit = FormDualSubmit
         }
   defaultLayout $ do
       setTitleI MsgCorrectorAssignTitle
diff --git a/templates/submission-assign.hamlet b/templates/submission-assign.hamlet
index 9b3911766..2caf92979 100644
--- a/templates/submission-assign.hamlet
+++ b/templates/submission-assign.hamlet
@@ -1 +1,3 @@
+<p>
+  _{MsgPressSaveToSave}
 ^{corrForm}

From c17588912f6714970432b05371dee629ce79d526 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 13 May 2019 15:48:38 +0200
Subject: [PATCH 314/519] Fix data leak in CCommR

---
 src/Handler/Course.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 5d2762eb2..dabc8c9d3 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -1408,6 +1408,7 @@ postCCommR tid ssh csh = 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
+                   E.&&. user E.^. UserId E.==. corrector E.^. SheetCorrectorUser
             return user
         )
       , ( RGCourseTutors
@@ -1415,6 +1416,7 @@ postCCommR tid ssh csh = 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
+                   E.&&. user E.^. UserId E.==. tutor E.^. TutorUser
             return user
         )
       ]

From 028c0eab3230fdedef91b8e1c730fae8cd3f185a Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Mon, 13 May 2019 16:29:00 +0200
Subject: [PATCH 315/519] Attempt filter UI subs

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

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 0cf975867..520f21c6d 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -196,7 +196,7 @@ colPointsField = sortable (Just "rating") (i18nCell MsgColumnRatingPoints) $ for
   )
 
 colCommentField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData)))
-colCommentField = sortable Nothing (i18nCell MsgRatingComment) $ formCell id
+colCommentField = sortable (Just "comment") (i18nCell MsgRatingComment) $ formCell id
   (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId)
   (\DBRow{ dbrOutput=(Entity _ Submission{..}, _, _, _, _) } mkUnique -> over (_1.mapped) ((_3 .~) . assertM (not . null) . fmap (Text.strip . unTextarea)) . over _2 fvInput <$> mopt textareaField (fsUniq mkUnique "comment") (Just $ Textarea <$> submissionRatingComment))
 
@@ -268,6 +268,9 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
               E.limit 1
               return (user E.^. UserSurname)
         )
+      , ( "comment" -- sorting by comment specifically requested by correctors to easily see submissions to be done
+        , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> submission E.^. SubmissionRatingComment
+        )
       ]
     , dbtFilter    = Map.fromList
       [ ( "term"
@@ -515,7 +518,7 @@ postCorrectionsR = do
         , prismAForm (singletonFilter "term"   ) mPrev $ aopt (lift `hoistField` selectField termOptions)   (fslI MsgTerm)
         , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` selectField schoolOptions) (fslI MsgCourseSchool)
         , Map.singleton "sheet-search" . maybeToList <$> aopt (lift `hoistField` searchField False)         (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
-        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField                        (fslI MsgRatingTime)
+        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField             (fslI MsgRatingTime)
         ]
       courseOptions = runDB $ do
         courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand)
@@ -531,6 +534,7 @@ postCorrectionsR = do
         & restrictFilter (\name _ -> name /= "corrector") -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information
         & restrictSorting (\name _ -> name /= "corrector")
         & defaultSorting [SortAscBy "israted", SortDescBy "ratingTime", SortAscBy "assignedtime" ]
+        & defaultFilter (Map.fromList [("israted",["no","Nein","No","False","Just False"]), ("sheet-search",["foo"])]) -- this does not work. "no" is the form value that we wanted
   correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
     [ downloadAction
     ]
@@ -879,8 +883,8 @@ postCorrectionsGradeR = do
   uid <- requireAuthId
   let whereClause = ratedBy uid
       displayColumns = mconcat -- should match getSSubsR for consistent UX
-        [ dbRow
-        , colSchool
+        [ -- dbRow,
+          colSchool
         , colTerm
         , colCourse
         , colSheet

From ae96c6269c4da406eb267d51ef4b896916a04a12 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Mon, 13 May 2019 17:30:49 +0200
Subject: [PATCH 316/519] Surpress MsgMassInputTip for common case of single
 submission sheets

---
 messages/uniworx/de.msg   |  4 +++-
 src/Handler/Submission.hs | 32 ++++++++++++++++++--------------
 src/Handler/Utils/Form.hs | 27 ++++++++++++++++++++-------
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index a243e5297..c20d2af83 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -8,6 +8,7 @@ BtnDeregister: Abmelden
 BtnHijack: Sitzung übernehmen
 BtnSave: Speichern
 PressSaveToSave: Änderungen werden erst durch Drücken des Knopfes "Speichern" gespeichert.
+BtnHandIn: Abgeben
 BtnCandidatesInfer: Studienfachzuordnung automatisch lernen
 BtnCandidatesDeleteConflicts: Konflikte löschen
 BtnCandidatesDeleteAll: Alle Beobachtungen löschen
@@ -203,6 +204,7 @@ SubmissionAlreadyExists: Sie haben bereits eine Abgabe zu diesem Übungsblatt.
 SubmissionEditHead tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{display tid}-#{display ssh}-#{csh} #{sheetName}: Abgabe editieren/anlegen
 CorrectionHead     tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName cid@CryptoFileNameSubmission: #{display tid}-#{display ssh}-#{csh} #{sheetName}: Korrektur
 SubmissionMembers: Abgebende
+SubmissionMember: Abgebende(r)
 SubmissionArchive: Zip-Archiv der Abgabedatei(en)
 SubmissionFile: Datei zur Abgabe
 SubmissionFiles: Abgegebene Dateien
@@ -957,7 +959,7 @@ 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.
+MassInputTip: Es können mehrere Werte angegeben werden. Werte müssen mit + zur Liste hinzugefügt werden und können mit - wieder entfernt werden. Alle Änderungen müssen noch durch Drücken des Forumular-Knopfes bestätigt werden.
 
 HealthReport: Instanz-Zustand
 InstanceIdentification: Instanz-Identifikation
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 15c228664..c843f7e1e 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -162,14 +162,23 @@ makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = ident
     addField :: (MonadHandler m, HandlerSite m ~ UniWorX) => Bool -> Field m (Set (Either UserEmail UserId))
     addField isAdmin = multiUserField True $ courseUsers <$ guard isAdmin
 
-    addFieldSettings, submittorSettings :: FieldSettings UniWorX
-    addFieldSettings = fslI MsgSubmissionMembers
+    addFieldSettings, submittorSettings, singleSubSettings :: FieldSettings UniWorX
+    addFieldSettings  = fslI MsgSubmissionMembers
     submittorSettings = fslI MsgSubmissionMembers & setTooltip MsgMassInputTip
+    singleSubSettings = fslI MsgSubmissionMember
+
+    maxSize | Arbitrary{..} <- grouping = Just maxParticipants
+            | otherwise = Nothing
+    mayEdit = is _Arbitrary grouping
+
+    submittorSettings'
+      | maxSize > Just 1 = submittorSettings
+      | otherwise        = singleSubSettings
 
     miButtonAction' :: forall p. PathPiece p => Maybe (Route UniWorX) -> p -> Maybe (SomeRoute UniWorX)
     miButtonAction' mCurrent frag = mCurrent <&> \current -> SomeRoute (current :#: frag)
 
-    submittorsForm 
+    submittorsForm
       | isLecturer = do-- Form is being used by lecturer; allow Everything™
         let
           miAdd :: (Text -> Text) -> FieldView UniWorX -> Form ([Either UserEmail UserId] -> FormResult [Either UserEmail UserId])
@@ -183,7 +192,7 @@ makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = ident
                   | otherwise
                     -> FormSuccess $ Set.toList newData
             return (addRes', $(widgetFile "widgets/massinput/submissionUsers/add"))
-        
+
         mRoute <- getCurrentRoute
         submittors <- massInputAccumW miAdd (miCell' mempty) (miButtonAction' mRoute) miLayout miIdent submittorSettings True (Just $ Set.toList prefillUsers)
         MsgRenderer mr <- getMsgRenderer
@@ -193,13 +202,8 @@ makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = ident
       | otherwise = do
         uid <- liftHandlerT requireAuthId
         mRoute <- getCurrentRoute
-        
-        let
-          maxSize
-            | Arbitrary{..} <- grouping = Just maxParticipants
-            | otherwise = Nothing
-          mayEdit = is _Arbitrary grouping
 
+        let
           miAdd :: ListPosition
                 -> Natural
                 -> (Text -> Text)
@@ -231,7 +235,7 @@ makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = ident
             guard $ Map.size dat > 1
 
             -- User may drop from submission only if it already exists; no directly creating submissions for other people
-            guard $ maybe True (/= Right uid) (dat !? delPos) || isJust msmid 
+            guard $ maybe True (/= Right uid) (dat !? delPos) || isJust msmid
 
             miDeleteList dat delPos
 
@@ -248,8 +252,8 @@ makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = ident
 
           postProcess :: Map ListPosition (Either UserEmail UserId, ()) -> Set (Either UserEmail UserId)
           postProcess = setOf $ folded . _1
-        fmap postProcess <$> massInputW MassInput{..} submittorSettings True (Just . Map.fromList . zip [0..] . map (, ()) $ Set.toList prefillUsers)
-        
+        fmap postProcess <$> massInputW MassInput{..} submittorSettings' True (Just . Map.fromList . zip [0..] . map (, ()) $ Set.toList prefillUsers)
+
 
 getSubmissionNewR, postSubmissionNewR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSubmissionNewR = postSubmissionNewR
@@ -335,7 +339,7 @@ submissionHelper tid ssh csh shn mcid = do
                 | otherwise      =  (mempty   , Set.singleton $ Right userID)
 
           invites <- sourceInvitationsList smid <&> Set.fromList . map (\(email, InvDBDataSubmissionUser) -> Left email)
-          
+
           return . over _2 (Set.union invites) $ foldMap breakUserFromBuddies submittors
 
         lastEdits <- do
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index aa3828422..92fbccf72 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -75,14 +75,27 @@ instance Finite ButtonSave
 saveButton :: (Button (HandlerSite m) ButtonSave, MonadHandler m) => AForm m ()
 saveButton = combinedButtonFieldF_ (Proxy @ButtonSave) ""
 
-
-
 nullaryPathPiece ''ButtonSave $ camelToPathPiece' 1
 
 embedRenderMessage ''UniWorX ''ButtonSave id
 instance Button UniWorX ButtonSave where
   btnClasses BtnSave = [BCIsButton, BCPrimary]
 
+
+
+data ButtonHandIn = BtnHandIn
+  deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
+instance Universe ButtonHandIn
+instance Finite ButtonHandIn
+
+nullaryPathPiece ''ButtonHandIn $ camelToPathPiece' 1
+
+embedRenderMessage ''UniWorX ''ButtonHandIn id
+instance Button UniWorX ButtonHandIn where
+  btnClasses BtnHandIn = [BCIsButton, BCPrimary]
+
+
+
 data ButtonRegister = BtnRegister | BtnDeregister
   deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
 instance Universe ButtonRegister
@@ -190,7 +203,7 @@ multiActionM :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq
              -> (Html -> MForm Handler (FormResult a, Widget))
 multiActionM acts fSettings defAction = renderAForm FormStandard $ multiActionA acts fSettings defAction
 
-  
+
 ------------
 -- Fields --
 ------------
@@ -549,7 +562,7 @@ utcTimeField = checkMMap (return . localTimeToUTC') utcToLocalTime localTimeFiel
       LTUUnique{_ltuResult} -> Right _ltuResult
       LTUNone{}             -> Left MsgIllDefinedUTCTime
       LTUAmbiguous{}        -> Left MsgAmbiguousUTCTime
-      
+
 
 langField :: Bool -- ^ Only allow values from `appLanguages`
           -> Field (HandlerT UniWorX IO) Lang
@@ -703,7 +716,7 @@ multiUserField onlySuggested suggestions = Field{..}
     lookupExpr
       | onlySuggested = suggestions
       | otherwise     = Just $ E.from return
-    
+
     fieldEnctype = UrlEncoded
     fieldView theId name attrs val isReq = do
       val' <- case val of
@@ -723,7 +736,7 @@ multiUserField onlySuggested suggestions = Field{..}
           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}>
@@ -739,7 +752,7 @@ multiUserField onlySuggested suggestions = Field{..}
             $forall email <- suggestedEmails
               <option value=#{email}>
         |]
-    fieldParse (all Text.null -> True) _ = return $ Right Nothing 
+    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)

From 0988ac0dd8a1474540c7725d0131485c244d76bc Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Mon, 13 May 2019 17:39:26 +0200
Subject: [PATCH 317/519] Rename HandIn Button. Fixes #340

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

diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index c843f7e1e..bdad11b37 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -355,7 +355,7 @@ submissionHelper tid ssh csh shn mcid = do
             forM raw $ \(E.Value name, E.Value time) -> (name, ) <$> formatTime SelFormatDateTime time
         return (csheet,buddies,lastEdits,maySubmit,isLecturer,isOwner)
   ((res,formWidget'), formEnctype) <- runFormPost . makeSubmissionForm sheetCourse msmid (fromMaybe (Upload True) . submissionModeUser $ sheetSubmissionMode) sheetGrouping isLecturer $ bool id (Set.insert $ Right uid) isOwner buddies
-  let formWidget = wrapForm formWidget' def
+  let formWidget = wrapForm' BtnHandIn formWidget' def
         { formAction = Just $ SomeRoute actionUrl
         , formEncoding = formEnctype
         }

From 92ec39143d10612ab5ecc885ad515dd56ffa032f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 13 May 2019 20:39:01 +0200
Subject: [PATCH 318/519] (Principal) support for zero-downtime restart

---
 src/Application.hs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Application.hs b/src/Application.hs
index 675c11d92..b39657de7 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -78,10 +78,13 @@ 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 System.Posix.Signals (SignalInfo(..), installHandler, sigTERM)
+import qualified System.Posix.Signals as Signals (Handler(..))
 
 import Control.Monad.Trans.State (execStateT)
 
 import Network (socketPort)
+import qualified Network.Socket as Socket (close)
 
 -- Import all relevant handler modules here.
 -- (HPack takes care to add new modules to our cabal file nowadays.)
@@ -346,7 +349,9 @@ warpSettings foundation = defaultSettings
             $(qLocation >>= liftLoc)
             "yesod"
             LevelError
-            (toLogStr $ "Exception from Warp: " ++ show e))
+            (toLogStr $ "Exception from Warp: " ++ show e)
+                     )
+                           
 
 getAppDevSettings, getAppSettings :: MonadIO m => m AppSettings
 getAppDevSettings = liftIO $ adjustSettings =<< loadYamlSettings [configSettingsYml] [configSettingsYmlValue] useEnv
@@ -405,6 +410,15 @@ appMain = runResourceT $ do
 
       $logDebugS "bind" . tshow =<< mapM (liftIO . socketPort) sockets
 
+      mainThreadId <- myThreadId
+      liftIO . void . flip (installHandler sigTERM) Nothing . Signals.CatchInfo $ \SignalInfo{..} -> runAppLoggingT foundation $ do
+        $logInfoS "shutdown" [st|Received signal #{tshow siginfoSignal}|]
+        didStore <- runMaybeT . forM_ sockets $ MaybeT . liftIO . Systemd.storeFd
+        case didStore of
+          Just () -> $logInfoS "shutdown" "Stored all bound sockets for restart"
+          Nothing -> forM_ sockets $ liftIO . Socket.close
+        liftIO . throwTo mainThreadId . ExitFailure $ 0b10000000 + fromIntegral siginfoSignal
+
       let runWarp socket = runSettingsSocket (warpSettings foundation) socket app
       case sockets of
         []  -> $logErrorS "bind" "No sockets to listen on"

From 0012e2a19c5e26389820bee0ea528518a3ab78d3 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 14 May 2019 12:31:15 +0200
Subject: [PATCH 319/519] No header for simple select box. Fixes #363

---
 src/Handler/Utils/Table/Pagination.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 88e08be1f..15a2952f5 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -962,7 +962,8 @@ dbSelect :: forall x h r i a. (Headedness h, Ord i, PathPiece i, Monoid' x)
          -> Setter' a Bool
          -> (DBRow r -> MForm (HandlerT UniWorX IO) i)
          -> Colonnade h (DBRow r) (DBCell (MForm (HandlerT UniWorX IO)) x)
-dbSelect resLens selLens genIndex = Colonnade.singleton (headednessPure $ i18nCell MsgSelectColumn) $ formCell resLens genIndex genForm
+-- dbSelect resLens selLens genIndex = Colonnade.singleton (headednessPure $ i18nCell MsgSelectColumn) $ formCell resLens genIndex genForm
+dbSelect resLens selLens genIndex = Colonnade.singleton (headednessPure $ mempty) $ formCell resLens genIndex genForm
   where
     genForm _ mkUnique = do
       (selResult, selWidget) <- mreq checkBoxField (fsUniq mkUnique "select") (Just False)

From f52b831f38cb408a973f48693e9eb3bc7717fd3e Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 14 May 2019 22:58:49 +0200
Subject: [PATCH 320/519] =?UTF-8?q?Fixes=20#368.=20Dauerte=20so=20lange=20?=
 =?UTF-8?q?wegen=202x=20Hlint=20Durchl=C3=A4ufen=20=20:(?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 messages/uniworx/de.msg |  1 -
 src/Foundation.hs       | 10 ++++++++++
 src/Handler/Course.hs   |  6 +++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index c20d2af83..115b31552 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -84,7 +84,6 @@ CourseTutorial: Tutorium
 CourseStudyFeatureTooltip: Korrekte Angabe kann Notenweiterleitungen beschleunigen
 CourseSecretWrong: Falsches Kennwort
 CourseSecret: Zugangspasswort
-CourseNewOk        tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} wurde erfolgreich erstellt.
 CourseEditOk       tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} wurde erfolgreich geändert.
 CourseNewDupShort  tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} konnte nicht erstellt werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester.
 CourseEditDupShort tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} konnte nicht geändert werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester.
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 65f897acb..11c865ef9 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1815,6 +1815,16 @@ pageActions (TermCourseListR tid) =
       , menuItemAccessCallback' = return True
       }
   ]
+pageActions (TermSchoolCourseListR _tid _ssh) =
+  [ MenuItem
+      { menuItemType = PageActionPrime
+      , menuItemLabel = MsgMenuCourseNew
+      , menuItemIcon  = Just "book"
+      , menuItemRoute = SomeRoute CourseNewR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
 pageActions (CourseListR) =
   [ MenuItem
       { menuItemType = PageActionPrime
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index e75e27698..594e307ce 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -232,7 +232,7 @@ getTermCurrentR = do
   termIds  <- runDB $ selectKeysList [TermActive ==. True] [Desc TermName]
   case fromNullable termIds of
     Nothing -> notFound
-    (Just (maximum -> tid)) -> -- getTermCourseListR tid
+    (Just (maximum -> tid)) ->
         redirect $ TermCourseListR tid -- redirect avoids problematic breadcrumbs, headings, etc.
 
 getTermSchoolCourseListR :: TermId -> SchoolId -> Handler Html
@@ -614,8 +614,8 @@ courseEditHandler miButtonAction mbCourseForm = do
             return insertOkay
           case insertOkay of
             Just _ -> do
-              addMessageI Info $ MsgCourseNewOk tid ssh csh
-              redirect $ TermCourseListR tid
+              -- addMessageI Info $ MsgCourseNewOk tid ssh csh
+              redirect $ CourseR tid ssh csh CShowR
             Nothing ->
               addMessageI Warning $ MsgCourseNewDupShort tid ssh csh
 

From 48f9410fcac80a8633528589dd7a2c0b81113254 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 14 May 2019 23:17:34 +0200
Subject: [PATCH 321/519] Fix typo

---
 src/Handler/Tutorial.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 6566a9cef..534c7d1c1 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -66,7 +66,7 @@ getCTutorialListR tid ssh csh = do
           , 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-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
@@ -83,7 +83,7 @@ getCTutorialListR tid ssh csh = do
             )
           , ("capacity", SortColumn $ \tutorial -> tutorial E.^. TutorialCapacity )
           , ("room", SortColumn $ \tutorial -> tutorial E.^. TutorialRoom )
-          , ("reg-grep", SortColumn $ \tutorial -> tutorial E.^. TutorialRegGroup )
+          , ("register-group", 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 )

From 008db4f56c58599b7b9767bd418be92d31a91d23 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 15 May 2019 09:39:06 +0200
Subject: [PATCH 322/519] Tooltip course invitation

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

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 115b31552..4fb54c59b 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -870,8 +870,8 @@ CourseLecInviteExplanation: Sie wurden eingeladen, Verwalter für einen Kurs zu
 
 CourseParticipantInviteHeading courseName@Text: Einladung zum Kursteilnahmer für #{courseName}
 CourseParticipantInviteExplanation: Sie wurden eingeladen, an einem Kurs teilzunehmen.
-CourseParticipantEnlistDirectly: bekannte Teilnehmer sofort als Teilnehmer eintragen
-CourseParticipantInviteField: einzuladende EMail Adressen
+CourseParticipantEnlistDirectly: Bekannte Teilnehmer sofort als Teilnehmer eintragen
+CourseParticipantInviteField: Einzuladende EMail Adressen
 
 CourseParticipantInvitationAccepted courseName@Text: Sie wurden als Teilnehmer für #{courseName} eingetragen
 
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index c294b0b07..0c8b386c5 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -534,7 +534,7 @@ postCorrectionsR = do
         & restrictFilter (\name _ -> name /= "corrector") -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information
         & restrictSorting (\name _ -> name /= "corrector")
         & defaultSorting [SortAscBy "israted", SortDescBy "ratingTime", SortAscBy "assignedtime" ]
-        & defaultFilter (Map.fromList [("israted",["no","Nein","No","False","Just False"]), ("sheet-search",["foo"])]) -- this does not work. "no" is the form value that we wanted
+        & defaultFilter (Map.fromList [("israted",["no"]), ("sheet-search",["foo"])]) -- this does not work. "no" is the form value that we wanted
   correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
     [ downloadAction
     ]
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 594e307ce..a274dbd92 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -1511,7 +1511,7 @@ postCAddUserR tid ssh csh = do
     ((usersToEnlist,formWgt),formEncoding) <- runFormPost . renderWForm FormStandard $ do
       enlist <- wreq checkBoxField (fslI MsgCourseParticipantEnlistDirectly) (Just False)
       wreq (multiUserField (maybe True not $ formResultToMaybe enlist) Nothing)
-              (fslI MsgCourseParticipantInviteField) Nothing
+              (fslI MsgCourseParticipantInviteField & setTooltip MsgMultiEmailFieldTip) Nothing
 
     formResultModal usersToEnlist (CourseR tid ssh csh CUsersR) $ processUsers cid
 

From db915f5736816fcc831a8516774dc2f402945a4d Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 15 May 2019 09:49:42 +0200
Subject: [PATCH 323/519] Default Filter corrections inactivated, depends on
 issue #371

---
 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 0c8b386c5..15646baea 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -534,7 +534,7 @@ postCorrectionsR = do
         & restrictFilter (\name _ -> name /= "corrector") -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information
         & restrictSorting (\name _ -> name /= "corrector")
         & defaultSorting [SortAscBy "israted", SortDescBy "ratingTime", SortAscBy "assignedtime" ]
-        & defaultFilter (Map.fromList [("israted",["no"]), ("sheet-search",["foo"])]) -- this does not work. "no" is the form value that we wanted
+        -- & defaultFilter (Map.fromList [("israted",[toPathPiece False])]) -- DEPENDS ON ISSUE #371 UNCOMMENT THEN
   correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
     [ downloadAction
     ]

From 7cda3e9f2edf0559e814dd96392d20fe36aa0828 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 15 May 2019 12:54:23 +0200
Subject: [PATCH 324/519] Towards #364 for task 1

---
 messages/uniworx/de.msg            |  4 +++-
 package.yaml                       |  1 +
 routes                             |  9 +++++----
 src/Database/Esqueleto/Utils/TH.hs | 11 +++++++----
 src/Foundation.hs                  |  8 ++++++++
 src/Handler/Corrections.hs         |  2 +-
 src/Handler/Submission.hs          | 13 +++++++++++++
 src/Handler/Utils/Submission.hs    | 30 ++++++++++++++++++++++++------
 src/Utils/Sheet.hs                 |  3 +--
 templates/i18n/README_i18n.txt     |  6 ++++++
 10 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 templates/i18n/README_i18n.txt

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 4fb54c59b..05b9b6579 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -210,6 +210,7 @@ SubmissionFiles: Abgegebene Dateien
 SubmissionAlreadyExistsFor email@UserEmail: #{email} hat bereits eine Abgabe zu diesem Übungsblatt.
 SubmissionUsersEmpty: Es kann keine Abgabe ohne Abgebende erstellt werden
 SubmissionUserAlreadyAdded: Dieser Nutzer ist bereits als Mitabgebende(r) eingetragen
+NoOpenSubmissions: Keine unkorrigierten Abgaben vorhanden
 
 SubmissionsDeleteQuestion n@Int: Wollen Sie #{pluralDE n "die unten aufgeführte Abgabe" "die unten aufgeführten Abgaben"} wirklich löschen?
 SubmissionsDeleted n@Int: #{pluralDE n "Abgabe gelöscht" "Abgaben gelöscht"}
@@ -793,8 +794,9 @@ MenuSheetEdit: Übungsblatt editieren
 MenuSheetDelete: Übungsblatt löschen
 MenuSheetClone:  Als neues Übungsblatt klonen
 MenuCorrectionsUpload: Korrekturen hochladen
+MenuCorrectionsDownload: Abgaben herunterladen
 MenuCorrectionsCreate: Abgaben registrieren
-MenuCorrectionsGrade: Abgaben bewerten
+MenuCorrectionsGrade: Abgaben online korrigieren
 MenuAuthPreds: Authorisierungseinstellungen
 MenuTutorialDelete: Tutorium löschen
 MenuTutorialEdit: Tutorium editieren
diff --git a/package.yaml b/package.yaml
index 5dd414b33..d0fc06ae8 100644
--- a/package.yaml
+++ b/package.yaml
@@ -185,6 +185,7 @@ ghc-options:
   - -fno-warn-unrecognised-pragmas
   - -fno-warn-partial-type-signatures
   - -fno-max-relevant-binds
+  - -j2
 
 when:
   - condition: flag(pedantic)
diff --git a/routes b/routes
index 34a0bb4ff..45fa74da5 100644
--- a/routes
+++ b/routes
@@ -137,10 +137,11 @@
     /tutor-invite             TInviteR         GET POST
 
 
-/subs  CorrectionsR GET POST !corrector !lecturer
-/subs/upload CorrectionsUploadR GET POST !corrector !lecturer
-/subs/create CorrectionsCreateR GET POST !corrector !lecturer
-/subs/grade CorrectionsGradeR GET POST !corrector !lecturer
+/subs          CorrectionsR          GET POST !corrector !lecturer
+/subs/upload   CorrectionsUploadR    GET POST !corrector !lecturer
+/subs/create   CorrectionsCreateR    GET POST !corrector !lecturer
+/subs/grade    CorrectionsGradeR     GET POST !corrector !lecturer
+/subs/download CorrectionsDownloadR  GET      !corrector !lecturer
 
 
 /msgs                           MessageListR GET POST
diff --git a/src/Database/Esqueleto/Utils/TH.hs b/src/Database/Esqueleto/Utils/TH.hs
index 218c96d70..52cd68cdc 100644
--- a/src/Database/Esqueleto/Utils/TH.hs
+++ b/src/Database/Esqueleto/Utils/TH.hs
@@ -50,7 +50,8 @@ sqlInTuple arity = do
     ]
 
 -- | Generic unValuing of Tuples of Values, i.e.
---   $(unValueN 3) :: (E.Value a, E.Value b, E.Value c) -> (a,b,c)
+--
+--   > $(unValueN 3) :: (E.Value a, E.Value b, E.Value c) -> (a,b,c)
 unValueN :: Int -> ExpQ
 unValueN arity = do
     vs <- replicateM arity $ newName "v"
@@ -60,7 +61,8 @@ unValueN arity = do
     lam1E pat rhs
 
 -- | Generic unValuing of certain indices of a Tuple, i.e.
---   $(unValueNIs 3 [1,3]) :: (E.Value a, b, E.Value c) -> (a,b,c)
+--
+--   > $(unValueNIs 3 [1,3]) :: (E.Value a, b, E.Value c) -> (a,b,c)
 unValueNIs :: Int -> [Int] -> ExpQ
 unValueNIs arity uvIdx = do
     vs <- replicateM arity $ newName "v"
@@ -74,8 +76,9 @@ unValueNIs arity uvIdx = do
 
 
 -- | Generic projections for InnerJoin-tuples
---   gives I-th element of N-tuple of left-associative InnerJoin-pairs,
---   i.e. @$(projN n m) :: (t1 `E.InnerJoin` .. `E.InnerJoin` tn) -> tm@ (for m<=n)
+--   gives I-th element of N-tuple of left-associative InnerJoin-pairs, i.e.
+--
+--   > $(projN n m) :: (t1 `E.InnerJoin` .. `E.InnerJoin` tn) -> tm@ (for m<=n)
 sqlIJproj :: Int -> Int -> ExpQ
 sqlIJproj = leftAssociativePairProjection 'E.InnerJoin
 
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 11c865ef9..733a55a9f 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2231,6 +2231,14 @@ pageActions (CSheetR tid ssh csh shn SCorrR) =
   ]
 pageActions (CorrectionsR) =
   [ MenuItem
+      { menuItemType = PageActionPrime
+      , menuItemLabel = MsgMenuCorrectionsDownload
+      , menuItemIcon = Nothing
+      , menuItemRoute = SomeRoute CorrectionsDownloadR
+      , menuItemModal = True
+      , menuItemAccessCallback' = return True
+      }
+  , MenuItem
       { menuItemType = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsUpload
       , menuItemIcon = Nothing
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 15646baea..d32195c58 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -502,7 +502,7 @@ postCorrectionsR = do
   let whereClause = ratedBy uid
       colonnade = mconcat
         [ colSelect
-        , dbRow
+        -- , dbRow
         , colSchool
         , colTerm
         , colCourse
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index bdad11b37..3e31fb658 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -600,3 +600,16 @@ postSubDelR tid ssh csh shn cID = do
     { drAbort = SomeRoute $ CSubmissionR tid ssh csh shn cID SubShowR
     , drSuccess = SomeRoute $ CSheetR tid ssh csh shn SShowR
     }
+
+
+getCorrectionsDownloadR :: Handler TypedContent
+getCorrectionsDownloadR = do -- download all assigned and open submissions
+  uid <- requireAuthId
+  subs <- runDB $ selectKeysList
+            [ SubmissionRatingBy   ==. Just uid
+            , SubmissionRatingTime ==. Nothing
+            ] []
+  when (null subs) $ do
+    addMessageI Info MsgNoOpenSubmissions
+    redirect CorrectionsR
+  submissionMultiArchive $ Set.fromList subs
\ No newline at end of file
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 33168da0e..ef297bff4 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -19,7 +19,7 @@ import Yesod.Core.Types (HandlerContents(..), ErrorResponse(..))
 import Utils.Lens
 
 import Control.Monad.State hiding (forM_, mapM_,foldM)
-import Control.Monad.Writer (MonadWriter(..), execWriterT)
+import Control.Monad.Writer (MonadWriter(..), execWriterT, execWriter)
 import Control.Monad.RWS.Lazy (RWST)
 import qualified Control.Monad.Random as Rand
 import qualified System.Random.Shuffle as Rand (shuffleM)
@@ -43,6 +43,7 @@ import qualified Handler.Utils.Rating as Rating (extractRatings)
 import Handler.Utils.Delete
 
 import qualified Database.Esqueleto as E
+import qualified Database.Esqueleto.Utils.TH as E
 
 import qualified Data.Conduit.List as Conduit
 import Data.Conduit.ResumableSink
@@ -223,17 +224,34 @@ submissionMultiArchive (Set.toList -> ids) = do
   (dbrunner, cleanup) <- getDBRunner
 
   ratedSubmissions <- runDBRunner dbrunner $ do
-    submissions <- selectList [ SubmissionId <-. ids ] []
-    forM submissions $ \s@(Entity submissionId _) -> maybe (invalidArgs ["Invalid submission numbers"]) (return . (, s)) =<< getRating submissionId
+    submissions <- E.select . E.from $ \(course `E.InnerJoin` sheet `E.InnerJoin` submission) -> do
+      E.on $ sheet E.^. SheetId     E.==. submission E.^. SubmissionSheet
+      E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId
+      E.where_ $ submission E.^. SubmissionId `E.in_` E.valList ids
+      return (submission, (sheet E.^. SheetName, course E.^. CourseShorthand, course E.^. CourseSchool, course E.^. CourseTerm))
+
+    forM submissions $ \(s@(Entity submissionId _), courseSheetInfo) ->
+       maybe (invalidArgs ["Invalid submission numbers"]) (return . (, s, $(E.unValueN 4) courseSheetInfo)) =<< getRating submissionId
+  let (setSheet,setCourse,setSchool,setTerm) =
+        execWriter . forM ratedSubmissions $ \(_rating,_submission,(shn,csh,ssh,tid)) ->
+          tell (Set.singleton shn, Set.singleton csh, Set.singleton ssh, Set.singleton tid)
 
   (<* cleanup) . respondSource "application/zip" . transPipe (runDBRunner dbrunner) $ do
     let
-      fileEntitySource' :: (Rating, Entity Submission) -> Source (YesodDB UniWorX) File
-      fileEntitySource' (rating, Entity submissionID Submission{..}) = do
+      fileEntitySource' :: (Rating, Entity Submission, (SheetName,CourseShorthand,SchoolId,TermId)) -> Source (YesodDB UniWorX) File
+      fileEntitySource' (rating, Entity submissionID Submission{..},(shn,csh,ssh,tid)) = do
         cID <- encrypt submissionID
 
         let
-          directoryName = Text.unpack $ toPathPiece (cID :: CryptoFileNameSubmission)
+          dirFrag :: PathPiece p => p -> FilePath
+          dirFrag = Text.unpack . toPathPiece
+          submissionDirectory  = dirFrag (cID :: CryptoFileNameSubmission)
+          directoryName
+            | Set.size setTerm   > 1 = dirFrag tid </> dirFrag ssh </> dirFrag csh </> dirFrag shn </> submissionDirectory
+            | Set.size setSchool > 1 =                 dirFrag ssh </> dirFrag csh </> dirFrag shn </> submissionDirectory
+            | Set.size setCourse > 1 =                                 dirFrag csh </> dirFrag shn </> submissionDirectory
+            | Set.size setSheet  > 1 =                                                 dirFrag shn </> submissionDirectory
+            | otherwise              =                                                                 submissionDirectory
 
           fileEntitySource = do
             submissionFileSource submissionID =$= Conduit.map entityVal
diff --git a/src/Utils/Sheet.hs b/src/Utils/Sheet.hs
index 241947549..d2f0cf11e 100644
--- a/src/Utils/Sheet.hs
+++ b/src/Utils/Sheet.hs
@@ -3,7 +3,7 @@ module Utils.Sheet where
 import Import.NoFoundation
 import qualified Database.Esqueleto as E
 
-import Database.Esqueleto.Internal.Language (From) -- How to avoid this import?
+import Database.Esqueleto.Internal.Language (From) -- cannot be avoided here
 
 -- DB Queries for Sheets that are used in several places
 
@@ -85,7 +85,6 @@ sheetFilesAllQuery tid ssh csh shn sft = E.select $ E.from $
 
 -- | Check whether a sheet has any files for a given file type
 hasSheetFileQuery :: Database.Esqueleto.Internal.Language.From query expr backend (expr (Entity SheetFile))
--- hasSheetFileQuery :: (E.Esqueleto query expr backend)
   => expr (Entity Sheet) -> SheetFileType -> expr (E.Value Bool)
 hasSheetFileQuery sheet sft =
   E.exists $ E.from $ \sFile ->
diff --git a/templates/i18n/README_i18n.txt b/templates/i18n/README_i18n.txt
new file mode 100644
index 000000000..9915cdd0b
--- /dev/null
+++ b/templates/i18n/README_i18n.txt
@@ -0,0 +1,6 @@
+This directories contains all language dependent widgets.
+
+Each widget requires its own directories, the name of which is needed in the source code, e.g. for directory "imprint"
+  $(i18nWidgetFile "imprint")
+inside this directory must be one file per language "de.hamlet", etc. 
+

From e712552397038295271aa33ba1802850f5983363 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 15 May 2019 14:16:21 +0200
Subject: [PATCH 325/519] sheet list icons cleaned

---
 src/Handler/Sheet.hs             |  4 ++--
 src/Utils.hs                     | 36 +++++++++++++++++++-------------
 templates/default-layout.lucius  | 11 ++++++++++
 templates/table/cell/link.hamlet |  2 +-
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 0a3b8c3fe..754d27a95 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -194,7 +194,7 @@ getSheetListR tid ssh csh = do
       , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> foldMap (dateTimeCellVisible now) sheetVisibleFrom
       , sortable (toNothing "downloads") (i18nCell MsgFiles)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, existFiles)} -> mconcat
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, existFiles)} -> listCell
               [ icnCell & addIconFixedWidth
               | let existingSFTs = hasSFT existFiles
               , sft <- [minBound..maxBound]
@@ -203,7 +203,7 @@ getSheetListR tid ssh csh = do
               , let icnCell = if sft `elem` existingSFTs
                               then linkEmptyCell link icn
                               else spacerCell
-              ]
+              ] id & cellAttrs <>~ [("class","list--inline list--space-separated")]
       , sortable (Just "submission-since") (i18nCell MsgSheetActiveFrom)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _, _)} -> dateTimeCell sheetActiveFrom
       , sortable (Just "submission-until") (i18nCell MsgSheetActiveTo)
diff --git a/src/Utils.hs b/src/Utils.hs
index c45171ed5..1fb39b1b6 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -123,33 +123,39 @@ type WidgetSiteless = forall site. forall m. (MonadIO m, MonadThrow m, MonadBase
 -- Icons --
 -----------
 
+-- Create an icon from font-awesome without additional space
+fontAwesomeIcon :: Text -> Markup
+fontAwesomeIcon iconName =
+  [shamlet|$newline never
+            <i .fas .fa-#{iconName}>|]
+
 -- We collect all used icons here for an overview.
 -- For consistency, some conditional icons are also provided, e.g. `isIvisble`
 
 iconQuestion :: Markup
-iconQuestion = [shamlet|<i .fas .fa-question-circle>|]
+iconQuestion = fontAwesomeIcon "question-circle"
 
 iconHint :: Markup
-iconHint = [shamlet|<i .fas .fa-life-ring>|]
+iconHint = fontAwesomeIcon "life-ring"
 
 iconSolution :: Markup
-iconSolution = [shamlet|<i .fas .fa-exclamation-circle>|]
+iconSolution =fontAwesomeIcon "exclamation-circle"
 
 iconMarking :: Markup
-iconMarking = [shamlet|<i .fas .fa-check-circle>|]
+iconMarking = fontAwesomeIcon "check-circle"
 
 fileDownload :: Markup
-fileDownload = [shamlet|<i .fas .fa-file-download>|]
+fileDownload = fontAwesomeIcon "file-download"
 
 zipDownload :: Markup
-zipDownload = [shamlet|<i .fas .fa-file-archive>|]
+zipDownload = fontAwesomeIcon "file-archive"
 
 -- Conditional icons
 
 isVisible :: Bool -> Markup
 -- ^ Display an icon that denotes that something™ is visible or invisible
-isVisible True  = [shamlet|<i .fas .fa-eye>|]
-isVisible False = [shamlet|<i .fas .fa-eye-slash>|]
+isVisible True  = fontAwesomeIcon "eye"
+isVisible False = fontAwesomeIcon "eye-slash"
 --
 -- For documentation on how to avoid these unneccessary functions
 -- we implement them here just once for the first icon:
@@ -165,26 +171,26 @@ maybeIsVisibleWidget = toWidget . foldMap isVisible
 -- Other _frequently_ used icons:
 hasComment :: Bool -> Markup
 -- ^ Display an icon that denotes that something™ has a comment or not
-hasComment True  = [shamlet|<i .fas .fa-comment-alt>|]
-hasComment False = [shamlet|<i .fas .fa-comment-slash>|] -- comment-alt-slash is not available for free
+hasComment True  = fontAwesomeIcon "comment-alt"
+hasComment False = fontAwesomeIcon "comment-slash" -- comment-alt-slash is not available for free
 
 hasTickmark :: Bool -> Markup
 -- ^ Display an icon that denotes that something™ is okay
-hasTickmark True  = [shamlet|<i .fas .fa-check>|]
+hasTickmark True  = fontAwesomeIcon "check"
 hasTickmark False = mempty
 
 isBad :: Bool -> Markup
 -- ^ Display an icon that denotes that something™ is bad
-isBad True  = [shamlet|<i .fas .fa-bolt>|] -- or times?!
+isBad True  = fontAwesomeIcon "bolt" -- or times?!
 isBad False = mempty
 
 isNew :: Bool -> Markup
-isNew True  = [shamlet|<i .fas .fa-seedling>|] -- was exclamation
+isNew True  = fontAwesomeIcon "seedling" -- was exclamation
 isNew False = mempty
 
 boolSymbol :: Bool -> Markup
-boolSymbol True  = [shamlet|<i .fas .fa-check>|]
-boolSymbol False = [shamlet|<i .fas .fa-times>|]
+boolSymbol True  = fontAwesomeIcon "check"
+boolSymbol False = fontAwesomeIcon "times"
 
 
 
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 558ee6e0d..644ad3d11 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -465,6 +465,17 @@ ul.list--inline {
   }
 }
 
+.list--space-separated li {
+  &::after {
+    content: ' ';
+    white-space: pre;
+  }
+
+  &:last-of-type::after {
+    content: none;
+  }
+}
+
 /* DEFINITION LIST */
 .deflist {
   display: grid;
diff --git a/templates/table/cell/link.hamlet b/templates/table/cell/link.hamlet
index 0ced27282..cdf41888f 100644
--- a/templates/table/cell/link.hamlet
+++ b/templates/table/cell/link.hamlet
@@ -1,3 +1,3 @@
 $newline never
 <a href=@{route}>
-  ^{widget}
+  ^{widget}
\ No newline at end of file

From 09196971f8093a0c8b1b6f5ecb94f44090932ae2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 15 May 2019 15:12:00 +0200
Subject: [PATCH 326/519] Rough sketch of models/exams

---
 models/exams           | 60 +++++++++++++++++++++++++++---------------
 src/Model/Migration.hs |  4 +++
 src/Model/Types.hs     | 39 ++++++++++++++++++++++++---
 3 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/models/exams b/models/exams
index f9d326011..af2ac807f 100644
--- a/models/exams
+++ b/models/exams
@@ -1,22 +1,40 @@
--- EXAMS ARE TODO; THIS IS JUST AN UNUSED STUB
 Exam
-    course              CourseId
-    name                Text
-    description         Text
-    begin               UTCTime
-    end                 UTCTime
-    registrationBegin   UTCTime
-    registrationEnd     UTCTime
-    deregistrationEnd   UTCTime
-    ratingVisible       Bool     -- may participants see their own rating yet
-    statisticsVisible   Bool     -- may participants view statistics over all participants (should not be allowed for 'small' courses)
---ExamEdit
---    user                UserId
---    time                UTCTime
---    exam                ExamId
---ExamUser
---    user                UserId
---    examId              ExamId
---    -- CONTINUE HERE: Include rating in this table or separately?
---    UniqueExamUser user   examId
--- By default this file is used in Model.hs (which is imported by Foundation.hs)
\ No newline at end of file
+  course CourseId
+  name (CI Text)
+  gradingKey [Points] -- [n1,n2,n3,...] means 0 <= p < n1 -> p ~= 5, n1 <= p < n2 -> p ~ 4.7, n2 <= p < n3 -> p ~ 4.3, ...
+  bonusRule ExamBonusRule
+  occuranceRule ExamOccuranceRule
+  registerFrom UTCTime Maybe
+  registerTo UTCTime Maybe
+  deregisterUntil UTCTime Maybe
+  start UTCTime
+  end UTCTime Maybe
+  finished UTCTime Maybe -- Grades shown to students, `ExamCorrector`s locked out
+  closed Bool -- Prüfungsamt hat Einsicht (notification)
+  publicStatistics Bool
+  description Html Maybe
+  UniqueExam course name
+ExamPart
+  exam ExamId
+  name (CI Text)
+  maxPoints Points Maybe
+  weight Rational
+  UniqueExamPart exam name
+ExamOccurance
+  exam ExamId
+  room Text
+  capacity Natural
+ExamRegistration
+  exam ExamId
+  user UserId
+  occurance ExamOccuranceId Maybe
+  UniqueExamRegistration exam user
+ExamResult
+  examPart ExamPartId
+  user UserId
+  result ExamPartResult
+  UniqueExamResult examPart user
+ExamCorrector
+  examPart ExamPartId
+  user UserId
+  UniqueExamCorrector examPart user
\ No newline at end of file
diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index f55638835..6a5e36ebb 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -288,6 +288,10 @@ customMigrations = Map.fromListWith (>>)
         tableDropEmpty "tutorial"
         tableDropEmpty "tutorial_user"
     )
+  , ( AppliedMigrationKey [migrationVersion|12.0.0|] [version|13.0.0|]
+    , whenM (tableExists "exam") $ -- Exams were an unused stub before
+        tableDropEmpty "exam"
+    )
   ]
 
 
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index aa1c91037..d55783fcb 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -366,9 +366,42 @@ classifySubmissionMode (SubmissionMode False (Just _)) = SubmissionModeUser
 classifySubmissionMode (SubmissionMode True  (Just _)) = SubmissionModeBoth
 
 
-data ExamStatus = Attended | NoShow | Voided
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
-derivePersistField "ExamStatus"
+data ExamPartResult = ExamAttended { examPartResult :: Maybe Points }
+                    | ExamNoShow
+                    | ExamVoided
+  deriving (Show, Read, Eq, Ord, Generic, Typeable)
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  , fieldLabelModifier = camelToPathPiece' 2
+  , omitNothingFields = True
+  , sumEncoding = TaggedObject "status" "result"
+  } ''ExamPartResult
+derivePersistFieldJSON ''ExamPartResult
+
+data ExamBonusRule = ExamNoBonus
+                   | ExamBonusPoints
+                     { bonusExchangeRate :: Rational
+                     , bonusOnlyPassed :: Bool
+                     }
+  deriving (Show, Read, Eq, Ord, Generic, Typeable)
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  , fieldLabelModifier = camelToPathPiece' 1
+  , sumEncoding = TaggedObject "rule" "settings"
+  } ''ExamBonusRule
+derivePersistFieldJSON ''ExamBonusRule
+
+data ExamOccuranceRule = ExamRoomManual
+                       | ExamRoomSurname
+                       | ExamRoomMatriculation
+                       | ExamRoomRandom
+  deriving (Show, Read, Eq, Ord, Generic, Typeable)
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 2
+  , fieldLabelModifier = camelToPathPiece' 1
+  , sumEncoding = TaggedObject "rule" "settings"
+  } ''ExamOccuranceRule
+derivePersistFieldJSON ''ExamOccuranceRule
 
 -- | Specify a corrector's workload
 data Load -- = ByTutorial { countsToLoad :: Bool } | ByProportion { load :: Rational }

From 3dcb5a2b19a9da9cdbb4dfdbff106f589c012f84 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 15 May 2019 16:12:00 +0200
Subject: [PATCH 327/519] Implement generic id-nudging and use everywhere

---
 static/js/services/httpClient.js     | 29 ++++++++++++++++++++++++++++
 static/js/utils/asyncTable.js        | 13 +++++--------
 static/js/utils/massInput.js         | 19 ++++--------------
 static/js/utils/modal.js             | 21 ++++----------------
 templates/widgets/modal/modal.hamlet |  2 +-
 5 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/static/js/services/httpClient.js b/static/js/services/httpClient.js
index eacd9b6b5..a69d788fd 100644
--- a/static/js/services/httpClient.js
+++ b/static/js/services/httpClient.js
@@ -36,6 +36,34 @@
       });
     }
 
+    function parseHTML(response, idPrefix) {
+      if (!idPrefix) {
+        idPrefix = Math.floor(Math.random() * 100000);
+      }
+
+      var contentType = response.headers.get("content-type");
+      if (contentType.indexOf("text/html") === -1) {
+        throw new Error('Server returned ' + contentType + ' when HTML was expected');
+      }
+
+      return response.text().then(function (responseText) {
+        var docFrag = document.createRange().createContextualFragment(responseText);
+        
+        var idAttrs = ['id', 'for', 'data-conditional-input', 'data-modal-trigger'];
+        idAttrs.forEach(function(attr) {
+          Array.from(docFrag.querySelectorAll('[' + attr + ']')).forEach(function(input) {
+            var value = idPrefix + '__' + input.getAttribute(attr);
+            input.setAttribute(attr, value);
+          });
+        });
+
+        return Promise.resolve(docFrag);
+      },
+      function (error) {
+        return Promise.reject(error);
+      }).catch(function (error) { console.error(error); });
+    }
+
     return {
       get: function(url, headers) {
         return _fetch(url, 'GET', headers);
@@ -44,6 +72,7 @@
         return _fetch(url, 'POST', headers, body);
       },
       addResponseInterceptor: addResponseInterceptor,
+      parseHTML: parseHTML,
     }
   })();
 })();
diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 13598904b..78d9ae90c 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -319,12 +319,9 @@
         [asyncTableHeader]: asyncTableId
       };
 
-      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) {
+      HttpClient.get(url, headers).then(
+        response => HttpClient.parseHTML(response, element.id)
+      ).then(function(data) {
         setLocalStorageParameter('currentTableUrl', url.href);
         // reset table
         removeListeners();
@@ -345,8 +342,8 @@
 
     function updateWrapperContents(newHtml) {
       var newPage = document.createElement('div');
-      newPage.innerHTML = newHtml;
-      var newWrapperContents = newPage.querySelector('#' + element.id);
+      newPage.appendChild(newHtml);
+      var newWrapperContents = newPage.querySelector('#' + element.id + '__' + element.id);
       element.innerHTML = newWrapperContents.innerHTML;
 
       if (UtilRegistry) {
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 5d75a7c6c..4f0400b6a 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -125,9 +125,8 @@
             url,
             headers,
             requestBody,
+          ).then(response => HttpClient.parseHTML(response, element.id)
           ).then(function(response) {
-            return response.text();
-          }).then(function(response) {
             processResponse(response);
             if (isAddCell) {
               reFocusAddCell();
@@ -164,26 +163,16 @@
     }
 
     function processResponse(response) {
-      element.innerHTML = response;
+      element.innerHTML = "";
+      element.appendChild(response);
 
-      prefixInputIds();
-      reset()
+      reset();
 
       if (UtilRegistry) {
         UtilRegistry.setupAll(element);
       }
     }
 
-    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);
 
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index de6fee9d6..e0ba9c7c1 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -168,14 +168,13 @@
       }
 
       HttpClient.get(url, MODAL_HEADERS)
-        .then(function(response) {
-          response.text().then(processResponse);
-        });
+        .then(response => HttpClient.parseHTML(response, element.id))
+        .then(processResponse);
     }
 
-    function processResponse(responseBody) {
+    function processResponse(responseFrag) {
       var responseElement = document.createElement('div');
-      responseElement.innerHTML = responseBody;
+      responseElement.appendChild(responseFrag);
 
       var modalContent = document.createElement('div');
       modalContent.classList.add(MODAL_CONTENT_CLASS);
@@ -191,24 +190,12 @@
         previousModalContent.remove();
       }
 
-      modalContent = withPrefixedInputIDs(modalContent);
       element.insertBefore(modalContent, null);
 
       // setup any newly arrived utils
       UtilRegistry.setupAll(element);
     }
 
-    function withPrefixedInputIDs(modalContent) {
-      var idAttrs = ['id', 'for', 'data-conditional-input'];
-      idAttrs.forEach(function(attr) {
-        Array.from(modalContent.querySelectorAll('[' + attr + ']')).forEach(function(input) {
-          var value = element.id + '__' + input.getAttribute(attr);
-          input.setAttribute(attr, value);
-        });
-      });
-      return modalContent;
-    }
-
     return _init();
   };
 
diff --git a/templates/widgets/modal/modal.hamlet b/templates/widgets/modal/modal.hamlet
index 001e4a00f..b801967f6 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>
+<div uw-modal data-modal-trigger=#{triggerId'} data-modal-closeable>
   $case modalContent
     $of Right content
       <div .modal__content>

From 05389fc27e8ac3b1e9f70d17c2f69bb07ce77ae2 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 15 May 2019 21:58:27 +0200
Subject: [PATCH 328/519] Splitting Model.Types into three parts

---
 package.yaml                |   2 +-
 src/Handler/Corrections.hs  |   2 +-
 src/Model/Types.hs          | 953 +-----------------------------------
 src/Model/Types/DateTime.hs | 158 ++++++
 src/Model/Types/Misc.hs     | 532 ++++++++++++++++++++
 src/Model/Types/Sheet.hs    | 338 +++++++++++++
 6 files changed, 1042 insertions(+), 943 deletions(-)
 create mode 100644 src/Model/Types/DateTime.hs
 create mode 100644 src/Model/Types/Misc.hs
 create mode 100644 src/Model/Types/Sheet.hs

diff --git a/package.yaml b/package.yaml
index d0fc06ae8..098fb0bec 100644
--- a/package.yaml
+++ b/package.yaml
@@ -185,7 +185,7 @@ ghc-options:
   - -fno-warn-unrecognised-pragmas
   - -fno-warn-partial-type-signatures
   - -fno-max-relevant-binds
-  - -j2
+  - -j3
 
 when:
   - condition: flag(pedantic)
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index d32195c58..4a18d3b79 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -531,7 +531,7 @@ postCorrectionsR = do
         optionsPairs $ map (id &&& id) $ nub $ map (CI.original . unSchoolKey . courseSchool . entityVal) courses
 
       psValidator = def
-        & restrictFilter (\name _ -> name /= "corrector") -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information
+        & restrictFilter  (\name _ -> name /= "corrector") -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information
         & restrictSorting (\name _ -> name /= "corrector")
         & defaultSorting [SortAscBy "israted", SortDescBy "ratingTime", SortAscBy "assignedtime" ]
         -- & defaultFilter (Map.fromList [("israted",[toPathPiece False])]) -- DEPENDS ON ISSUE #371 UNCOMMENT THEN
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index aa1c91037..b812d529c 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -3,8 +3,13 @@
   #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
 
+
+
 module Model.Types
   ( module Model.Types
+  , module Model.Types.Sheet
+  , module Model.Types.DateTime
+  , module Model.Types.Misc
   , module Numeric.Natural
   , module Mail
   , module Utils.DateTime
@@ -12,86 +17,31 @@ module Model.Types
   ) where
 
 import ClassyPrelude
-import Utils
-import Control.Lens hiding (universe)
-import Utils.Lens.TH
-
-import Data.Set (Set)
-import qualified Data.Set as Set
-import qualified Data.Map as Map
-import Data.Fixed
-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
-
 import Data.NonNull.Instances ()
 
-import Data.Default
-
-import Text.Read (readMaybe)
-
-import Database.Persist.TH hiding (derivePersistFieldJSON)
-import Model.Types.JSON
-import Database.Persist.Class
-import Database.Persist.Sql
-
-import Web.HttpApiData
-import Web.PathPieces
-
-import Text.Blaze (Markup)
 import Data.Text (Text)
 import qualified Data.Text as Text
-import qualified Data.Text.Lens as Text
-
-import qualified Data.HashMap.Strict as HashMap
-
 import Data.CaseInsensitive (CI)
-import qualified Data.CaseInsensitive as CI
 import Data.CaseInsensitive.Instances ()
 
-import Yesod.Core.Dispatch (PathPiece(..))
-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(..), mkToJSON, mkParseJSON)
-
-import GHC.Generics (Generic)
-import Generics.Deriving.Monoid (memptydefault, mappenddefault)
-import Data.Typeable (Typeable)
-
 import Data.Universe.Instances.Reverse ()
 
+import Yesod.Core.Dispatch (PathPiece(..))
 import qualified Yesod.Auth.Util.PasswordStore as PWStore
+import Web.PathPieces
 
 import Mail (MailLanguages(..))
 import Utils.DateTime (DateTimeFormat(..), SelDateTimeFormat(..))
-
 import Numeric.Natural
-import Data.Word.Word24 (Word24)
-import Data.Bits
-import Data.Ix
-import Data.List (genericIndex, elemIndex)
-import System.Random (Random(..))
-import Data.Data (Data)
 
-import Model.Types.Wordlist
-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)
-
-import Data.Semigroup (Min(..))
-import Control.Monad.Trans.Writer (execWriter)
-import Control.Monad.Writer.Class (MonadWriter(..))
+import Model.Types.Sheet
+import Model.Types.DateTime
+import Model.Types.Misc
 
+----
+-- Just bringing together the different Model.Types submodules.
 
 instance PathPiece UUID where
   fromPathPiece = UUID.fromString . unpack
@@ -102,885 +52,6 @@ instance {-# OVERLAPS #-} PathMultiPiece FilePath where
   toPathMultiPiece = Text.splitOn "/" . pack
 
 
-type Count  = Sum Integer
-type Points = Centi
-
-toPoints :: Integral a => a -> Points -- deprecated
-toPoints = fromIntegral
-
-pToI :: Points -> Integer -- deprecated
-pToI = fromPoints
-
-fromPoints :: Integral a => Points -> a -- deprecated
-fromPoints = round
-
-instance DisplayAble Points
-
-instance DisplayAble a => DisplayAble (Sum a) where
-  display (Sum x) = display x
-
-data SheetGrading
-  = Points     { maxPoints :: Points }
-  | PassPoints { maxPoints, passingPoints :: Points }
-  | PassBinary -- non-zero means passed
-  deriving (Eq, Read, Show, Generic)
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece
-  , fieldLabelModifier = intercalate "-" . map toLower . dropEnd 1 . splitCamel
-  , sumEncoding = TaggedObject "type" "data"
-  } ''SheetGrading
-derivePersistFieldJSON ''SheetGrading
-
-makeLenses_ ''SheetGrading
-
-_passingBound :: Fold SheetGrading (Either () Points)
-_passingBound = folding passPts
-  where
-    passPts :: SheetGrading -> Maybe (Either () Points)
-    passPts (Points{}) = Nothing
-    passPts (PassPoints{passingPoints}) = Just $ Right passingPoints
-    passPts (PassBinary) = Just $ Left ()
-
-gradingPassed :: SheetGrading -> Points -> Maybe Bool
-gradingPassed gr pts = either pBinary pPoints <$> gr ^? _passingBound
-    where pBinary _ = pts /= 0
-          pPoints b = pts >= b
-
-
-data SheetGradeSummary = SheetGradeSummary
-  { numSheets       :: Count       -- Total number of sheets, includes all
-  , numSheetsPasses :: Count       -- Number of sheets required to pass FKA: numGradePasses
-  , numSheetsPoints :: Count       -- Number of sheets having points    FKA: sumGradePointsd
-  , sumSheetsPoints :: Sum Points  -- Total of all points in all sheets
-  -- Marking dependend
-  , numMarked       :: Count       -- Number of already marked sheets
-  , numMarkedPasses :: Count       -- Number of already marked sheets with passes
-  , numMarkedPoints :: Count       -- Number of already marked sheets with points
-  , sumMarkedPoints :: Sum Points  -- Achieveable points within marked sheets
-  --
-  , achievedPasses :: Count        -- Achieved passes (within marked sheets)
-  , achievedPoints :: Sum Points   -- Achieved points (within marked sheets)
-  } deriving (Generic, Read, Show, Eq)
-
-instance Monoid SheetGradeSummary where
-  mempty  = memptydefault
-  mappend = mappenddefault
-
-instance Semigroup SheetGradeSummary where
-  (<>) = mappend -- TODO: remove for GHC > 8.4.x
-
-makeLenses_ ''SheetGradeSummary
-
-sheetGradeSum :: SheetGrading -> Maybe Points -> SheetGradeSummary
-sheetGradeSum gr Nothing  = mempty
-  { numSheets = 1
-  , numSheetsPasses = bool  mempty   1 $ has _passingBound gr
-  , numSheetsPoints = bool  mempty   1 $ has _maxPoints    gr
-  , sumSheetsPoints = maybe mempty Sum $ gr ^? _maxPoints
-  }
-sheetGradeSum gr (Just p) =
-  let unmarked@SheetGradeSummary{..} = sheetGradeSum gr Nothing
-  in  unmarked
-        { numMarked       = numSheets
-        , numMarkedPasses = numSheetsPasses
-        , numMarkedPoints = numSheetsPoints
-        , sumMarkedPoints = sumSheetsPoints
-        , achievedPasses  = fromMaybe mempty $ bool 0 1 <$> gradingPassed gr p
-        , achievedPoints  = bool mempty (Sum p) $ has _maxPoints gr
-        }
-
-
-data SheetType
-  = NotGraded
-  | Normal        { grading :: SheetGrading }
-  | Bonus         { grading :: SheetGrading }
-  | Informational { grading :: SheetGrading }
-  deriving (Eq, Read, Show, Generic)
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece
-  , fieldLabelModifier = camelToPathPiece
-  , sumEncoding = TaggedObject "type" "data"
-  } ''SheetType
-derivePersistFieldJSON ''SheetType
-
-data SheetTypeSummary = SheetTypeSummary
-  { normalSummary
-  , bonusSummary
-  , informationalSummary :: SheetGradeSummary
-  , numNotGraded :: Count
-  } deriving (Generic, Read, Show, Eq)
-
-instance Monoid SheetTypeSummary where
-  mempty  = memptydefault
-  mappend = mappenddefault
-
-instance Semigroup SheetTypeSummary where
-  (<>) = mappend -- TODO: remove for GHC > 8.4.x
-
-makeLenses_ ''SheetTypeSummary
-
-sheetTypeSum :: SheetType -> Maybe Points -> SheetTypeSummary
-sheetTypeSum Bonus{..}         mps = mempty { bonusSummary         = sheetGradeSum grading mps }
-sheetTypeSum Normal{..}        mps = mempty { normalSummary        = sheetGradeSum grading mps }
-sheetTypeSum Informational{..} mps = mempty { informationalSummary = sheetGradeSum grading mps }
-sheetTypeSum NotGraded _           = mempty { numNotGraded         = Sum 1 }
-
-data SheetGroup
-  = Arbitrary { maxParticipants :: Natural }
-  | RegisteredGroups
-  | NoGroups
-  deriving (Show, Read, Eq, Generic)
-deriveJSON defaultOptions ''SheetGroup
-derivePersistFieldJSON ''SheetGroup
-
-makeLenses_ ''SheetGroup
-
-data SheetFileType = SheetExercise | SheetHint | SheetSolution | SheetMarking
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
-derivePersistField "SheetFileType"
-
-instance Universe SheetFileType where universe = universeDef
-instance Finite SheetFileType
-
-instance PathPiece SheetFileType where
-  toPathPiece SheetExercise = "file"
-  toPathPiece SheetHint     = "hint"
-  toPathPiece SheetSolution = "solution"
-  toPathPiece SheetMarking  = "marking"
-  fromPathPiece = finiteFromPathPiece
-
-sheetFile2markup :: SheetFileType -> Markup
-sheetFile2markup SheetExercise = iconQuestion
-sheetFile2markup SheetHint     = iconHint
-sheetFile2markup SheetSolution = iconSolution
-sheetFile2markup SheetMarking  = iconMarking
-
--- $(deriveSimpleWith ''DisplayAble 'display (drop 17) ''SheetFileType)
-instance DisplayAble SheetFileType where -- deprecated, see RenderMessage instance in Foundation
-  display SheetExercise = "Aufgabenstellung"
-  display SheetHint     = "Hinweise"
-  display SheetSolution = "Musterlösung"
-  display SheetMarking  = "Korrekturhinweise"
-
--- partitionFileType' :: Ord a => [(SheetFileType,a)] -> Map SheetFileType (Set a)
--- partitionFileType' = groupMap
-
-partitionFileType :: Ord a => [(SheetFileType,a)] -> SheetFileType -> Set a
-partitionFileType fs t = Map.findWithDefault Set.empty t . Map.fromListWith Set.union $ map (over _2 Set.singleton) fs
-
-data SubmissionFileType = SubmissionOriginal | SubmissionCorrected
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
-
-instance Universe SubmissionFileType where universe = universeDef
-instance Finite SubmissionFileType
-
-submissionFileTypeIsUpdate :: SubmissionFileType -> Bool
-submissionFileTypeIsUpdate SubmissionOriginal  = False
-submissionFileTypeIsUpdate SubmissionCorrected = True
-
-isUpdateSubmissionFileType :: Bool -> SubmissionFileType
-isUpdateSubmissionFileType False = SubmissionOriginal
-isUpdateSubmissionFileType True  = SubmissionCorrected
-
-instance PathPiece SubmissionFileType where
-  toPathPiece SubmissionOriginal  = "original"
-  toPathPiece SubmissionCorrected = "corrected"
-  fromPathPiece = finiteFromPathPiece
-
-instance DisplayAble SubmissionFileType where
-  display SubmissionOriginal  = "Abgabe"
-  display SubmissionCorrected = "Korrektur"
-
-{-
-data DA = forall a . (DisplayAble a) => DA a
-
-instance DisplayAble DA where
-  display (DA x) = display x
--}
-
-
-data UploadMode = NoUpload | Upload { unpackZips :: Bool }
-  deriving (Show, Read, Eq, Ord, Generic)
-
-deriveFinite ''UploadMode
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece
-  , fieldLabelModifier = camelToPathPiece
-  , sumEncoding = TaggedObject "mode" "settings"
-  }''UploadMode
-derivePersistFieldJSON ''UploadMode
-
-instance PathPiece UploadMode where
-  toPathPiece = \case
-    NoUpload     -> "no-upload"
-    Upload True  -> "unpack"
-    Upload False -> "no-unpack"
-  fromPathPiece = finiteFromPathPiece
-
-data SubmissionMode = SubmissionMode
-  { submissionModeCorrector :: Bool
-  , submissionModeUser :: Maybe UploadMode
-  }
-  deriving (Show, Read, Eq, Ord, Generic)
-
-deriveFinite ''SubmissionMode
-
-deriveJSON defaultOptions
-  { fieldLabelModifier = camelToPathPiece' 2
-  } ''SubmissionMode
-derivePersistFieldJSON ''SubmissionMode
-
-finitePathPiece ''SubmissionMode
-  [ "no-submissions"
-  , "no-upload"
-  , "no-unpack"
-  , "unpack"
-  , "correctors"
-  , "correctors+no-upload"
-  , "correctors+no-unpack"
-  , "correctors+unpack"
-  ]
-
-data SubmissionModeDescr = SubmissionModeNone
-                         | SubmissionModeCorrector
-                         | SubmissionModeUser
-                         | SubmissionModeBoth
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
-instance Universe SubmissionModeDescr
-instance Finite SubmissionModeDescr
-
-finitePathPiece ''SubmissionModeDescr
-  [ "no-submissions"
-  , "correctors"
-  , "users"
-  , "correctors+users"
-  ]
-
-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)
-derivePersistField "ExamStatus"
-
--- | Specify a corrector's workload
-data Load -- = ByTutorial { countsToLoad :: Bool } | ByProportion { load :: Rational }
-    = Load { byTutorial :: Maybe Bool  -- ^ @Just@ all from Tutorial, @True@ if counting towards overall workload
-           , byProportion :: Rational  -- ^ workload proportion of all submission not assigned to tutorial leaders
-           }
-  deriving (Show, Read, Eq, Ord, Generic)
-
-deriveJSON defaultOptions ''Load
-derivePersistFieldJSON ''Load
-
-instance Hashable Load
-
-instance Semigroup Load where
-  (Load byTut prop) <> (Load byTut' prop') = Load byTut'' (prop + prop')
-    where
-      byTut''
-        | Nothing <- byTut  = byTut'
-        | Nothing <- byTut' = byTut
-        | Just a <- byTut
-        , Just b <- byTut'  = Just $ a || b
-
-instance Monoid Load where
-  mempty = Load Nothing 0
-  mappend = (<>)
-
-{- Use (is _ByTutorial) instead of this unneeded definition:
-  isByTutorial :: Load -> Bool
-  isByTutorial (ByTutorial {}) = True
-  isByTutorial _               = False
--}
-
-data Season = Summer | Winter
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Typeable)
-
-instance Binary Season
-
-seasonToChar :: Season -> Char
-seasonToChar Summer = 'S'
-seasonToChar Winter = 'W'
-
-seasonFromChar :: Char -> Either Text Season
-seasonFromChar c
-  | c ~= 'S'  = Right Summer
-  | c ~= 'W'  = Right Winter
-  | otherwise = Left $ "Invalid season character: ‘" <> tshow c <> "’"
-  where
-    (~=) = (==) `on` CI.mk
-
-instance DisplayAble Season
-
-data TermIdentifier = TermIdentifier
-  { year :: Integer -- ^ Using 'Integer' to model years is consistent with 'Data.Time.Calendar'
-  , season :: Season
-  } deriving (Show, Read, Eq, Ord, Generic, Typeable)
-
-instance Binary TermIdentifier
-
-instance Enum TermIdentifier where
-  -- ^ Do not use for conversion – Enumeration only
-  toEnum int = let (toInteger -> year, toEnum -> season) = int `divMod` 2 in TermIdentifier{..}
-  fromEnum TermIdentifier{..} = fromInteger year * 2 + fromEnum season
-
--- Conversion TermId <-> TermIdentifier::
--- from_TermId_to_TermIdentifier = unTermKey
--- from_TermIdentifier_to_TermId = TermKey
-
-shortened :: Iso' Integer Integer
-shortened = iso shorten expand
-  where
-    century = ($currentYear `div` 100) * 100
-    expand year
-      | 0 <= year
-      , year < 100 = let
-          options = [ expanded | offset <- [-1, 0, 1]
-                               , let century' = century + offset * 100
-                                     expanded = century' + year
-                               , $currentYear - 50 <= expanded
-                               , expanded < $currentYear + 50
-                               ]
-          in case options of
-               [unique] -> unique
-               failed   -> error $ "Could not expand year " ++ show year ++ ": " ++ show failed
-      | otherwise = year
-    shorten year
-      | $currentYear - 50 <= year
-      , year < $currentYear + 50 = year `mod` 100
-      | otherwise = year
-
-termToText :: TermIdentifier -> Text
-termToText TermIdentifier{..} = Text.pack $ seasonToChar season : show (year ^. shortened)
-
--- also see Hander.Utils.tidFromText
-termFromText :: Text -> Either Text TermIdentifier
-termFromText t
-  | (s:ys) <- Text.unpack t
-  , Just (review shortened -> year) <- readMaybe ys
-  , Right season <- seasonFromChar s
-  = Right TermIdentifier{..}
-  | otherwise = Left $ "Invalid TermIdentifier: “" <> t <> "”" -- TODO: Could be improved, I.e. say "W"/"S" from Number
-
-termToRational :: TermIdentifier -> Rational
-termToRational TermIdentifier{..} = fromInteger year + seasonOffset
-  where
-    seasonOffset
-      | Summer <- season = 0
-      | Winter <- season = 0.5
-
-termFromRational :: Rational -> TermIdentifier
-termFromRational n = TermIdentifier{..}
-  where
-    year = floor n
-    remainder = n - (fromInteger $ floor n)
-    season
-      | remainder == 0 = Summer
-      | otherwise      = Winter
-
-instance PersistField TermIdentifier where
-  toPersistValue = PersistRational . termToRational
-  fromPersistValue (PersistRational t) = Right $ termFromRational t
-  fromPersistValue x = Left $ "Expected TermIdentifier, received: " <> tshow x
-
-instance PersistFieldSql TermIdentifier where
-  sqlType _ = SqlNumeric 5 1
-
-instance ToHttpApiData TermIdentifier where
-  toUrlPiece = termToText
-
-instance FromHttpApiData TermIdentifier where
-  parseUrlPiece = termFromText
-
-instance PathPiece TermIdentifier where
-  fromPathPiece = either (const Nothing) Just . termFromText
-  toPathPiece = termToText
-
-instance ToJSON TermIdentifier where
-  toJSON = Aeson.String . termToText
-
-instance FromJSON TermIdentifier where
-  parseJSON = withText "Term" $ either (fail . Text.unpack) return . termFromText
-
-{- Must be defined in a later module:
-    termField :: Field (HandlerT UniWorX IO) TermIdentifier
-    termField = checkMMap (return . termFromText) termToText textField
-   See Handler.Utils.Form.termsField and termActiveField
--}
-
-
-withinTerm :: Day -> TermIdentifier -> Bool
-time `withinTerm` term = timeYear `mod` 100 == termYear `mod` 100
-  where
-    timeYear = fst3 $ toGregorian time
-    termYear = year term
-
-
-data StudyFieldType = FieldPrimary | FieldSecondary
-  deriving (Eq, Ord, Enum, Show, Read, Bounded, Generic)
-derivePersistField "StudyFieldType"
-
-instance PersistField UUID where
-  toPersistValue = PersistDbSpecific . UUID.toASCIIBytes
-  fromPersistValue (PersistText t) = maybe (Left "Failed to parse UUID") Right $ UUID.fromText t
-  fromPersistValue (PersistByteString bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
-  fromPersistValue (PersistDbSpecific bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
-  fromPersistValue x = Left $ "Expected UUID, received: " <> tshow x
-
-instance PersistFieldSql UUID where
-  sqlType _ = SqlOther "uuid"
-
-instance DisplayAble StudyFieldType
-
-data Theme
-  = ThemeDefault
-  | ThemeLavender
-  | ThemeNeutralBlue
-  | ThemeAberdeenReds
-  | ThemeMossGreen
-  | ThemeSkyLove
-  deriving (Eq, Ord, Bounded, Enum, Show, Read, Generic)
-
-deriveJSON defaultOptions
-  { constructorTagModifier = fromJust . stripPrefix "Theme"
-  } ''Theme
-
-instance Universe Theme where universe = universeDef
-instance Finite Theme
-
-nullaryPathPiece ''Theme (camelToPathPiece' 1)
-
-$(deriveSimpleWith ''DisplayAble 'display (over Text.packed $ Text.intercalate " " . unsafeTail . splitCamel) ''Theme) -- describe theme to user
-
-derivePersistField "Theme"
-
-
-newtype ZIPArchiveName obj = ZIPArchiveName { unZIPArchiveName :: obj }
-  deriving (Show, Read, Eq, Ord, Generic, Typeable)
-
-instance PathPiece obj => PathPiece (ZIPArchiveName obj) where
-    fromPathPiece = fmap ZIPArchiveName . fromPathPiece <=< (stripSuffix `on` CI.foldCase) ".zip"
-    toPathPiece = (<> ".zip") . toPathPiece . unZIPArchiveName
-
-
-data CorrectorState = CorrectorNormal | CorrectorMissing | CorrectorExcused
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic)
-
-deriveJSON defaultOptions
-  { constructorTagModifier = fromJust . stripPrefix "Corrector"
-  } ''CorrectorState
-
-instance Universe CorrectorState
-instance Finite CorrectorState
-
-instance Hashable CorrectorState
-
-nullaryPathPiece ''CorrectorState (camelToPathPiece' 1)
-
-derivePersistField "CorrectorState"
-
-
-data AuthenticationMode = AuthLDAP
-                        | AuthPWHash { authPWHash :: Text }
-  deriving (Eq, Ord, Read, Show, Generic)
-
-deriveJSON defaultOptions
-  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
-  , fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel
-  , sumEncoding = UntaggedValue
-  } ''AuthenticationMode
-
-derivePersistFieldJSON ''AuthenticationMode
-
-
-derivePersistFieldJSON ''Value
-
-
--- ^ `NotificationSettings` is for now a series of boolean checkboxes, i.e. a mapping @NotificationTrigger -> Bool@
---
--- Could maybe be replaced with `Structure Notification` in the long term
-data NotificationTrigger = NTSubmissionRatedGraded
-                         | NTSubmissionRated
-                         | NTSheetActive
-                         | NTSheetSoonInactive
-                         | NTSheetInactive
-                         | NTCorrectionsAssigned
-                         | NTCorrectionsNotDistributed
-                         | NTUserRightsUpdate
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
-
-instance Universe NotificationTrigger
-instance Finite NotificationTrigger
-
-instance Hashable NotificationTrigger
-
-deriveJSON defaultOptions
-  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
-  } ''NotificationTrigger
-
-instance ToJSONKey NotificationTrigger where
-  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
-
-instance FromJSONKey NotificationTrigger where
-  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
-
-
-newtype NotificationSettings = NotificationSettings { notificationAllowed :: NotificationTrigger -> Bool }
-  deriving (Generic, Typeable)
-  deriving newtype (Eq, Ord, Read, Show)
-
-instance Default NotificationSettings where
-  def = NotificationSettings $ \case
-    NTSubmissionRatedGraded -> True
-    NTSubmissionRated -> False
-    NTSheetActive -> True
-    NTSheetSoonInactive -> False
-    NTSheetInactive -> True
-    NTCorrectionsAssigned -> True
-    NTCorrectionsNotDistributed -> True
-    NTUserRightsUpdate -> True
-
-instance ToJSON NotificationSettings where
-  toJSON v = toJSON . HashMap.fromList $ map (id &&& notificationAllowed v) universeF
-
-instance FromJSON NotificationSettings where
-  parseJSON = withObject "NotificationSettings" $ \o -> do
-    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap NotificationTrigger Bool)
-    return . NotificationSettings $ \n -> case HashMap.lookup n o' of
-      Nothing -> notificationAllowed def n
-      Just b  -> b
-
-derivePersistFieldJSON ''NotificationSettings
-
-
-instance ToBackendKey SqlBackend record => Hashable (Key record) where
-  hashWithSalt s key = s `hashWithSalt` fromSqlKey key
-
-derivePersistFieldJSON ''MailLanguages
-
-
-type PseudonymWord   = CI Text
-
-newtype Pseudonym = Pseudonym Word24
-  deriving (Eq, Ord, Read, Show, Generic, Data)
-  deriving newtype (Bounded, Enum, Integral, Num, Real, Ix)
-
-
-instance PersistField Pseudonym where
-  toPersistValue p = toPersistValue (fromIntegral p :: Word32)
-  fromPersistValue v = do
-    w <- fromPersistValue v :: Either Text Word32
-    if
-      | 0 <= w
-      , w <= fromIntegral (maxBound :: Pseudonym)
-        -> return $ fromIntegral w
-      | otherwise
-        -> Left "Pseudonym out of range"
-
-instance PersistFieldSql Pseudonym where
-  sqlType _ = SqlInt32
-
-instance Random Pseudonym where
-  randomR (max minBound -> lo, min maxBound -> hi) gen = over _1 (fromIntegral :: Word32 -> Pseudonym) $ randomR (fromIntegral lo, fromIntegral hi) gen
-  random = randomR (minBound, maxBound)
-
-instance FromJSON Pseudonym where
-  parseJSON v@(Aeson.Number _) = do
-    w <- parseJSON v :: Aeson.Parser Word32
-    if
-      | 0 <= w
-      , w <= fromIntegral (maxBound :: Pseudonym)
-        -> return $ fromIntegral w
-      | otherwise
-        -> fail "Pseudonym out auf range"
-  parseJSON (Aeson.String t)
-    = case t ^? _PseudonymText of
-        Just p -> return p
-        Nothing -> fail "Could not parse pseudonym"
-  parseJSON v = flip (Aeson.withArray "Pseudonym") v $ \ws -> do
-    ws' <- toList . map CI.mk <$> mapM parseJSON ws
-    case ws' ^? _PseudonymWords of
-      Just p -> return p
-      Nothing -> fail "Could not parse pseudonym words"
-
-instance ToJSON Pseudonym where
-  toJSON = toJSON . (review _PseudonymWords :: Pseudonym -> [PseudonymWord])
-
-pseudonymWordlist :: [PseudonymWord]
-pseudonymCharacters :: Set (CI Char)
-(pseudonymWordlist, pseudonymCharacters) = $(wordlist "config/wordlist.txt")
-
-_PseudonymWords :: Prism' [PseudonymWord] Pseudonym
-_PseudonymWords = prism' pToWords pFromWords
-  where
-    pFromWords :: [PseudonymWord] -> Maybe Pseudonym
-    pFromWords [w1, w2]
-      | Just i1 <- elemIndex w1 pseudonymWordlist
-      , Just i2 <- elemIndex w2 pseudonymWordlist
-      , i1 <= maxWord, i2 <= maxWord
-      = Just . Pseudonym $ shiftL (fromIntegral i1) 12 .|. fromIntegral i2
-    pFromWords _ = Nothing
-
-    pToWords :: Pseudonym -> [PseudonymWord]
-    pToWords (Pseudonym p)
-      = [ genericIndex pseudonymWordlist $ shiftR p 12 .&. maxWord
-        , genericIndex pseudonymWordlist $ p .&. maxWord
-        ]
-
-    maxWord :: Num a => a
-    maxWord = 0b111111111111
-
-_PseudonymText :: Prism' Text Pseudonym
-_PseudonymText = prism' tToWords tFromWords . _PseudonymWords
-  where
-    tFromWords :: Text -> Maybe [PseudonymWord]
-    tFromWords input
-      | [result] <- input ^.. pseudonymFragments
-      = Just result
-      | otherwise
-      = Nothing
-
-    tToWords :: [PseudonymWord] -> Text
-    tToWords = Text.unwords . map CI.original
-
-pseudonymWords :: Fold Text PseudonymWord
-pseudonymWords = folding
-  $ \(CI.mk -> input) -> map (view _2) . fromMaybe [] . listToMaybe . groupBy ((==) `on` view _1) . sortBy (comparing $ view _1) . filter ((<= distanceCutoff) . view _1) $ map (distance input &&& id) pseudonymWordlist
-  where
-    distance = damerauLevenshtein `on` CI.foldedCase
-    -- | Arbitrary cutoff point, for reference: ispell cuts off at 1
-    distanceCutoff = 2
-
-pseudonymFragments :: Fold Text [PseudonymWord]
-pseudonymFragments = folding
-  $ mapM (toListOf pseudonymWords) . (\l -> guard (length l == 2) *> l) . filter (not . null) . Text.split (\(CI.mk -> c) -> not $ Set.member c pseudonymCharacters)
-
-
-data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prädikate sind sortier nach Relevanz für Benutzer
-  = AuthAdmin
-  | AuthLecturer
-  | AuthCorrector
-  | AuthTutor
-  | AuthCourseRegistered
-  | AuthTutorialRegistered
-  | AuthParticipant
-  | AuthTime
-  | AuthMaterials
-  | AuthOwner
-  | AuthRated
-  | AuthUserSubmissions
-  | AuthCorrectorSubmissions
-  | AuthCapacity
-  | AuthRegisterGroup
-  | AuthEmpty
-  | AuthSelf
-  | AuthAuthentication
-  | AuthNoEscalation
-  | AuthRead
-  | AuthWrite
-  | AuthToken
-  | AuthDeprecated
-  | AuthDevelopment
-  | AuthFree
-  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
-
-instance Universe AuthTag
-instance Finite AuthTag
-instance Hashable AuthTag
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 1
-  } ''AuthTag
-
-nullaryPathPiece ''AuthTag (camelToPathPiece' 1)
-
-instance ToJSONKey AuthTag where
-  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
-
-instance FromJSONKey AuthTag where
-  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
-
-instance Binary AuthTag
-
-
-newtype AuthTagActive = AuthTagActive { authTagIsActive :: AuthTag -> Bool }
-  deriving (Read, Show, Generic)
-  deriving newtype (Eq, Ord)
-
-instance Default AuthTagActive where
-  def = AuthTagActive $ \case
-    AuthAdmin -> False
-    _ -> True
-
-instance ToJSON AuthTagActive where
-  toJSON v = toJSON . HashMap.fromList $ map (id &&& authTagIsActive v) universeF
-
-instance FromJSON AuthTagActive where
-  parseJSON = withObject "AuthTagActive" $ \o -> do
-    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap AuthTag Bool)
-    return . AuthTagActive $ \n -> case HashMap.lookup n o' of
-      Nothing -> authTagIsActive def n
-      Just b  -> b
-
-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 = TaggedObject "val" "var"
-  } ''PredLiteral
-
-instance PathPiece a => PathPiece (PredLiteral a) where
-  toPathPiece PLVariable{..} = toPathPiece plVar
-  toPathPiece PLNegated{..} = "¬" <> toPathPiece plVar
-
-  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)
-  deriving newtype (Semigroup, Monoid)
-
-$(return [])
-
-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
-
-
-data LecturerType = CourseLecturer | CourseAssistant
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
-
-instance Universe LecturerType
-instance Finite LecturerType
-
-nullaryPathPiece ''LecturerType $ camelToPathPiece' 1
-deriveJSON  defaultOptions
-  { constructorTagModifier = camelToPathPiece' 1
-  } ''LecturerType
-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
-
-
-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
-  , 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
-  , 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
-  { fieldLabelModifier = camelToPathPiece' 1
-  , 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)
-
-instance Universe HealthStatus
-instance Finite HealthStatus
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 1
-  } ''HealthStatus
-nullaryPathPiece ''HealthStatus $ camelToPathPiece' 1
-
-classifyHealthReport :: HealthReport -> HealthStatus
--- ^ 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
-  unless (fromMaybe True healthWidgetMemcached) . tell $ Min HealthFailure
-
-
 -- Type synonyms
 
 type Email           = Text
diff --git a/src/Model/Types/DateTime.hs b/src/Model/Types/DateTime.hs
new file mode 100644
index 000000000..05fe00594
--- /dev/null
+++ b/src/Model/Types/DateTime.hs
@@ -0,0 +1,158 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving
+           , UndecidableInstances
+  #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
+
+module Model.Types.DateTime where
+
+
+import ClassyPrelude
+import GHC.Generics (Generic)
+import Utils
+import Control.Lens hiding (universe)
+import Data.NonNull.Instances ()
+import Data.Typeable (Typeable)
+import Data.Universe.Instances.Reverse ()
+import Data.Binary (Binary)
+
+import Data.Text (Text)
+import qualified Data.Text as Text
+import qualified Data.CaseInsensitive as CI
+import Data.CaseInsensitive.Instances ()
+import Text.Read (readMaybe)
+
+import Database.Persist.Class
+import Database.Persist.Sql
+
+import Web.HttpApiData
+
+import Yesod.Core.Dispatch (PathPiece(..))
+import qualified Data.Aeson as Aeson
+import Data.Aeson (FromJSON(..), ToJSON(..), withText)
+
+
+----
+--  Terms, Seaons, anything loosely related to time
+
+data Season = Summer | Winter
+  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Typeable)
+
+instance Binary Season
+
+seasonToChar :: Season -> Char
+seasonToChar Summer = 'S'
+seasonToChar Winter = 'W'
+
+seasonFromChar :: Char -> Either Text Season
+seasonFromChar c
+  | c ~= 'S'  = Right Summer
+  | c ~= 'W'  = Right Winter
+  | otherwise = Left $ "Invalid season character: ‘" <> tshow c <> "’"
+  where
+    (~=) = (==) `on` CI.mk
+
+instance DisplayAble Season
+
+data TermIdentifier = TermIdentifier
+  { year :: Integer -- ^ Using 'Integer' to model years is consistent with 'Data.Time.Calendar'
+  , season :: Season
+  } deriving (Show, Read, Eq, Ord, Generic, Typeable)
+
+instance Binary TermIdentifier
+
+instance Enum TermIdentifier where
+  -- ^ Do not use for conversion – Enumeration only
+  toEnum int = let (toInteger -> year, toEnum -> season) = int `divMod` 2 in TermIdentifier{..}
+  fromEnum TermIdentifier{..} = fromInteger year * 2 + fromEnum season
+
+-- Conversion TermId <-> TermIdentifier::
+-- from_TermId_to_TermIdentifier = unTermKey
+-- from_TermIdentifier_to_TermId = TermKey
+
+shortened :: Iso' Integer Integer
+shortened = iso shorten expand
+  where
+    century = ($currentYear `div` 100) * 100
+    expand year
+      | 0 <= year
+      , year < 100 = let
+          options = [ expanded | offset <- [-1, 0, 1]
+                               , let century' = century + offset * 100
+                                     expanded = century' + year
+                               , $currentYear - 50 <= expanded
+                               , expanded < $currentYear + 50
+                               ]
+          in case options of
+               [unique] -> unique
+               failed   -> error $ "Could not expand year " ++ show year ++ ": " ++ show failed
+      | otherwise = year
+    shorten year
+      | $currentYear - 50 <= year
+      , year < $currentYear + 50 = year `mod` 100
+      | otherwise = year
+
+termToText :: TermIdentifier -> Text
+termToText TermIdentifier{..} = Text.pack $ seasonToChar season : show (year ^. shortened)
+
+-- also see Hander.Utils.tidFromText
+termFromText :: Text -> Either Text TermIdentifier
+termFromText t
+  | (s:ys) <- Text.unpack t
+  , Just (review shortened -> year) <- readMaybe ys
+  , Right season <- seasonFromChar s
+  = Right TermIdentifier{..}
+  | otherwise = Left $ "Invalid TermIdentifier: “" <> t <> "”" -- TODO: Could be improved, I.e. say "W"/"S" from Number
+
+termToRational :: TermIdentifier -> Rational
+termToRational TermIdentifier{..} = fromInteger year + seasonOffset
+  where
+    seasonOffset
+      | Summer <- season = 0
+      | Winter <- season = 0.5
+
+termFromRational :: Rational -> TermIdentifier
+termFromRational n = TermIdentifier{..}
+  where
+    year = floor n
+    remainder = n - (fromInteger $ floor n)
+    season
+      | remainder == 0 = Summer
+      | otherwise      = Winter
+
+instance PersistField TermIdentifier where
+  toPersistValue = PersistRational . termToRational
+  fromPersistValue (PersistRational t) = Right $ termFromRational t
+  fromPersistValue x = Left $ "Expected TermIdentifier, received: " <> tshow x
+
+instance PersistFieldSql TermIdentifier where
+  sqlType _ = SqlNumeric 5 1
+
+instance ToHttpApiData TermIdentifier where
+  toUrlPiece = termToText
+
+instance FromHttpApiData TermIdentifier where
+  parseUrlPiece = termFromText
+
+instance PathPiece TermIdentifier where
+  fromPathPiece = either (const Nothing) Just . termFromText
+  toPathPiece = termToText
+
+instance ToJSON TermIdentifier where
+  toJSON = Aeson.String . termToText
+
+instance FromJSON TermIdentifier where
+  parseJSON = withText "Term" $ either (fail . Text.unpack) return . termFromText
+
+{- Must be defined in a later module:
+    termField :: Field (HandlerT UniWorX IO) TermIdentifier
+    termField = checkMMap (return . termFromText) termToText textField
+   See Handler.Utils.Form.termsField and termActiveField
+-}
+
+
+withinTerm :: Day -> TermIdentifier -> Bool
+time `withinTerm` term = timeYear `mod` 100 == termYear `mod` 100
+  where
+    timeYear = fst3 $ toGregorian time
+    termYear = year term
+
diff --git a/src/Model/Types/Misc.hs b/src/Model/Types/Misc.hs
new file mode 100644
index 000000000..226665e63
--- /dev/null
+++ b/src/Model/Types/Misc.hs
@@ -0,0 +1,532 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving
+           , UndecidableInstances
+  #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
+
+module Model.Types.Misc where
+
+
+import ClassyPrelude
+import Utils
+import Control.Lens hiding (universe)
+
+import Data.Set (Set)
+import qualified Data.Set as Set
+import Data.Maybe (fromJust)
+import Data.Universe
+import Data.Universe.Helpers
+import Data.UUID.Types (UUID)
+import qualified Data.UUID.Types as UUID
+
+import Data.NonNull.Instances ()
+
+import Data.Default
+
+import Database.Persist.TH hiding (derivePersistFieldJSON)
+import Model.Types.JSON
+import Database.Persist.Class
+import Database.Persist.Sql
+
+import Data.Text (Text)
+import qualified Data.Text as Text
+import qualified Data.Text.Lens as Text
+
+import qualified Data.HashMap.Strict as HashMap
+
+import Data.CaseInsensitive (CI)
+import qualified Data.CaseInsensitive as CI
+import Data.CaseInsensitive.Instances ()
+
+import Yesod.Core.Dispatch (PathPiece(..))
+import qualified Data.Aeson as Aeson
+import qualified Data.Aeson.Types as Aeson
+import Data.Aeson (FromJSON(..), ToJSON(..), FromJSONKey(..), ToJSONKey(..), FromJSONKeyFunction(..), withObject, Value())
+import Data.Aeson.Types (toJSONKeyText)
+import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..), mkToJSON, mkParseJSON)
+
+import GHC.Generics (Generic)
+import Data.Typeable (Typeable)
+
+import Data.Universe.Instances.Reverse ()
+
+import Mail (MailLanguages(..))
+
+import Data.Word.Word24 (Word24)
+import Data.Bits
+import Data.Ix
+import Data.List (genericIndex, elemIndex)
+import System.Random (Random(..))
+import Data.Data (Data)
+
+import Model.Types.Wordlist
+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)
+
+import Data.Semigroup (Min(..))
+import Control.Monad.Trans.Writer (execWriter)
+import Control.Monad.Writer.Class (MonadWriter(..))
+
+
+
+
+data StudyFieldType = FieldPrimary | FieldSecondary
+  deriving (Eq, Ord, Enum, Show, Read, Bounded, Generic)
+derivePersistField "StudyFieldType"
+
+instance PersistField UUID where
+  toPersistValue = PersistDbSpecific . UUID.toASCIIBytes
+  fromPersistValue (PersistText t) = maybe (Left "Failed to parse UUID") Right $ UUID.fromText t
+  fromPersistValue (PersistByteString bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
+  fromPersistValue (PersistDbSpecific bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
+  fromPersistValue x = Left $ "Expected UUID, received: " <> tshow x
+
+instance PersistFieldSql UUID where
+  sqlType _ = SqlOther "uuid"
+
+instance DisplayAble StudyFieldType
+
+data Theme
+  = ThemeDefault
+  | ThemeLavender
+  | ThemeNeutralBlue
+  | ThemeAberdeenReds
+  | ThemeMossGreen
+  | ThemeSkyLove
+  deriving (Eq, Ord, Bounded, Enum, Show, Read, Generic)
+
+deriveJSON defaultOptions
+  { constructorTagModifier = fromJust . stripPrefix "Theme"
+  } ''Theme
+
+instance Universe Theme where universe = universeDef
+instance Finite Theme
+
+nullaryPathPiece ''Theme (camelToPathPiece' 1)
+
+$(deriveSimpleWith ''DisplayAble 'display (over Text.packed $ Text.intercalate " " . unsafeTail . splitCamel) ''Theme) -- describe theme to user
+
+derivePersistField "Theme"
+
+
+newtype ZIPArchiveName obj = ZIPArchiveName { unZIPArchiveName :: obj }
+  deriving (Show, Read, Eq, Ord, Generic, Typeable)
+
+instance PathPiece obj => PathPiece (ZIPArchiveName obj) where
+    fromPathPiece = fmap ZIPArchiveName . fromPathPiece <=< (stripSuffix `on` CI.foldCase) ".zip"
+    toPathPiece = (<> ".zip") . toPathPiece . unZIPArchiveName
+
+
+data CorrectorState = CorrectorNormal | CorrectorMissing | CorrectorExcused
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic)
+
+deriveJSON defaultOptions
+  { constructorTagModifier = fromJust . stripPrefix "Corrector"
+  } ''CorrectorState
+
+instance Universe CorrectorState
+instance Finite CorrectorState
+
+instance Hashable CorrectorState
+
+nullaryPathPiece ''CorrectorState (camelToPathPiece' 1)
+
+derivePersistField "CorrectorState"
+
+
+data AuthenticationMode = AuthLDAP
+                        | AuthPWHash { authPWHash :: Text }
+  deriving (Eq, Ord, Read, Show, Generic)
+
+deriveJSON defaultOptions
+  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
+  , fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel
+  , sumEncoding = UntaggedValue
+  } ''AuthenticationMode
+
+derivePersistFieldJSON ''AuthenticationMode
+
+
+derivePersistFieldJSON ''Value
+
+
+-- ^ `NotificationSettings` is for now a series of boolean checkboxes, i.e. a mapping @NotificationTrigger -> Bool@
+--
+-- Could maybe be replaced with `Structure Notification` in the long term
+data NotificationTrigger = NTSubmissionRatedGraded
+                         | NTSubmissionRated
+                         | NTSheetActive
+                         | NTSheetSoonInactive
+                         | NTSheetInactive
+                         | NTCorrectionsAssigned
+                         | NTCorrectionsNotDistributed
+                         | NTUserRightsUpdate
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+
+instance Universe NotificationTrigger
+instance Finite NotificationTrigger
+
+instance Hashable NotificationTrigger
+
+deriveJSON defaultOptions
+  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
+  } ''NotificationTrigger
+
+instance ToJSONKey NotificationTrigger where
+  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
+
+instance FromJSONKey NotificationTrigger where
+  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
+
+
+newtype NotificationSettings = NotificationSettings { notificationAllowed :: NotificationTrigger -> Bool }
+  deriving (Generic, Typeable)
+  deriving newtype (Eq, Ord, Read, Show)
+
+instance Default NotificationSettings where
+  def = NotificationSettings $ \case
+    NTSubmissionRatedGraded -> True
+    NTSubmissionRated -> False
+    NTSheetActive -> True
+    NTSheetSoonInactive -> False
+    NTSheetInactive -> True
+    NTCorrectionsAssigned -> True
+    NTCorrectionsNotDistributed -> True
+    NTUserRightsUpdate -> True
+
+instance ToJSON NotificationSettings where
+  toJSON v = toJSON . HashMap.fromList $ map (id &&& notificationAllowed v) universeF
+
+instance FromJSON NotificationSettings where
+  parseJSON = withObject "NotificationSettings" $ \o -> do
+    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap NotificationTrigger Bool)
+    return . NotificationSettings $ \n -> case HashMap.lookup n o' of
+      Nothing -> notificationAllowed def n
+      Just b  -> b
+
+derivePersistFieldJSON ''NotificationSettings
+
+
+instance ToBackendKey SqlBackend record => Hashable (Key record) where
+  hashWithSalt s key = s `hashWithSalt` fromSqlKey key
+
+derivePersistFieldJSON ''MailLanguages
+
+
+type PseudonymWord   = CI Text
+
+newtype Pseudonym = Pseudonym Word24
+  deriving (Eq, Ord, Read, Show, Generic, Data)
+  deriving newtype (Bounded, Enum, Integral, Num, Real, Ix)
+
+
+instance PersistField Pseudonym where
+  toPersistValue p = toPersistValue (fromIntegral p :: Word32)
+  fromPersistValue v = do
+    w <- fromPersistValue v :: Either Text Word32
+    if
+      | 0 <= w
+      , w <= fromIntegral (maxBound :: Pseudonym)
+        -> return $ fromIntegral w
+      | otherwise
+        -> Left "Pseudonym out of range"
+
+instance PersistFieldSql Pseudonym where
+  sqlType _ = SqlInt32
+
+instance Random Pseudonym where
+  randomR (max minBound -> lo, min maxBound -> hi) gen = over _1 (fromIntegral :: Word32 -> Pseudonym) $ randomR (fromIntegral lo, fromIntegral hi) gen
+  random = randomR (minBound, maxBound)
+
+instance FromJSON Pseudonym where
+  parseJSON v@(Aeson.Number _) = do
+    w <- parseJSON v :: Aeson.Parser Word32
+    if
+      | 0 <= w
+      , w <= fromIntegral (maxBound :: Pseudonym)
+        -> return $ fromIntegral w
+      | otherwise
+        -> fail "Pseudonym out auf range"
+  parseJSON (Aeson.String t)
+    = case t ^? _PseudonymText of
+        Just p -> return p
+        Nothing -> fail "Could not parse pseudonym"
+  parseJSON v = flip (Aeson.withArray "Pseudonym") v $ \ws -> do
+    ws' <- toList . map CI.mk <$> mapM parseJSON ws
+    case ws' ^? _PseudonymWords of
+      Just p -> return p
+      Nothing -> fail "Could not parse pseudonym words"
+
+instance ToJSON Pseudonym where
+  toJSON = toJSON . (review _PseudonymWords :: Pseudonym -> [PseudonymWord])
+
+pseudonymWordlist :: [PseudonymWord]
+pseudonymCharacters :: Set (CI Char)
+(pseudonymWordlist, pseudonymCharacters) = $(wordlist "config/wordlist.txt")
+
+_PseudonymWords :: Prism' [PseudonymWord] Pseudonym
+_PseudonymWords = prism' pToWords pFromWords
+  where
+    pFromWords :: [PseudonymWord] -> Maybe Pseudonym
+    pFromWords [w1, w2]
+      | Just i1 <- elemIndex w1 pseudonymWordlist
+      , Just i2 <- elemIndex w2 pseudonymWordlist
+      , i1 <= maxWord, i2 <= maxWord
+      = Just . Pseudonym $ shiftL (fromIntegral i1) 12 .|. fromIntegral i2
+    pFromWords _ = Nothing
+
+    pToWords :: Pseudonym -> [PseudonymWord]
+    pToWords (Pseudonym p)
+      = [ genericIndex pseudonymWordlist $ shiftR p 12 .&. maxWord
+        , genericIndex pseudonymWordlist $ p .&. maxWord
+        ]
+
+    maxWord :: Num a => a
+    maxWord = 0b111111111111
+
+_PseudonymText :: Prism' Text Pseudonym
+_PseudonymText = prism' tToWords tFromWords . _PseudonymWords
+  where
+    tFromWords :: Text -> Maybe [PseudonymWord]
+    tFromWords input
+      | [result] <- input ^.. pseudonymFragments
+      = Just result
+      | otherwise
+      = Nothing
+
+    tToWords :: [PseudonymWord] -> Text
+    tToWords = Text.unwords . map CI.original
+
+pseudonymWords :: Fold Text PseudonymWord
+pseudonymWords = folding
+  $ \(CI.mk -> input) -> map (view _2) . fromMaybe [] . listToMaybe . groupBy ((==) `on` view _1) . sortBy (comparing $ view _1) . filter ((<= distanceCutoff) . view _1) $ map (distance input &&& id) pseudonymWordlist
+  where
+    distance = damerauLevenshtein `on` CI.foldedCase
+    -- | Arbitrary cutoff point, for reference: ispell cuts off at 1
+    distanceCutoff = 2
+
+pseudonymFragments :: Fold Text [PseudonymWord]
+pseudonymFragments = folding
+  $ mapM (toListOf pseudonymWords) . (\l -> guard (length l == 2) *> l) . filter (not . null) . Text.split (\(CI.mk -> c) -> not $ Set.member c pseudonymCharacters)
+
+
+data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prädikate sind sortier nach Relevanz für Benutzer
+  = AuthAdmin
+  | AuthLecturer
+  | AuthCorrector
+  | AuthTutor
+  | AuthCourseRegistered
+  | AuthTutorialRegistered
+  | AuthParticipant
+  | AuthTime
+  | AuthMaterials
+  | AuthOwner
+  | AuthRated
+  | AuthUserSubmissions
+  | AuthCorrectorSubmissions
+  | AuthCapacity
+  | AuthRegisterGroup
+  | AuthEmpty
+  | AuthSelf
+  | AuthAuthentication
+  | AuthNoEscalation
+  | AuthRead
+  | AuthWrite
+  | AuthToken
+  | AuthDeprecated
+  | AuthDevelopment
+  | AuthFree
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
+
+instance Universe AuthTag
+instance Finite AuthTag
+instance Hashable AuthTag
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  } ''AuthTag
+
+nullaryPathPiece ''AuthTag (camelToPathPiece' 1)
+
+instance ToJSONKey AuthTag where
+  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
+
+instance FromJSONKey AuthTag where
+  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
+
+instance Binary AuthTag
+
+
+newtype AuthTagActive = AuthTagActive { authTagIsActive :: AuthTag -> Bool }
+  deriving (Read, Show, Generic)
+  deriving newtype (Eq, Ord)
+
+instance Default AuthTagActive where
+  def = AuthTagActive $ \case
+    AuthAdmin -> False
+    _ -> True
+
+instance ToJSON AuthTagActive where
+  toJSON v = toJSON . HashMap.fromList $ map (id &&& authTagIsActive v) universeF
+
+instance FromJSON AuthTagActive where
+  parseJSON = withObject "AuthTagActive" $ \o -> do
+    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap AuthTag Bool)
+    return . AuthTagActive $ \n -> case HashMap.lookup n o' of
+      Nothing -> authTagIsActive def n
+      Just b  -> b
+
+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 = TaggedObject "val" "var"
+  } ''PredLiteral
+
+instance PathPiece a => PathPiece (PredLiteral a) where
+  toPathPiece PLVariable{..} = toPathPiece plVar
+  toPathPiece PLNegated{..} = "¬" <> toPathPiece plVar
+
+  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)
+  deriving newtype (Semigroup, Monoid)
+
+$(return [])
+
+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
+
+
+data LecturerType = CourseLecturer | CourseAssistant
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+
+instance Universe LecturerType
+instance Finite LecturerType
+
+nullaryPathPiece ''LecturerType $ camelToPathPiece' 1
+deriveJSON  defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  } ''LecturerType
+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
+
+
+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
+  , 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
+  , 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
+  { fieldLabelModifier = camelToPathPiece' 1
+  , 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)
+
+instance Universe HealthStatus
+instance Finite HealthStatus
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  } ''HealthStatus
+nullaryPathPiece ''HealthStatus $ camelToPathPiece' 1
+
+classifyHealthReport :: HealthReport -> HealthStatus
+-- ^ 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
+  unless (fromMaybe True healthWidgetMemcached) . tell $ Min HealthFailure
+
diff --git a/src/Model/Types/Sheet.hs b/src/Model/Types/Sheet.hs
new file mode 100644
index 000000000..825c07e9f
--- /dev/null
+++ b/src/Model/Types/Sheet.hs
@@ -0,0 +1,338 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving
+           , UndecidableInstances
+  #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
+
+module Model.Types.Sheet where
+
+import ClassyPrelude
+import Utils
+import Numeric.Natural
+
+import Control.Lens hiding (universe)
+import Utils.Lens.TH
+import GHC.Generics (Generic)
+import Generics.Deriving.Monoid (memptydefault, mappenddefault)
+import Data.Typeable (Typeable)
+import Data.Universe
+import Data.Universe.Helpers
+import Data.Universe.TH
+import Data.Universe.Instances.Reverse ()
+
+import Data.NonNull.Instances ()
+import Data.Set (Set)
+import qualified Data.Set as Set
+import qualified Data.Map as Map
+import Data.Fixed
+import Data.Monoid (Sum(..))
+import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..))
+
+import Data.CaseInsensitive.Instances ()
+import Text.Blaze (Markup)
+
+import Database.Persist.TH hiding (derivePersistFieldJSON)
+import Model.Types.JSON
+import Yesod.Core.Dispatch (PathPiece(..))
+
+
+----
+-- Sheet and Submission realted Model.Types
+
+type Count  = Sum Integer
+type Points = Centi
+
+toPoints :: Integral a => a -> Points -- deprecated
+toPoints = fromIntegral
+
+pToI :: Points -> Integer -- deprecated
+pToI = fromPoints
+
+fromPoints :: Integral a => Points -> a -- deprecated
+fromPoints = round
+
+instance DisplayAble Points
+
+instance DisplayAble a => DisplayAble (Sum a) where
+  display (Sum x) = display x
+
+data SheetGrading
+  = Points     { maxPoints :: Points }
+  | PassPoints { maxPoints, passingPoints :: Points }
+  | PassBinary -- non-zero means passed
+  deriving (Eq, Read, Show, Generic)
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece
+  , fieldLabelModifier = intercalate "-" . map toLower . dropEnd 1 . splitCamel
+  , sumEncoding = TaggedObject "type" "data"
+  } ''SheetGrading
+derivePersistFieldJSON ''SheetGrading
+
+makeLenses_ ''SheetGrading
+
+_passingBound :: Fold SheetGrading (Either () Points)
+_passingBound = folding passPts
+  where
+    passPts :: SheetGrading -> Maybe (Either () Points)
+    passPts (Points{}) = Nothing
+    passPts (PassPoints{passingPoints}) = Just $ Right passingPoints
+    passPts (PassBinary) = Just $ Left ()
+
+gradingPassed :: SheetGrading -> Points -> Maybe Bool
+gradingPassed gr pts = either pBinary pPoints <$> gr ^? _passingBound
+    where pBinary _ = pts /= 0
+          pPoints b = pts >= b
+
+
+data SheetGradeSummary = SheetGradeSummary
+  { numSheets       :: Count       -- Total number of sheets, includes all
+  , numSheetsPasses :: Count       -- Number of sheets required to pass FKA: numGradePasses
+  , numSheetsPoints :: Count       -- Number of sheets having points    FKA: sumGradePointsd
+  , sumSheetsPoints :: Sum Points  -- Total of all points in all sheets
+  -- Marking dependend
+  , numMarked       :: Count       -- Number of already marked sheets
+  , numMarkedPasses :: Count       -- Number of already marked sheets with passes
+  , numMarkedPoints :: Count       -- Number of already marked sheets with points
+  , sumMarkedPoints :: Sum Points  -- Achieveable points within marked sheets
+  --
+  , achievedPasses :: Count        -- Achieved passes (within marked sheets)
+  , achievedPoints :: Sum Points   -- Achieved points (within marked sheets)
+  } deriving (Generic, Read, Show, Eq)
+
+instance Monoid SheetGradeSummary where
+  mempty  = memptydefault
+  mappend = mappenddefault
+
+instance Semigroup SheetGradeSummary where
+  (<>) = mappend -- TODO: remove for GHC > 8.4.x
+
+makeLenses_ ''SheetGradeSummary
+
+sheetGradeSum :: SheetGrading -> Maybe Points -> SheetGradeSummary
+sheetGradeSum gr Nothing  = mempty
+  { numSheets = 1
+  , numSheetsPasses = bool  mempty   1 $ has _passingBound gr
+  , numSheetsPoints = bool  mempty   1 $ has _maxPoints    gr
+  , sumSheetsPoints = maybe mempty Sum $ gr ^? _maxPoints
+  }
+sheetGradeSum gr (Just p) =
+  let unmarked@SheetGradeSummary{..} = sheetGradeSum gr Nothing
+  in  unmarked
+        { numMarked       = numSheets
+        , numMarkedPasses = numSheetsPasses
+        , numMarkedPoints = numSheetsPoints
+        , sumMarkedPoints = sumSheetsPoints
+        , achievedPasses  = fromMaybe mempty $ bool 0 1 <$> gradingPassed gr p
+        , achievedPoints  = bool mempty (Sum p) $ has _maxPoints gr
+        }
+
+
+data SheetType
+  = NotGraded
+  | Normal        { grading :: SheetGrading }
+  | Bonus         { grading :: SheetGrading }
+  | Informational { grading :: SheetGrading }
+  deriving (Eq, Read, Show, Generic)
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece
+  , fieldLabelModifier = camelToPathPiece
+  , sumEncoding = TaggedObject "type" "data"
+  } ''SheetType
+derivePersistFieldJSON ''SheetType
+
+data SheetTypeSummary = SheetTypeSummary
+  { normalSummary
+  , bonusSummary
+  , informationalSummary :: SheetGradeSummary
+  , numNotGraded :: Count
+  } deriving (Generic, Read, Show, Eq)
+
+instance Monoid SheetTypeSummary where
+  mempty  = memptydefault
+  mappend = mappenddefault
+
+instance Semigroup SheetTypeSummary where
+  (<>) = mappend -- TODO: remove for GHC > 8.4.x
+
+makeLenses_ ''SheetTypeSummary
+
+sheetTypeSum :: SheetType -> Maybe Points -> SheetTypeSummary
+sheetTypeSum Bonus{..}         mps = mempty { bonusSummary         = sheetGradeSum grading mps }
+sheetTypeSum Normal{..}        mps = mempty { normalSummary        = sheetGradeSum grading mps }
+sheetTypeSum Informational{..} mps = mempty { informationalSummary = sheetGradeSum grading mps }
+sheetTypeSum NotGraded _           = mempty { numNotGraded         = Sum 1 }
+
+data SheetGroup
+  = Arbitrary { maxParticipants :: Natural }
+  | RegisteredGroups
+  | NoGroups
+  deriving (Show, Read, Eq, Generic)
+deriveJSON defaultOptions ''SheetGroup
+derivePersistFieldJSON ''SheetGroup
+
+makeLenses_ ''SheetGroup
+
+data SheetFileType = SheetExercise | SheetHint | SheetSolution | SheetMarking
+  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
+derivePersistField "SheetFileType"
+
+instance Universe SheetFileType where universe = universeDef
+instance Finite SheetFileType
+
+instance PathPiece SheetFileType where
+  toPathPiece SheetExercise = "file"
+  toPathPiece SheetHint     = "hint"
+  toPathPiece SheetSolution = "solution"
+  toPathPiece SheetMarking  = "marking"
+  fromPathPiece = finiteFromPathPiece
+
+sheetFile2markup :: SheetFileType -> Markup
+sheetFile2markup SheetExercise = iconQuestion
+sheetFile2markup SheetHint     = iconHint
+sheetFile2markup SheetSolution = iconSolution
+sheetFile2markup SheetMarking  = iconMarking
+
+-- $(deriveSimpleWith ''DisplayAble 'display (drop 17) ''SheetFileType)
+instance DisplayAble SheetFileType where -- deprecated, see RenderMessage instance in Foundation
+  display SheetExercise = "Aufgabenstellung"
+  display SheetHint     = "Hinweise"
+  display SheetSolution = "Musterlösung"
+  display SheetMarking  = "Korrekturhinweise"
+
+-- partitionFileType' :: Ord a => [(SheetFileType,a)] -> Map SheetFileType (Set a)
+-- partitionFileType' = groupMap
+
+partitionFileType :: Ord a => [(SheetFileType,a)] -> SheetFileType -> Set a
+partitionFileType fs t = Map.findWithDefault Set.empty t . Map.fromListWith Set.union $ map (over _2 Set.singleton) fs
+
+data SubmissionFileType = SubmissionOriginal | SubmissionCorrected
+  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
+
+instance Universe SubmissionFileType where universe = universeDef
+instance Finite SubmissionFileType
+
+submissionFileTypeIsUpdate :: SubmissionFileType -> Bool
+submissionFileTypeIsUpdate SubmissionOriginal  = False
+submissionFileTypeIsUpdate SubmissionCorrected = True
+
+isUpdateSubmissionFileType :: Bool -> SubmissionFileType
+isUpdateSubmissionFileType False = SubmissionOriginal
+isUpdateSubmissionFileType True  = SubmissionCorrected
+
+instance PathPiece SubmissionFileType where
+  toPathPiece SubmissionOriginal  = "original"
+  toPathPiece SubmissionCorrected = "corrected"
+  fromPathPiece = finiteFromPathPiece
+
+instance DisplayAble SubmissionFileType where
+  display SubmissionOriginal  = "Abgabe"
+  display SubmissionCorrected = "Korrektur"
+
+{-
+data DA = forall a . (DisplayAble a) => DA a
+
+instance DisplayAble DA where
+  display (DA x) = display x
+-}
+
+
+data UploadMode = NoUpload | Upload { unpackZips :: Bool }
+  deriving (Show, Read, Eq, Ord, Generic)
+
+deriveFinite ''UploadMode
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece
+  , fieldLabelModifier = camelToPathPiece
+  , sumEncoding = TaggedObject "mode" "settings"
+  }''UploadMode
+derivePersistFieldJSON ''UploadMode
+
+instance PathPiece UploadMode where
+  toPathPiece = \case
+    NoUpload     -> "no-upload"
+    Upload True  -> "unpack"
+    Upload False -> "no-unpack"
+  fromPathPiece = finiteFromPathPiece
+
+data SubmissionMode = SubmissionMode
+  { submissionModeCorrector :: Bool
+  , submissionModeUser :: Maybe UploadMode
+  }
+  deriving (Show, Read, Eq, Ord, Generic)
+
+deriveFinite ''SubmissionMode
+
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 2
+  } ''SubmissionMode
+derivePersistFieldJSON ''SubmissionMode
+
+finitePathPiece ''SubmissionMode
+  [ "no-submissions"
+  , "no-upload"
+  , "no-unpack"
+  , "unpack"
+  , "correctors"
+  , "correctors+no-upload"
+  , "correctors+no-unpack"
+  , "correctors+unpack"
+  ]
+
+data SubmissionModeDescr = SubmissionModeNone
+                         | SubmissionModeCorrector
+                         | SubmissionModeUser
+                         | SubmissionModeBoth
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe SubmissionModeDescr
+instance Finite SubmissionModeDescr
+
+finitePathPiece ''SubmissionModeDescr
+  [ "no-submissions"
+  , "correctors"
+  , "users"
+  , "correctors+users"
+  ]
+
+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)
+derivePersistField "ExamStatus"
+
+-- | Specify a corrector's workload
+data Load -- = ByTutorial { countsToLoad :: Bool } | ByProportion { load :: Rational }
+    = Load { byTutorial :: Maybe Bool  -- ^ @Just@ all from Tutorial, @True@ if counting towards overall workload
+           , byProportion :: Rational  -- ^ workload proportion of all submission not assigned to tutorial leaders
+           }
+  deriving (Show, Read, Eq, Ord, Generic)
+
+deriveJSON defaultOptions ''Load
+derivePersistFieldJSON ''Load
+
+instance Hashable Load
+
+instance Semigroup Load where
+  (Load byTut prop) <> (Load byTut' prop') = Load byTut'' (prop + prop')
+    where
+      byTut''
+        | Nothing <- byTut  = byTut'
+        | Nothing <- byTut' = byTut
+        | Just a <- byTut
+        , Just b <- byTut'  = Just $ a || b
+
+instance Monoid Load where
+  mempty = Load Nothing 0
+  mappend = (<>)
+
+{- Use (is _ByTutorial) instead of this unneeded definition:
+  isByTutorial :: Load -> Bool
+  isByTutorial (ByTutorial {}) = True
+  isByTutorial _               = False
+-}
\ No newline at end of file

From d95edd662e2e176e0374e61600ff7f662ab719b6 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 15 May 2019 22:28:22 +0200
Subject: [PATCH 329/519] tweak js http client get/post api a little

---
 static/js/services/httpClient.js | 24 +++++++++++++-----------
 static/js/utils/asyncForm.js     |  2 +-
 static/js/utils/asyncTable.js    |  2 +-
 static/js/utils/massInput.js     | 21 +++++++++------------
 static/js/utils/modal.js         |  2 +-
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/static/js/services/httpClient.js b/static/js/services/httpClient.js
index a69d788fd..4d6dc1820 100644
--- a/static/js/services/httpClient.js
+++ b/static/js/services/httpClient.js
@@ -11,19 +11,19 @@
       }
     }
 
-    function _fetch(url, method, additionalHeaders, body) {
+    function _fetch(options) {
       var requestOptions = {
         credentials: 'same-origin',
         headers: { },
-        method: method,
-        body: body,
+        method: options.method,
+        body: options.body,
       };
 
-      Object.keys(additionalHeaders).forEach(function(headerKey) {
-        requestOptions.headers[headerKey] = additionalHeaders[headerKey];
+      Object.keys(options.headers).forEach(function(headerKey) {
+        requestOptions.headers[headerKey] = options.headers[headerKey];
       });
 
-      return fetch(url, requestOptions).then(
+      return fetch(options.url, requestOptions).then(
         function(response) {
           _responseInterceptors.forEach(function(interceptor) { interceptor(response); });
           return Promise.resolve(response);
@@ -48,7 +48,7 @@
 
       return response.text().then(function (responseText) {
         var docFrag = document.createRange().createContextualFragment(responseText);
-        
+
         var idAttrs = ['id', 'for', 'data-conditional-input', 'data-modal-trigger'];
         idAttrs.forEach(function(attr) {
           Array.from(docFrag.querySelectorAll('[' + attr + ']')).forEach(function(input) {
@@ -65,11 +65,13 @@
     }
 
     return {
-      get: function(url, headers) {
-        return _fetch(url, 'GET', headers);
+      get: function(args) {
+        args.method = 'GET';
+        return _fetch(args);
       },
-      post: function(url, headers, body) {
-        return _fetch(url, 'POST', headers, body);
+      post: function(args) {
+        args.method = 'POST';
+        return _fetch(args);
       },
       addResponseInterceptor: addResponseInterceptor,
       parseHTML: parseHTML,
diff --git a/static/js/utils/asyncForm.js b/static/js/utils/asyncForm.js
index eaf6f9221..2f6d40284 100644
--- a/static/js/utils/asyncForm.js
+++ b/static/js/utils/asyncForm.js
@@ -96,7 +96,7 @@
         headers[MODAL_HEADER_KEY] = MODAL_HEADER_VALUE;
       }
 
-      HttpClient.post(url, headers, body)
+      HttpClient.post({ url: url, headers: headers, body: body })
         .then(function(response) {
           if (response.headers.get("content-type").indexOf("application/json") !== -1) {// checking response header
             return response.json();
diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 78d9ae90c..577ffb753 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -319,7 +319,7 @@
         [asyncTableHeader]: asyncTableId
       };
 
-      HttpClient.get(url, headers).then(
+      HttpClient.get({ url: url, headers: headers }).then(
         response => HttpClient.parseHTML(response, element.id)
       ).then(function(data) {
         setLocalStorageParameter('currentTableUrl', url.href);
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 4f0400b6a..e7b594b3f 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -120,18 +120,15 @@
 
           if (enctype !== 'multipart/form-data')
             headers['Content-Type'] = enctype;
-          
-          requestFn(
-            url,
-            headers,
-            requestBody,
-          ).then(response => HttpClient.parseHTML(response, element.id)
-          ).then(function(response) {
-            processResponse(response);
-            if (isAddCell) {
-              reFocusAddCell();
-            }
-          });
+
+          requestFn({ url: url, headers: headers, body: requestBody })
+            .then(response => HttpClient.parseHTML(response, element.id))
+            .then(function(response) {
+              processResponse(response);
+              if (isAddCell) {
+                reFocusAddCell();
+              }
+            });
         }
       };
     }
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index e0ba9c7c1..20c453873 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -167,7 +167,7 @@
         throw new Error('HttpClient not found! Can\'t fetch modal content from ' + url);
       }
 
-      HttpClient.get(url, MODAL_HEADERS)
+      HttpClient.get({ url: url, headers: MODAL_HEADERS })
         .then(response => HttpClient.parseHTML(response, element.id))
         .then(processResponse);
     }

From 81441717ce44adf7e3d547ef80e691d037bd678c Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 15 May 2019 22:33:57 +0200
Subject: [PATCH 330/519] Quiet hlint, one more split to Model.Types

---
 src/Model/Types.hs          |   6 +-
 src/Model/Types/DateTime.hs |   6 +-
 src/Model/Types/Misc.hs     | 399 ++--------------------------------
 src/Model/Types/Security.hs | 411 ++++++++++++++++++++++++++++++++++++
 src/Model/Types/Sheet.hs    |  29 +--
 5 files changed, 444 insertions(+), 407 deletions(-)
 create mode 100644 src/Model/Types/Security.hs

diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index b812d529c..b1692283c 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -1,6 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving
-           , UndecidableInstances
-  #-}
+{-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
 
 
@@ -9,6 +7,7 @@ module Model.Types
   ( module Model.Types
   , module Model.Types.Sheet
   , module Model.Types.DateTime
+  , module Model.Types.Security
   , module Model.Types.Misc
   , module Numeric.Natural
   , module Mail
@@ -38,6 +37,7 @@ import Numeric.Natural
 
 import Model.Types.Sheet
 import Model.Types.DateTime
+import Model.Types.Security
 import Model.Types.Misc
 
 ----
diff --git a/src/Model/Types/DateTime.hs b/src/Model/Types/DateTime.hs
index 05fe00594..cb7b2999d 100644
--- a/src/Model/Types/DateTime.hs
+++ b/src/Model/Types/DateTime.hs
@@ -9,7 +9,7 @@ module Model.Types.DateTime where
 import ClassyPrelude
 import GHC.Generics (Generic)
 import Utils
-import Control.Lens hiding (universe)
+import Control.Lens
 import Data.NonNull.Instances ()
 import Data.Typeable (Typeable)
 import Data.Universe.Instances.Reverse ()
@@ -51,7 +51,7 @@ seasonFromChar c
   where
     (~=) = (==) `on` CI.mk
 
-instance DisplayAble Season
+-- instance DisplayAble Season
 
 data TermIdentifier = TermIdentifier
   { year :: Integer -- ^ Using 'Integer' to model years is consistent with 'Data.Time.Calendar'
@@ -114,7 +114,7 @@ termFromRational :: Rational -> TermIdentifier
 termFromRational n = TermIdentifier{..}
   where
     year = floor n
-    remainder = n - (fromInteger $ floor n)
+    remainder = n - fromInteger (floor n)
     season
       | remainder == 0 = Summer
       | otherwise      = Winter
diff --git a/src/Model/Types/Misc.hs b/src/Model/Types/Misc.hs
index 226665e63..0affd8b70 100644
--- a/src/Model/Types/Misc.hs
+++ b/src/Model/Types/Misc.hs
@@ -8,87 +8,45 @@ module Model.Types.Misc where
 
 import ClassyPrelude
 import Utils
-import Control.Lens hiding (universe)
+import Control.Lens
 
+import Data.NonNull.Instances ()
 import Data.Set (Set)
-import qualified Data.Set as Set
 import Data.Maybe (fromJust)
 import Data.Universe
 import Data.Universe.Helpers
-import Data.UUID.Types (UUID)
-import qualified Data.UUID.Types as UUID
 
-import Data.NonNull.Instances ()
-
-import Data.Default
-
-import Database.Persist.TH hiding (derivePersistFieldJSON)
-import Model.Types.JSON
-import Database.Persist.Class
-import Database.Persist.Sql
-
-import Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.Lens as Text
-
-import qualified Data.HashMap.Strict as HashMap
-
-import Data.CaseInsensitive (CI)
 import qualified Data.CaseInsensitive as CI
 import Data.CaseInsensitive.Instances ()
 
+import Database.Persist.TH hiding (derivePersistFieldJSON)
+import Model.Types.JSON
+
 import Yesod.Core.Dispatch (PathPiece(..))
-import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.Types as Aeson
-import Data.Aeson (FromJSON(..), ToJSON(..), FromJSONKey(..), ToJSONKey(..), FromJSONKeyFunction(..), withObject, Value())
-import Data.Aeson.Types (toJSONKeyText)
-import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..), mkToJSON, mkParseJSON)
+import Data.Aeson (Value())
+import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..))
 
 import GHC.Generics (Generic)
 import Data.Typeable (Typeable)
 
 import Data.Universe.Instances.Reverse ()
 
-import Mail (MailLanguages(..))
-
-import Data.Word.Word24 (Word24)
-import Data.Bits
-import Data.Ix
-import Data.List (genericIndex, elemIndex)
-import System.Random (Random(..))
-import Data.Data (Data)
-
-import Model.Types.Wordlist
-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)
-
-import Data.Semigroup (Min(..))
-import Control.Monad.Trans.Writer (execWriter)
-import Control.Monad.Writer.Class (MonadWriter(..))
+import Time.Types (WeekDay(..))
 
 
+-----
+-- Miscellaneous Model.Types
 
+derivePersistFieldJSON ''Value
 
 data StudyFieldType = FieldPrimary | FieldSecondary
   deriving (Eq, Ord, Enum, Show, Read, Bounded, Generic)
 derivePersistField "StudyFieldType"
 
-instance PersistField UUID where
-  toPersistValue = PersistDbSpecific . UUID.toASCIIBytes
-  fromPersistValue (PersistText t) = maybe (Left "Failed to parse UUID") Right $ UUID.fromText t
-  fromPersistValue (PersistByteString bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
-  fromPersistValue (PersistDbSpecific bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
-  fromPersistValue x = Left $ "Expected UUID, received: " <> tshow x
-
-instance PersistFieldSql UUID where
-  sqlType _ = SqlOther "uuid"
-
-instance DisplayAble StudyFieldType
+-- instance DisplayAble StudyFieldType
 
 data Theme
   = ThemeDefault
@@ -138,290 +96,6 @@ nullaryPathPiece ''CorrectorState (camelToPathPiece' 1)
 derivePersistField "CorrectorState"
 
 
-data AuthenticationMode = AuthLDAP
-                        | AuthPWHash { authPWHash :: Text }
-  deriving (Eq, Ord, Read, Show, Generic)
-
-deriveJSON defaultOptions
-  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
-  , fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel
-  , sumEncoding = UntaggedValue
-  } ''AuthenticationMode
-
-derivePersistFieldJSON ''AuthenticationMode
-
-
-derivePersistFieldJSON ''Value
-
-
--- ^ `NotificationSettings` is for now a series of boolean checkboxes, i.e. a mapping @NotificationTrigger -> Bool@
---
--- Could maybe be replaced with `Structure Notification` in the long term
-data NotificationTrigger = NTSubmissionRatedGraded
-                         | NTSubmissionRated
-                         | NTSheetActive
-                         | NTSheetSoonInactive
-                         | NTSheetInactive
-                         | NTCorrectionsAssigned
-                         | NTCorrectionsNotDistributed
-                         | NTUserRightsUpdate
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
-
-instance Universe NotificationTrigger
-instance Finite NotificationTrigger
-
-instance Hashable NotificationTrigger
-
-deriveJSON defaultOptions
-  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
-  } ''NotificationTrigger
-
-instance ToJSONKey NotificationTrigger where
-  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
-
-instance FromJSONKey NotificationTrigger where
-  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
-
-
-newtype NotificationSettings = NotificationSettings { notificationAllowed :: NotificationTrigger -> Bool }
-  deriving (Generic, Typeable)
-  deriving newtype (Eq, Ord, Read, Show)
-
-instance Default NotificationSettings where
-  def = NotificationSettings $ \case
-    NTSubmissionRatedGraded -> True
-    NTSubmissionRated -> False
-    NTSheetActive -> True
-    NTSheetSoonInactive -> False
-    NTSheetInactive -> True
-    NTCorrectionsAssigned -> True
-    NTCorrectionsNotDistributed -> True
-    NTUserRightsUpdate -> True
-
-instance ToJSON NotificationSettings where
-  toJSON v = toJSON . HashMap.fromList $ map (id &&& notificationAllowed v) universeF
-
-instance FromJSON NotificationSettings where
-  parseJSON = withObject "NotificationSettings" $ \o -> do
-    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap NotificationTrigger Bool)
-    return . NotificationSettings $ \n -> case HashMap.lookup n o' of
-      Nothing -> notificationAllowed def n
-      Just b  -> b
-
-derivePersistFieldJSON ''NotificationSettings
-
-
-instance ToBackendKey SqlBackend record => Hashable (Key record) where
-  hashWithSalt s key = s `hashWithSalt` fromSqlKey key
-
-derivePersistFieldJSON ''MailLanguages
-
-
-type PseudonymWord   = CI Text
-
-newtype Pseudonym = Pseudonym Word24
-  deriving (Eq, Ord, Read, Show, Generic, Data)
-  deriving newtype (Bounded, Enum, Integral, Num, Real, Ix)
-
-
-instance PersistField Pseudonym where
-  toPersistValue p = toPersistValue (fromIntegral p :: Word32)
-  fromPersistValue v = do
-    w <- fromPersistValue v :: Either Text Word32
-    if
-      | 0 <= w
-      , w <= fromIntegral (maxBound :: Pseudonym)
-        -> return $ fromIntegral w
-      | otherwise
-        -> Left "Pseudonym out of range"
-
-instance PersistFieldSql Pseudonym where
-  sqlType _ = SqlInt32
-
-instance Random Pseudonym where
-  randomR (max minBound -> lo, min maxBound -> hi) gen = over _1 (fromIntegral :: Word32 -> Pseudonym) $ randomR (fromIntegral lo, fromIntegral hi) gen
-  random = randomR (minBound, maxBound)
-
-instance FromJSON Pseudonym where
-  parseJSON v@(Aeson.Number _) = do
-    w <- parseJSON v :: Aeson.Parser Word32
-    if
-      | 0 <= w
-      , w <= fromIntegral (maxBound :: Pseudonym)
-        -> return $ fromIntegral w
-      | otherwise
-        -> fail "Pseudonym out auf range"
-  parseJSON (Aeson.String t)
-    = case t ^? _PseudonymText of
-        Just p -> return p
-        Nothing -> fail "Could not parse pseudonym"
-  parseJSON v = flip (Aeson.withArray "Pseudonym") v $ \ws -> do
-    ws' <- toList . map CI.mk <$> mapM parseJSON ws
-    case ws' ^? _PseudonymWords of
-      Just p -> return p
-      Nothing -> fail "Could not parse pseudonym words"
-
-instance ToJSON Pseudonym where
-  toJSON = toJSON . (review _PseudonymWords :: Pseudonym -> [PseudonymWord])
-
-pseudonymWordlist :: [PseudonymWord]
-pseudonymCharacters :: Set (CI Char)
-(pseudonymWordlist, pseudonymCharacters) = $(wordlist "config/wordlist.txt")
-
-_PseudonymWords :: Prism' [PseudonymWord] Pseudonym
-_PseudonymWords = prism' pToWords pFromWords
-  where
-    pFromWords :: [PseudonymWord] -> Maybe Pseudonym
-    pFromWords [w1, w2]
-      | Just i1 <- elemIndex w1 pseudonymWordlist
-      , Just i2 <- elemIndex w2 pseudonymWordlist
-      , i1 <= maxWord, i2 <= maxWord
-      = Just . Pseudonym $ shiftL (fromIntegral i1) 12 .|. fromIntegral i2
-    pFromWords _ = Nothing
-
-    pToWords :: Pseudonym -> [PseudonymWord]
-    pToWords (Pseudonym p)
-      = [ genericIndex pseudonymWordlist $ shiftR p 12 .&. maxWord
-        , genericIndex pseudonymWordlist $ p .&. maxWord
-        ]
-
-    maxWord :: Num a => a
-    maxWord = 0b111111111111
-
-_PseudonymText :: Prism' Text Pseudonym
-_PseudonymText = prism' tToWords tFromWords . _PseudonymWords
-  where
-    tFromWords :: Text -> Maybe [PseudonymWord]
-    tFromWords input
-      | [result] <- input ^.. pseudonymFragments
-      = Just result
-      | otherwise
-      = Nothing
-
-    tToWords :: [PseudonymWord] -> Text
-    tToWords = Text.unwords . map CI.original
-
-pseudonymWords :: Fold Text PseudonymWord
-pseudonymWords = folding
-  $ \(CI.mk -> input) -> map (view _2) . fromMaybe [] . listToMaybe . groupBy ((==) `on` view _1) . sortBy (comparing $ view _1) . filter ((<= distanceCutoff) . view _1) $ map (distance input &&& id) pseudonymWordlist
-  where
-    distance = damerauLevenshtein `on` CI.foldedCase
-    -- | Arbitrary cutoff point, for reference: ispell cuts off at 1
-    distanceCutoff = 2
-
-pseudonymFragments :: Fold Text [PseudonymWord]
-pseudonymFragments = folding
-  $ mapM (toListOf pseudonymWords) . (\l -> guard (length l == 2) *> l) . filter (not . null) . Text.split (\(CI.mk -> c) -> not $ Set.member c pseudonymCharacters)
-
-
-data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prädikate sind sortier nach Relevanz für Benutzer
-  = AuthAdmin
-  | AuthLecturer
-  | AuthCorrector
-  | AuthTutor
-  | AuthCourseRegistered
-  | AuthTutorialRegistered
-  | AuthParticipant
-  | AuthTime
-  | AuthMaterials
-  | AuthOwner
-  | AuthRated
-  | AuthUserSubmissions
-  | AuthCorrectorSubmissions
-  | AuthCapacity
-  | AuthRegisterGroup
-  | AuthEmpty
-  | AuthSelf
-  | AuthAuthentication
-  | AuthNoEscalation
-  | AuthRead
-  | AuthWrite
-  | AuthToken
-  | AuthDeprecated
-  | AuthDevelopment
-  | AuthFree
-  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
-
-instance Universe AuthTag
-instance Finite AuthTag
-instance Hashable AuthTag
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 1
-  } ''AuthTag
-
-nullaryPathPiece ''AuthTag (camelToPathPiece' 1)
-
-instance ToJSONKey AuthTag where
-  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
-
-instance FromJSONKey AuthTag where
-  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
-
-instance Binary AuthTag
-
-
-newtype AuthTagActive = AuthTagActive { authTagIsActive :: AuthTag -> Bool }
-  deriving (Read, Show, Generic)
-  deriving newtype (Eq, Ord)
-
-instance Default AuthTagActive where
-  def = AuthTagActive $ \case
-    AuthAdmin -> False
-    _ -> True
-
-instance ToJSON AuthTagActive where
-  toJSON v = toJSON . HashMap.fromList $ map (id &&& authTagIsActive v) universeF
-
-instance FromJSON AuthTagActive where
-  parseJSON = withObject "AuthTagActive" $ \o -> do
-    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap AuthTag Bool)
-    return . AuthTagActive $ \n -> case HashMap.lookup n o' of
-      Nothing -> authTagIsActive def n
-      Just b  -> b
-
-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 = TaggedObject "val" "var"
-  } ''PredLiteral
-
-instance PathPiece a => PathPiece (PredLiteral a) where
-  toPathPiece PLVariable{..} = toPathPiece plVar
-  toPathPiece PLNegated{..} = "¬" <> toPathPiece plVar
-
-  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)
-  deriving newtype (Semigroup, Monoid)
-
-$(return [])
-
-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
-
-
 data LecturerType = CourseLecturer | CourseAssistant
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
 
@@ -481,52 +155,3 @@ deriveJSON defaultOptions
   } ''Occurences
 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
-  , 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
-  , 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
-  { fieldLabelModifier = camelToPathPiece' 1
-  , 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)
-
-instance Universe HealthStatus
-instance Finite HealthStatus
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 1
-  } ''HealthStatus
-nullaryPathPiece ''HealthStatus $ camelToPathPiece' 1
-
-classifyHealthReport :: HealthReport -> HealthStatus
--- ^ 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
-  unless (fromMaybe True healthWidgetMemcached) . tell $ Min HealthFailure
-
diff --git a/src/Model/Types/Security.hs b/src/Model/Types/Security.hs
new file mode 100644
index 000000000..27be35f81
--- /dev/null
+++ b/src/Model/Types/Security.hs
@@ -0,0 +1,411 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving
+           , UndecidableInstances
+  #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
+
+module Model.Types.Security where
+
+
+import ClassyPrelude
+import Utils
+import Control.Lens hiding (universe)
+
+import Data.Set (Set)
+import qualified Data.Set as Set
+import Data.Universe
+import Data.UUID.Types (UUID)
+import qualified Data.UUID.Types as UUID
+
+import Data.NonNull.Instances ()
+
+import Data.Default
+
+import Model.Types.JSON
+import Database.Persist.Class
+import Database.Persist.Sql
+
+import Data.Text (Text)
+import qualified Data.Text as Text
+
+import qualified Data.HashMap.Strict as HashMap
+
+import Data.CaseInsensitive (CI)
+import qualified Data.CaseInsensitive as CI
+import Data.CaseInsensitive.Instances ()
+
+import Yesod.Core.Dispatch (PathPiece(..))
+import qualified Data.Aeson as Aeson
+import qualified Data.Aeson.Types as Aeson
+import Data.Aeson (FromJSON(..), ToJSON(..), FromJSONKey(..), ToJSONKey(..), FromJSONKeyFunction(..), withObject)
+import Data.Aeson.Types (toJSONKeyText)
+import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..), mkToJSON, mkParseJSON)
+
+import GHC.Generics (Generic)
+import Data.Typeable (Typeable)
+
+import Data.Universe.Instances.Reverse ()
+
+import Mail (MailLanguages(..))
+
+import Data.Word.Word24 (Word24)
+import Data.Bits
+import Data.Ix
+import Data.List (genericIndex, elemIndex)
+import System.Random (Random(..))
+import Data.Data (Data)
+
+import Model.Types.Wordlist
+import Data.Text.Metrics (damerauLevenshtein)
+
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
+import Data.Semigroup (Min(..))
+import Control.Monad.Trans.Writer (execWriter)
+import Control.Monad.Writer.Class (MonadWriter(..))
+
+
+----
+-- Security, Authentification, Notification Stuff
+
+instance PersistField UUID where
+  toPersistValue = PersistDbSpecific . UUID.toASCIIBytes
+  fromPersistValue (PersistText t) = maybe (Left "Failed to parse UUID") Right $ UUID.fromText t
+  fromPersistValue (PersistByteString bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
+  fromPersistValue (PersistDbSpecific bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
+  fromPersistValue x = Left $ "Expected UUID, received: " <> tshow x
+
+instance PersistFieldSql UUID where
+  sqlType _ = SqlOther "uuid"
+
+
+data AuthenticationMode = AuthLDAP
+                        | AuthPWHash { authPWHash :: Text }
+  deriving (Eq, Ord, Read, Show, Generic)
+
+deriveJSON defaultOptions
+  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
+  , fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel
+  , sumEncoding = UntaggedValue
+  } ''AuthenticationMode
+
+derivePersistFieldJSON ''AuthenticationMode
+
+
+
+-- ^ `NotificationSettings` is for now a series of boolean checkboxes, i.e. a mapping @NotificationTrigger -> Bool@
+--
+-- Could maybe be replaced with `Structure Notification` in the long term
+data NotificationTrigger = NTSubmissionRatedGraded
+                         | NTSubmissionRated
+                         | NTSheetActive
+                         | NTSheetSoonInactive
+                         | NTSheetInactive
+                         | NTCorrectionsAssigned
+                         | NTCorrectionsNotDistributed
+                         | NTUserRightsUpdate
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+
+instance Universe NotificationTrigger
+instance Finite NotificationTrigger
+
+instance Hashable NotificationTrigger
+
+deriveJSON defaultOptions
+  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
+  } ''NotificationTrigger
+
+instance ToJSONKey NotificationTrigger where
+  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
+
+instance FromJSONKey NotificationTrigger where
+  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
+
+
+newtype NotificationSettings = NotificationSettings { notificationAllowed :: NotificationTrigger -> Bool }
+  deriving (Generic, Typeable)
+  deriving newtype (Eq, Ord, Read, Show)
+
+instance Default NotificationSettings where
+  def = NotificationSettings $ \case
+    NTSubmissionRatedGraded -> True
+    NTSubmissionRated -> False
+    NTSheetActive -> True
+    NTSheetSoonInactive -> False
+    NTSheetInactive -> True
+    NTCorrectionsAssigned -> True
+    NTCorrectionsNotDistributed -> True
+    NTUserRightsUpdate -> True
+
+instance ToJSON NotificationSettings where
+  toJSON v = toJSON . HashMap.fromList $ map (id &&& notificationAllowed v) universeF
+
+instance FromJSON NotificationSettings where
+  parseJSON = withObject "NotificationSettings" $ \o -> do
+    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap NotificationTrigger Bool)
+    return . NotificationSettings $ \n -> case HashMap.lookup n o' of
+      Nothing -> notificationAllowed def n
+      Just b  -> b
+
+derivePersistFieldJSON ''NotificationSettings
+
+
+instance ToBackendKey SqlBackend record => Hashable (Key record) where
+  hashWithSalt s key = s `hashWithSalt` fromSqlKey key
+
+derivePersistFieldJSON ''MailLanguages
+
+
+type PseudonymWord   = CI Text
+
+newtype Pseudonym = Pseudonym Word24
+  deriving (Eq, Ord, Read, Show, Generic, Data)
+  deriving newtype (Bounded, Enum, Integral, Num, Real, Ix)
+
+
+instance PersistField Pseudonym where
+  toPersistValue p = toPersistValue (fromIntegral p :: Word32)
+  fromPersistValue v = do
+    w <- fromPersistValue v :: Either Text Word32
+    if
+      | 0 <= w
+      , w <= fromIntegral (maxBound :: Pseudonym)
+        -> return $ fromIntegral w
+      | otherwise
+        -> Left "Pseudonym out of range"
+
+instance PersistFieldSql Pseudonym where
+  sqlType _ = SqlInt32
+
+instance Random Pseudonym where
+  randomR (max minBound -> lo, min maxBound -> hi) gen = over _1 (fromIntegral :: Word32 -> Pseudonym) $ randomR (fromIntegral lo, fromIntegral hi) gen
+  random = randomR (minBound, maxBound)
+
+instance FromJSON Pseudonym where
+  parseJSON v@(Aeson.Number _) = do
+    w <- parseJSON v :: Aeson.Parser Word32
+    if
+      | 0 <= w
+      , w <= fromIntegral (maxBound :: Pseudonym)
+        -> return $ fromIntegral w
+      | otherwise
+        -> fail "Pseudonym out auf range"
+  parseJSON (Aeson.String t)
+    = case t ^? _PseudonymText of
+        Just p -> return p
+        Nothing -> fail "Could not parse pseudonym"
+  parseJSON v = flip (Aeson.withArray "Pseudonym") v $ \ws -> do
+    ws' <- toList . map CI.mk <$> mapM parseJSON ws
+    case ws' ^? _PseudonymWords of
+      Just p -> return p
+      Nothing -> fail "Could not parse pseudonym words"
+
+instance ToJSON Pseudonym where
+  toJSON = toJSON . (review _PseudonymWords :: Pseudonym -> [PseudonymWord])
+
+pseudonymWordlist :: [PseudonymWord]
+pseudonymCharacters :: Set (CI Char)
+(pseudonymWordlist, pseudonymCharacters) = $(wordlist "config/wordlist.txt")
+
+_PseudonymWords :: Prism' [PseudonymWord] Pseudonym
+_PseudonymWords = prism' pToWords pFromWords
+  where
+    pFromWords :: [PseudonymWord] -> Maybe Pseudonym
+    pFromWords [w1, w2]
+      | Just i1 <- elemIndex w1 pseudonymWordlist
+      , Just i2 <- elemIndex w2 pseudonymWordlist
+      , i1 <= maxWord, i2 <= maxWord
+      = Just . Pseudonym $ shiftL (fromIntegral i1) 12 .|. fromIntegral i2
+    pFromWords _ = Nothing
+
+    pToWords :: Pseudonym -> [PseudonymWord]
+    pToWords (Pseudonym p)
+      = [ genericIndex pseudonymWordlist $ shiftR p 12 .&. maxWord
+        , genericIndex pseudonymWordlist $ p .&. maxWord
+        ]
+
+    maxWord :: Num a => a
+    maxWord = 0b111111111111
+
+_PseudonymText :: Prism' Text Pseudonym
+_PseudonymText = prism' tToWords tFromWords . _PseudonymWords
+  where
+    tFromWords :: Text -> Maybe [PseudonymWord]
+    tFromWords input
+      | [result] <- input ^.. pseudonymFragments
+      = Just result
+      | otherwise
+      = Nothing
+
+    tToWords :: [PseudonymWord] -> Text
+    tToWords = Text.unwords . map CI.original
+
+pseudonymWords :: Fold Text PseudonymWord
+pseudonymWords = folding
+  $ \(CI.mk -> input) -> map (view _2) . fromMaybe [] . listToMaybe . groupBy ((==) `on` view _1) . sortBy (comparing $ view _1) . filter ((<= distanceCutoff) . view _1) $ map (distance input &&& id) pseudonymWordlist
+  where
+    distance = damerauLevenshtein `on` CI.foldedCase
+    -- | Arbitrary cutoff point, for reference: ispell cuts off at 1
+    distanceCutoff = 2
+
+pseudonymFragments :: Fold Text [PseudonymWord]
+pseudonymFragments = folding
+  $ mapM (toListOf pseudonymWords) . (\l -> guard (length l == 2) *> l) . filter (not . null) . Text.split (\(CI.mk -> c) -> not $ Set.member c pseudonymCharacters)
+
+
+data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prädikate sind sortier nach Relevanz für Benutzer
+  = AuthAdmin
+  | AuthLecturer
+  | AuthCorrector
+  | AuthTutor
+  | AuthCourseRegistered
+  | AuthTutorialRegistered
+  | AuthParticipant
+  | AuthTime
+  | AuthMaterials
+  | AuthOwner
+  | AuthRated
+  | AuthUserSubmissions
+  | AuthCorrectorSubmissions
+  | AuthCapacity
+  | AuthRegisterGroup
+  | AuthEmpty
+  | AuthSelf
+  | AuthAuthentication
+  | AuthNoEscalation
+  | AuthRead
+  | AuthWrite
+  | AuthToken
+  | AuthDeprecated
+  | AuthDevelopment
+  | AuthFree
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
+
+instance Universe AuthTag
+instance Finite AuthTag
+instance Hashable AuthTag
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  } ''AuthTag
+
+nullaryPathPiece ''AuthTag (camelToPathPiece' 1)
+
+instance ToJSONKey AuthTag where
+  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
+
+instance FromJSONKey AuthTag where
+  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
+
+instance Binary AuthTag
+
+
+newtype AuthTagActive = AuthTagActive { authTagIsActive :: AuthTag -> Bool }
+  deriving (Read, Show, Generic)
+  deriving newtype (Eq, Ord)
+
+instance Default AuthTagActive where
+  def = AuthTagActive $ \case
+    AuthAdmin -> False
+    _ -> True
+
+instance ToJSON AuthTagActive where
+  toJSON v = toJSON . HashMap.fromList $ map (id &&& authTagIsActive v) universeF
+
+instance FromJSON AuthTagActive where
+  parseJSON = withObject "AuthTagActive" $ \o -> do
+    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap AuthTag Bool)
+    return . AuthTagActive $ \n -> case HashMap.lookup n o' of
+      Nothing -> authTagIsActive def n
+      Just b  -> b
+
+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 = TaggedObject "val" "var"
+  } ''PredLiteral
+
+instance PathPiece a => PathPiece (PredLiteral a) where
+  toPathPiece PLVariable{..} = toPathPiece plVar
+  toPathPiece PLNegated{..} = "¬" <> toPathPiece plVar
+
+  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)
+  deriving newtype (Semigroup, Monoid)
+
+$(return [])
+
+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
+
+
+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
+  , 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
+  , 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
+  { fieldLabelModifier = camelToPathPiece' 1
+  , 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)
+
+instance Universe HealthStatus
+instance Finite HealthStatus
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  } ''HealthStatus
+nullaryPathPiece ''HealthStatus $ camelToPathPiece' 1
+
+classifyHealthReport :: HealthReport -> HealthStatus
+-- ^ 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
+  unless (fromMaybe True healthWidgetMemcached) . tell $ Min HealthFailure
+
diff --git a/src/Model/Types/Sheet.hs b/src/Model/Types/Sheet.hs
index 825c07e9f..a754d0d0b 100644
--- a/src/Model/Types/Sheet.hs
+++ b/src/Model/Types/Sheet.hs
@@ -9,7 +9,7 @@ import ClassyPrelude
 import Utils
 import Numeric.Natural
 
-import Control.Lens hiding (universe)
+import Control.Lens
 import Utils.Lens.TH
 import GHC.Generics (Generic)
 import Generics.Deriving.Monoid (memptydefault, mappenddefault)
@@ -35,6 +35,7 @@ import Model.Types.JSON
 import Yesod.Core.Dispatch (PathPiece(..))
 
 
+
 ----
 -- Sheet and Submission realted Model.Types
 
@@ -53,7 +54,7 @@ fromPoints = round
 instance DisplayAble Points
 
 instance DisplayAble a => DisplayAble (Sum a) where
-  display (Sum x) = display x
+   display (Sum x) = display x
 
 data SheetGrading
   = Points     { maxPoints :: Points }
@@ -74,9 +75,9 @@ _passingBound :: Fold SheetGrading (Either () Points)
 _passingBound = folding passPts
   where
     passPts :: SheetGrading -> Maybe (Either () Points)
-    passPts (Points{}) = Nothing
-    passPts (PassPoints{passingPoints}) = Just $ Right passingPoints
-    passPts (PassBinary) = Just $ Left ()
+    passPts Points{}                  = Nothing
+    passPts PassPoints{passingPoints} = Just $ Right passingPoints
+    passPts PassBinary                = Just $ Left ()
 
 gradingPassed :: SheetGrading -> Points -> Maybe Bool
 gradingPassed gr pts = either pBinary pPoints <$> gr ^? _passingBound
@@ -122,7 +123,7 @@ sheetGradeSum gr (Just p) =
         , numMarkedPasses = numSheetsPasses
         , numMarkedPoints = numSheetsPoints
         , sumMarkedPoints = sumSheetsPoints
-        , achievedPasses  = fromMaybe mempty $ bool 0 1 <$> gradingPassed gr p
+        , achievedPasses  = maybe mempty (bool 0 1) (gradingPassed gr p)
         , achievedPoints  = bool mempty (Sum p) $ has _maxPoints gr
         }
 
@@ -194,11 +195,11 @@ sheetFile2markup SheetSolution = iconSolution
 sheetFile2markup SheetMarking  = iconMarking
 
 -- $(deriveSimpleWith ''DisplayAble 'display (drop 17) ''SheetFileType)
-instance DisplayAble SheetFileType where -- deprecated, see RenderMessage instance in Foundation
-  display SheetExercise = "Aufgabenstellung"
-  display SheetHint     = "Hinweise"
-  display SheetSolution = "Musterlösung"
-  display SheetMarking  = "Korrekturhinweise"
+-- instance DisplayAble SheetFileType where -- deprecated, see RenderMessage instance in Foundation
+--   display SheetExercise = "Aufgabenstellung"
+--   display SheetHint     = "Hinweise"
+--   display SheetSolution = "Musterlösung"
+--   display SheetMarking  = "Korrekturhinweise"
 
 -- partitionFileType' :: Ord a => [(SheetFileType,a)] -> Map SheetFileType (Set a)
 -- partitionFileType' = groupMap
@@ -225,9 +226,9 @@ instance PathPiece SubmissionFileType where
   toPathPiece SubmissionCorrected = "corrected"
   fromPathPiece = finiteFromPathPiece
 
-instance DisplayAble SubmissionFileType where
-  display SubmissionOriginal  = "Abgabe"
-  display SubmissionCorrected = "Korrektur"
+-- instance DisplayAble SubmissionFileType where
+--   display SubmissionOriginal  = "Abgabe"
+--   display SubmissionCorrected = "Korrektur"
 
 {-
 data DA = forall a . (DisplayAble a) => DA a

From cc3f3fe41a35cff2f7a4cd8d2bac7e30faf236c2 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 15 May 2019 23:16:27 +0200
Subject: [PATCH 331/519] add htmlhelpers (fns from httpclient)

---
 src/Foundation.hs                 |  1 +
 static/js/services/htmlHelpers.js | 33 ++++++++++++++++++++
 static/js/services/httpClient.js  | 52 +++++++++++++------------------
 static/js/utils/asyncForm.js      | 28 ++++++++---------
 static/js/utils/asyncTable.js     | 16 ++++++----
 static/js/utils/massInput.js      | 17 ++++++----
 static/js/utils/modal.js          | 16 +++++-----
 7 files changed, 100 insertions(+), 63 deletions(-)
 create mode 100644 static/js/services/htmlHelpers.js

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 733a55a9f..9f9d34652 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1340,6 +1340,7 @@ siteLayout' headingOverride widget = do
       addScript $ StaticR js_polyfills_urlPolyfill_js
       -- JavaScript services
       addScript $ StaticR js_services_utilRegistry_js
+      addScript $ StaticR js_services_htmlHelpers_js
       addScript $ StaticR js_services_httpClient_js
       addScript $ StaticR js_services_i18n_js
       -- JavaScript utils
diff --git a/static/js/services/htmlHelpers.js b/static/js/services/htmlHelpers.js
new file mode 100644
index 000000000..bf7d1b163
--- /dev/null
+++ b/static/js/services/htmlHelpers.js
@@ -0,0 +1,33 @@
+(function () {
+  'use strict';
+
+  window.HtmlHelpers = (function() {
+
+    function _prefixIds(element) {
+      var idPrefix = Math.floor(Math.random() * 100000);
+      var idAttrs = ['id', 'for', 'data-conditional-input', 'data-modal-trigger'];
+
+      idAttrs.forEach(function(attr) {
+        Array.from(element.querySelectorAll('[' + attr + ']')).forEach(function(input) {
+          var value = idPrefix + '__' + input.getAttribute(attr);
+          input.setAttribute(attr, value);
+        });
+      });
+    }
+
+    function parseResponse(response) {
+      return response.text().then(function (responseText) {
+        var docFrag = document.createRange().createContextualFragment(responseText);
+        _prefixIds(docFrag);
+        return Promise.resolve(docFrag);
+      },
+      function (error) {
+        return Promise.reject(error);
+      }).catch(function (error) { console.error(error); });
+    }
+
+    return {
+      parseResponse: parseResponse,
+    }
+  })();
+})();
diff --git a/static/js/services/httpClient.js b/static/js/services/httpClient.js
index 4d6dc1820..f65fb0e3f 100644
--- a/static/js/services/httpClient.js
+++ b/static/js/services/httpClient.js
@@ -25,7 +25,9 @@
 
       return fetch(options.url, requestOptions).then(
         function(response) {
-          _responseInterceptors.forEach(function(interceptor) { interceptor(response); });
+          _responseInterceptors.forEach(function(interceptor) {
+            interceptor(response, options);
+          });
           return Promise.resolve(response);
         },
         function(error) {
@@ -36,34 +38,6 @@
       });
     }
 
-    function parseHTML(response, idPrefix) {
-      if (!idPrefix) {
-        idPrefix = Math.floor(Math.random() * 100000);
-      }
-
-      var contentType = response.headers.get("content-type");
-      if (contentType.indexOf("text/html") === -1) {
-        throw new Error('Server returned ' + contentType + ' when HTML was expected');
-      }
-
-      return response.text().then(function (responseText) {
-        var docFrag = document.createRange().createContextualFragment(responseText);
-
-        var idAttrs = ['id', 'for', 'data-conditional-input', 'data-modal-trigger'];
-        idAttrs.forEach(function(attr) {
-          Array.from(docFrag.querySelectorAll('[' + attr + ']')).forEach(function(input) {
-            var value = idPrefix + '__' + input.getAttribute(attr);
-            input.setAttribute(attr, value);
-          });
-        });
-
-        return Promise.resolve(docFrag);
-      },
-      function (error) {
-        return Promise.reject(error);
-      }).catch(function (error) { console.error(error); });
-    }
-
     return {
       get: function(args) {
         args.method = 'GET';
@@ -74,7 +48,25 @@
         return _fetch(args);
       },
       addResponseInterceptor: addResponseInterceptor,
-      parseHTML: parseHTML,
+      ACCEPT: {
+        TEXT_HTML: 'text/html',
+        JSON: 'application/json',
+      },
     }
   })();
+
+  // HttpClient ships with its own little interceptor to throw an error
+  // if the response does not match the expected content-type
+  function contentTypeInterceptor(response, options) {
+    if (!options || !options.accept) {
+      return;
+    }
+
+    var contentType = response.headers.get("content-type");
+    if (!contentType.match(options.accept)) {
+      throw new Error('Server returned with "' + contentType + '" when "' + options.accept + '" was expected');
+    }
+  }
+
+  HttpClient.addResponseInterceptor(contentTypeInterceptor);
 })();
diff --git a/static/js/utils/asyncForm.js b/static/js/utils/asyncForm.js
index 2f6d40284..4750a7e57 100644
--- a/static/js/utils/asyncForm.js
+++ b/static/js/utils/asyncForm.js
@@ -96,21 +96,21 @@
         headers[MODAL_HEADER_KEY] = MODAL_HEADER_VALUE;
       }
 
-      HttpClient.post({ url: url, headers: headers, body: body })
-        .then(function(response) {
-          if (response.headers.get("content-type").indexOf("application/json") !== -1) {// checking response header
-            return response.json();
-          } else {
-            throw new TypeError('Unexpected Content-Type. Expected Content-Type: "application/json". Requested URL:' + url + '"');
-          }
-        }).then(function(response) {
-          processResponse(response[0]);
-        }).catch(function(error) {
-          var failureMessage = I18n.get('asyncFormFailure');
-          processResponse({ content: failureMessage });
+      HttpClient.post({
+        url: url,
+        headers: headers,
+        body: body,
+        accept: HttpClient.ACCEPT.JSON,
+      }).then(function(response) {
+        return response.json();
+      }).then(function(response) {
+        processResponse(response[0]);
+      }).catch(function(error) {
+        var failureMessage = I18n.get('asyncFormFailure');
+        processResponse({ content: failureMessage });
 
-          element.classList.remove(ASYNC_FORM_LOADING_CLASS);
-        });
+        element.classList.remove(ASYNC_FORM_LOADING_CLASS);
+      });
     }
 
     return init();
diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 577ffb753..32a7bf844 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -319,15 +319,19 @@
         [asyncTableHeader]: asyncTableId
       };
 
-      HttpClient.get({ url: url, headers: headers }).then(
-        response => HttpClient.parseHTML(response, element.id)
-      ).then(function(data) {
+      HttpClient.get({
+        url: url,
+        headers: headers,
+        accept: HttpClient.ACCEPT.TEXT_HTML,
+      }).then(function(response) {
+        return HtmlHelpers.parseResponse(response);
+      }).then(function(responseElement) {
         setLocalStorageParameter('currentTableUrl', url.href);
         // reset table
         removeListeners();
         element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
         // update table with new
-        updateWrapperContents(data);
+        updateWrapperContents(responseElement);
 
         if (callback && typeof callback === 'function') {
           callback(element);
@@ -340,9 +344,9 @@
       });
     }
 
-    function updateWrapperContents(newHtml) {
+    function updateWrapperContents(newHtmlElement) {
       var newPage = document.createElement('div');
-      newPage.appendChild(newHtml);
+      newPage.appendChild(newHtmlElement);
       var newWrapperContents = newPage.querySelector('#' + element.id + '__' + element.id);
       element.innerHTML = newWrapperContents.innerHTML;
 
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index e7b594b3f..e0d1578e6 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -121,10 +121,15 @@
           if (enctype !== 'multipart/form-data')
             headers['Content-Type'] = enctype;
 
-          requestFn({ url: url, headers: headers, body: requestBody })
-            .then(response => HttpClient.parseHTML(response, element.id))
-            .then(function(response) {
-              processResponse(response);
+          requestFn({
+            url: url,
+            headers: headers,
+            body: requestBody,
+            accept: HttpClient.ACCEPT.TEXT_HTML,
+          }).then(function(response) {
+            return HtmlHelpers.parseResponse(response);
+          }).then(function(responseElement) {
+              processResponse(responseElement);
               if (isAddCell) {
                 reFocusAddCell();
               }
@@ -159,9 +164,9 @@
       button.removeEventListener('click', massInputFormSubmitHandler);
     }
 
-    function processResponse(response) {
+    function processResponse(responseElement) {
       element.innerHTML = "";
-      element.appendChild(response);
+      element.appendChild(responseElement);
 
       reset();
 
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index 20c453873..b994b79c8 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -51,6 +51,7 @@
     var modalUrl;
 
     function _init() {
+      console.log('modalUtil.init', { element });
       if (!element) {
         throw new Error('Modal utility cannot be setup without an element!');
       }
@@ -167,15 +168,16 @@
         throw new Error('HttpClient not found! Can\'t fetch modal content from ' + url);
       }
 
-      HttpClient.get({ url: url, headers: MODAL_HEADERS })
-        .then(response => HttpClient.parseHTML(response, element.id))
-        .then(processResponse);
+      HttpClient.get({
+        url: url,
+        headers: MODAL_HEADERS,
+        accept: HttpClient.ACCEPT.TEXT_HTML,
+      }).then(function(response) {
+        return HtmlHelpers.parseResponse(response, element.id);
+      }).then(processResponse);
     }
 
-    function processResponse(responseFrag) {
-      var responseElement = document.createElement('div');
-      responseElement.appendChild(responseFrag);
-
+    function processResponse(responseElement) {
       var modalContent = document.createElement('div');
       modalContent.classList.add(MODAL_CONTENT_CLASS);
 

From 5a9ca00ff6d7f4f056b1e38d25dd7c37f21c6835 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 16 May 2019 11:18:19 +0200
Subject: [PATCH 332/519] Fix #379

---
 messages/uniworx/de.msg    |  8 ++++----
 src/Foundation.hs          | 14 +++++++-------
 src/Handler/Corrections.hs |  2 +-
 src/Utils.hs               |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 05b9b6579..ccd4eac45 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -64,7 +64,7 @@ TermActive: Aktiv
 
 
 SchoolListHeading: Übersicht über verwaltete Institute
-SchoolHeading school@SchoolName: Übersicht #{display school}
+SchoolHeading school@SchoolName: Übersicht #{school}
 
 LectureStart: Beginn Vorlesungen
 
@@ -89,10 +89,10 @@ CourseNewDupShort  tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display t
 CourseEditDupShort tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} konnte nicht geändert werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester.
 FFSheetName: Name
 TermCourseListHeading tid@TermId: Kursübersicht #{display tid}
-TermSchoolCourseListHeading tid@TermId school@SchoolName: Kursübersicht #{display tid} für #{display school}
+TermSchoolCourseListHeading tid@TermId school@SchoolName: Kursübersicht #{display tid} für #{school}
 CourseListTitle: Alle Kurse
 TermCourseListTitle   tid@TermId: Kurse #{display tid}
-TermSchoolCourseListTitle tid@TermId school@SchoolName: Kurse #{display tid} für #{display school}
+TermSchoolCourseListTitle tid@TermId school@SchoolName: Kurse #{display tid} für #{school}
 CourseNewHeading: Neuen Kurs anlegen
 CourseEditHeading tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} editieren
 CourseEditTitle: Kurs editieren/anlegen
@@ -142,7 +142,7 @@ CourseLecturerRightsIdentical: Alle Sorten von Kursverwalter haben identische Re
 
 NoSuchTerm tid@TermId: Semester #{display tid} gibt es nicht.
 NoSuchSchool ssh@SchoolId: Institut #{display ssh} gibt es nicht.
-NoSuchCourseShorthand csh@CourseShorthand: Kein Kurs mit Kürzel #{display csh} bekannt.
+NoSuchCourseShorthand csh@CourseShorthand: Kein Kurs mit Kürzel #{csh} bekannt.
 NoSuchCourse: Keinen passenden Kurs gefunden.
 
 Sheet: Blatt
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 733a55a9f..7eaaeabba 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2231,25 +2231,25 @@ pageActions (CSheetR tid ssh csh shn SCorrR) =
   ]
 pageActions (CorrectionsR) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsDownload
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute CorrectionsDownloadR
-      , menuItemModal = True
+      , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsUpload
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute CorrectionsUploadR
       , menuItemModal = True
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsCreate
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute CorrectionsCreateR
       , menuItemModal = False
       , menuItemAccessCallback' = runDB . maybeT (return False) $ do
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 4a18d3b79..34530d0e8 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -502,7 +502,7 @@ postCorrectionsR = do
   let whereClause = ratedBy uid
       colonnade = mconcat
         [ colSelect
-        -- , dbRow
+        , dbRow     -- very useful, since correction statistics are still missing.
         , colSchool
         , colTerm
         , colCourse
diff --git a/src/Utils.hs b/src/Utils.hs
index 1fb39b1b6..a66e0313a 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -249,8 +249,8 @@ class DisplayAble a where
 instance DisplayAble Text where
   display = id
 
-instance DisplayAble String where
-  display = pack
+-- instance DisplayAble String where
+--   display = pack
 
 instance DisplayAble Int
 instance DisplayAble Int64

From 953f7af1228bb37f1235d97acd0eb956f2072014 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 16 May 2019 12:11:48 +0200
Subject: [PATCH 333/519] Avoid reported confusion of bookmark using users

---
 messages/uniworx/de.msg |  5 +++--
 routes                  |  2 +-
 src/Foundation.hs       |  4 +++-
 src/Handler/Sheet.hs    | 35 ++++++++++++++++++++++++++---------
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index ccd4eac45..83045e281 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -190,7 +190,8 @@ SheetErrVisibility: "Beginn Abgabezeitraum" muss nach "Sichbar für Teilnehmer a
 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
-
+SheetNoCurrent: Es gibt momentan kein aktives Übungsblatt.
+SheetNoOldUnassigned: Alle Abgaben inaktiver Blätter sind bereits einen Korrektor zugeteilt.
 
 Deadline: Abgabe
 Done: Eingereicht
@@ -794,7 +795,7 @@ MenuSheetEdit: Übungsblatt editieren
 MenuSheetDelete: Übungsblatt löschen
 MenuSheetClone:  Als neues Übungsblatt klonen
 MenuCorrectionsUpload: Korrekturen hochladen
-MenuCorrectionsDownload: Abgaben herunterladen
+MenuCorrectionsDownload: Offene Abgaben herunterladen
 MenuCorrectionsCreate: Abgaben registrieren
 MenuCorrectionsGrade: Abgaben online korrigieren
 MenuAuthPreds: Authorisierungseinstellungen
diff --git a/routes b/routes
index 45fa74da5..d934bd8f6 100644
--- a/routes
+++ b/routes
@@ -95,7 +95,7 @@
   /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/unassigned              SheetOldUnassignedR  GET
   /ex/#SheetName SheetR:
     /show                       SShowR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
     /edit                       SEditR         GET POST
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 7eaaeabba..48b5e033e 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1450,6 +1450,8 @@ 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 SheetCurrentR) = return ("Aktuelles Blatt", Just $ CourseR tid ssh csh SheetListR)
+  breadcrumb (CourseR tid ssh csh SheetOldUnassignedR) = return ("Offene Abgaben", 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)
@@ -1949,7 +1951,7 @@ pageActions (CourseR tid ssh csh SheetListR) =
       { menuItemType = PageActionPrime
       , menuItemLabel = MsgMenuSheetOldUnassigned
       , menuItemIcon  = Nothing
-      , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetOldUnassigned
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetOldUnassignedR
       , menuItemModal = False
       , menuItemAccessCallback' = runDB . maybeT (return False) $ do
           void . MaybeT $ sheetOldUnassigned tid ssh csh
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 754d27a95..c5c7fb45f 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -146,16 +146,33 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
 
 
 getSheetCurrentR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
-getSheetCurrentR tid ssh csh = runDB $ do
-  let redi shn = redirectAccess $ CSheetR tid ssh csh shn SShowR
-  shn <- sheetCurrent tid ssh csh
-  maybe notFound redi shn
+getSheetCurrentR tid ssh csh = do
+  mbShn <- runDB $ sheetCurrent tid ssh csh
+  case mbShn of
+    Just shn -> redirectAccess $ CSheetR tid ssh csh shn SShowR
+    Nothing  -> do -- no current sheet exists
+      -- users should never see a link to this URL in this situation,
+      -- but we had confused users that used a bookmark instead.
+      let headingShort = [whamlet|_{MsgMenuSheetCurrent}|]
+          headingLong = prependCourseTitle tid ssh csh MsgMenuSheetCurrent
+      siteLayout headingShort $ do
+        setTitleI headingLong
+        [whamlet|_{MsgSheetNoCurrent}|]
 
-getSheetOldUnassigned :: TermId -> SchoolId -> CourseShorthand -> Handler ()
-getSheetOldUnassigned tid ssh csh = runDB $ do
-  let redi shn = redirectAccess $ CSheetR tid ssh csh shn SSubsR
-  shn <- sheetOldUnassigned tid ssh csh
-  maybe notFound redi shn
+
+getSheetOldUnassignedR:: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getSheetOldUnassignedR tid ssh csh = do
+    mbShn <- runDB $ sheetOldUnassigned tid ssh csh
+    case mbShn of
+      Just shn -> redirectAccess $ CSheetR tid ssh csh shn SSubsR
+      Nothing  -> do -- no unassigned submissions in any inactive sheet
+        -- users should never see a link to this URL in this situation,
+        -- but we had confused users that used a bookmark instead.
+        let headingShort = [whamlet|_{MsgMenuSheetOldUnassigned}|]
+            headingLong = prependCourseTitle tid ssh csh MsgMenuSheetOldUnassigned
+        siteLayout headingShort $ do
+          setTitleI headingLong
+          [whamlet|_{MsgSheetNoOldUnassigned}|]
 
 getSheetListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getSheetListR tid ssh csh = do

From 86204f78e2391c32b2cf6c9716de6c9cb738168b Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 16 May 2019 13:58:07 +0200
Subject: [PATCH 334/519] attempt at #374 failed

---
 src/Handler/Corrections.hs | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 34530d0e8..536ebb35a 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -200,6 +200,35 @@ colCommentField = sortable (Just "comment") (i18nCell MsgRatingComment) $ formCe
   (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId)
   (\DBRow{ dbrOutput=(Entity _ Submission{..}, _, _, _, _) } mkUnique -> over (_1.mapped) ((_3 .~) . assertM (not . null) . fmap (Text.strip . unTextarea)) . over _2 fvInput <$> mopt textareaField (fsUniq mkUnique "comment") (Just $ Textarea <$> submissionRatingComment))
 
+colLastEdit ::  Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData)))
+colLastEdit = sortable (Just "last-edit") (i18nCell MsgLastEdit) $
+   \DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> sqlCell $ do
+      edits <- E.select $ E.from $ \edit -> do
+                E.where_ $ edit E.^. SubmissionEditSubmission E.==. E.val subId
+                return $ E.max_ $ edit E.^. SubmissionEditTime
+      return [whamlet|
+          $newline never
+          DATES
+          $forall ed <- edits
+            #{show ed}
+        |]
+
+-- colLastEdit' ::  Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData)))
+-- colLastEdit' = sortable (Just "last-edit") (i18nCell MsgLastEdit) $ (formCell id
+--   (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId)
+--   (const mempty))
+--   --  \DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> sqlCell $ do
+--   --     edits <- E.select $ E.from $ \edit -> do
+--   --               E.where_ $ edit E.^. SubmissionEditSubmission E.==. E.val subId
+--   --               return $ E.max_ $ edit E.^. SubmissionEditTime
+--   --     return [whamlet|
+--   --         $newline never
+--   --         DATES
+--   --         $forall ed <- edits
+--   --           #{show ed}
+--   --       |]
+
+
 
 makeCorrectionsTable :: ( IsDBTable m x, ToSortable h, Functor h )
                      => CorrectionTableWhere -> Colonnade h CorrectionTableData (DBCell m x) -> _ -> PSValidator m x -> _ -> DBParams m x -> DB (DBResult m x)
@@ -551,6 +580,8 @@ postCCorrectionsR tid ssh csh = do
         , colSMatrikel
         , colSubmittors
         , colSubmissionLink
+        -- , colLastEdit -- this does not type
+        -- , colLastEdit'
         , colRating
         , colRated
         , colCorrector

From 601cbeab7611b1a47741673594224946daea850b Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 17 May 2019 13:40:39 +0200
Subject: [PATCH 335/519] Fixes #381

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

diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index ed2334d5c..3f1bd2aae 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -54,8 +54,9 @@ serveOneFile query = do
   case results of
     [Entity _fileId File{fileTitle, fileContent}]
       | Just fileContent' <- fileContent -> do
-          whenM downloadFiles $
-            addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
+          ifM downloadFiles
+            (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|])
+            (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|])
           return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
       | otherwise -> sendResponseStatus noContent204 ()
     [] -> notFound
@@ -72,8 +73,9 @@ serveSomeFiles archiveName query = do
     [] -> notFound
     [Entity _fileId File{fileTitle, fileContent}]
       | Just fileContent' <- fileContent -> do
-          whenM downloadFiles $
-            addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
+          ifM downloadFiles
+            (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|])
+            (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|])
           return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
       | otherwise -> sendResponseStatus noContent204 ()
     files -> do

From c0bc4dd8f37b1574cc2e9b4941f709a59586ad16 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 17 May 2019 13:53:07 +0200
Subject: [PATCH 336/519] Code DRY cleaning

---
 src/Handler/Utils.hs | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 3f1bd2aae..a51723840 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -38,6 +38,7 @@ import qualified Data.List as List
 import qualified Data.List.NonEmpty as NonEmpty
 
 
+-- | Check whether the user's preference for files is inline-viewing or downloading
 downloadFiles :: (MonadHandler m, HandlerSite m ~ UniWorX) => m Bool
 downloadFiles = do
   mauth <- liftHandlerT maybeAuth
@@ -47,18 +48,22 @@ downloadFiles = do
       UserDefaultConf{..} <- getsYesod $ view _appUserDefaults
       return userDefaultDownloadFiles
 
+-- | Simply send a `File`-Value
+sendThisFile :: File -> Handler TypedContent
+sendThisFile File{..}
+  | Just fileContent' <- fileContent = do
+      ifM downloadFiles
+        (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|])
+        (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|])
+      return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
+  | otherwise = sendResponseStatus noContent204 ()
+
 -- | 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
-          ifM downloadFiles
-            (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|])
-            (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|])
-          return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
-      | otherwise -> sendResponseStatus noContent204 ()
+    [Entity _fileId file] -> sendThisFile file
     [] -> notFound
     other -> do
       $logErrorS "SFileR" $ "Multiple matching files: " <> tshow other
@@ -70,19 +75,13 @@ serveSomeFiles :: Text -> DB [Entity File] -> Handler TypedContent
 serveSomeFiles archiveName query = do
   results <- runDB query
   case results of
-    [] -> notFound
-    [Entity _fileId File{fileTitle, fileContent}]
-      | Just fileContent' <- fileContent -> do
-          ifM downloadFiles
-            (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|])
-            (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|])
-          return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
-      | otherwise -> sendResponseStatus noContent204 ()
-    files -> do
+    []                    -> notFound
+    [Entity _fileId file] -> sendThisFile file
+    moreFiles -> do
       addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece archiveName}"|]
       respondSourceDB "application/zip" $ do
         let zipComment = T.encodeUtf8 archiveName
-        yieldMany files .| Conduit.map entityVal .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
+        yieldMany moreFiles .| Conduit.map entityVal .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
 
 
 tidFromText :: Text -> Maybe TermId

From e676be8f3f19403b8ca73d7ce454343bcc29d96f Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 17 May 2019 18:51:55 +0200
Subject: [PATCH 337/519] Fixes #374

---
 src/Handler/Corrections.hs | 108 ++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 61 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 536ebb35a..33bcb4992 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -36,6 +36,7 @@ import Data.Monoid (All(..))
 -- import qualified Data.Conduit.List as C
 
 import qualified Database.Esqueleto as E
+import qualified Database.Esqueleto.Internal.Language (From)
 -- import qualified Database.Esqueleto.Internal.Sql as E
 
 -- import Control.Monad.Writer (MonadWriter(..), execWriterT)
@@ -60,7 +61,7 @@ import Data.Foldable (foldrM)
 
 type CorrectionTableExpr  = (E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity Sheet) `E.InnerJoin` E.SqlExpr (Entity Submission)) `E.LeftOuterJoin` E.SqlExpr (Maybe (Entity User))
 type CorrectionTableWhere = CorrectionTableExpr -> E.SqlExpr (E.Value Bool)
-type CorrectionTableData = DBRow (Entity Submission, Entity Sheet, (CourseName, CourseShorthand, Key Term, Key School), Maybe (Entity User), Map UserId (User, Maybe Pseudonym))
+type CorrectionTableData = DBRow (Entity Submission, Entity Sheet, (CourseName, CourseShorthand, Key Term, Key School), Maybe (Entity User), Maybe UTCTime, Map UserId (User, Maybe Pseudonym))
 
 correctionsTableQuery :: CorrectionTableWhere -> (CorrectionTableExpr -> v) -> CorrectionTableExpr -> E.SqlQuery v
 correctionsTableQuery whereClause returnStatement t@((course `E.InnerJoin` sheet `E.InnerJoin` submission) `E.LeftOuterJoin` corrector) = do
@@ -70,6 +71,12 @@ correctionsTableQuery whereClause returnStatement t@((course `E.InnerJoin` sheet
     E.where_ $ whereClause t
     return $ returnStatement t
 
+lastEditQuery :: Database.Esqueleto.Internal.Language.From query expr backend (expr (Entity SubmissionEdit))
+  => expr (Entity Submission) -> expr (E.Value (Maybe UTCTime))
+lastEditQuery submission = E.sub_select $ E.from $ \edit -> do
+  E.where_ $ edit E.^. SubmissionEditSubmission E.==. submission E.^. SubmissionId
+  return $ E.max_ $ edit E.^. SubmissionEditTime
+
 -- Where Clauses
 ratedBy :: UserId -> CorrectionTableWhere
 ratedBy uid   ((_course `E.InnerJoin` _sheet `E.InnerJoin`  submission) `E.LeftOuterJoin` _corrector) = submission E.^. SubmissionRatingBy E.==. E.just (E.val uid)
@@ -84,40 +91,41 @@ sheetIs shid  ((_course `E.InnerJoin`  sheet `E.InnerJoin` _submission) `E.LeftO
 -- Columns
 colTerm :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
 colTerm = sortable (Just "term") (i18nCell MsgTerm)
-        $ \DBRow{ dbrOutput=(_, _, course, _, _) } ->
-          -- cell [whamlet| _{untermKey $ course ^. _3}|]   -- lange, internationale Semester
-          textCell $ termToText $ unTermKey $ course ^. _3 -- kurze Semsterkürzel
+        $ \DBRow{ dbrOutput } ->
+          textCell $ termToText $ unTermKey $ dbrOutput ^. _3 . _3 -- kurze Semsterkürzel
 
 colSchool :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
 colSchool = sortable (Just "school") (i18nCell MsgCourseSchool)
-          $ \DBRow{ dbrOutput=(_, _, course, _, _) } ->
+          $ \DBRow{ dbrOutput } -> let course = dbrOutput ^. _3 in
             anchorCell (TermSchoolCourseListR (course ^. _3) (course ^. _4)) [whamlet|#{unSchoolKey (course ^. _4)}|]
 
 colCourse :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
 colCourse = sortable (Just "course") (i18nCell MsgCourse)
-        $ \DBRow{ dbrOutput=(_, _, (_,csh,tid,sid), _, _) } -> courseCellCL (tid,sid,csh)
+        $ \DBRow{ dbrOutput=(_, _, (_,csh,tid,sid),_ , _, _) } -> courseCellCL (tid,sid,csh)
 
 colSheet :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
-colSheet = sortable (Just "sheet") (i18nCell MsgSheet)
-        $ \DBRow{ dbrOutput=(_, sheet, course, _, _) } ->
-          let tid   = course ^. _3
+colSheet = sortable (Just "sheet") (i18nCell MsgSheet) $ \row ->
+          let sheet = row ^. _dbrOutput . _2
+              course= row ^. _dbrOutput . _3
+              tid   = course ^. _3
               ssh   = course ^. _4
               csh   = course ^. _2
               shn   = sheetName $ entityVal sheet
           in anchorCell (CSheetR tid ssh csh shn SShowR) [whamlet|#{display shn}|]
 
 colSheetType :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
-colSheetType = sortable (toNothing "sheetType") (i18nCell MsgSheetType)
-        $ \DBRow{ dbrOutput=(_, sheet, _, _, _) } -> i18nCell . sheetType $ entityVal sheet
+colSheetType = sortable (toNothing "sheetType") (i18nCell MsgSheetType) $
+        i18nCell . sheetType <$> view (_dbrOutput . _2 . _entityVal)
+        -- $ \DBRow{ dbrOutput=(_, sheet, _, _, _, _) } -> i18nCell . sheetType $ entityVal sheet
 
 colCorrector :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
 colCorrector = sortable (Just "corrector") (i18nCell MsgCorrector) $ \case
-  DBRow{ dbrOutput = (_, _, _, Nothing  , _) } -> cell mempty
-  DBRow{ dbrOutput = (_, _, _, Just (Entity _ User{..}), _) } -> userCell userDisplayName userSurname
+  DBRow{ dbrOutput = (_, _, _, Nothing  , _, _) } -> cell mempty
+  DBRow{ dbrOutput = (_, _, _, Just (Entity _ User{..}), _, _) } -> userCell userDisplayName userSurname
 
 colSubmissionLink :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
 colSubmissionLink = sortable Nothing (i18nCell MsgSubmission)
-        $ \DBRow{ dbrOutput=(submission, sheet, course, _, _) } ->
+        $ \DBRow{ dbrOutput=(submission, sheet, course, _, _,_) } ->
           let csh = course ^. _2
               tid = course ^. _3
               ssh = course ^. _4
@@ -129,10 +137,10 @@ colSubmissionLink = sortable Nothing (i18nCell MsgSubmission)
           in anchorCellM mkRoute (mkCid >>= \cid -> [whamlet|#{display cid}|])
 
 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
+colSelect = dbSelect (_1 . applying _2) id $ \DBRow{ dbrOutput=(Entity subId _, _, _, _, _, _) } -> encrypt subId
 
 colSubmittors :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
-colSubmittors = sortable (Just "submittors") (i18nCell MsgSubmissionUsers) $ \DBRow{ dbrOutput=(_, _, course, _, users) } -> let
+colSubmittors = sortable (Just "submittors") (i18nCell MsgSubmissionUsers) $ \DBRow{ dbrOutput=(_, _, course, _, _, users) } -> let
   csh = course ^. _2
   tid = course ^. _3
   ssh = course ^. _4
@@ -144,12 +152,12 @@ colSubmittors = sortable (Just "submittors") (i18nCell MsgSubmissionUsers) $ \DB
   in protoCell & cellAttrs <>~ [("class", "list--inline list--comma-separated")]
 
 colSMatrikel :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
-colSMatrikel = sortable Nothing (i18nCell MsgMatrikelNr) $ \DBRow{ dbrOutput=(_, _, _, _, users) } -> let
+colSMatrikel = sortable Nothing (i18nCell MsgMatrikelNr) $ \DBRow{ dbrOutput=(_, _, _, _, _, users) } -> let
   protoCell = listCell (Map.toList users) $ \(userId, (User{..}, _)) -> anchorCellM (AdminUserR <$> encrypt userId) (maybe mempty toWidget userMatrikelnummer)
   in protoCell & cellAttrs <>~ [("class", "list--inline list--comma-separated")]
 
 colRating :: forall m a. IsDBTable m (a, SheetTypeSummary) => Colonnade Sortable CorrectionTableData (DBCell m (a, SheetTypeSummary))
-colRating = sortable (Just "rating") (i18nCell MsgRating) $ \DBRow{ dbrOutput=(Entity subId sub@Submission{..}, Entity _ Sheet{..}, course, _, _) } ->
+colRating = sortable (Just "rating") (i18nCell MsgRating) $ \DBRow{ dbrOutput=(Entity subId sub@Submission{..}, Entity _ Sheet{..}, course, _, _, _) } ->
   let csh = course ^. _2
       tid = course ^. _3
       ssh = course ^. _4
@@ -169,65 +177,40 @@ colRating = sortable (Just "rating") (i18nCell MsgRating) $ \DBRow{ dbrOutput=(E
      ]
 
 colAssigned :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
-colAssigned = sortable (Just "assignedtime") (i18nCell MsgAssignedTime) $ \DBRow{ dbrOutput=(Entity _subId Submission{..}, _sheet, _course, _, _) } ->
+colAssigned = sortable (Just "assignedtime") (i18nCell MsgAssignedTime) $ \DBRow{ dbrOutput=(Entity _subId Submission{..}, _sheet, _course, _, _, _) } ->
   maybe mempty dateTimeCell submissionRatingAssigned
 
 colRated :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
-colRated = sortable (Just "ratingtime") (i18nCell MsgRatingTime) $ \DBRow{ dbrOutput=(Entity _subId Submission{..}, _sheet, _course, _, _) } ->
+colRated = sortable (Just "ratingtime") (i18nCell MsgRatingTime) $ \DBRow{ dbrOutput=(Entity _subId Submission{..}, _sheet, _course, _, _, _) } ->
   maybe mempty dateTimeCell submissionRatingTime
 
 colPseudonyms :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
-colPseudonyms = sortable Nothing (i18nCell MsgPseudonyms) $ \DBRow{ dbrOutput=(_, _, _, _, users) } -> let
+colPseudonyms = sortable Nothing (i18nCell MsgPseudonyms) $ \DBRow{ dbrOutput=(_, _, _, _, _, users) } -> let
     lCell = listCell (catMaybes $ snd . snd <$> Map.toList users) $ \pseudo ->
       cell [whamlet|#{review _PseudonymText pseudo}|]
   in lCell & cellAttrs <>~ [("class", "list--inline list--comma-separated")]
 
 colRatedField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (Bool, a, b) CorrectionTableData)))
 colRatedField = sortable Nothing (i18nCell MsgRatingDone) $ formCell id
-  (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId)
-  (\DBRow{ dbrOutput=(Entity _ (submissionRatingDone -> done), _, _, _, _) } mkUnique -> over (_1.mapped) (_1 .~) . over _2 fvInput <$> mreq checkBoxField (fsUniq mkUnique "rated") (Just done))
+  (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _, _) } -> return subId)
+  (\DBRow{ dbrOutput=(Entity _ (submissionRatingDone -> done), _, _, _, _, _) } mkUnique -> over (_1.mapped) (_1 .~) . over _2 fvInput <$> mreq checkBoxField (fsUniq mkUnique "rated") (Just done))
 
 colPointsField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, Maybe Points, b) CorrectionTableData)))
 colPointsField = sortable (Just "rating") (i18nCell MsgColumnRatingPoints) $ formCell id
-  (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId)
-  (\DBRow{ dbrOutput=(Entity _ Submission{..}, Entity _ Sheet{..}, _, _, _) } mkUnique -> case sheetType of
+  (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _, _) } -> return subId)
+  (\DBRow{ dbrOutput=(Entity _ Submission{..}, Entity _ Sheet{..}, _, _, _, _) } mkUnique -> case sheetType of
       NotGraded -> over (_1.mapped) (_2 .~) <$> pure (FormSuccess Nothing, mempty)
       _other -> over (_1.mapped) (_2 .~) . over _2 fvInput <$> mopt pointsField (fsUniq mkUnique "points") (Just submissionRatingPoints)
   )
 
 colCommentField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData)))
 colCommentField = sortable (Just "comment") (i18nCell MsgRatingComment) $ formCell id
-  (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId)
-  (\DBRow{ dbrOutput=(Entity _ Submission{..}, _, _, _, _) } mkUnique -> over (_1.mapped) ((_3 .~) . assertM (not . null) . fmap (Text.strip . unTextarea)) . over _2 fvInput <$> mopt textareaField (fsUniq mkUnique "comment") (Just $ Textarea <$> submissionRatingComment))
+  (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _, _) } -> return subId)
+  (\DBRow{ dbrOutput=(Entity _ Submission{..}, _, _, _, _, _) } mkUnique -> over (_1.mapped) ((_3 .~) . assertM (not . null) . fmap (Text.strip . unTextarea)) . over _2 fvInput <$> mopt textareaField (fsUniq mkUnique "comment") (Just $ Textarea <$> submissionRatingComment))
 
-colLastEdit ::  Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData)))
+colLastEdit :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
 colLastEdit = sortable (Just "last-edit") (i18nCell MsgLastEdit) $
-   \DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> sqlCell $ do
-      edits <- E.select $ E.from $ \edit -> do
-                E.where_ $ edit E.^. SubmissionEditSubmission E.==. E.val subId
-                return $ E.max_ $ edit E.^. SubmissionEditTime
-      return [whamlet|
-          $newline never
-          DATES
-          $forall ed <- edits
-            #{show ed}
-        |]
-
--- colLastEdit' ::  Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData)))
--- colLastEdit' = sortable (Just "last-edit") (i18nCell MsgLastEdit) $ (formCell id
---   (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId)
---   (const mempty))
---   --  \DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> sqlCell $ do
---   --     edits <- E.select $ E.from $ \edit -> do
---   --               E.where_ $ edit E.^. SubmissionEditSubmission E.==. E.val subId
---   --               return $ E.max_ $ edit E.^. SubmissionEditTime
---   --     return [whamlet|
---   --         $newline never
---   --         DATES
---   --         $forall ed <- edits
---   --           #{show ed}
---   --       |]
-
+   \DBRow{ dbrOutput=(_, _, _, _, mbLastEdit, _) } -> maybe mempty dateTimeCell mbLastEdit
 
 
 makeCorrectionsTable :: ( IsDBTable m x, ToSortable h, Functor h )
@@ -241,10 +224,10 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
                         , course E.^. CourseTerm
                         , course E.^. CourseSchool    :: E.SqlExpr (E.Value SchoolId)
                         )
-            in (submission, sheet, crse, corrector)
+            in (submission, sheet, crse, corrector, lastEditQuery submission)
           )
       dbtProj :: DBRow _ -> MaybeT (ReaderT SqlBackend (HandlerT UniWorX IO)) CorrectionTableData
-      dbtProj = traverse $ \(submission@(Entity sId _), sheet@(Entity shId _), (E.Value courseName, E.Value courseShorthand, E.Value courseTerm, E.Value courseSchool), mCorrector) -> do
+      dbtProj = traverse $ \(submission@(Entity sId _), sheet@(Entity shId _), (E.Value courseName, E.Value courseShorthand, E.Value courseTerm, E.Value courseSchool), mCorrector,  E.Value mbLastEdit) -> do
         submittors <- lift . E.select . E.from $ \((submissionUser `E.InnerJoin` user) `E.LeftOuterJoin` pseudonym) -> do
           E.on $ pseudonym E.?. SheetPseudonymUser E.==. E.just (user E.^. UserId)
            E.&&. pseudonym E.?. SheetPseudonymSheet E.==. E.just (E.val shId)
@@ -254,7 +237,7 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
           return (user, pseudonym E.?. SheetPseudonymPseudonym)
         let
           submittorMap = foldr (\(Entity userId user, E.Value pseudo) -> Map.insert userId (user, pseudo)) Map.empty submittors
-        dbtProj' (submission, sheet, (courseName, courseShorthand, courseTerm, courseSchool), mCorrector, submittorMap)
+        dbtProj' (submission, sheet, (courseName, courseShorthand, courseTerm, courseSchool), mCorrector, mbLastEdit, submittorMap)
   dbTable psValidator DBTable
     { dbtSQLQuery
     , dbtRowKey = \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) -> submission E.^. SubmissionId
@@ -300,6 +283,9 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
       , ( "comment" -- sorting by comment specifically requested by correctors to easily see submissions to be done
         , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> submission E.^. SubmissionRatingComment
         )
+      , ( "last-edit"
+        , SortColumn $ \((_course `E.InnerJoin` _sheet `E.InnerJoin` submission) `E.LeftOuterJoin` _corrector) -> lastEditQuery submission
+        )
       ]
     , dbtFilter    = Map.fromList
       [ ( "term"
@@ -580,8 +566,7 @@ postCCorrectionsR tid ssh csh = do
         , colSMatrikel
         , colSubmittors
         , colSubmissionLink
-        -- , colLastEdit -- this does not type
-        -- , colLastEdit'
+        , colLastEdit
         , colRating
         , colRated
         , colCorrector
@@ -605,6 +590,7 @@ postSSubsR tid ssh csh shn = do
         , colSMatrikel
         , colSubmittors
         , colSubmissionLink
+        , colLastEdit
         , colRating
         , colRated
         , colCorrector
@@ -928,8 +914,8 @@ postCorrectionsGradeR = do
         ] -- Continue here
       psValidator = def
         & defaultSorting [SortDescBy "ratingtime"] :: PSValidator (MForm (HandlerT UniWorX IO)) (FormResult (DBFormResult SubmissionId (Bool, Maybe Points, Maybe Text) CorrectionTableData))
-      unFormResult = getDBFormResult $ \DBRow{ dbrOutput = (Entity _ sub@Submission{..}, _, _, _, _) } -> (submissionRatingDone sub, submissionRatingPoints, submissionRatingComment)
-      dbtProj' i@(Entity subId _, Entity _ Sheet{ sheetName = shn }, (_, csh, tid, ssh), _, _) = do
+      unFormResult = getDBFormResult $ \DBRow{ dbrOutput = (Entity _ sub@Submission{..}, _, _, _, _, _) } -> (submissionRatingDone sub, submissionRatingPoints, submissionRatingComment)
+      dbtProj' i@(Entity subId _, Entity _ Sheet{ sheetName = shn }, (_, csh, tid, ssh), _, _, _) = do
         cID <- encrypt subId
         void . assertM (== Authorized) . lift $ evalAccessDB (CSubmissionR tid ssh csh shn cID CorrectionR) True
         return i

From 97eb18c5aac1e9f15ed7bccf313c11c21940ec0a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 18 May 2019 15:58:29 +0200
Subject: [PATCH 338/519] Cleanup file handling

  * Use serve*File(s)-Utilities wherever possible
  * Stream Files from database through zip-encoder and to client whenever possible
  * Get rid of ZIPArchiveName and use Content-Disposition everywhere
  * Make Content-Disposition able to deal with non-ascii filenames
---
 routes                    |  9 ++--
 src/Foundation.hs         |  8 ++--
 src/Handler/Material.hs   | 45 ++++++++------------
 src/Handler/Sheet.hs      | 10 ++---
 src/Handler/Submission.hs | 86 ++++++++++++++++-----------------------
 src/Handler/Utils.hs      | 43 ++++++++++++--------
 src/Model/Types/Misc.hs   | 10 -----
 src/Utils.hs              | 39 +++++++++++++++++-
 src/Utils/Sheet.hs        | 10 ++---
 9 files changed, 134 insertions(+), 126 deletions(-)

diff --git a/routes b/routes
index d934bd8f6..40579f9e6 100644
--- a/routes
+++ b/routes
@@ -105,27 +105,26 @@
     !/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
       /invite                   SInviteR       GET POST        !ownerANDtime
+      !/#SubmissionFileType     SubArchiveR    GET             !owner !corrector
       !/#SubmissionFileType/*FilePath SubDownloadR  GET        !owner !corrector
     /correctors                 SCorrR         GET POST
     /iscorrector                SIsCorrR       GET             !corrector -- Route is used to check for corrector access to this sheet
     /pseudonym                  SPseudonymR    GET POST        !course-registeredANDcorrector-submissions
     /corrector-invite/          SCorrInviteR   GET POST
+    !/#SheetFileType            SZipR          GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
     !/#SheetFileType/*FilePath  SFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
-    !/#{ZIPArchiveName SheetFileType}  SZipR   GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
   /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 !tutor
-    /load/*FilePath             MFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
-    /download                   MArchiveR      GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
-    /zip                        MZipR          GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
+    !/download                  MArchiveR      GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
+    !/download/*FilePath        MFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
   /tuts                         CTutorialListR GET             !tutor -- THIS route is used to check for overall course tutor access!
   /tuts/new                     CTutorialNewR  GET POST
   /tuts/#TutorialName TutorialR:
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 48b5e033e..bf592b1b1 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -677,10 +677,10 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
       SFileR                SheetSolution _ -> guard $ maybe False (<= cTime) sheetSolutionFrom
       SFileR                _             _ -> mzero
       -- Archives of SheetFileType
-      SZipR (ZIPArchiveName SheetExercise)  -> guard $ sheetActiveFrom <= cTime
-      SZipR (ZIPArchiveName SheetHint    )  -> guard $ maybe False (<= cTime) sheetHintFrom
-      SZipR (ZIPArchiveName SheetSolution)  -> guard $ maybe False (<= cTime) sheetSolutionFrom
-      SZipR _                               -> mzero
+      SZipR                 SheetExercise   -> guard $ sheetActiveFrom <= cTime
+      SZipR                 SheetHint       -> guard $ maybe False (<= cTime) sheetHintFrom
+      SZipR                 SheetSolution   -> guard $ maybe False (<= cTime) sheetSolutionFrom
+      SZipR                 _               -> mzero
       -- Submissions
       SubmissionNewR         -> guard   active
       SubmissionR _ SAssignR -> guard   marking -- Correctors can only be assigned when the Sheet is inactive, since submissions are subject to change
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 7ae50af56..119fa5027 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -9,7 +9,7 @@ import qualified Data.Set as Set
 import qualified Data.Map as Map
 import qualified Data.Conduit.List as C
 -- import qualified Data.CaseInsensitive as CI
-import qualified Data.Text.Encoding as Text
+-- import qualified Data.Text.Encoding as Text
 
 import qualified Database.Esqueleto as E
 import Database.Esqueleto.Utils.TH
@@ -107,15 +107,18 @@ getMaterialListR tid ssh csh = do
   seeAllModificationTimestamps <- hasWriteAccessTo $ CourseR tid ssh csh MaterialNewR -- ordinary users should not see modification dates older than visibility
   table <- runDB $ do
     cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-    let row2material = entityVal . dbrOutput -- no inner join, just Entity Material
+    let row2material = view $ _dbrOutput . _1 . _entityVal
         psValidator  = def & defaultSorting [SortDescBy "last-edit"]
     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
+          E.where_ $ material E.^. MaterialCourse  E.==.  E.val cid
+          let filesNum = E.sub_select . E.from $ \materialFile -> do
+                E.where_ $ materialFile E.^. MaterialFileMaterial E.==. material E.^. MaterialId
+                return E.countRows :: E.SqlQuery (E.SqlExpr (E.Value Int64))
+          return (material, filesNum)
       , dbtRowKey    = (E.^. MaterialId)
       -- , dbtProj      = \dbr -> guardAuthorizedFor (matLink . materialName $ dbr ^. _dbrOutput . _entityVal) dbr
       , dbtProj      = guardAuthorizedFor =<< matLink . materialName . row2material -- Moand: (a ->)
@@ -127,8 +130,10 @@ getMaterialListR tid ssh csh = do
                 $ liftA2 anchorCell matLink toWgt . materialName . row2material
             , sortable (toNothingS "description") mempty
                 $ foldMap modalCell . materialDescription . row2material
-            , sortable (toNothingS "zip-archive") mempty -- TODO: don't show if there are no files!
-                $ fileCell . filesLink . materialName . row2material
+            , sortable (toNothingS "zip-archive") mempty
+                $ \DBRow{ dbrOutput = (Entity _ Material{..}, E.Value fileNum) } -> if
+                  | fileNum == 0 -> mempty
+                  | otherwise    -> fileCell $ filesLink materialName
             , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
                 $ foldMap (dateTimeCellVisible now) . materialVisibleFrom . row2material
             , sortable (Just "last-edit") (i18nCell MsgFileModified)
@@ -156,9 +161,9 @@ getMaterialListR tid ssh csh = do
 
 
 getMFileR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> FilePath -> Handler TypedContent
-getMFileR tid ssh csh mnm title = serveOneFile fileQuery
+getMFileR tid ssh csh mnm title = serveOneFile $ fileQuery .| C.map entityVal
   where
-    fileQuery = E.select $ E.from $
+    fileQuery = E.selectSource $ 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)
@@ -180,7 +185,7 @@ getMShowR tid ssh csh mnm = do
       matLink = CourseR tid ssh csh . MaterialR mnm . MFileR
 
       zipLink :: Route UniWorX
-      zipLink = CMaterialR tid ssh csh mnm MZipR
+      zipLink = CMaterialR tid ssh csh mnm MArchiveR
 
   seeAllModificationTimestamps <- hasReadAccessTo $ CourseR tid ssh csh CNotesR -- ordinary users should not see modification dates older than visibility
 
@@ -351,28 +356,12 @@ postMDelR tid ssh csh mnm = do
     , drAbort   = SomeRoute $ CourseR tid ssh csh $ MaterialR mnm MShowR
     }
 
--- | Variant of getMArchiveR that always serves a Zip Archive, even for single files. Kept, since we might change this according to UX feedback.
-getMZipR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler TypedContent
-getMZipR tid ssh csh mnm = do
-  let filename = ZIPArchiveName mnm
-  addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece filename}"|]
-  respondSourceDB "application/zip" $ do
-    mid <- lift $ getMaterialKeyBy404 tid ssh csh mnm
-    -- Entity{entityKey=mid, entityVal=material} <- lift $ fetchMaterial tid ssh csh mnm
-    let
-      fileSelect = E.selectSource . E.from $ \(materialFile `E.InnerJoin` file) -> do
-        E.on     $  materialFile E.^. MaterialFileFile E.==. file E.^. FileId
-        E.where_ $  materialFile E.^. MaterialFileMaterial E.==. E.val mid
-        return file
-      zipComment = Text.encodeUtf8 $ termToText (unTermKey tid) <> "-" <> toPathPiece (unSchoolKey ssh <> "-" <> csh <> ":" <> mnm)
-    fileSelect .| C.map entityVal .| produceZip ZipInfo{..} .| C.map toFlushBuilder
-
--- | Variant of getMZipR that does not serve single file Zip Archives. Maybe confusing to users.
+-- | Serve all material-files
 getMArchiveR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler TypedContent
 getMArchiveR tid ssh csh mnm = serveSomeFiles archivename getMatQuery
   where
-    archivename = termToText (unTermKey tid) <> "-" <> toPathPiece (unSchoolKey ssh <> "-" <> csh <> "-" <> mnm)
-    getMatQuery = E.select . E.from $
+    archivename = unpack (termToText (unTermKey tid) <> "-" <> toPathPiece (unSchoolKey ssh <> "-" <> csh <> "-" <> mnm)) <.> "zip"
+    getMatQuery = (.| C.map entityVal) . E.selectSource . E.from $
       \(course `E.InnerJoin` material `E.InnerJoin` materialFile `E.InnerJoin` file) -> do
         E.on $ file     E.^. FileId         E.==. materialFile E.^. MaterialFileFile
         E.on $ material E.^. MaterialId     E.==. materialFile E.^. MaterialFileMaterial
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index c5c7fb45f..88af1d515 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -215,7 +215,7 @@ getSheetListR tid ssh csh = do
               [ icnCell & addIconFixedWidth
               | let existingSFTs = hasSFT existFiles
               , sft <- [minBound..maxBound]
-              , let link = CSheetR tid ssh csh sheetName $ SZipR $ ZIPArchiveName sft
+              , let link = CSheetR tid ssh csh sheetName $ SZipR sft
               , let icn  = toWidget $ sheetFile2markup sft
               , let icnCell = if sft `elem` existingSFTs
                               then linkEmptyCell link icn
@@ -455,11 +455,11 @@ postSPseudonymR tid ssh csh shn = do
 
 
 getSFileR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> FilePath -> Handler TypedContent
-getSFileR tid ssh csh shn sft file = serveOneFile $ sheetFileQuery tid ssh csh shn sft file
+getSFileR tid ssh csh shn sft file = serveOneFile $ sheetFileQuery tid ssh csh shn sft file .| C.map entityVal
 
-getSZipR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> ZIPArchiveName SheetFileType -> Handler TypedContent
-getSZipR tid ssh csh shn filename@(ZIPArchiveName sft)
-  = serveSomeFiles (toPathPiece filename) $ sheetFilesAllQuery tid ssh csh shn sft
+getSZipR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> Handler TypedContent
+getSZipR tid ssh csh shn sft
+  = serveSomeFiles (unpack (toPathPiece sft) <.> "zip") $ sheetFilesAllQuery tid ssh csh shn sft .| C.map entityVal
 
 
 getSheetNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 3e31fb658..f9f04f8cc 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -38,8 +38,6 @@ import Data.Map (Map, (!), (!?))
 import qualified Data.Map as Map
 -- import Data.Bifunctor
 
-import System.FilePath
-
 import Text.Blaze (Markup)
 import Data.Aeson hiding (Result(..))
 import Text.Hamlet (ihamlet)
@@ -515,8 +513,8 @@ submissionHelper tid ssh csh shn mcid = do
 
   defaultLayout $ do
     setTitleI $ MsgSubmissionEditHead tid ssh csh shn
-    let urlArchive  cID = CSubmissionR tid ssh csh shn cID (SubArchiveR (ZIPArchiveName SubmissionCorrected))
-        urlOriginal cID = CSubmissionR tid ssh csh shn cID (SubArchiveR (ZIPArchiveName SubmissionOriginal))
+    let urlArchive  cID = CSubmissionR tid ssh csh shn cID $ SubArchiveR SubmissionCorrected
+        urlOriginal cID = CSubmissionR tid ssh csh shn cID $ SubArchiveR SubmissionOriginal
     $(widgetFile "submission")
 
 getSInviteR, postSInviteR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> Handler Html
@@ -525,72 +523,60 @@ postSInviteR = invitationR submissionUserInvitationConfig
 
 
 getSubDownloadR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> SubmissionFileType -> FilePath -> Handler TypedContent
-getSubDownloadR tid ssh csh shn cID (submissionFileTypeIsUpdate -> isUpdate) path = runDB $ do
-  submissionID <- submissionMatchesSheet tid ssh csh shn cID
+getSubDownloadR tid ssh csh shn cID (submissionFileTypeIsUpdate -> isUpdate) path = do
+  (submissionID, isRating) <- runDB $ do
+    submissionID <- submissionMatchesSheet tid ssh csh shn cID
 
-  isRating <- (== Just submissionID) <$> isRatingFile path
+    isRating <- (== Just submissionID) <$> isRatingFile path
 
-  when (isUpdate || isRating) $
-    guardAuthResult =<< evalAccessDB (CSubmissionR tid ssh csh shn cID CorrectionR) False
+    when (isUpdate || isRating) $
+      guardAuthResult =<< evalAccessDB (CSubmissionR tid ssh csh shn cID CorrectionR) False
+
+    return (submissionID, isRating)
 
   case isRating of
     True
-      | isUpdate -> do
+      | isUpdate -> runDB $ do
           file <- runMaybeT $ lift . ratingFile cID =<< MaybeT (getRating submissionID)
           maybe notFound (return . toTypedContent . Text.decodeUtf8) $ fileContent =<< file
       | otherwise -> notFound
     False -> do
-      results <- E.select . E.from $ \(sf `E.InnerJoin` f) -> do
-        E.on (f E.^. FileId E.==. sf E.^. SubmissionFileFile)
-        E.where_ $ sf E.^. SubmissionFileSubmission E.==. E.val submissionID
-             E.&&. f E.^. FileTitle E.==. E.val path
-             E.&&. E.not_ (sf E.^. SubmissionFileIsDeletion)
-             E.&&. sf E.^. SubmissionFileIsUpdate E.==. E.val isUpdate
-             -- E.&&. E.not_ (E.isNothing $ f E.^. FileContent) -- This is fine, we just return 204
-        return f
+      let results = (.| Conduit.map entityVal) . E.selectSource . E.from $ \(sf `E.InnerJoin` f) -> do
+            E.on (f E.^. FileId E.==. sf E.^. SubmissionFileFile)
+            E.where_ $ sf E.^. SubmissionFileSubmission E.==. E.val submissionID
+                 E.&&. f E.^. FileTitle E.==. E.val path
+                 E.&&. E.not_ (sf E.^. SubmissionFileIsDeletion)
+                 E.&&. sf E.^. SubmissionFileIsUpdate E.==. E.val isUpdate
+                 -- E.&&. E.not_ (E.isNothing $ f E.^. FileContent) -- This is fine, we just return 204
+            return f
 
-      case results of
-        [] -> notFound
-        [Entity _ File{ fileContent = Just c, fileTitle }] -> do
-          whenM downloadFiles $
-            addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
-          return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent c)
-        [Entity _ File{ fileContent = Nothing }] -> sendResponseStatus noContent204 ()
-        other -> do
-          $logErrorS "SubDownloadR" $ "Multiple matching files: " <> tshow other
-          error "Multiple matching files found."
+      serveOneFile results
 
-getSubArchiveR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> ZIPArchiveName SubmissionFileType -> Handler TypedContent
-getSubArchiveR tid ssh csh shn cID (ZIPArchiveName sfType) = do
+getSubArchiveR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> SubmissionFileType -> Handler TypedContent
+getSubArchiveR tid ssh csh shn cID sfType = do
   when (sfType == SubmissionCorrected) $
     guardAuthResult =<< evalAccess (CSubmissionR tid ssh csh shn cID CorrectionR) False
 
   let filename
-        | SubmissionOriginal <- sfType = ZIPArchiveName $ toPathPiece cID <> "-" <> toPathPiece sfType
-        | otherwise = ZIPArchiveName $ toPathPiece cID
+        | SubmissionOriginal <- sfType = toPathPiece cID <> "-" <> toPathPiece sfType
+        | otherwise = toPathPiece cID
 
-  addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece filename}"|]
-  respondSourceDB "application/zip" $ do
-    submissionID <- lift $ submissionMatchesSheet tid ssh csh shn cID
-    rating <- lift $ getRating submissionID
+      source = do
+        submissionID <- lift $ submissionMatchesSheet tid ssh csh shn cID
+        rating <- lift $ getRating submissionID
 
-    let
-      fileSelect = case sfType of
-        SubmissionOriginal -> E.selectSource . E.from $ \(sf `E.InnerJoin` f) -> do
-          E.on $ f E.^. FileId E.==. sf E.^. SubmissionFileFile
-          E.where_ $ sf E.^. SubmissionFileSubmission E.==. E.val submissionID
-               E.&&. sf E.^. SubmissionFileIsUpdate E.==. E.val False
-          return f
-        _ -> submissionFileSource submissionID
+        case sfType of
+          SubmissionOriginal -> (.| Conduit.map entityVal) . E.selectSource . E.from $ \(sf `E.InnerJoin` f) -> do
+            E.on $ f E.^. FileId E.==. sf E.^. SubmissionFileFile
+            E.where_ $ sf E.^. SubmissionFileSubmission E.==. E.val submissionID
+                 E.&&. sf E.^. SubmissionFileIsUpdate E.==. E.val False
+            return f
+          _ -> submissionFileSource submissionID .| Conduit.map entityVal
 
-      fileSource' = do
-        fileSelect .| Conduit.map entityVal
         when (sfType == SubmissionCorrected) $
           maybe (return ()) (yieldM . ratingFile cID) rating
 
-      zipComment = Text.encodeUtf8 $ toPathPiece cID
-
-    fileSource' .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
+  serveSomeFiles (unpack filename <.> "zip") source
 
 getSubDelR, postSubDelR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> Handler Html
 getSubDelR = postSubDelR
@@ -612,4 +598,4 @@ getCorrectionsDownloadR = do -- download all assigned and open submissions
   when (null subs) $ do
     addMessageI Info MsgNoOpenSubmissions
     redirect CorrectionsR
-  submissionMultiArchive $ Set.fromList subs
\ No newline at end of file
+  submissionMultiArchive $ Set.fromList subs
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index a51723840..e1aea383f 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -48,40 +48,47 @@ downloadFiles = do
       UserDefaultConf{..} <- getsYesod $ view _appUserDefaults
       return userDefaultDownloadFiles
 
+setContentDisposition' :: (MonadHandler m, HandlerSite m ~ UniWorX) => Maybe FilePath -> m ()
+setContentDisposition' mFileName = do
+  wantsDownload <- downloadFiles
+  setContentDisposition (bool ContentInline ContentAttachment wantsDownload) mFileName
+
 -- | Simply send a `File`-Value
 sendThisFile :: File -> Handler TypedContent
 sendThisFile File{..}
   | Just fileContent' <- fileContent = do
-      ifM downloadFiles
-        (addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|])
-        (addHeader "Content-Disposition" [st|inline; filename="#{takeFileName fileTitle}"|])
+      setContentDisposition' . Just $ takeFileName fileTitle
       return $ TypedContent (mimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
   | otherwise = sendResponseStatus noContent204 ()
 
 -- | Serve a single file, identified through a given DB query
-serveOneFile :: DB [Entity File] -> Handler TypedContent
-serveOneFile query = do
-  results <- runDB query
+serveOneFile :: Source (YesodDB UniWorX) File -> Handler TypedContent
+serveOneFile source = do
+  results <- runDB . runConduit $ source .| Conduit.take 2 -- We don't need more than two files to make a decision below
   case results of
-    [Entity _fileId file] -> sendThisFile file
-    [] -> notFound
-    other -> do
+    [file] -> sendThisFile file
+    []     -> notFound
+    other  -> do
       $logErrorS "SFileR" $ "Multiple matching files: " <> tshow other
       error "Multiple matching files found."
 
 -- | Serve one file directly or a zip-archive of files, identified through a given DB query
+--
 -- Like `serveOneFile`, but sends a zip-archive if multiple results are returned
-serveSomeFiles :: Text -> DB [Entity File] -> Handler TypedContent
-serveSomeFiles archiveName query = do
-  results <- runDB query
+serveSomeFiles :: FilePath -> Source (YesodDB UniWorX) File -> Handler TypedContent
+serveSomeFiles archiveName source = do
+  results <- runDB . runConduit $ source .| peekN 2
+
+  $logDebugS "serveSomeFiles" . tshow $ length results
+  
   case results of
-    []                    -> notFound
-    [Entity _fileId file] -> sendThisFile file
-    moreFiles -> do
-      addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece archiveName}"|]
+    []         -> notFound
+    [file]     -> sendThisFile file
+    _moreFiles -> do
+      setContentDisposition' $ Just archiveName
       respondSourceDB "application/zip" $ do
-        let zipComment = T.encodeUtf8 archiveName
-        yieldMany moreFiles .| Conduit.map entityVal .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
+        let zipComment = T.encodeUtf8 $ pack archiveName
+        source .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
 
 
 tidFromText :: Text -> Maybe TermId
diff --git a/src/Model/Types/Misc.hs b/src/Model/Types/Misc.hs
index 0affd8b70..aa3811f9d 100644
--- a/src/Model/Types/Misc.hs
+++ b/src/Model/Types/Misc.hs
@@ -18,13 +18,11 @@ import Data.Universe.Helpers
 
 import qualified Data.Text as Text
 import qualified Data.Text.Lens as Text
-import qualified Data.CaseInsensitive as CI
 import Data.CaseInsensitive.Instances ()
 
 import Database.Persist.TH hiding (derivePersistFieldJSON)
 import Model.Types.JSON
 
-import Yesod.Core.Dispatch (PathPiece(..))
 import Data.Aeson (Value())
 import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..))
 
@@ -71,14 +69,6 @@ $(deriveSimpleWith ''DisplayAble 'display (over Text.packed $ Text.intercalate "
 derivePersistField "Theme"
 
 
-newtype ZIPArchiveName obj = ZIPArchiveName { unZIPArchiveName :: obj }
-  deriving (Show, Read, Eq, Ord, Generic, Typeable)
-
-instance PathPiece obj => PathPiece (ZIPArchiveName obj) where
-    fromPathPiece = fmap ZIPArchiveName . fromPathPiece <=< (stripSuffix `on` CI.foldCase) ".zip"
-    toPathPiece = (<> ".zip") . toPathPiece . unZIPArchiveName
-
-
 data CorrectorState = CorrectorNormal | CorrectorMissing | CorrectorExcused
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic)
 
diff --git a/src/Utils.hs b/src/Utils.hs
index a66e0313a..4f9d28a25 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -30,7 +30,7 @@ import Utils.Parameters as Utils
 
 import Text.Blaze (Markup, ToMarkup)
 
-import Data.Char (isDigit, isSpace)
+import Data.Char (isDigit, isSpace, isAscii)
 import Data.Text (dropWhileEnd, takeWhileEnd, justifyRight)
 import Numeric (showFFloat)
 
@@ -718,6 +718,16 @@ mconcatForM = flip mconcatMapM
 findM :: (Monad m, Foldable f) => (a -> MaybeT m b) -> f a -> m (Maybe b)
 findM f = runMaybeT . Fold.foldr (\x as -> f x <|> as) mzero
 
+-------------
+-- Conduit --
+-------------
+
+peekN :: (Integral n, Monad m) => n -> Consumer a m [a]
+peekN n = do
+  peeked <- catMaybes <$> replicateM (fromIntegral n) await
+  mapM_ leftover peeked
+  return peeked
+
 -----------------
 -- Alternative --
 -----------------
@@ -781,6 +791,33 @@ addCustomHeader, replaceOrAddCustomHeader :: (MonadHandler m, PathPiece payload)
 addCustomHeader ident payload = addHeader (toPathPiece ident) (toPathPiece payload)
 replaceOrAddCustomHeader ident payload = replaceOrAddHeader (toPathPiece ident) (toPathPiece payload)
 
+------------------
+-- HTTP Headers --
+------------------
+
+data ContentDisposition = ContentInline | ContentAttachment
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe ContentDisposition
+instance Finite ContentDisposition
+nullaryPathPiece ''ContentDisposition $ camelToPathPiece' 1
+
+setContentDisposition :: MonadHandler m => ContentDisposition -> Maybe FilePath -> m ()
+-- ^ Set a @Content-Disposition@-header using `replaceOrAddHeader`
+--
+-- Takes care of correct formatting and encoding of non-ascii filenames
+setContentDisposition cd (fmap pack -> mFName) = replaceOrAddHeader "Content-Disposition" headerVal
+  where
+    headerVal
+      | Just fName <- mFName
+      , Text.all isAscii fName
+      , Text.all (not . flip elem ['"', '\\']) fName
+      = [st|#{toPathPiece cd}; filename="#{fName}"|]
+      | Just fName <- mFName
+      = let encoded = decodeUtf8 . urlEncode True $ encodeUtf8 fName
+         in [st|#{toPathPiece cd}; filename*=UTF-8''#{encoded}|]
+      | otherwise
+      = toPathPiece cd
+
 ------------------
 -- Cryptography --
 ------------------
diff --git a/src/Utils/Sheet.hs b/src/Utils/Sheet.hs
index d2f0cf11e..0fa7da74f 100644
--- a/src/Utils/Sheet.hs
+++ b/src/Utils/Sheet.hs
@@ -47,8 +47,8 @@ sheetOldUnassigned tid ssh csh = do
     _ -> error "SQL Query with limit 1 returned more than one result"
 
 -- | Return a specfic file from  a `Sheet`
-sheetFileQuery :: MonadIO m => TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> FilePath -> SqlReadT m [Entity File]
-sheetFileQuery tid ssh csh shn sft title = E.select $ E.from $
+sheetFileQuery :: MonadResource m => TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> FilePath -> Source (SqlPersistT m) (Entity File)
+sheetFileQuery tid ssh csh shn sft title = E.selectSource $ E.from $
   \(course `E.InnerJoin` sheet `E.InnerJoin` sFile `E.InnerJoin` file) -> do
   -- Restrict to consistent rows that correspond to each other
   E.on (file  E.^. FileId         E.==. sFile  E.^. SheetFileFile)
@@ -66,8 +66,8 @@ sheetFileQuery tid ssh csh shn sft title = E.select $ E.from $
   return file
 
 -- | Return all files of a certain `SheetFileType` for a `Sheet`
-sheetFilesAllQuery :: MonadIO m => TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> SqlReadT m [Entity File]
-sheetFilesAllQuery tid ssh csh shn sft = E.select $ E.from $
+sheetFilesAllQuery :: MonadResource m => TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> Source (SqlPersistT m) (Entity File)
+sheetFilesAllQuery tid ssh csh shn sft = E.selectSource $ E.from $
   \(course `E.InnerJoin` sheet `E.InnerJoin` sFile `E.InnerJoin` file) -> do
   -- Restrict to consistent rows that correspond to each other
   E.on (file  E.^. FileId         E.==. sFile  E.^. SheetFileFile)
@@ -89,4 +89,4 @@ hasSheetFileQuery :: Database.Esqueleto.Internal.Language.From query expr backen
 hasSheetFileQuery sheet sft =
   E.exists $ E.from $ \sFile ->
     E.where_ ((sFile E.^. SheetFileSheet E.==. sheet E.^. SheetId)
-      E.&&.   (sFile E.^. SheetFileType  E.==. E.val sft  ))
\ No newline at end of file
+      E.&&.   (sFile E.^. SheetFileType  E.==. E.val sft  ))

From 9f101087ac50df134a12a1a284db619815e92f3c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 18 May 2019 22:51:07 +0200
Subject: [PATCH 339/519] Overhaul SubmissonMode extensively

---
 config/archive-types                          |  40 +++++
 messages/uniworx/de.msg                       |  21 ++-
 routes                                        |   6 +-
 src/Foundation.hs                             |  10 +-
 src/Handler/Admin.hs                          |   7 +-
 src/Handler/Corrections.hs                    |   4 +-
 src/Handler/Course.hs                         |   1 -
 src/Handler/Sheet.hs                          |   3 +-
 src/Handler/Submission.hs                     |  20 ++-
 src/Handler/Term.hs                           |   1 -
 src/Handler/Tutorial.hs                       |   1 -
 src/Handler/Utils/Communication.hs            |   1 -
 src/Handler/Utils/Form.hs                     | 144 ++++++++++++++----
 src/Handler/Utils/Form/MassInput.hs           |   1 -
 src/Handler/Utils/Form/Occurences.hs          |   1 -
 src/Handler/Utils/Submission.hs               |  26 +++-
 src/Import/NoFoundation.hs                    |   2 +
 src/Model/Migration.hs                        |   4 +-
 src/Model/Submission.hs                       |   1 +
 src/Model/Types/Sheet.hs                      |  77 +++++-----
 src/Network/Mime/TH.hs                        |  14 +-
 src/Settings.hs                               |  14 +-
 src/Utils/Form.hs                             |  24 +++
 src/Utils/Lens.hs                             |   2 +
 stack.yaml                                    |   2 +
 .../messages/submissionFilesIgnored.hamlet    |   2 +-
 .../massinput/uploadSpecificFiles/add.hamlet  |   4 +
 .../massinput/uploadSpecificFiles/form.hamlet |   4 +
 .../uploadSpecificFiles/layout.hamlet         |  16 ++
 templates/widgets/specificFileField.hamlet    |   8 +
 templates/widgets/zipFileField.hamlet         |   8 +-
 test/Database.hs                              |  62 +++++++-
 32 files changed, 422 insertions(+), 109 deletions(-)
 create mode 100644 config/archive-types
 create mode 100644 templates/widgets/massinput/uploadSpecificFiles/add.hamlet
 create mode 100644 templates/widgets/massinput/uploadSpecificFiles/form.hamlet
 create mode 100644 templates/widgets/massinput/uploadSpecificFiles/layout.hamlet
 create mode 100644 templates/widgets/specificFileField.hamlet

diff --git a/config/archive-types b/config/archive-types
new file mode 100644
index 000000000..0599971bb
--- /dev/null
+++ b/config/archive-types
@@ -0,0 +1,40 @@
+# Simple list of mime-types corresponding to archive-formats
+#
+# Comments are empty lines and any line for which the first non-whitespace symbol is ‘#’
+#
+# Format is a single mime-type per line (may not contain whitespace)
+#
+# Largely copied from https://en.wikipedia.org/wiki/List_of_archive_formats
+
+application/x-archive 
+application/x-cpio
+application/x-bcpio
+application/x-shar
+application/x-iso9660-image 
+application/x-sbx
+application/x-tar
+application/x-7z-compressed 
+application/x-ace-compressed
+application/x-astrotite-afa 
+application/x-alz-compressed
+application/vnd.android.package-archive 
+application/x-arj 
+application/x-b1 
+application/vnd.ms-cab-compressed 
+application/x-cfs-compressed 
+application/x-dar 
+application/x-dgc-compressed 
+application/x-apple-diskimage 
+application/x-gca-compressed 
+application/java-archive 
+application/x-lzh 
+application/x-lzx 
+application/x-rar-compressed 
+application/x-stuffit 
+application/x-stuffitx 
+application/x-gtar 
+application/x-ms-wim 
+application/x-xar 
+application/zip 
+application/x-zoo 
+application/x-par2 
\ No newline at end of file
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 83045e281..9ea58fd65 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -445,6 +445,7 @@ SubmissionSinkExceptionDuplicateFileTitle file@FilePath: Dateiname #{show file}
 SubmissionSinkExceptionDuplicateRating: Mehr als eine Bewertung gefunden.
 SubmissionSinkExceptionRatingWithoutUpdate: Bewertung gefunden, es ist hier aber keine Bewertung der Abgabe möglich.
 SubmissionSinkExceptionForeignRating smid@CryptoFileNameSubmission: Fremde Bewertung für Abgabe #{toPathPiece smid} enthalten. Bewertungen müssen sich immer auf die gleiche Abgabe beziehen!
+SubmissionSinkExceptionInvalidFileTitleExtension file@FilePath: Dateiname #{show file} hat keine der für dieses Übungsblatt zulässigen Dateiendungen.
 
 MultiSinkException name@Text error@Text: In Abgabe #{name} ist ein Fehler aufgetreten: #{error}
 
@@ -488,7 +489,7 @@ LastEdit: Letzte Änderung
 LastEditByUser: Ihre letzte Bearbeitung
 NoEditByUser: Nicht von Ihnen bearbeitet
 
-SubmissionFilesIgnored: Es wurden Dateien in der hochgeladenen Abgabe ignoriert:
+SubmissionFilesIgnored n@Int: Es #{pluralDE n "wurde" "wurden"} #{tshow n} #{pluralDE n "Datei" "Dateien"} in der hochgeladenen Abgabe ignoriert
 SubmissionDoesNotExist smid@CryptoFileNameSubmission: Es existiert keine Abgabe mit Nummer #{toPathPiece smid}.
 
 LDAPLoginTitle: Campus-Login
@@ -507,8 +508,22 @@ DayIsOutOfLecture tid@TermId date@Text: #{date} ist außerhalb der Vorlesungszei
 DayIsOutOfTerm    tid@TermId date@Text: #{date} liegt nicht im #{display tid}
 
 UploadModeNone: Kein Upload
-UploadModeUnpack: Upload, einzelne Datei
-UploadModeNoUnpack: Upload, ZIP-Archive entpacken
+UploadModeAny: Upload, beliebige Datei(en)
+UploadModeSpecific: Upload, vorgegebene Dateinamen
+
+UploadModeUnpackZips: Abgabe mehrerer Dateien
+UploadModeUnpackZipsTip: Wenn die Abgabe mehrerer Dateien erlaubt ist, werden auch unterstützte Archiv-Formate zugelassen. Diese werden nach dann beim Hochladen automatisch entpackt.
+
+UploadModeExtensionRestriction: Zulässige Dateiendungen
+UploadModeExtensionRestrictionTip: Komma-separiert. Wenn keine Dateiendungen angegeben werden erfolgt keine Einschränkung.
+
+UploadSpecificFiles: Vorgegebene Dateinamen
+NoUploadSpecificFilesConfigured: Wenn der Abgabemodus vorgegebene Dateinamen vorsieht, muss mindestens ein vorgegebener Dateiname konfiguriert werden.
+UploadSpecificFilesDuplicateNames: Vorgegebene Dateinamen müssen eindeutig sein
+UploadSpecificFilesDuplicateLabels: Bezeichner für vorgegebene Dateinamen müssen eindeutig sein
+UploadSpecificFileLabel: Bezeichnung
+UploadSpecificFileName: Dateiname
+UploadSpecificFileRequired: Zur Abgabe erforderlich
 
 NoSubmissions: Keine Abgabe
 CorrectorSubmissions: Abgabe extern mit Pseudonym
diff --git a/routes b/routes
index 40579f9e6..b1a1214bc 100644
--- a/routes
+++ b/routes
@@ -104,11 +104,11 @@
     !/subs/new                  SubmissionNewR GET POST        !timeANDcourse-registeredANDuser-submissions
     !/subs/own                  SubmissionOwnR GET             !free -- just redirect
     /subs/#CryptoFileNameSubmission SubmissionR:
-      /                         SubShowR       GET POST        !ownerANDtime !ownerANDread !correctorANDread
-      /delete                   SubDelR        GET POST        !ownerANDtime
+      /                         SubShowR       GET POST        !ownerANDtimeANDuser-submissions !ownerANDread !correctorANDread
+      /delete                   SubDelR        GET POST        !ownerANDtimeANDuser-submissions
       /assign                   SAssignR       GET POST        !lecturerANDtime
       /correction               CorrectionR    GET POST        !corrector !ownerANDreadANDrated
-      /invite                   SInviteR       GET POST        !ownerANDtime
+      /invite                   SInviteR       GET POST        !ownerANDtimeANDuser-submissions
       !/#SubmissionFileType     SubArchiveR    GET             !owner !corrector
       !/#SubmissionFileType/*FilePath SubDownloadR  GET        !owner !corrector
     /correctors                 SCorrR         GET POST
diff --git a/src/Foundation.hs b/src/Foundation.hs
index bf592b1b1..b1a1f6b97 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -280,18 +280,12 @@ embedRenderMessage ''UniWorX ''SubmissionModeDescr
         verbMap [_, _, v] = v <> "Submissions"
         verbMap _ = error "Invalid number of verbs"
      in verbMap . splitCamel
+embedRenderMessage ''UniWorX ''UploadModeDescr id
+embedRenderMessage ''UniWorX ''SecretJSONFieldException id
 
 newtype SheetTypeHeader = SheetTypeHeader SheetType
 embedRenderMessageVariant ''UniWorX ''SheetTypeHeader ("SheetType" <>)
 
-instance RenderMessage UniWorX UploadMode where
-  renderMessage foundation ls uploadMode = case uploadMode of
-    NoUpload     -> mr MsgUploadModeNone
-    Upload False -> mr MsgUploadModeNoUnpack
-    Upload True  -> mr MsgUploadModeUnpack
-    where
-      mr = renderMessage foundation ls
-
 instance RenderMessage UniWorX SheetType where
   renderMessage foundation ls sheetType = case sheetType of
       NotGraded -> mr $ SheetTypeHeader NotGraded
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 7a7cc36f8..6f13dba0c 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -2,7 +2,6 @@ module Handler.Admin where
 
 import Import
 import Handler.Utils
-import Handler.Utils.Form.MassInput
 import Jobs
 import Data.Aeson.Encode.Pretty (encodePrettyToTextBuilder)
 
@@ -261,7 +260,11 @@ postAdminErrMsgR = do
     [whamlet|
       $maybe t <- plaintext
         <pre style="white-space:pre-wrap; font-family:monospace">
-          #{encodePrettyToTextBuilder t}
+          $case t
+            $of String t'
+              #{t'}
+            $of t'
+              #{encodePrettyToTextBuilder t'}
 
       ^{ctView'}
     |]
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 33bcb4992..bb547e7f7 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -644,7 +644,7 @@ postCorrectionR tid ssh csh shn cid = do
             }
 
       ((uploadResult, uploadForm'), uploadEncoding) <- runFormPost . identifyForm FIDcorrectionUpload . renderAForm FormStandard $
-            areq (zipFileField True) (fslI MsgRatingFiles) Nothing
+            areq (zipFileField True Nothing) (fslI MsgRatingFiles) Nothing
       let uploadForm = wrapForm uploadForm' def
             { formAction = Just . SomeRoute $ CSubmissionR tid ssh csh shn cid CorrectionR
             , formEncoding = uploadEncoding
@@ -720,7 +720,7 @@ getCorrectionsUploadR, postCorrectionsUploadR :: Handler Html
 getCorrectionsUploadR = postCorrectionsUploadR
 postCorrectionsUploadR = do
   ((uploadRes, upload), uploadEncoding) <- runFormPost . identifyForm FIDcorrectionsUpload . renderAForm FormStandard $
-       areq (zipFileField True) (fslI MsgCorrUploadField & addAttr "uw-file-input" "") Nothing
+       areq (zipFileField True Nothing) (fslI MsgCorrUploadField) Nothing
 
   case uploadRes of
     FormMissing -> return ()
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index a274dbd92..5abd1e624 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -11,7 +11,6 @@ import Handler.Utils
 import Handler.Utils.Course
 import Handler.Utils.Tutorial
 import Handler.Utils.Communication
-import Handler.Utils.Form.MassInput
 import Handler.Utils.Delete
 import Handler.Utils.Database
 import Handler.Utils.Table.Cells
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 88af1d515..0b0b62e40 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -14,7 +14,6 @@ import Handler.Utils.Table.Cells
 -- import Handler.Utils.Table.Columns
 import Handler.Utils.SheetType
 import Handler.Utils.Delete
-import Handler.Utils.Form.MassInput
 import Handler.Utils.Invitations
 
 -- import Data.Time
@@ -116,7 +115,7 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
             & setTooltip MsgSheetActiveFromTip)
                                                               (sfActiveFrom   <$> template)
       <*> areq utcTimeField   (fslI MsgSheetActiveTo)         (sfActiveTo     <$> template)
-      <*> submissionModeForm ((sfSubmissionMode <$> template) <|> pure (SubmissionMode False . Just $ Upload True))
+      <*> submissionModeForm ((sfSubmissionMode <$> template) <|> pure (SubmissionMode False . Just $ UploadAny True defaultExtensionRestriction))
       <*> aopt (multiFileField $ oldFileIds SheetExercise) (fslI MsgSheetExercise) (sfSheetF <$> template)
       <*> aopt utcTimeField   (fslpI MsgSheetHintFrom "Datum, sonst nur für Korrektoren"
             & setTooltip MsgSheetHintFromTip)                 (sfHintFrom     <$> template)
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index f9f04f8cc..12c605917 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -14,7 +14,6 @@ import Handler.Utils
 import Handler.Utils.Delete
 import Handler.Utils.Submission
 import Handler.Utils.Table.Cells
-import Handler.Utils.Form.MassInput
 import Handler.Utils.Invitations
 
 -- import Control.Monad.Trans.Maybe
@@ -130,8 +129,19 @@ makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = ident
     fileUploadForm = case uploadMode of
       NoUpload
         -> pure Nothing
-      (Upload unpackZips)
-        -> (bool (\f fs _ -> Just <$> areq f fs Nothing) aopt $ isJust msmid) (zipFileField unpackZips) (fsm $ bool MsgSubmissionFile MsgSubmissionArchive unpackZips) Nothing
+      UploadAny{..}
+        -> (bool (\f fs _ -> Just <$> areq f fs Nothing) aopt $ isJust msmid) (zipFileField unpackZips extensionRestriction) (fsm $ bool MsgSubmissionFile MsgSubmissionArchive unpackZips) Nothing
+      UploadSpecific{..}
+        -> mergeFileSources <$> sequenceA (map specificFileForm . Set.toList $ toNullable specificFiles)
+
+    specificFileForm :: UploadSpecificFile -> AForm Handler (Maybe (Source Handler File))
+    specificFileForm spec@UploadSpecificFile{..}
+      = bool (\f fs d -> aopt f fs $ fmap Just d) (\f fs d -> Just <$> areq f fs d) specificFileRequired (specificFileField spec) (fsl specificFileLabel) Nothing
+
+    mergeFileSources :: [Maybe (Source Handler File)] -> Maybe (Source Handler File)
+    mergeFileSources (catMaybes -> sources) = case sources of
+      [] -> Nothing
+      fs -> Just $ sequence_ fs
 
     miCell' :: Markup -> Either UserEmail UserId -> Widget
     miCell' csrf (Left email) = $(widgetFile "widgets/massinput/submissionUsers/cellInvitation")
@@ -352,7 +362,9 @@ submissionHelper tid ssh csh shn mcid = do
               return (userName, submissionEdit E.^. SubmissionEditTime)
             forM raw $ \(E.Value name, E.Value time) -> (name, ) <$> formatTime SelFormatDateTime time
         return (csheet,buddies,lastEdits,maySubmit,isLecturer,isOwner)
-  ((res,formWidget'), formEnctype) <- runFormPost . makeSubmissionForm sheetCourse msmid (fromMaybe (Upload True) . submissionModeUser $ sheetSubmissionMode) sheetGrouping isLecturer $ bool id (Set.insert $ Right uid) isOwner buddies
+  -- @submissionModeUser == Nothing@ below iff we are currently serving a user with elevated rights (lecturer, admin, ...)
+  -- Therefore we do not restrict upload behaviour in any way in that case
+  ((res,formWidget'), formEnctype) <- runFormPost . makeSubmissionForm sheetCourse msmid (fromMaybe (UploadAny True Nothing) . submissionModeUser $ sheetSubmissionMode) sheetGrouping isLecturer $ bool id (Set.insert $ Right uid) isOwner buddies 
   let formWidget = wrapForm' BtnHandIn formWidget' def
         { formAction = Just $ SomeRoute actionUrl
         , formEncoding = formEnctype
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index 08e960581..c25ec43bb 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -3,7 +3,6 @@ module Handler.Term where
 import Import
 import Handler.Utils
 import Handler.Utils.Table.Cells
-import Handler.Utils.Form.MassInput
 import qualified Data.Map as Map
 
 import Utils.Lens
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 534c7d1c1..2a98110c1 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -8,7 +8,6 @@ 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 Handler.Utils.Invitations
 import Jobs.Queue
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 843160372..042e90a52 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -9,7 +9,6 @@ module Handler.Utils.Communication
 
 import Import
 import Handler.Utils
-import Handler.Utils.Form.MassInput
 import Utils.Lens
 
 import Jobs.Queue
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 92fbccf72..a9dbe1ede 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -1,5 +1,6 @@
 module Handler.Utils.Form
   ( module Handler.Utils.Form
+  , module Handler.Utils.Form.MassInput
   , module Utils.Form
   , MonadWriter(..)
   ) where
@@ -35,6 +36,7 @@ import qualified Data.Map as Map
 import Control.Monad.Trans.Writer (execWriterT, WriterT)
 import Control.Monad.Trans.Except (throwE, runExceptT)
 import Control.Monad.Writer.Class
+import Control.Monad.Error.Class (MonadError(..))
 
 import Data.Scientific (Scientific)
 import Text.Read (readMaybe)
@@ -49,6 +51,13 @@ import Data.Proxy
 
 import qualified Text.Email.Validate as Email
 
+import Yesod.Core.Types (FileInfo(..))
+
+import System.FilePath (isExtensionOf)
+import Data.Text.Lens (unpacked)
+
+import Handler.Utils.Form.MassInput
+
 ----------------------------
 -- Buttons (new version ) --
 ----------------------------
@@ -341,14 +350,88 @@ studyFeaturesPrimaryFieldFor isOptional oldFeatures mbuid = selectField $ do
           }
 
 
-uploadModeField :: Field Handler UploadMode
-uploadModeField = selectField optionsFinite
+uploadModeForm :: Maybe UploadMode -> AForm Handler UploadMode
+uploadModeForm prev = multiActionA actions (fslI MsgSheetUploadMode) (classifyUploadMode <$> prev)
+  where
+    actions :: Map UploadModeDescr (AForm Handler UploadMode)
+    actions = Map.fromList
+      [ ( UploadModeNone, pure NoUpload)
+      , ( UploadModeAny
+        , UploadAny
+          <$> apreq checkBoxField (fslI MsgUploadModeUnpackZips & setTooltip MsgUploadModeUnpackZipsTip) (prev ^? _Just . _unpackZips)
+          <*> apreq extensionRestrictionField (fslI MsgUploadModeExtensionRestriction & setTooltip MsgUploadModeExtensionRestrictionTip) ((prev ^? _Just . _extensionRestriction) <|> fmap Just defaultExtensionRestriction)
+        )
+      , ( UploadModeSpecific
+        , UploadSpecific <$> specificFileForm
+        )
+      ]
+  
+    extensionRestrictionField :: Field Handler (Maybe (NonNull (Set Extension)))
+    extensionRestrictionField = convertField (fromNullable . toSet) (maybe "" $ intercalate ", " . Set.toList . toNullable) textField
+      where
+        toSet = Set.fromList . filter (not . Text.null) . map (stripDot . Text.strip) . Text.splitOn ","
+        stripDot ext
+          | Just nExt <- Text.stripPrefix "." ext = nExt
+          | otherwise = ext
+    
+    specificFileForm :: AForm Handler (NonNull (Set UploadSpecificFile))
+    specificFileForm = wFormToAForm $ do
+      Just currentRoute <- getCurrentRoute
+      let miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX)
+          miButtonAction frag = Just . SomeRoute $ currentRoute :#: frag
+      miIdent <- ("specific-files--" <>) <$> newIdent
+      postProcess =<< massInputW MassInput{..} (fslI MsgUploadSpecificFiles & setTooltip MsgMassInputTip) True (preProcess <$> prev ^? _Just . _specificFiles)
+      where
+        preProcess :: NonNull (Set UploadSpecificFile) -> Map ListPosition (UploadSpecificFile, UploadSpecificFile)
+        preProcess = Map.fromList . zip [0..] . map (\x -> (x, x)) . Set.toList . toNullable
+        
+        postProcess :: FormResult (Map ListPosition (UploadSpecificFile, UploadSpecificFile)) -> WForm Handler (FormResult (NonNull (Set UploadSpecificFile)))
+        postProcess mapResult = do
+          MsgRenderer mr <- getMsgRenderer
+          return $ do
+            mapResult' <- Set.fromList . map snd . Map.elems <$> mapResult
+            case fromNullable mapResult' of
+              Nothing -> throwError [mr MsgNoUploadSpecificFilesConfigured]
+              Just lResult -> do
+                let names = Set.map specificFileName mapResult'
+                    labels = Set.map specificFileLabel mapResult'
+                if
+                  | Set.size names /= Set.size mapResult'
+                    -> throwError [mr MsgUploadSpecificFilesDuplicateNames]
+                  | Set.size labels /= Set.size mapResult'
+                    -> throwError [mr MsgUploadSpecificFilesDuplicateLabels]
+                  | otherwise
+                    -> return lResult
+
+        sFileForm :: (Text -> Text) -> Maybe UploadSpecificFile -> Form UploadSpecificFile
+        sFileForm nudge mPrevUF csrf = do
+          (labelRes, labelView) <- mpreq textField ("" & addName (nudge "label")) $ specificFileLabel <$> mPrevUF
+          (nameRes, nameView) <- mpreq textField ("" & addName (nudge "name")) $ specificFileName <$> mPrevUF
+          (reqRes, reqView) <- mpreq checkBoxField ("" & addName (nudge "required")) $ specificFileRequired <$> mPrevUF
+
+          return ( UploadSpecificFile <$> labelRes <*> nameRes <*> reqRes
+                 , $(widgetFile "widgets/massinput/uploadSpecificFiles/form")
+                 )
+
+        miAdd _ _ nudge submitView = Just $ \csrf -> do
+          (formRes, formWidget) <- sFileForm nudge Nothing csrf
+          let formWidget' = $(widgetFile "widgets/massinput/uploadSpecificFiles/add")
+              addRes' = formRes <&> \fileRes oldRess ->
+                let iStart = maybe 0 (succ . fst) $ Map.lookupMax oldRess
+                 in pure $ Map.singleton iStart fileRes
+          return (addRes', formWidget')
+        miCell _ initFile initFile' nudge csrf =
+          sFileForm nudge (Just $ fromMaybe initFile initFile') csrf
+        miDelete = miDeleteList
+        miAllowAdd _ _ _ = True
+        miAddEmpty _ _ _ = Set.empty
+        miLayout :: MassInputLayout ListLength UploadSpecificFile UploadSpecificFile
+        miLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/massinput/uploadSpecificFiles/layout")
+                                               
 
 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
@@ -358,10 +441,10 @@ submissionModeForm prev = multiActionA actions (fslI MsgSheetSubmissionMode) $ c
         , pure $ SubmissionMode True  Nothing
         )
       , ( SubmissionModeUser
-        , SubmissionMode False . Just <$> uploadModeForm
+        , SubmissionMode False . Just <$> uploadModeForm (prev ^? _Just . _submissionModeUser . _Just)
         )
       , ( SubmissionModeBoth
-        , SubmissionMode True  . Just <$> uploadModeForm
+        , SubmissionMode True  . Just <$> uploadModeForm (prev ^? _Just . _submissionModeUser . _Just)
         )
       ]
 
@@ -374,17 +457,41 @@ pseudonymWordField = checkMMap doCheck CI.original $ textField & addDatalist (re
       | otherwise
       = return . Left $ MsgUnknownPseudonymWord (CI.original w)
 
-zipFileField :: Bool -- ^ Unpack zips?
-             -> Field Handler (Source Handler File)
-zipFileField doUnpack = Field{..}
+specificFileField :: UploadSpecificFile -> Field Handler (Source Handler File)
+specificFileField UploadSpecificFile{..} = Field{..}
   where
     fieldEnctype = Multipart
     fieldParse _ files
-      | [f] <- files = return . Right . Just $ bool (yieldM . acceptFile) sourceFiles doUnpack f
+      | [f] <- files
+      = return . Right . Just $ yieldM (acceptFile f) .| modifyFileTitle (const $ unpack specificFileName)
+      | null files   = return $ Right Nothing
+      | otherwise    = return . Left $ SomeMessage MsgOnlyUploadOneFile
+    fieldView fieldId fieldName attrs _ req = $(widgetFile "widgets/specificFileField")
+
+    extensions = fileNameExtensions specificFileName
+    acceptRestricted = not $ null extensions
+    accept = Text.intercalate "," . map ("." <>) $ extensions
+
+
+zipFileField :: Bool -- ^ Unpack zips?
+             -> Maybe (NonNull (Set Extension)) -- ^ Restrictions on file extensions
+             -> Field Handler (Source Handler File)
+zipFileField doUnpack permittedExtensions = Field{..}
+  where
+    fieldEnctype = Multipart
+    fieldParse _ files
+      | [f@FileInfo{..}] <- files
+      , maybe True (anyOf (re _nullable . folded . unpacked) (`isExtensionOf` unpack fileName)) permittedExtensions || doUnpack
+      = return . Right . Just $ bool (yieldM . acceptFile) sourceFiles doUnpack f
       | null files   = return $ Right Nothing
       | otherwise    = return . Left $ SomeMessage MsgOnlyUploadOneFile
     fieldView fieldId fieldName attrs _ req = $(widgetFile "widgets/zipFileField")
 
+    zipExtensions = mimeExtensions "application/zip"
+
+    acceptRestricted = isJust permittedExtensions
+    accept = Text.intercalate "," . map ("." <>) $ bool [] (Set.toList zipExtensions) doUnpack ++ toListOf (_Just . re _nullable . folded) permittedExtensions
+
 multiFileField :: Handler (Set FileId) -> Field Handler (Source Handler (Either FileId File))
 multiFileField permittedFiles' = Field{..}
   where
@@ -590,23 +697,6 @@ jsonField hide = Field{..}
     |]
     fieldEnctype = UrlEncoded
 
-secretJsonField :: ( ToJSON a, FromJSON a
-                   , MonadHandler m
-                   , HandlerSite m ~ UniWorX
-                   )
-                => Field m a
-secretJsonField = Field{..}
-  where
-    fieldParse [v] [] = bimap (\_ -> SomeMessage MsgSecretJSONFieldDecryptFailure) Just <$> runExceptT (encodedSecretBoxOpen v)
-    fieldParse [] [] = return $ Right Nothing
-    fieldParse _ _ = return . Left $ SomeMessage MsgValueRequired
-    fieldView theId name attrs val _isReq = do
-      val' <- traverse (encodedSecretBox SecretBoxShort) val
-      [whamlet|
-        <input id=#{theId} name=#{name} *{attrs} type=hidden value=#{either id id val'}>
-      |]
-    fieldEnctype = UrlEncoded
-
 boolField :: ( MonadHandler m
              , HandlerSite m ~ UniWorX
              )
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index cd5e4f5ac..e9121be5f 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -17,7 +17,6 @@ module Handler.Utils.Form.MassInput
 import Import
 import Utils.Form
 import Utils.Lens
-import Handler.Utils.Form (secretJsonField)
 import Handler.Utils.Form.MassInput.Liveliness
 import Handler.Utils.Form.MassInput.TH
 
diff --git a/src/Handler/Utils/Form/Occurences.hs b/src/Handler/Utils/Form/Occurences.hs
index f39ec3323..da0e7733f 100644
--- a/src/Handler/Utils/Form/Occurences.hs
+++ b/src/Handler/Utils/Form/Occurences.hs
@@ -4,7 +4,6 @@ module Handler.Utils.Form.Occurences
 
 import Import
 import Handler.Utils.Form
-import Handler.Utils.Form.MassInput
 import Handler.Utils.DateTime
 
 import qualified Data.Set as Set
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index ef297bff4..09c59f6b3 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -318,8 +318,10 @@ extractRatingsMsg = do
   let ignoredFiles :: Set (Either CryptoFileNameSubmission FilePath)
       ignoredFiles = Right `Set.map` ignored'
   unless (null ignoredFiles) $ do
-    mr <- (toHtml . ) <$> getMessageRender
-    addMessage Warning =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionFilesIgnored.hamlet") mr)
+    let ignoredModal = msgModal
+          [whamlet|_{MsgSubmissionFilesIgnored (Set.size ignoredFiles)}|]
+          (Right $(widgetFile "messages/submissionFilesIgnored"))
+    addMessageWidget Warning ignoredModal
 
 -- Nicht innerhalb von runDB aufrufen, damit das DB Rollback passieren kann!
 msgSubmissionErrors :: (MonadHandler m, MonadCatch m, HandlerSite m ~ UniWorX) => m a -> m (Maybe a)
@@ -362,10 +364,28 @@ sinkSubmission userId mExists isUpdate = do
       return sId
     Right sId -> return sId
 
-  sId <$ sinkSubmission' sId
+  Sheet{..} <- lift $ case mExists of
+    Left sheetId -> getJust sheetId
+    Right subId  -> getJust . submissionSheet =<< getJust subId
+
+  sId <$ (guardFileTitles sheetSubmissionMode .| sinkSubmission' sId)
   where
     tellSt = modify . mappend
 
+    guardFileTitles :: MonadThrow m => SubmissionMode -> Conduit SubmissionContent m SubmissionContent
+    guardFileTitles SubmissionMode{..}
+      | Just UploadAny{..} <- submissionModeUser
+      , not isUpdate
+      , Just (map unpack . Set.toList . toNullable -> exts) <- extensionRestriction
+      = Conduit.mapM $ \x -> if
+          | Left File{..} <- x
+          , none (`isExtensionOf` fileTitle) exts
+          , isn't _Nothing fileContent -- File record is not a directory, we don't care about those
+            -> throwM $ InvalidFileTitleExtension fileTitle
+          | otherwise
+            -> return x
+      | otherwise = Conduit.map id
+
     sinkSubmission' :: SubmissionId
                     -> Sink SubmissionContent (YesodJobDB UniWorX) ()
     sinkSubmission' submissionId = lift . finalize <=< execStateLC mempty . Conduit.mapM_ $ \case
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 7006bd5e5..975ae3925 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -99,6 +99,8 @@ import Data.CaseInsensitive as Import (CI, FoldCase(..), foldedCase)
 
 import Data.Ratio as Import ((%))
 
+import Network.Mime as Import
+
 
 import Control.Monad.Trans.RWS (RWST)
 
diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index f55638835..f220e4353 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -279,8 +279,8 @@ customMigrations = Map.fromListWith (>>)
                 ( 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)
+                ( Legacy.UserSubmissions     , Legacy.Upload True  ) -> SubmissionMode False (Just $ UploadAny True defaultExtensionRestriction)
+                ( Legacy.UserSubmissions     , Legacy.Upload False ) -> SubmissionMode False (Just $ UploadAny False defaultExtensionRestriction)
           [executeQQ| UPDATE "sheet" SET "submission_mode" = #{submissionMode'} WHERE "id" = #{shid}; |]
     )
   , ( AppliedMigrationKey [migrationVersion|11.0.0|] [version|12.0.0|]
diff --git a/src/Model/Submission.hs b/src/Model/Submission.hs
index 0f931911b..24ef1bad6 100644
--- a/src/Model/Submission.hs
+++ b/src/Model/Submission.hs
@@ -7,6 +7,7 @@ data SubmissionSinkException = DuplicateFileTitle FilePath
                              | DuplicateRating
                              | RatingWithoutUpdate
                              | ForeignRating CryptoFileNameSubmission
+                             | InvalidFileTitleExtension FilePath
   deriving (Typeable, Show)
 
 instance Exception SubmissionSinkException
diff --git a/src/Model/Types/Sheet.hs b/src/Model/Types/Sheet.hs
index a754d0d0b..6ec4ae4f0 100644
--- a/src/Model/Types/Sheet.hs
+++ b/src/Model/Types/Sheet.hs
@@ -16,7 +16,6 @@ import Generics.Deriving.Monoid (memptydefault, mappenddefault)
 import Data.Typeable (Typeable)
 import Data.Universe
 import Data.Universe.Helpers
-import Data.Universe.TH
 import Data.Universe.Instances.Reverse ()
 
 import Data.NonNull.Instances ()
@@ -34,6 +33,8 @@ import Database.Persist.TH hiding (derivePersistFieldJSON)
 import Model.Types.JSON
 import Yesod.Core.Dispatch (PathPiece(..))
 
+import Network.Mime
+
 
 
 ----
@@ -210,9 +211,11 @@ partitionFileType fs t = Map.findWithDefault Set.empty t . Map.fromListWith Set.
 data SubmissionFileType = SubmissionOriginal | SubmissionCorrected
   deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
 
-instance Universe SubmissionFileType where universe = universeDef
+instance Universe SubmissionFileType
 instance Finite SubmissionFileType
 
+nullaryPathPiece ''SubmissionFileType $ camelToPathPiece' 1
+
 submissionFileTypeIsUpdate :: SubmissionFileType -> Bool
 submissionFileTypeIsUpdate SubmissionOriginal  = False
 submissionFileTypeIsUpdate SubmissionCorrected = True
@@ -221,41 +224,52 @@ isUpdateSubmissionFileType :: Bool -> SubmissionFileType
 isUpdateSubmissionFileType False = SubmissionOriginal
 isUpdateSubmissionFileType True  = SubmissionCorrected
 
-instance PathPiece SubmissionFileType where
-  toPathPiece SubmissionOriginal  = "original"
-  toPathPiece SubmissionCorrected = "corrected"
-  fromPathPiece = finiteFromPathPiece
 
--- instance DisplayAble SubmissionFileType where
---   display SubmissionOriginal  = "Abgabe"
---   display SubmissionCorrected = "Korrektur"
+data UploadSpecificFile = UploadSpecificFile
+  { specificFileLabel :: Text
+  , specificFileName :: FileName
+  , specificFileRequired :: Bool
+  } deriving (Show, Read, Eq, Ord, Generic)
 
-{-
-data DA = forall a . (DisplayAble a) => DA a
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 2
+  } ''UploadSpecificFile
+derivePersistFieldJSON ''UploadSpecificFile
 
-instance DisplayAble DA where
-  display (DA x) = display x
--}
-
-
-data UploadMode = NoUpload | Upload { unpackZips :: Bool }
+data UploadMode = NoUpload
+                | UploadAny
+                  { unpackZips :: Bool
+                  , extensionRestriction :: Maybe (NonNull (Set Extension))
+                  }
+                | UploadSpecific
+                  { specificFiles :: NonNull (Set UploadSpecificFile)
+                  }
   deriving (Show, Read, Eq, Ord, Generic)
 
-deriveFinite ''UploadMode
+defaultExtensionRestriction :: Maybe (NonNull (Set Extension))
+defaultExtensionRestriction = fromNullable $ Set.fromList ["txt", "pdf"]
 
 deriveJSON defaultOptions
   { constructorTagModifier = camelToPathPiece
   , fieldLabelModifier = camelToPathPiece
   , sumEncoding = TaggedObject "mode" "settings"
+  , omitNothingFields = True
   }''UploadMode
 derivePersistFieldJSON ''UploadMode
 
-instance PathPiece UploadMode where
-  toPathPiece = \case
-    NoUpload     -> "no-upload"
-    Upload True  -> "unpack"
-    Upload False -> "no-unpack"
-  fromPathPiece = finiteFromPathPiece
+data UploadModeDescr = UploadModeNone
+                     | UploadModeAny
+                     | UploadModeSpecific
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe UploadModeDescr
+instance Finite UploadModeDescr
+
+nullaryPathPiece ''UploadModeDescr $ camelToPathPiece' 2
+
+classifyUploadMode :: UploadMode -> UploadModeDescr
+classifyUploadMode NoUpload = UploadModeNone
+classifyUploadMode UploadAny{} = UploadModeAny
+classifyUploadMode UploadSpecific{} = UploadModeSpecific
 
 data SubmissionMode = SubmissionMode
   { submissionModeCorrector :: Bool
@@ -263,24 +277,11 @@ data SubmissionMode = SubmissionMode
   }
   deriving (Show, Read, Eq, Ord, Generic)
 
-deriveFinite ''SubmissionMode
-
 deriveJSON defaultOptions
   { fieldLabelModifier = camelToPathPiece' 2
   } ''SubmissionMode
 derivePersistFieldJSON ''SubmissionMode
 
-finitePathPiece ''SubmissionMode
-  [ "no-submissions"
-  , "no-upload"
-  , "no-unpack"
-  , "unpack"
-  , "correctors"
-  , "correctors+no-upload"
-  , "correctors+no-unpack"
-  , "correctors+unpack"
-  ]
-
 data SubmissionModeDescr = SubmissionModeNone
                          | SubmissionModeCorrector
                          | SubmissionModeUser
@@ -336,4 +337,4 @@ instance Monoid Load where
   isByTutorial :: Load -> Bool
   isByTutorial (ByTutorial {}) = True
   isByTutorial _               = False
--}
\ No newline at end of file
+-}
diff --git a/src/Network/Mime/TH.hs b/src/Network/Mime/TH.hs
index 0fd1c2beb..486eda779 100644
--- a/src/Network/Mime/TH.hs
+++ b/src/Network/Mime/TH.hs
@@ -1,11 +1,12 @@
 module Network.Mime.TH
-  ( mimeMapFile
+  ( mimeMapFile, mimeSetFile
   ) where
 
 import ClassyPrelude.Yesod hiding (lift)
 import Language.Haskell.TH hiding (Extension)
 import Language.Haskell.TH.Syntax (qAddDependentFile, Lift(..))
 
+import qualified Data.Set as Set
 import qualified Data.Map as Map
 
 import Data.Text (Text)
@@ -18,7 +19,7 @@ import Network.Mime
 import Instances.TH.Lift ()
 
 
-mimeMapFile :: FilePath -> ExpQ
+mimeMapFile, mimeSetFile :: FilePath -> ExpQ
 mimeMapFile file = do
   qAddDependentFile file
   
@@ -36,6 +37,15 @@ mimeMapFile file = do
 
 
   lift mimeMap
+mimeSetFile file = do
+  qAddDependentFile file
+  
+  ls <- runIO $ filter (not . isComment) . Text.lines <$> Text.readFile file
+
+  let mimeSet :: Set MimeType
+      mimeSet = Set.fromList $ map (encodeUtf8 . Text.strip) ls
+
+  lift mimeSet
 
 isComment :: Text -> Bool
 isComment line = or
diff --git a/src/Settings.hs b/src/Settings.hs
index 739ac5554..a60b4597b 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -73,6 +73,9 @@ import Handler.Utils.Submission.TH
 import Network.Mime
 import Network.Mime.TH
 
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+
 
 -- | Runtime settings to configure this application. These settings can be
 -- loaded from various sources: defaults, environment variables, config files,
@@ -431,8 +434,17 @@ widgetFileSettings = def
 submissionBlacklist :: [Pattern]
 submissionBlacklist = $(patternFile compDefault "config/submission-blacklist")
 
+mimeMap :: MimeMap
+mimeMap = $(mimeMapFile "config/mimetypes")
+
 mimeLookup :: FileName -> MimeType
-mimeLookup = mimeByExt $(mimeMapFile "config/mimetypes") defaultMimeType
+mimeLookup = mimeByExt mimeMap defaultMimeType
+
+mimeExtensions :: MimeType -> Set Extension
+mimeExtensions needle = Set.fromList [ ext | (ext, typ) <- Map.toList mimeMap, typ == needle ]
+
+archiveTypes :: Set MimeType
+archiveTypes = $(mimeSetFile "config/archive-types")
 
 -- The rest of this file contains settings which rarely need changing by a
 -- user.
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index ad62f224f..c11496380 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -24,6 +24,7 @@ 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 Control.Monad.Trans.Except (ExceptT, runExceptT)
 
 import Data.List ((!!))
 
@@ -445,6 +446,29 @@ optionsFinite = do
 rationalField :: (MonadHandler m, RenderMessage (HandlerSite m) FormMessage) => Field m Rational
 rationalField = convertField toRational fromRational doubleField
 
+data SecretJSONFieldException = SecretJSONFieldDecryptFailure
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Exception SecretJSONFieldException
+
+secretJsonField :: ( ToJSON a, FromJSON a
+                   , MonadHandler m
+                   , MonadSecretBox (ExceptT EncodedSecretBoxException m)
+                   , MonadSecretBox (WidgetT (HandlerSite m) IO)
+                   , RenderMessage (HandlerSite m) FormMessage
+                   , RenderMessage (HandlerSite m) SecretJSONFieldException
+                   )
+                => Field m a
+secretJsonField = Field{..}
+  where
+    fieldParse [v] [] = bimap (\_ -> SomeMessage SecretJSONFieldDecryptFailure) Just <$> runExceptT (encodedSecretBoxOpen v)
+    fieldParse [] [] = return $ Right Nothing
+    fieldParse _ _ = return . Left $ SomeMessage MsgValueRequired
+    fieldView theId name attrs val _isReq = do
+      val' <- traverse (encodedSecretBox SecretBoxShort) val
+      [whamlet|
+        <input id=#{theId} name=#{name} *{attrs} type=hidden value=#{either id id val'}>
+      |]
+    fieldEnctype = UrlEncoded
 
 -----------
 -- Forms --
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index d52b852c8..51aa57fd0 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -103,6 +103,8 @@ makePrisms ''HandlerContents
 
 makePrisms ''ErrorResponse
 
+makeLenses_ ''UploadMode
+
 makeLenses_ ''SubmissionMode
 
 makePrisms ''E.Value
diff --git a/stack.yaml b/stack.yaml
index 7fadc6e4e..02b25ee57 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -51,4 +51,6 @@ extra-deps:
 
   - systemd-1.2.0
 
+  - filepath-1.4.2
+
 resolver: lts-10.5
diff --git a/templates/messages/submissionFilesIgnored.hamlet b/templates/messages/submissionFilesIgnored.hamlet
index ebb61695e..628125d9f 100644
--- a/templates/messages/submissionFilesIgnored.hamlet
+++ b/templates/messages/submissionFilesIgnored.hamlet
@@ -1,4 +1,4 @@
-_{MsgSubmissionFilesIgnored}
+<h2>_{MsgSubmissionFilesIgnored (Set.size ignoredFiles)}
 <ul>
   $forall ident <- ignoredFiles
     $case ident
diff --git a/templates/widgets/massinput/uploadSpecificFiles/add.hamlet b/templates/widgets/massinput/uploadSpecificFiles/add.hamlet
new file mode 100644
index 000000000..6ef4903fb
--- /dev/null
+++ b/templates/widgets/massinput/uploadSpecificFiles/add.hamlet
@@ -0,0 +1,4 @@
+$newline never
+^{formWidget}
+<td>
+  ^{fvInput submitView}
diff --git a/templates/widgets/massinput/uploadSpecificFiles/form.hamlet b/templates/widgets/massinput/uploadSpecificFiles/form.hamlet
new file mode 100644
index 000000000..46e856c46
--- /dev/null
+++ b/templates/widgets/massinput/uploadSpecificFiles/form.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<td>#{csrf}^{fvInput labelView}
+<td>^{fvInput nameView}
+<td>^{fvInput reqView}
diff --git a/templates/widgets/massinput/uploadSpecificFiles/layout.hamlet b/templates/widgets/massinput/uploadSpecificFiles/layout.hamlet
new file mode 100644
index 000000000..2179c82b1
--- /dev/null
+++ b/templates/widgets/massinput/uploadSpecificFiles/layout.hamlet
@@ -0,0 +1,16 @@
+$newline never
+<table>
+  <thead>
+    <th>_{MsgUploadSpecificFileLabel}
+    <th>_{MsgUploadSpecificFileName}
+    <th>_{MsgUploadSpecificFileRequired}
+    <th>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput__cell>
+        ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr .massinput__cell.massinput__cell--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/specificFileField.hamlet b/templates/widgets/specificFileField.hamlet
new file mode 100644
index 000000000..2f77bae30
--- /dev/null
+++ b/templates/widgets/specificFileField.hamlet
@@ -0,0 +1,8 @@
+$newline never
+<input type=file uw-file-input ##{fieldId} *{attrs} name=#{fieldName} :req:required :acceptRestricted:accept=#{accept}>
+$if acceptRestricted
+  <br>
+  _{MsgUploadModeExtensionRestriction}: 
+  <ul .list--inline .list--comma-separated .list--iconless>
+    $forall ext <- extensions
+      <li style="font-family: monospace">#{ext}
diff --git a/templates/widgets/zipFileField.hamlet b/templates/widgets/zipFileField.hamlet
index 4c432c524..1e39effa6 100644
--- a/templates/widgets/zipFileField.hamlet
+++ b/templates/widgets/zipFileField.hamlet
@@ -1,2 +1,8 @@
 $newline never
-<input type=file uw-file-input ##{fieldId} *{attrs} name=#{fieldName} :req:required>
+<input type=file uw-file-input ##{fieldId} *{attrs} name=#{fieldName} :req:required :acceptRestricted:accept=#{accept}>
+$maybe exts <- fmap toNullable permittedExtensions
+  <br>
+  _{MsgUploadModeExtensionRestriction}: 
+  <ul .list--inline .list--comma-separated .list--iconless>
+    $forall ext <- zipExtensions <> exts
+      <li style="font-family: monospace">#{ext}
diff --git a/test/Database.hs b/test/Database.hs
index 5f9140cb0..6332584b4 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -393,11 +393,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 (SubmissionMode False . Just $ Upload True) False
+  adhoc <- insert $ Sheet ffp "AdHoc-Gruppen" Nothing NotGraded (Arbitrary 3) Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
   insert_ $ SheetEdit gkleen now adhoc
-  feste <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ Upload True) False
+  feste <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
   insert_ $ SheetEdit gkleen now feste
-  keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ Upload True) False
+  keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ UploadAny True Nothing) False
   insert_ $ SheetEdit gkleen now keine
   void . insertMany $ map (\(u,sf) -> CourseParticipant ffp u now sf)
     [(fhamann   , Nothing)
@@ -484,7 +484,7 @@ fillDb = do
     ]
   sh1 <- insert Sheet
     { sheetCourse = pmo
-    , sheetName = "Blatt 1"
+    , sheetName = "Papierabgabe"
     , sheetDescription = Nothing
     , sheetType = Normal $ Points 6
     , sheetGrouping = Arbitrary 3
@@ -516,6 +516,60 @@ fillDb = do
   void . insert $ SubmissionUser maxMuster sub1
   sub1fid1 <- insertFile "AbgabeH10-1.hs"
   void . insert $ SubmissionFile sub1 sub1fid1 False False
+  sh2 <- insert Sheet
+    { sheetCourse = pmo
+    , sheetName = "Spezifische Abgabe"
+    , sheetDescription = Nothing
+    , sheetType = Normal $ Points 6
+    , sheetGrouping = Arbitrary 3
+    , sheetMarkingText = Nothing
+    , sheetVisibleFrom = Just now
+    , sheetActiveFrom = now
+    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetSubmissionMode = SubmissionMode False $ Just UploadSpecific
+      { specificFiles = impureNonNull $ Set.fromList
+        [ UploadSpecificFile "Aufgabe 1" "exercise_2.1.hs" False
+        , UploadSpecificFile "Aufgabe 2" "exercise_2.2.hs" False
+        , UploadSpecificFile "Erklärung der Eigenständigkeit" "erklärung.txt" True
+        ]
+      }
+    , sheetHintFrom = Nothing
+    , sheetSolutionFrom = Nothing
+    , sheetAutoDistribute = True
+    }
+  void . insert $ SheetEdit jost now sh2
+  sh3 <- insert Sheet
+    { sheetCourse = pmo
+    , sheetName = "Dateiendung-eingeschränkte Abgabe"
+    , sheetDescription = Nothing
+    , sheetType = Normal $ Points 6
+    , sheetGrouping = Arbitrary 3
+    , sheetMarkingText = Nothing
+    , sheetVisibleFrom = Just now
+    , sheetActiveFrom = now
+    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetSubmissionMode = SubmissionMode False . Just $ UploadAny True defaultExtensionRestriction
+    , sheetHintFrom = Nothing
+    , sheetSolutionFrom = Nothing
+    , sheetAutoDistribute = True
+    }
+  void . insert $ SheetEdit jost now sh3
+  sh4 <- insert Sheet
+    { sheetCourse = pmo
+    , sheetName = "Uneingeschränkte Abgabe, einzelne Datei"
+    , sheetDescription = Nothing
+    , sheetType = Normal $ Points 6
+    , sheetGrouping = Arbitrary 3
+    , sheetMarkingText = Nothing
+    , sheetVisibleFrom = Just now
+    , sheetActiveFrom = now
+    , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
+    , sheetSubmissionMode = SubmissionMode False . Just $ UploadAny False Nothing
+    , sheetHintFrom = Nothing
+    , sheetSolutionFrom = Nothing
+    , sheetAutoDistribute = True
+    }
+  void . insert $ SheetEdit jost now sh4
   tut1 <- insert Tutorial
     { tutorialName = "Di08"
     , tutorialCourse = pmo

From 813d44697591daeae76f1579d9e3f1ef0b4118f8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 18 May 2019 23:14:21 +0200
Subject: [PATCH 340/519] Divide sheetForm into sections

---
 messages/uniworx/de.msg |  5 +++++
 src/Handler/Sheet.hs    | 40 +++++++++++++++++++++-------------------
 src/Utils/Form.hs       |  3 +++
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 9ea58fd65..70f005dfc 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -169,6 +169,7 @@ SheetHintFrom: Hinweis ab
 SheetSolution: Lösung
 SheetSolutionFrom: Lösung ab
 SheetMarking: Hinweise für Korrektoren
+SheetMarkingFiles: Korrektur
 SheetType: Wertung
 SheetInvisible: Dieses Übungsblatt ist für Teilnehmer momentan unsichtbar!
 SheetInvisibleUntil date@Text: Dieses Übungsblatt ist für Teilnehmer momentan unsichtbar bis #{date}!
@@ -186,6 +187,10 @@ SheetMarkingTip: Hinweise zur Korrektur, sichtbar nur für Korrektoren
 SheetPseudonym: Persönliches Abgabe-Pseudonym
 SheetGeneratePseudonym: Generieren
 
+SheetFormType: Wertung & Abgabe
+SheetFormTimes: Zeiten
+SheetFormFiles: Dateien
+
 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
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 0b0b62e40..f315c7709 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -68,19 +68,19 @@ import Text.Hamlet (ihamlet)
 
 data SheetForm = SheetForm
       { sfName         :: SheetName
-      , sfDescription  :: Maybe Html
-      , sfType         :: SheetType
-      , sfGrouping     :: SheetGroup
       , sfVisibleFrom  :: Maybe UTCTime
       , sfActiveFrom   :: UTCTime
       , sfActiveTo     :: UTCTime
-      , sfSubmissionMode :: SubmissionMode
-      , sfSheetF       :: Maybe (Source Handler (Either FileId File))
       , sfHintFrom     :: Maybe UTCTime
-      , sfHintF        :: Maybe (Source Handler (Either FileId File))
       , sfSolutionFrom :: Maybe UTCTime
+      , sfSheetF       :: Maybe (Source Handler (Either FileId File))
+      , sfHintF        :: Maybe (Source Handler (Either FileId File))
       , sfSolutionF    :: Maybe (Source Handler (Either FileId File))
       , sfMarkingF     :: Maybe (Source Handler (Either FileId File))
+      , sfType         :: SheetType
+      , sfGrouping     :: SheetGroup
+      , sfSubmissionMode :: SubmissionMode
+      , sfDescription  :: Maybe Html
       , sfMarkingText  :: Maybe Html
       -- Keine SheetId im Formular!
       }
@@ -102,12 +102,7 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
     ctime <- ceilingQuarterHour <$> liftIO getCurrentTime
     (result, widget) <- flip (renderAForm FormStandard) html $ SheetForm
       <$> areq ciField        (fslI MsgSheetName)         (sfName        <$> template)
-      <*> aopt htmlField      (fslpI MsgSheetDescription "Html")
-                                                          (sfDescription <$> template)
-      <*> sheetTypeAFormReq   (fslI MsgSheetType
-            & setTooltip (uniworxMessages [MsgSheetTypeInfoBonus,MsgSheetTypeInfoNotGraded]))
-                                                          (sfType        <$> template)
-      <*> sheetGroupAFormReq  (fslI MsgSheetGroup)        (sfGrouping    <$> template)
+      <* aformSection MsgSheetFormTimes
       <*> aopt utcTimeField   (fslI MsgSheetVisibleFrom
             & setTooltip MsgSheetVisibleFromTip)
                                                               ((sfVisibleFrom  <$> template) <|> pure (Just ctime))
@@ -115,17 +110,24 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
             & setTooltip MsgSheetActiveFromTip)
                                                               (sfActiveFrom   <$> template)
       <*> areq utcTimeField   (fslI MsgSheetActiveTo)         (sfActiveTo     <$> template)
-      <*> submissionModeForm ((sfSubmissionMode <$> template) <|> pure (SubmissionMode False . Just $ UploadAny True defaultExtensionRestriction))
-      <*> aopt (multiFileField $ oldFileIds SheetExercise) (fslI MsgSheetExercise) (sfSheetF <$> template)
       <*> aopt utcTimeField   (fslpI MsgSheetHintFrom "Datum, sonst nur für Korrektoren"
             & setTooltip MsgSheetHintFromTip)                 (sfHintFrom     <$> template)
-      <*> aopt (multiFileField $ oldFileIds SheetHint)     (fslI MsgSheetHint)      (sfHintF <$> template)
       <*> aopt utcTimeField   (fslpI MsgSheetSolutionFrom  "Datum, sonst nur für Korrektoren"
-            & setTooltip MsgSheetSolutionFromTip)
-                                                              (sfSolutionFrom <$> template)
+            & setTooltip MsgSheetSolutionFromTip)             (sfSolutionFrom <$> template)
+      <* aformSection MsgSheetFormFiles
+      <*> aopt (multiFileField $ oldFileIds SheetExercise) (fslI MsgSheetExercise) (sfSheetF <$> template)
+      <*> aopt (multiFileField $ oldFileIds SheetHint)     (fslI MsgSheetHint)      (sfHintF <$> template)
       <*> aopt (multiFileField $ oldFileIds SheetSolution) (fslI MsgSheetSolution) (sfSolutionF <$> template)
-      <*> aopt (multiFileField $ oldFileIds SheetMarking)  (fslI MsgSheetMarking
-            & setTooltip MsgSheetMarkingTip)   (sfMarkingF <$> template)
+      <*> aopt (multiFileField $ oldFileIds SheetMarking)  (fslI MsgSheetMarkingFiles
+            & setTooltip MsgSheetMarkingTip)                  (sfMarkingF <$> template)
+      <* aformSection MsgSheetFormType
+      <*> sheetTypeAFormReq   (fslI MsgSheetType
+            & setTooltip (uniworxMessages [MsgSheetTypeInfoBonus,MsgSheetTypeInfoNotGraded]))
+                                                          (sfType        <$> template)
+      <*> sheetGroupAFormReq  (fslI MsgSheetGroup)        (sfGrouping    <$> template)
+      <*> submissionModeForm ((sfSubmissionMode <$> template) <|> pure (SubmissionMode False . Just $ UploadAny True defaultExtensionRestriction))
+      <*> aopt htmlField      (fslpI MsgSheetDescription "Html")
+                                                          (sfDescription <$> template)
       <*> aopt htmlField    (fslpI MsgSheetMarking "Html") (sfMarkingText <$> template)
     return $ case result of
       FormSuccess sheetResult
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index c11496380..c2797980d 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -546,6 +546,9 @@ idFormSectionNoinput = "form-section-noinput"
 aformSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> AForm m ()
 aformSection = formToAForm . fmap (second pure) . formSection
 
+wformSection :: (MonadHandler m, RenderMessage (HandlerSite m) msg) => msg -> WForm m ()
+wformSection = void . aFormToWForm . aformSection
+
 formSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
 formSection formSectionTitle = do
     mr <- getMessageRender

From 22f5a655c5b1d655bad466c18e7332ced96a8103 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 18 May 2019 23:51:50 +0200
Subject: [PATCH 341/519] Don't crash on unsafe migrations

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

diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index f220e4353..9c8b1578b 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -79,7 +79,7 @@ migrateAll = do
 
 requiresMigration :: forall m. (MonadLogger m, MonadBaseControl IO m, MonadIO m) => ReaderT SqlBackend m Bool
 requiresMigration = mapReaderT (exceptT return return) $ do
-  initial <- getMigration initialMigration
+  initial <- either id (map snd) <$> parseMigration initialMigration
   when (not $ null initial) $ do
     $logInfoS "Migration" $ intercalate "; " initial
     throwError True
@@ -89,7 +89,7 @@ requiresMigration = mapReaderT (exceptT return return) $ do
     $logInfoS "Migration" . intercalate ", " . map tshow $ Map.keys customs
     throwError True
     
-  automatic <- getMigration migrateAll'
+  automatic <- either id (map snd) <$> parseMigration migrateAll'
   when (not $ null automatic) $ do
     $logInfoS "Migration" $ intercalate "; " automatic
     throwError True

From 2b79b40bfba22990fb7800af56fd62e41a6fca8f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 19 May 2019 00:40:54 +0200
Subject: [PATCH 342/519] Fix Haddock

---
 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 bb547e7f7..78b5d187a 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -116,7 +116,7 @@ colSheet = sortable (Just "sheet") (i18nCell MsgSheet) $ \row ->
 colSheetType :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
 colSheetType = sortable (toNothing "sheetType") (i18nCell MsgSheetType) $
         i18nCell . sheetType <$> view (_dbrOutput . _2 . _entityVal)
-        -- $ \DBRow{ dbrOutput=(_, sheet, _, _, _, _) } -> i18nCell . sheetType $ entityVal sheet
+        -- \DBRow{ dbrOutput=(_, sheet, _, _, _, _) } -> i18nCell . sheetType $ entityVal sheet
 
 colCorrector :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
 colCorrector = sortable (Just "corrector") (i18nCell MsgCorrector) $ \case

From fce531cdda756b4da03c74927e67f8b89f4e1554 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 19 May 2019 10:34:18 +0200
Subject: [PATCH 343/519] Fix tests

---
 test/Model/TypesSpec.hs | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index 7e725c166..289df3136 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -13,6 +13,9 @@ import System.IO.Unsafe
 import Yesod.Auth.Util.PasswordStore
 
 
+instance (Arbitrary a, MonoFoldable a) => Arbitrary (NonNull a) where
+  arbitrary = arbitrary `suchThatMap` fromNullable
+  
 instance Arbitrary Season where
   arbitrary = genericArbitrary
   shrink = genericShrink
@@ -62,10 +65,18 @@ instance Arbitrary SubmissionFileType where
   arbitrary = genericArbitrary
   shrink = genericShrink
 
+instance Arbitrary UploadSpecificFile where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
 instance Arbitrary UploadMode where
   arbitrary = genericArbitrary
   shrink = genericShrink
 
+instance Arbitrary UploadModeDescr where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
 instance Arbitrary SubmissionMode where
   arbitrary = genericArbitrary
   shrink = genericShrink
@@ -148,10 +159,6 @@ instance Arbitrary AuthenticationMode where
 instance Arbitrary LecturerType where
   arbitrary = genericArbitrary
   shrink = genericShrink
-
-instance Arbitrary a => Arbitrary (ZIPArchiveName a) where
-  arbitrary = genericArbitrary
-  shrink = genericShrink
   
 
 spec :: Spec
@@ -177,10 +184,14 @@ spec = do
       [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, persistFieldLaws, pathPieceLaws, finiteLaws ]
     lawsCheckHspec (Proxy @SubmissionFileType)
       [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, pathPieceLaws, finiteLaws ]
+    lawsCheckHspec (Proxy @UploadSpecificFile)
+      [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws ]
     lawsCheckHspec (Proxy @UploadMode)
-      [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws, pathPieceLaws, finiteLaws ]
+      [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws ]
+    lawsCheckHspec (Proxy @UploadModeDescr)
+      [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, finiteLaws, pathPieceLaws ]
     lawsCheckHspec (Proxy @SubmissionMode)
-      [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws, finiteLaws ]
+      [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws ]
     lawsCheckHspec (Proxy @SubmissionModeDescr)
       [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, finiteLaws, pathPieceLaws ]
     lawsCheckHspec (Proxy @ExamStatus)
@@ -215,8 +226,6 @@ spec = do
       [ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws ]
     lawsCheckHspec (Proxy @LecturerType)
       [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, finiteLaws, jsonLaws, pathPieceLaws, persistFieldLaws ]
-    lawsCheckHspec (Proxy @(ZIPArchiveName (CI Text)))
-      [ eqLaws, ordLaws, showReadLaws, pathPieceLaws ]
 
   describe "TermIdentifier" $ do
     it "has compatible encoding/decoding to/from Text" . property $

From 0f1abf6cd19192dc0345e1d1dce3e1be4e149b8f Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 19 May 2019 11:25:20 +0200
Subject: [PATCH 344/519] =?UTF-8?q?add=20options=20object=20to=20HtmlHelpe?=
 =?UTF-8?q?rs=20=C2=BBparseResponse=C2=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/services/htmlHelpers.js | 41 ++++++++++++++++++++++---------
 static/js/utils/asyncTable.js     | 12 ++++-----
 static/js/utils/massInput.js      |  4 +--
 static/js/utils/modal.js          |  6 +++--
 4 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/static/js/services/htmlHelpers.js b/static/js/services/htmlHelpers.js
index bf7d1b163..ec025dc4b 100644
--- a/static/js/services/htmlHelpers.js
+++ b/static/js/services/htmlHelpers.js
@@ -3,27 +3,44 @@
 
   window.HtmlHelpers = (function() {
 
-    function _prefixIds(element) {
-      var idPrefix = Math.floor(Math.random() * 100000);
+    // `parseResponse` takes a raw HttpClient response and an options object.
+    // Returns an object with `element` being an contextual fragment of the
+    // HTML in the response and `ifPrefix` being the prefix that was used to
+    // "unique-ify" the ids of the received HTML.
+    // Original Response IDs can optionally be kept by adding `originalIds: true`
+    // to the `options` object.
+    function parseResponse(response, options) {
+      options = options || {};
+
+      return response.text().then(function (responseText) {
+        var docFrag = document.createRange().createContextualFragment(responseText);
+        var idPrefix;
+        if (!options.originalIds) {
+          idPrefix = _getIdPrefix();
+          _prefixIds(docFrag, idPrefix);
+        }
+        return Promise.resolve({ idPrefix: idPrefix, element: docFrag });
+      },
+      function (error) {
+        return Promise.reject(error);
+      }).catch(function (error) { console.error(error); });
+    }
+
+    function _prefixIds(element, idPrefix) {
       var idAttrs = ['id', 'for', 'data-conditional-input', 'data-modal-trigger'];
 
       idAttrs.forEach(function(attr) {
         Array.from(element.querySelectorAll('[' + attr + ']')).forEach(function(input) {
-          var value = idPrefix + '__' + input.getAttribute(attr);
+          var value = idPrefix + input.getAttribute(attr);
           input.setAttribute(attr, value);
         });
       });
     }
 
-    function parseResponse(response) {
-      return response.text().then(function (responseText) {
-        var docFrag = document.createRange().createContextualFragment(responseText);
-        _prefixIds(docFrag);
-        return Promise.resolve(docFrag);
-      },
-      function (error) {
-        return Promise.reject(error);
-      }).catch(function (error) { console.error(error); });
+    function _getIdPrefix() {
+      // leading 'r'(andom) to overcome the fact that IDs
+      // starting with a numeric value are not valid in CSS
+      return 'r' + Math.floor(Math.random() * 100000) + '__';
     }
 
     return {
diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 32a7bf844..6e8ee66e7 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -324,14 +324,14 @@
         headers: headers,
         accept: HttpClient.ACCEPT.TEXT_HTML,
       }).then(function(response) {
-        return HtmlHelpers.parseResponse(response);
-      }).then(function(responseElement) {
+        return HtmlHelpers.parseResponse(response, { originalIds: true });
+      }).then(function(response) {
         setLocalStorageParameter('currentTableUrl', url.href);
         // reset table
         removeListeners();
         element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
         // update table with new
-        updateWrapperContents(responseElement);
+        updateWrapperContents(response);
 
         if (callback && typeof callback === 'function') {
           callback(element);
@@ -344,10 +344,10 @@
       });
     }
 
-    function updateWrapperContents(newHtmlElement) {
+    function updateWrapperContents(response) {
       var newPage = document.createElement('div');
-      newPage.appendChild(newHtmlElement);
-      var newWrapperContents = newPage.querySelector('#' + element.id + '__' + element.id);
+      newPage.appendChild(response.element);
+      var newWrapperContents = newPage.querySelector('#' + element.id);
       element.innerHTML = newWrapperContents.innerHTML;
 
       if (UtilRegistry) {
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index e0d1578e6..00f873ced 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -128,8 +128,8 @@
             accept: HttpClient.ACCEPT.TEXT_HTML,
           }).then(function(response) {
             return HtmlHelpers.parseResponse(response);
-          }).then(function(responseElement) {
-              processResponse(responseElement);
+          }).then(function(response) {
+              processResponse(response.element);
               if (isAddCell) {
                 reFocusAddCell();
               }
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index b994b79c8..84efe8a1a 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -173,8 +173,10 @@
         headers: MODAL_HEADERS,
         accept: HttpClient.ACCEPT.TEXT_HTML,
       }).then(function(response) {
-        return HtmlHelpers.parseResponse(response, element.id);
-      }).then(processResponse);
+        return HtmlHelpers.parseResponse(response);
+      }).then(function(response) {
+        processResponse(response.element);
+      });
     }
 
     function processResponse(responseElement) {

From c4e6b757f9dc4cc28c5adcd06b817d672df4c69f Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 19 May 2019 11:35:13 +0200
Subject: [PATCH 345/519] dont set selectionStart on non-text inputs with async
 table response

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

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 6e8ee66e7..a4b2148e3 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -200,7 +200,7 @@
 
       var focusedInput = tableFilterForm.querySelector(':focus, :active');
       // focus previously focused input
-      if (focusedInput) {
+      if (focusedInput && focusedInput.selectionStart !== null) {
         var selectionStart = focusedInput.selectionStart;
         var focusId = focusedInput.id;
         callback = function(wrapper) {
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index 84efe8a1a..6710c0854 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -51,7 +51,6 @@
     var modalUrl;
 
     function _init() {
-      console.log('modalUtil.init', { element });
       if (!element) {
         throw new Error('Modal utility cannot be setup without an element!');
       }

From b18b3b95a9adde2ac53d8e8a7f181ca6128f2cdb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 19 May 2019 13:55:56 +0200
Subject: [PATCH 346/519] Build failing testcase for assignSubmissions

---
 test/FoundationSpec.hs               |   6 --
 test/Handler/Utils/SubmissionSpec.hs | 135 +++++++++++++++++++++++++++
 test/Model/TypesSpec.hs              |  38 +++++++-
 test/ModelSpec.hs                    |  21 +++++
 test/TestImport.hs                   |   3 +-
 5 files changed, 194 insertions(+), 9 deletions(-)
 create mode 100644 test/Handler/Utils/SubmissionSpec.hs

diff --git a/test/FoundationSpec.hs b/test/FoundationSpec.hs
index 04081f1b9..b7af14fe9 100644
--- a/test/FoundationSpec.hs
+++ b/test/FoundationSpec.hs
@@ -7,12 +7,6 @@ import ModelSpec ()
 import qualified Data.CryptoID as CID
 import Yesod.EmbeddedStatic
 
-instance Arbitrary TermId where
-  arbitrary = TermKey <$> arbitrary
-  
-instance Arbitrary SchoolId where
-  arbitrary = SchoolKey <$> arbitrary
-
 instance Arbitrary (Route Auth) where
   arbitrary = oneof
     [ return CheckR
diff --git a/test/Handler/Utils/SubmissionSpec.hs b/test/Handler/Utils/SubmissionSpec.hs
new file mode 100644
index 000000000..995ae63d5
--- /dev/null
+++ b/test/Handler/Utils/SubmissionSpec.hs
@@ -0,0 +1,135 @@
+module Handler.Utils.SubmissionSpec where
+
+import qualified Yesod
+
+import TestImport
+
+import Handler.Utils.Submission
+import ModelSpec ()
+
+import qualified Data.Set as Set
+import qualified Data.Map as Map
+
+import Data.List (genericLength)
+
+import qualified Data.CaseInsensitive as CI
+
+import System.IO.Unsafe
+
+import System.Random.Shuffle
+import Control.Monad.Random.Class
+
+import Database.Persist.Sql (fromSqlKey)
+
+
+userNumber :: TVar Natural
+userNumber = unsafePerformIO $ newTVarIO 1
+{-# NOINLINE userNumber #-}
+
+makeUsers :: Natural -> SqlPersistM [Entity User]
+makeUsers (fromIntegral -> n) = do
+  users' <- liftIO . replicateM n $ generate arbitrary
+  users <- forM users' $ \u -> do
+    i <- atomically $ readTVar userNumber <* modifyTVar userNumber succ
+    let u' = u { userIdent = CI.mk $ "user." <> tshow i
+               , userEmail = CI.mk $ "user." <> tshow i <> "@example.com"
+               }
+    return u'
+  uids <- insertMany users
+  return $ zipWith Entity uids users
+
+distributionExample :: SqlPersistM [(Natural, [Maybe Load])] -- ^ Number of submissions and corrector specification
+                    -> ([Entity Submission] -> [Entity SheetCorrector] -> SqlPersistM ()) -- ^ Setup hook
+                    -> (Map (Maybe SheetCorrector) (Set SubmissionId) -> Expectation)
+                    -> YesodExample UniWorX ()
+distributionExample mkParameters setupHook cont = do
+  situations <- runDB $ do
+    term <- liftIO $ generate arbitrary
+    void . insert $ term
+    school <- liftIO $ generate arbitrary
+    void . insert $ school
+    course <- liftIO $ generate arbitrary <&> \c -> c { courseTerm = TermKey $ termName term, courseSchool = SchoolKey $ schoolShorthand school }
+    cid <- insert course
+
+    steps <- mkParameters
+    let subsN = maybe 0 maximum . fromNullable $ map fst steps
+        correctorsN = maybe 0 maximum . fromNullable $ map (genericLength . snd) steps
+    participants <- makeUsers subsN
+    correctors <- makeUsers correctorsN
+
+    situations <- forM steps $ \(subsN', loads) -> do
+      sheet <- liftIO $ generate arbitrary <&> \s -> s { sheetCourse = cid }
+      sid <- insert sheet
+
+      participants' <- liftIO $ take (fromIntegral subsN') <$> shuffleM participants
+      let loads' = loads ++ replicate (fromIntegral $ correctorsN - genericLength loads) Nothing
+      
+      submissions <- forM participants' $ \(Entity uid _) -> do
+        sub@(Entity subId _) <- insertEntity $ Submission
+          sid
+          Nothing
+          Nothing
+          Nothing
+          Nothing
+          Nothing
+        void . insert $ SubmissionUser uid subId
+        return sub
+
+      let sheetCorrectors = [ SheetCorrector corr sid load CorrectorNormal | (Entity corr _, Just load) <- zip correctors loads']
+      scIds <- insertMany sheetCorrectors
+      let sheetCorrectors' = zipWith Entity scIds sheetCorrectors
+
+      return (sid, (submissions, sheetCorrectors'))
+
+    mapM_ (uncurry setupHook) $ map snd situations
+
+    return situations
+
+  let subIds = concatMap (\(_, (subs, _)) -> map entityKey subs) situations
+
+  results <- runHandler . Yesod.runDB . mapM (\sid -> assignSubmissions sid Nothing) $ map fst situations
+
+  submissions <- fmap concat . forM results $ \(assigned, unassigned) -> runDB $ selectList ([ SubmissionId <-. Set.toList assigned ] ||. [ SubmissionId <-. Set.toList unassigned ]) []
+
+  liftIO $ do
+    let (assigned, unassigned) = bimap concat concat $ unzip results
+    Set.union assigned unassigned `shouldBe` Set.fromList subIds
+    cont . Map.fromListWith mappend $ do
+      Entity subId Submission{..} <- submissions
+      let key = listToMaybe . filter (\(Entity _ (SheetCorrector uid _ _ _)) -> Just uid == submissionRatingBy) $ concatMap (\(_, (_, corrs)) -> corrs) situations
+      return (entityVal <$> key, Set.singleton subId)
+  
+
+spec :: Spec
+spec = withApp . describe "Submission distribution" $ do
+  it "is fair" $
+    distributionExample
+      (return [(500, replicate 10 (Just $ Load Nothing 1))])
+      (\_ _ -> return ())
+      (\result -> do
+          let countResult = Map.map Set.size result
+          countResult `shouldNotSatisfy` Map.member Nothing
+          countResult `shouldSatisfy` all (== 50)
+      )
+  it "follows distribution" $
+    distributionExample
+      (return [(500, replicate 6 (Just $ Load Nothing 1) ++ replicate 2 (Just $ Load Nothing 2))])
+      (\_ _ -> return ())
+      (\result -> do
+          let countResult = Map.map Set.size result
+          countResult `shouldNotSatisfy` Map.member Nothing
+          countResult `shouldSatisfy` all (\(Just (SheetCorrector _ _ (Load _ prop) _), subsSet) -> (== 50 * prop) $ fromIntegral subsSet) . Map.toList
+      )
+  it "follows cumulative distribution over multiple sheets" $ do
+    ns <- liftIO . replicateM 5 . fmap fromInteger $ getRandomR (0, 100)
+    let ns' = ns ++ [500 - sum ns]
+        loads = replicate 6 (Just $ Load Nothing 1) ++ replicate 2 (Just $ Load Nothing 2)
+    distributionExample
+      (return [ (n, loads) | n <- ns' ])
+      (\_ _ -> return ())
+      (\result -> do
+          let countResult = Map.map Set.size result
+              countResult' = Map.mapKeysWith (+) (fmap $ \SheetCorrector{..} -> (fromSqlKey sheetCorrectorUser, byProportion sheetCorrectorLoad)) countResult
+          countResult `shouldNotSatisfy` Map.member Nothing
+          countResult' `shouldSatisfy` all (\(Just (_, prop), subsSet) -> (== 50 * prop) $ fromIntegral subsSet) . Map.toList
+      )
diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index 289df3136..354ef20e6 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE UndecidableInstances #-}
+
 module Model.TypesSpec where
 
 import TestImport
@@ -12,6 +14,13 @@ import MailSpec ()
 import System.IO.Unsafe
 import Yesod.Auth.Util.PasswordStore
 
+import Database.Persist.Sql (SqlBackend, fromSqlKey, toSqlKey)
+
+import Text.Blaze.Html
+import Text.Blaze.Renderer.Text
+
+import qualified Data.Set as Set
+
 
 instance (Arbitrary a, MonoFoldable a) => Arbitrary (NonNull a) where
   arbitrary = arbitrary `suchThatMap` fromNullable
@@ -27,6 +36,14 @@ instance Arbitrary TermIdentifier where
     return $ TermIdentifier{..}
   shrink = genericShrink
 
+instance Arbitrary TermId where
+  arbitrary = TermKey <$> arbitrary
+  shrink = map TermKey . shrink . unTermKey
+
+instance Arbitrary SchoolId where
+  arbitrary = SchoolKey <$> arbitrary
+  shrink = map SchoolKey . shrink . unSchoolKey
+
 instance Arbitrary Pseudonym where
   arbitrary = Pseudonym <$> arbitraryBoundedIntegral
 
@@ -66,11 +83,20 @@ instance Arbitrary SubmissionFileType where
   shrink = genericShrink
 
 instance Arbitrary UploadSpecificFile where
-  arbitrary = genericArbitrary
+  arbitrary = UploadSpecificFile
+    <$> (pack . getPrintableString <$> arbitrary)
+    <*> (pack . getPrintableString <$> arbitrary)
+    <*> arbitrary
   shrink = genericShrink
 
 instance Arbitrary UploadMode where
-  arbitrary = genericArbitrary
+  arbitrary = oneof
+    [ pure NoUpload
+    , UploadAny
+      <$> arbitrary
+      <*> (fromNullable . Set.fromList . map (pack . getPrintableString) <$> arbitrary)
+    , UploadSpecific <$> arbitrary
+    ]
   shrink = genericShrink
 
 instance Arbitrary UploadModeDescr where
@@ -159,6 +185,14 @@ instance Arbitrary AuthenticationMode where
 instance Arbitrary LecturerType where
   arbitrary = genericArbitrary
   shrink = genericShrink
+
+instance {-# OVERLAPPABLE #-} ToBackendKey SqlBackend record => Arbitrary (Key record) where
+  arbitrary = toSqlKey <$> arbitrary
+  shrink = map toSqlKey . shrink . fromSqlKey
+
+instance Arbitrary Html where
+  arbitrary = (preEscapedToHtml :: String -> Html) . getPrintableString <$> arbitrary
+  shrink = map preEscapedToHtml . shrink . renderMarkup
   
 
 spec :: Spec
diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs
index 3850363a6..f530ec26a 100644
--- a/test/ModelSpec.hs
+++ b/test/ModelSpec.hs
@@ -33,6 +33,27 @@ instance Arbitrary EmailAddress where
         isEmail l d = Email.isValid (makeEmailLike l d)
         makeEmailLike l d = CBS.concat [l, CBS.singleton '@', d]
 
+instance Arbitrary Course where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary Sheet where
+  arbitrary = Sheet
+    <$> arbitrary
+    <*> (CI.mk . pack . getPrintableString <$> arbitrary)
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+  shrink = genericShrink
+
 instance Arbitrary User where
   arbitrary = do
     userIdent <- CI.mk . pack <$> oneof
diff --git a/test/TestImport.hs b/test/TestImport.hs
index 522201f4c..a9c5cd88d 100644
--- a/test/TestImport.hs
+++ b/test/TestImport.hs
@@ -6,7 +6,8 @@ module TestImport
 import Application           (makeFoundation, makeLogWare)
 import ClassyPrelude         as X hiding (delete, deleteBy, Handler, Index, (<.>), (<|), index, uncons, unsnoc, cons, snoc)
 import Database.Persist      as X hiding (get)
-import Database.Persist.Sql  (SqlPersistM, runSqlPersistMPool)
+import Database.Persist.Sql  as X (SqlPersistM)
+import Database.Persist.Sql  (runSqlPersistMPool)
 import Foundation            as X
 import Model                 as X
 import Test.Hspec            as X

From 27a5b83f55aeb7526d407d5b58518bdfb39bdfcb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 19 May 2019 17:18:29 +0200
Subject: [PATCH 347/519] Re-do assignSubmissions to pass tests

---
 src/Handler/Utils/Submission.hs | 258 ++++++++++++++++----------------
 src/Utils/Lens.hs               |   2 +
 2 files changed, 134 insertions(+), 126 deletions(-)

diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 09c59f6b3..17bcc2b73 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -13,27 +13,25 @@ module Handler.Utils.Submission
 
 import Import hiding (joinPath)
 import Jobs.Queue
-import Prelude (lcm)
 import Yesod.Core.Types (HandlerContents(..), ErrorResponse(..))
 
 import Utils.Lens
 
-import Control.Monad.State hiding (forM_, mapM_,foldM)
+import Control.Monad.State as State (StateT)
+import Control.Monad.State.Class as State
 import Control.Monad.Writer (MonadWriter(..), execWriterT, execWriter)
-import Control.Monad.RWS.Lazy (RWST)
+import Control.Monad.RWS.Lazy (MonadRWS, RWST, execRWST)
 import qualified Control.Monad.Random as Rand
 import qualified System.Random.Shuffle as Rand (shuffleM)
 
 import Data.Maybe ()
 
-import qualified Data.List as List
 import Data.Set (Set)
 import qualified Data.Set as Set
-import Data.Map (Map)
+import Data.Map (Map, (!), (!?))
 import qualified Data.Map as Map
 
 import qualified Data.Text as Text
-import Data.Ratio
 
 import Data.Monoid (Monoid, Any(..), Sum(..))
 import Generics.Deriving.Monoid (memptydefault, mappenddefault)
@@ -56,155 +54,163 @@ import Text.Hamlet (ihamletFile)
 import qualified Control.Monad.Catch as E (Handler(..))
 
 
-data AssignSubmissionException = NoCorrectorsByProportion
+data AssignSubmissionException = NoCorrectors
+                               | NoCorrectorsByProportion
+                               | SubmissionsNotFound (NonNull (Set SubmissionId))
   deriving (Typeable, Show)
 
 instance Exception AssignSubmissionException
 
 -- | Assigns all submissions according to sheet corrector loads
-assignSubmissions :: SheetId -- ^ Sheet do distribute to correction
+assignSubmissions :: SheetId -- ^ Sheet to distribute to correctors
                   -> Maybe (Set SubmissionId) -- ^ Optionally restrict submission to consider
                   -> YesodDB UniWorX ( Set SubmissionId
                                      , Set SubmissionId
                                      ) -- ^ Returns assigned and unassigned submissions; unassigned submissions occur only if no tutors have an assigned load
 assignSubmissions sid restriction = do
     Sheet{..} <- getJust sid
-    correctors <- selectList [ SheetCorrectorSheet ==. sid, SheetCorrectorState ==. CorrectorNormal ] []
-    let
-      -- byTutorial' uid = join . Map.lookup uid $ Map.fromList [ (sheetCorrectorUser, byTutorial sheetCorrectorLoad) | Entity _ SheetCorrector{..} <- corrsTutorial ]
-      corrsTutorial = filter hasTutorialLoad correctors -- needed as List within Esqueleto
-      corrsProp  = filter hasPositiveLoad correctors
-      countsToLoad' :: UserId -> Bool
-      countsToLoad' uid = Map.findWithDefault True uid loadMap
-      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 `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.==. 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' E.?. UserId)
-
-    let subTutor' :: Map SubmissionId (Set UserId)
-        subTutor' = Map.fromListWith Set.union $ currentSubs
-          & 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 `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)
-        return (sheetCorrector, isByTutorial, E.isNothing (submission E.?. SubmissionId))
+    correctorsRaw <- E.select . E.from $ \(sheet `E.InnerJoin` sheetCorrector) -> do
+      E.on $ sheet E.^. SheetId E.==. sheetCorrector E.^. SheetCorrectorSheet
+      E.where_ $ sheetCorrector E.^. SheetCorrectorState `E.in_` E.valList [CorrectorNormal, CorrectorMissing]
+      return (sheet E.^. SheetId, sheetCorrector)
 
     let
-      prevSubs' :: Map SheetId (Map UserId (Rational, Integer))
-      prevSubs' = Map.unionsWith (Map.unionWith $ \(prop, n) (_, n') -> (prop, n + n')) $ do
-        (Entity _ SheetCorrector{ sheetCorrectorLoad = Load{..}, .. }, E.Value isByTutorial, E.Value isPlaceholder) <- prevSubs
-        guard $ maybe True (not isByTutorial ||) byTutorial
-        let proportion
-              | CorrectorExcused <- sheetCorrectorState = 0
-              | otherwise                               = byProportion
-        return . Map.singleton sheetCorrectorSheet $ Map.singleton sheetCorrectorUser (proportion, bool 1 0 isPlaceholder)
+      correctors :: Map SheetId (Map UserId (Load, CorrectorState))
+      correctors = Map.fromList $ do
+        E.Value sheetId <- Set.toList $ setOf (folded . _1) correctorsRaw
+        let loads = Map.fromList $ do
+              (E.Value sheetId', Entity _ SheetCorrector{..})
+                <- correctorsRaw
+              guard $ sheetId' == sheetId
+              return (sheetCorrectorUser, (sheetCorrectorLoad, sheetCorrectorState))
+        return (sheetId, loads)
 
-      deficit :: Map UserId Integer
-      deficit = Map.filter (> 0) $ Map.foldr (Map.unionWith (+) . toDeficit) Map.empty prevSubs'
-
-      toDeficit :: Map UserId (Rational, Integer) -> Map UserId Integer
-      toDeficit assignments = toDeficit' <$> assignments
+      sheetCorrectors :: Map UserId Load
+      sheetCorrectors = Map.mapMaybe filterLoad $ correctors ! sid
         where
-          assigned' = getSum $ foldMap (Sum . snd) assignments
-          props = getSum $ foldMap (Sum . fst) assignments
+          filterLoad (l@Load{..}, CorrectorNormal) = l <$ guard (isJust byTutorial || byProportion /= 0)
+          filterLoad _ = Nothing
 
-          toDeficit' (prop, assigned) = let
-              target
-                | props == 0 = 0
-                | otherwise  = round $ fromInteger assigned' * (prop / props)
-            in target - assigned
+    unless (Map.member sid correctors) $
+      throwM NoCorrectors
 
-    $logDebugS "assignSubmissions" $ "Previous submissions: " <> tshow prevSubs'
-    $logDebugS "assignSubmissions" $ "Current deficit: " <> tshow deficit
+    submissionDataRaw <- E.select . E.from $ \((sheet `E.InnerJoin` submission `E.InnerJoin` submissionUser) `E.LeftOuterJoin` (tutorialUser `E.InnerJoin` tutor)) -> do
+      E.on $ tutor E.?. TutorTutorial E.==. tutorialUser E.?. TutorialParticipantTutorial
+      E.on $ tutorialUser E.?. TutorialParticipantUser E.==. E.just (submissionUser E.^. SubmissionUserUser)
+       E.&&. tutor E.?. TutorUser `E.in_` E.justList (E.valList $ foldMap Map.keys correctors)
+      E.on $ submission E.^. SubmissionId E.==. submissionUser E.^. SubmissionUserSubmission
+      E.on $ submission E.^. SubmissionSheet E.==. sheet E.^. SheetId
+
+      E.where_ $ sheet E.^. SheetCourse E.==. E.val sheetCourse
+
+      return (sheet E.^. SheetId, submission, tutor E.?. TutorUser)
 
     let
-      lcd :: Integer
-      lcd = foldr lcm 1 $ map (denominator . byProportion . sheetCorrectorLoad . entityVal) corrsProp
-      wholeProps :: Map UserId Integer
-      wholeProps = Map.fromList [ ( sheetCorrectorUser, round $ byProportion * fromInteger lcd ) | Entity _ SheetCorrector{ sheetCorrectorLoad = Load{..}, .. } <- corrsProp ]
-      detQueueLength = fromIntegral (Map.size $ Map.filter (\tuts -> all countsToLoad' tuts) subTutor') - sum deficit
-      detQueue = concat . List.genericReplicate (detQueueLength `div` sum wholeProps) . concatMap (uncurry $ flip List.genericReplicate) $ Map.toList wholeProps
+      -- | All submissions in this course so far
+      submissionData :: Map SubmissionId
+                          ( Maybe UserId -- Corrector
+                          , Map UserId (Sum Natural) -- Tutors
+                          , SheetId
+                          )
+      submissionData = Map.fromListWith merge $ map process submissionDataRaw
+        where
+          process (E.Value sheetId, Entity subId Submission{..}, E.Value mTutId) = (subId, (submissionRatingBy, maybe Map.empty (flip Map.singleton $ Sum 1) mTutId, sheetId))
+          merge (corrA, tutorsA, sheetA) (corrB, tutorsB, sheetB)
+            | corrA /= corrB   = error "Same submission seen with different correctors"
+            | sheetA /= sheetB = error "Same submission seen with different sheets"
+            | otherwise        = (corrA, Map.unionWith mappend tutorsA tutorsB, sheetA)
 
-    $logDebugS "assignSubmissions" $ "Deterministic Queue: " <> tshow detQueue
+      targetSubmissions = Set.fromList $ do
+        (E.Value sheetId, Entity subId Submission{..}, _) <- submissionDataRaw
+        guard $ sheetId == sid
+        case restriction of
+          Just restriction' -> 
+            guard $ subId `Set.member` restriction'
+          Nothing ->
+            guard $ is _Nothing submissionRatingBy
+        return subId
 
-    queue <- liftIO . Rand.evalRandIO . execWriterT $ do
-      tell $ map Just detQueue
-      forever $
-        tell . pure =<< Rand.weightedMay [ (sheetCorrectorUser, byProportion sheetCorrectorLoad) | Entity _ SheetCorrector{..} <- corrsProp ]
+      targetSubmissionData = set _1 Nothing <$> Map.restrictKeys submissionData targetSubmissions
+      oldSubmissionData    = Map.withoutKeys submissionData targetSubmissions
 
-    $logDebugS "assignSubmissions" $ "Queue: " <> tshow (take (Map.size subTutor') queue)
+    whenIsJust (fromNullable =<< fmap (`Set.difference` targetSubmissions) restriction) $ \missing ->
+      throwM $ SubmissionsNotFound missing
 
     let
-      assignSubmission :: MonadState (Map SubmissionId UserId, [Maybe UserId], Map UserId Integer) m => Bool -> SubmissionId -> UserId -> m ()
-      assignSubmission countsToLoad smid tutid = do
-        _1 %= Map.insert smid tutid
-        _3 . at tutid %= assertM' (> 0) . maybe (-1) pred
-        when countsToLoad $
-          _2 %= List.delete (Just tutid)
+      withSubmissionData :: MonadRWS (Map SubmissionId a) w (Map SubmissionId a) m
+                         => (Map SubmissionId a -> b)
+                         -> m b
+      withSubmissionData f = f <$> (mappend <$> ask <*> State.get)
+      
+      -- | How many additional submission should the given corrector be assigned, if possible?
+      calculateDeficit :: UserId -> Map SubmissionId (Maybe UserId, Map UserId _, SheetId) -> Integer
+      calculateDeficit corrector submissionState = getSum $ foldMap Sum deficitBySheet
+        where
+          sheetSizes :: Map SheetId Integer
+          -- ^ Number of assigned submissions (to anyone) per sheet
+          sheetSizes = Map.map getSum . Map.fromListWith mappend $ do
+            (_, (Just _, _, sheetId)) <- Map.toList submissionState
+            return (sheetId, Sum 1)
 
-      maximumDeficit :: (MonadState (_a, _b, Map UserId Integer) m, MonadIO m) => m (Maybe UserId)
-      maximumDeficit = do
-        transposed <- uses _3 invertMap
-        traverse (liftIO . Rand.evalRandIO . Rand.uniform . snd) (Map.lookupMax transposed)
+          deficitBySheet :: Map SheetId Integer
+          -- ^ Deficite of @corrector@ per sheet
+          deficitBySheet = flip Map.mapMaybeWithKey sheetSizes $ \sheetId sheetSize -> do
+            let assigned :: Integer
+                assigned = fromIntegral . Map.size $ Map.filter (\(mCorr, _, sheetId') -> mCorr == Just corrector && sheetId == sheetId') submissionState
+                proportionSum :: Rational
+                proportionSum = getSum . foldMap corrProportion . fromMaybe Map.empty $ correctors !? sheetId
+                  where corrProportion (_, CorrectorExcused) = mempty
+                        corrProportion (Load{..}, _) = Sum byProportion
+                extra
+                  | Just (Load{..}, corrState) <- correctors !? sheetId >>= Map.lookup corrector
+                  = sum
+                    [ assigned
+                    , fromMaybe 0 $ do -- If corrections assigned by tutorial do not count against proportion, substract them from deficit
+                        tutCounts <- byTutorial
+                        guard $ not tutCounts
+                        guard $ corrState /= CorrectorExcused
+                        return . negate . fromIntegral . Map.size $ Map.filter (\(mCorr, tutors, sheetId') -> mCorr == Just corrector && sheetId == sheetId' && Map.member corrector tutors) submissionState
+                    , fromMaybe 0 $ do
+                        guard $ corrState /= CorrectorExcused
+                        return . negate . floor $ (byProportion / proportionSum) * fromIntegral sheetSize
+                    ] 
+                  | otherwise
+                  = assigned
+            return $ negate extra
 
-    subTutor'' <- liftIO . Rand.evalRandIO . Rand.shuffleM $ Map.toList subTutor'
+    targetSubmissions' <- liftIO . Rand.shuffleM $ Set.toList targetSubmissions
 
-    subTutor <- fmap (view _1) . flip execStateT (Map.empty, queue, deficit) . forM_ subTutor'' $ \(smid, tuts) -> do
-      let
-        restrictTuts
-          | Set.null tuts = id
-          | otherwise     = flip Map.restrictKeys tuts
-      byDeficit <- withStateT (over _3 restrictTuts) maximumDeficit
-      case byDeficit of
-        Just q' -> do
-          $logDebugS "assignSubmissions" $ tshow smid <> " -> " <> tshow q' <> " (byDeficit)"
-          assignSubmission False smid q'
-        Nothing
-          | Set.null tuts -> do
-              q <- preuse $ _2 . _head . _Just
-              case q of
-                Just q' -> do
-                  $logDebugS "assignSubmissions" $ tshow smid <> " -> " <> tshow q' <> " (queue)"
-                  assignSubmission True smid q'
-                Nothing -> return ()
-          | otherwise -> do
-              q <- liftIO . Rand.evalRandIO $ Rand.uniform tuts
-              $logDebugS "assignSubmissions" $ tshow smid <> " -> " <> tshow q <> " (tutorial)"
-              assignSubmission (countsToLoad' q) smid q
+    (newSubmissionData, ()) <- (\act -> execRWST act oldSubmissionData targetSubmissionData) . forM_ targetSubmissions' $ \subId -> do
+      tutors <- gets $ view _2 . (! subId) -- :: Map UserId (Sum Natural)
+      let acceptableCorrectors
+            | correctorsByTut <- Map.filter (is _Just . view _byTutorial) $ sheetCorrectors `Map.restrictKeys` Map.keysSet tutors
+            , not $ null correctorsByTut
+            = Map.keysSet correctorsByTut
+            | otherwise
+            = Map.keysSet $ Map.filter (views _byProportion (/= 0)) sheetCorrectors
+
+      when (not $ null acceptableCorrectors) $ do
+        deficits <- sequence . flip Map.fromSet acceptableCorrectors $ withSubmissionData . calculateDeficit
+        let
+          bestCorrectors :: Set UserId
+          bestCorrectors = acceptableCorrectors
+            & maximumsBy (deficits !)
+            & maximumsBy (tutors !?)
+
+        ix subId . _1 <~ Just <$> liftIO (Rand.uniform bestCorrectors)
 
     now <- liftIO getCurrentTime
-    forM_ (Map.toList subTutor) $
-        \(smid, tutid) -> update smid [ SubmissionRatingBy       =. Just tutid
-                                      , SubmissionRatingAssigned =. Just now  ]
-
-    let assignedSubmissions   = Map.keysSet subTutor
-        unassigendSubmissions = Map.keysSet subTutor' \\ assignedSubmissions
-    return (assignedSubmissions, unassigendSubmissions)
-    where
-      hasPositiveLoad = (> 0)  . byProportion . sheetCorrectorLoad . entityVal
-      hasTutorialLoad = isJust . byTutorial   . sheetCorrectorLoad . entityVal
+    execWriterT . forM_ (Map.toList newSubmissionData) $ \(subId, (mCorrector, _, _)) -> case mCorrector of
+      Just corrector -> do
+        lift $ update subId [ SubmissionRatingBy       =. Just corrector
+                            , SubmissionRatingAssigned =. Just now
+                            ]
+        tell (Set.singleton subId, mempty)
+      Nothing ->
+        tell (mempty, Set.singleton subId)
+  where
+    maximumsBy :: (Ord a, Ord b) => (a -> b) -> Set a -> Set a
+    maximumsBy f xs = flip Set.filter xs $ \x -> maybe True (((==) `on` f) x . maximumBy (comparing f)) $ fromNullable xs
 
 
 submissionFileSource :: SubmissionId -> Source (YesodDB UniWorX) (Entity File)
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 51aa57fd0..b4cd5a572 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -77,6 +77,8 @@ hasEntityUser = hasEntity
 
 makeLenses_ ''SheetCorrector
 
+makeLenses_ ''Load
+
 makeLenses_ ''SubmissionGroup
 
 makeLenses_ ''SheetGrading

From 935fd6d7eb45505aceb951fed57256d36cd13cf3 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 19 May 2019 20:04:22 +0200
Subject: [PATCH 348/519] rename originalIds to keepIds in HtmlHelpers API

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

diff --git a/static/js/services/htmlHelpers.js b/static/js/services/htmlHelpers.js
index ec025dc4b..30477314c 100644
--- a/static/js/services/htmlHelpers.js
+++ b/static/js/services/htmlHelpers.js
@@ -7,7 +7,7 @@
     // Returns an object with `element` being an contextual fragment of the
     // HTML in the response and `ifPrefix` being the prefix that was used to
     // "unique-ify" the ids of the received HTML.
-    // Original Response IDs can optionally be kept by adding `originalIds: true`
+    // Original Response IDs can optionally be kept by adding `keepIds: true`
     // to the `options` object.
     function parseResponse(response, options) {
       options = options || {};
@@ -15,7 +15,7 @@
       return response.text().then(function (responseText) {
         var docFrag = document.createRange().createContextualFragment(responseText);
         var idPrefix;
-        if (!options.originalIds) {
+        if (!options.keepIds) {
           idPrefix = _getIdPrefix();
           _prefixIds(docFrag, idPrefix);
         }
diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index a4b2148e3..3f4f8da56 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -324,7 +324,7 @@
         headers: headers,
         accept: HttpClient.ACCEPT.TEXT_HTML,
       }).then(function(response) {
-        return HtmlHelpers.parseResponse(response, { originalIds: true });
+        return HtmlHelpers.parseResponse(response);
       }).then(function(response) {
         setLocalStorageParameter('currentTableUrl', url.href);
         // reset table

From cfb09b089a0ac8158d23a6729d54acacc5c22685 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 19 May 2019 20:05:15 +0200
Subject: [PATCH 349/519] fix js utils not checking whether element is already
 initialized

---
 static/js/utils/asyncTable.js | 5 +++++
 static/js/utils/checkAll.js   | 4 ++++
 static/js/utils/massInput.js  | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 3f4f8da56..61a8e9cfd 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -48,6 +48,10 @@
         throw new Error('Async Table utility cannot be setup without an element!');
       }
 
+      if (element.classList.contains(ASYNC_TABLE_INITIALIZED_CLASS)) {
+        return false;
+      }
+
       // param asyncTableDbHeader
       if (element.dataset.asyncTableDbHeader !== undefined) {
         asyncTableHeader = element.dataset.asyncTableDbHeader;
@@ -337,6 +341,7 @@
           callback(element);
         }
 
+        element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
         element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
       }).catch(function(err) {
         console.error(err);
diff --git a/static/js/utils/checkAll.js b/static/js/utils/checkAll.js
index 5a15e0ac7..1c207be34 100644
--- a/static/js/utils/checkAll.js
+++ b/static/js/utils/checkAll.js
@@ -30,6 +30,10 @@
         throw new Error('Check All utility cannot be setup without an element!');
       }
 
+      if (element.classList.contains(CHECK_ALL_INITIALIZED_CLASS)) {
+        return false;
+      }
+
       gatherColumns();
       setupCheckAllCheckbox();
 
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 00f873ced..8dbccdca3 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -38,6 +38,10 @@
         throw new Error('Mass Input utility cannot be setup without an element!');
       }
 
+      if (element.classList.contains(MASS_INPUT_INITIALIZED_CLASS)) {
+        return false;
+      }
+
       massInputId = element.dataset.massInputIdent || '_';
       massInputForm = element.closest('form');
 

From cc90faf7320de85fe9ace1b4b9dfc36f4f53fd14 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 19 May 2019 20:07:03 +0200
Subject: [PATCH 350/519] fix: async table js util now knows current random css
 prefix

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

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 61a8e9cfd..174af2f94 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -35,6 +35,7 @@
     var pageLinks = [];
     var pagesizeForm;
     var scrollTable;
+    var cssIdPrefix = '';
 
     var tableFilterInputs = {
       search: [],
@@ -100,7 +101,7 @@
     }
 
     function setupPagination() {
-      var pagination = element.querySelector('#' + asyncTableId + '-pagination');
+      var pagination = element.querySelector('#' + cssIdPrefix + asyncTableId + '-pagination');
       if (pagination) {
         pageLinks = Array.from(pagination.querySelectorAll('.page-link')).map(function(link) {
           return { element: link };
@@ -126,7 +127,7 @@
 
     function setupPageSizeSelect() {
       // pagesize form
-      pagesizeForm = element.querySelector('#' + asyncTableId + '-pagesize-form');
+      pagesizeForm = element.querySelector('#' + cssIdPrefix + asyncTableId + '-pagesize-form');
 
       if (pagesizeForm) {
         var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
@@ -206,9 +207,12 @@
       // focus previously focused input
       if (focusedInput && focusedInput.selectionStart !== null) {
         var selectionStart = focusedInput.selectionStart;
-        var focusId = focusedInput.id;
+        // remove the following part of the id to get rid of the random
+        // (yet somewhat structured) prefix we got from nudging.
+        var matcher = /r\d*?__/;
+        var focusId = focusedInput.id.replace(matcher, '');
         callback = function(wrapper) {
-          var toBeFocused = wrapper.querySelector('#' + focusId);
+          var toBeFocused = wrapper.querySelector('#' + cssIdPrefix + focusId);
           if (toBeFocused) {
             toBeFocused.focus();
             toBeFocused.selectionStart = selectionStart;
@@ -352,7 +356,8 @@
     function updateWrapperContents(response) {
       var newPage = document.createElement('div');
       newPage.appendChild(response.element);
-      var newWrapperContents = newPage.querySelector('#' + element.id);
+      cssIdPrefix = response.idPrefix;
+      var newWrapperContents = newPage.querySelector('#' + cssIdPrefix + element.id);
       element.innerHTML = newWrapperContents.innerHTML;
 
       if (UtilRegistry) {

From 848dc7470a79e200bb48cee505b3f7b6311fb209 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 19 May 2019 20:19:46 +0200
Subject: [PATCH 351/519] Additional testing

---
 models/tutorials                     |  1 +
 src/Handler/Utils/Submission.hs      | 31 +++++++++++++++++++++-------
 test/Handler/Utils/SubmissionSpec.hs | 31 ++++++++++++++++++++++++++--
 test/Model/TypesSpec.hs              | 17 +++++++++++++++
 test/ModelSpec.hs                    | 15 ++++++++++++++
 5 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/models/tutorials b/models/tutorials
index 444d988cd..4961e0bd5 100644
--- a/models/tutorials
+++ b/models/tutorials
@@ -11,6 +11,7 @@ Tutorial json
     deregisterUntil UTCTime Maybe
     lastChanged     UTCTime default=now()
     UniqueTutorial course name
+    deriving Generic
 Tutor
     tutorial    TutorialId
     user        UserId
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 17bcc2b73..9f604afd1 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -94,10 +94,12 @@ assignSubmissions sid restriction = do
     unless (Map.member sid correctors) $
       throwM NoCorrectors
 
-    submissionDataRaw <- E.select . E.from $ \((sheet `E.InnerJoin` submission `E.InnerJoin` submissionUser) `E.LeftOuterJoin` (tutorialUser `E.InnerJoin` tutor)) -> do
-      E.on $ tutor E.?. TutorTutorial E.==. tutorialUser E.?. TutorialParticipantTutorial
+    submissionDataRaw <- E.select . E.from $ \((sheet `E.InnerJoin` submission `E.InnerJoin` submissionUser) `E.LeftOuterJoin` (tutorial `E.InnerJoin` tutorialUser `E.InnerJoin` tutor)) -> do
+      E.on $ tutor E.?. TutorTutorial E.==. tutorial E.?. TutorialId
+      E.on $ tutorialUser E.?. TutorialParticipantTutorial E.==. tutorial E.?. TutorialId
       E.on $ tutorialUser E.?. TutorialParticipantUser E.==. E.just (submissionUser E.^. SubmissionUserUser)
        E.&&. tutor E.?. TutorUser `E.in_` E.justList (E.valList $ foldMap Map.keys correctors)
+       E.&&. tutorial E.?. TutorialCourse E.==. E.just (E.val sheetCourse)
       E.on $ submission E.^. SubmissionId E.==. submissionUser E.^. SubmissionUserSubmission
       E.on $ submission E.^. SubmissionSheet E.==. sheet E.^. SheetId
 
@@ -114,12 +116,15 @@ assignSubmissions sid restriction = do
                           )
       submissionData = Map.fromListWith merge $ map process submissionDataRaw
         where
-          process (E.Value sheetId, Entity subId Submission{..}, E.Value mTutId) = (subId, (submissionRatingBy, maybe Map.empty (flip Map.singleton $ Sum 1) mTutId, sheetId))
+          process (E.Value sheetId, Entity subId Submission{..}, E.Value mTutId) = (subId, (submissionRatingBy, maybe Map.empty (flip Map.singleton $ Sum 1) $ assertM isCorrectorByTutorial mTutId, sheetId))
           merge (corrA, tutorsA, sheetA) (corrB, tutorsB, sheetB)
             | corrA /= corrB   = error "Same submission seen with different correctors"
             | sheetA /= sheetB = error "Same submission seen with different sheets"
             | otherwise        = (corrA, Map.unionWith mappend tutorsA tutorsB, sheetA)
 
+          -- Not done in esqueleto, since inspection of `Load`-Values is difficult
+          isCorrectorByTutorial = maybe False (\Load{..} -> is _Just byTutorial) . flip Map.lookup sheetCorrectors
+
       targetSubmissions = Set.fromList $ do
         (E.Value sheetId, Entity subId Submission{..}, _) <- submissionDataRaw
         guard $ sheetId == sid
@@ -143,7 +148,7 @@ assignSubmissions sid restriction = do
       withSubmissionData f = f <$> (mappend <$> ask <*> State.get)
       
       -- | How many additional submission should the given corrector be assigned, if possible?
-      calculateDeficit :: UserId -> Map SubmissionId (Maybe UserId, Map UserId _, SheetId) -> Integer
+      calculateDeficit :: UserId -> Map SubmissionId (Maybe UserId, Map UserId _, SheetId) -> Rational
       calculateDeficit corrector submissionState = getSum $ foldMap Sum deficitBySheet
         where
           sheetSizes :: Map SheetId Integer
@@ -152,10 +157,10 @@ assignSubmissions sid restriction = do
             (_, (Just _, _, sheetId)) <- Map.toList submissionState
             return (sheetId, Sum 1)
 
-          deficitBySheet :: Map SheetId Integer
+          deficitBySheet :: Map SheetId Rational
           -- ^ Deficite of @corrector@ per sheet
           deficitBySheet = flip Map.mapMaybeWithKey sheetSizes $ \sheetId sheetSize -> do
-            let assigned :: Integer
+            let assigned :: Rational
                 assigned = fromIntegral . Map.size $ Map.filter (\(mCorr, _, sheetId') -> mCorr == Just corrector && sheetId == sheetId') submissionState
                 proportionSum :: Rational
                 proportionSum = getSum . foldMap corrProportion . fromMaybe Map.empty $ correctors !? sheetId
@@ -172,13 +177,16 @@ assignSubmissions sid restriction = do
                         return . negate . fromIntegral . Map.size $ Map.filter (\(mCorr, tutors, sheetId') -> mCorr == Just corrector && sheetId == sheetId' && Map.member corrector tutors) submissionState
                     , fromMaybe 0 $ do
                         guard $ corrState /= CorrectorExcused
-                        return . negate . floor $ (byProportion / proportionSum) * fromIntegral sheetSize
+                        return . negate $ (byProportion / proportionSum) * fromIntegral sheetSize
                     ] 
                   | otherwise
                   = assigned
             return $ negate extra
 
-    targetSubmissions' <- liftIO . Rand.shuffleM $ Set.toList targetSubmissions
+    -- Sort target submissions by those that have tutors first and otherwise random
+    --
+    -- Deficit produced by restriction to tutors can thus be fixed by later submissions
+    targetSubmissions' <- liftIO . unstableSortBy (comparing $ \subId -> Map.null . view _2 $ submissionData ! subId) $ Set.toList targetSubmissions
 
     (newSubmissionData, ()) <- (\act -> execRWST act oldSubmissionData targetSubmissionData) . forM_ targetSubmissions' $ \subId -> do
       tutors <- gets $ view _2 . (! subId) -- :: Map UserId (Sum Natural)
@@ -197,6 +205,10 @@ assignSubmissions sid restriction = do
             & maximumsBy (deficits !)
             & maximumsBy (tutors !?)
 
+        $logDebugS "assignSubmissions" [st|Tutors for #{tshow subId}: #{tshow tutors}|]
+        $logDebugS "assignSubmissions" [st|Current (#{tshow subId}) relevant deficits: #{tshow deficits}|]
+        $logDebugS "assignSubmissions" [st|Assigning #{tshow subId} to one of #{tshow bestCorrectors}|]
+
         ix subId . _1 <~ Just <$> liftIO (Rand.uniform bestCorrectors)
 
     now <- liftIO getCurrentTime
@@ -212,6 +224,9 @@ assignSubmissions sid restriction = do
     maximumsBy :: (Ord a, Ord b) => (a -> b) -> Set a -> Set a
     maximumsBy f xs = flip Set.filter xs $ \x -> maybe True (((==) `on` f) x . maximumBy (comparing f)) $ fromNullable xs
 
+    unstableSortBy :: MonadRandom m => (a -> a -> Ordering) -> [a] -> m [a]
+    unstableSortBy cmp = fmap concat . mapM Rand.shuffleM . groupBy (\a b -> cmp a b == EQ) . sortBy cmp
+
 
 submissionFileSource :: SubmissionId -> Source (YesodDB UniWorX) (Entity File)
 submissionFileSource = E.selectSource . fmap snd . E.from . submissionFileQuery
diff --git a/test/Handler/Utils/SubmissionSpec.hs b/test/Handler/Utils/SubmissionSpec.hs
index 995ae63d5..e25a087fb 100644
--- a/test/Handler/Utils/SubmissionSpec.hs
+++ b/test/Handler/Utils/SubmissionSpec.hs
@@ -21,6 +21,8 @@ import Control.Monad.Random.Class
 
 import Database.Persist.Sql (fromSqlKey)
 
+import qualified Database.Esqueleto as E
+
 
 userNumber :: TVar Natural
 userNumber = unsafePerformIO $ newTVarIO 1
@@ -57,8 +59,8 @@ distributionExample mkParameters setupHook cont = do
     participants <- makeUsers subsN
     correctors <- makeUsers correctorsN
 
-    situations <- forM steps $ \(subsN', loads) -> do
-      sheet <- liftIO $ generate arbitrary <&> \s -> s { sheetCourse = cid }
+    situations <- forM (zip [1..] steps) $ \(i, (subsN', loads)) -> do
+      sheet <- liftIO $ generate arbitrary <&> \s -> s { sheetName = CI.mk $ "Sheet " <> tshow (i :: Integer), sheetCourse = cid }
       sid <- insert sheet
 
       participants' <- liftIO $ take (fromIntegral subsN') <$> shuffleM participants
@@ -133,3 +135,28 @@ spec = withApp . describe "Submission distribution" $ do
           countResult `shouldNotSatisfy` Map.member Nothing
           countResult' `shouldSatisfy` all (\(Just (_, prop), subsSet) -> (== 50 * prop) $ fromIntegral subsSet) . Map.toList
       )
+  it "handles tutorials with proportion" $ do
+    ns <- liftIO . replicateM 5 . fmap fromInteger $ getRandomR (0, 100)
+    let ns' = ns ++ [500 - sum ns]
+        loads = replicate 6 (Just $ Load Nothing 1) ++ replicate 2 (Just $ Load Nothing 2)
+    distributionExample
+      (return [ (n, loads) | n <- ns' ])
+      (\subs corrs -> do
+          tutSubmissions <- liftIO $ getRandomR (1,500)
+          subs' <- liftIO $ shuffleM subs
+          forM_ (take tutSubmissions subs') $ \(Entity subId Submission{..}) -> do
+            Entity _ SheetCorrector{..} <- liftIO $ uniform corrs
+            Sheet{..} <- getJust submissionSheet
+            tut <- liftIO $ generate arbitrary <&> \c -> c { tutorialName = CI.mk $ "Tut for " <> tshow (fromSqlKey subId), tutorialCourse = sheetCourse }
+            tutId <- insert tut
+            void . insert $ Tutor tutId sheetCorrectorUser
+            E.insertSelect . E.from $ \submissionUser -> do
+              E.where_ $ submissionUser E.^. SubmissionUserSubmission E.==. E.val subId
+              return $ TutorialParticipant E.<# E.val tutId E.<&> (submissionUser E.^. SubmissionUserUser)
+      )
+      (\result -> do
+          let countResult = Map.map Set.size result
+              countResult' = Map.mapKeysWith (+) (fmap $ \SheetCorrector{..} -> (fromSqlKey sheetCorrectorUser, byProportion sheetCorrectorLoad)) countResult
+          countResult `shouldNotSatisfy` Map.member Nothing
+          countResult' `shouldSatisfy` all (\(Just (_, prop), subsSet) -> (== 50 * prop) $ fromIntegral subsSet) . Map.toList
+      )
diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index 354ef20e6..ad74f5831 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -21,6 +21,8 @@ import Text.Blaze.Renderer.Text
 
 import qualified Data.Set as Set
 
+import Time.Types (WeekDay(..))
+
 
 instance (Arbitrary a, MonoFoldable a) => Arbitrary (NonNull a) where
   arbitrary = arbitrary `suchThatMap` fromNullable
@@ -193,6 +195,21 @@ instance {-# OVERLAPPABLE #-} ToBackendKey SqlBackend record => Arbitrary (Key r
 instance Arbitrary Html where
   arbitrary = (preEscapedToHtml :: String -> Html) . getPrintableString <$> arbitrary
   shrink = map preEscapedToHtml . shrink . renderMarkup
+
+instance Arbitrary WeekDay where
+  arbitrary = oneof $ map pure [minBound..maxBound]
+
+instance Arbitrary OccurenceSchedule where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary OccurenceException where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary Occurences where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
   
 
 spec :: Spec
diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs
index f530ec26a..e5fbdb9c3 100644
--- a/test/ModelSpec.hs
+++ b/test/ModelSpec.hs
@@ -54,6 +54,21 @@ instance Arbitrary Sheet where
     <*> arbitrary
   shrink = genericShrink
 
+instance Arbitrary Tutorial where
+  arbitrary = Tutorial
+    <$> (CI.mk . pack . getPrintableString <$> arbitrary)
+    <*> arbitrary
+    <*> (CI.mk . pack . getPrintableString <$> arbitrary)
+    <*> (fmap getPositive <$> arbitrary)
+    <*> (pack . getPrintableString <$> arbitrary)
+    <*> arbitrary
+    <*> (fmap (CI.mk . pack . getPrintableString) <$> arbitrary)
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+    <*> arbitrary
+  shrink = genericShrink
+
 instance Arbitrary User where
   arbitrary = do
     userIdent <- CI.mk . pack <$> oneof

From 7deba8132004626fe4c2ea7b9efa176caf59c03b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 00:06:15 +0200
Subject: [PATCH 352/519] Additional testing

---
 package.yaml                         |  1 +
 src/Handler/Utils/Submission.hs      |  8 +++---
 test/Handler/Utils/SubmissionSpec.hs | 41 +++++++++++++++++++++++++---
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/package.yaml b/package.yaml
index 098fb0bec..417b74e26 100644
--- a/package.yaml
+++ b/package.yaml
@@ -243,6 +243,7 @@ tests:
       - uniworx
       - hspec >=2.0.0
       - QuickCheck
+      - HUnit
       - yesod-test
       - conduit-extra
       - quickcheck-classes
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 9f604afd1..8fededf3f 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -188,7 +188,7 @@ assignSubmissions sid restriction = do
     -- Deficit produced by restriction to tutors can thus be fixed by later submissions
     targetSubmissions' <- liftIO . unstableSortBy (comparing $ \subId -> Map.null . view _2 $ submissionData ! subId) $ Set.toList targetSubmissions
 
-    (newSubmissionData, ()) <- (\act -> execRWST act oldSubmissionData targetSubmissionData) . forM_ targetSubmissions' $ \subId -> do
+    (newSubmissionData, ()) <- (\act -> execRWST act oldSubmissionData targetSubmissionData) . forM_ (zip [1..] targetSubmissions') $ \(i, subId) -> do
       tutors <- gets $ view _2 . (! subId) -- :: Map UserId (Sum Natural)
       let acceptableCorrectors
             | correctorsByTut <- Map.filter (is _Just . view _byTutorial) $ sheetCorrectors `Map.restrictKeys` Map.keysSet tutors
@@ -205,9 +205,9 @@ assignSubmissions sid restriction = do
             & maximumsBy (deficits !)
             & maximumsBy (tutors !?)
 
-        $logDebugS "assignSubmissions" [st|Tutors for #{tshow subId}: #{tshow tutors}|]
-        $logDebugS "assignSubmissions" [st|Current (#{tshow subId}) relevant deficits: #{tshow deficits}|]
-        $logDebugS "assignSubmissions" [st|Assigning #{tshow subId} to one of #{tshow bestCorrectors}|]
+        $logDebugS "assignSubmissions" [st|#{tshow i} Tutors for #{tshow subId}: #{tshow tutors}|]
+        $logDebugS "assignSubmissions" [st|#{tshow i} Current (#{tshow subId}) relevant deficits: #{tshow deficits}|]
+        $logDebugS "assignSubmissions" [st|#{tshow i} Assigning #{tshow subId} to one of #{tshow bestCorrectors}|]
 
         ix subId . _1 <~ Just <$> liftIO (Rand.uniform bestCorrectors)
 
diff --git a/test/Handler/Utils/SubmissionSpec.hs b/test/Handler/Utils/SubmissionSpec.hs
index e25a087fb..4caeba5fa 100644
--- a/test/Handler/Utils/SubmissionSpec.hs
+++ b/test/Handler/Utils/SubmissionSpec.hs
@@ -3,11 +3,13 @@ module Handler.Utils.SubmissionSpec where
 import qualified Yesod
 
 import TestImport
+-- import qualified Test.HUnit.Base as HUnit
 
 import Handler.Utils.Submission
 import ModelSpec ()
 
 import qualified Data.Set as Set
+import Data.Map ((!?))
 import qualified Data.Map as Map
 
 import Data.List (genericLength)
@@ -19,10 +21,12 @@ import System.IO.Unsafe
 import System.Random.Shuffle
 import Control.Monad.Random.Class
 
-import Database.Persist.Sql (fromSqlKey)
+import Database.Persist.Sql (toSqlKey, fromSqlKey)
 
 import qualified Database.Esqueleto as E
 
+-- import Data.Maybe (fromJust)
+
 
 userNumber :: TVar Natural
 userNumber = unsafePerformIO $ newTVarIO 1
@@ -135,10 +139,27 @@ spec = withApp . describe "Submission distribution" $ do
           countResult `shouldNotSatisfy` Map.member Nothing
           countResult' `shouldSatisfy` all (\(Just (_, prop), subsSet) -> (== 50 * prop) $ fromIntegral subsSet) . Map.toList
       )
+  it "follows non-constant cumulative distribution over multiple sheets" $ do
+    let ns = replicate 4 100
+        loads = do
+          (onesBefore, onesAfter) <- zip [0,2..6] [6,4..0]
+          return $ replicate onesBefore (Just $ Load Nothing 1)
+                ++ replicate 2          (Just $ Load Nothing 2)
+                ++ replicate onesAfter  (Just $ Load Nothing 1)
+    distributionExample
+      (return $ zip ns loads)
+      (\_ _ -> return ())
+      (\result -> do
+          let countResult = Map.map Set.size result
+              countResult' = Map.mapKeysWith (+) (fmap $ \SheetCorrector{..} -> fromSqlKey sheetCorrectorUser) countResult
+          countResult `shouldNotSatisfy` Map.member Nothing
+          countResult' `shouldSatisfy` all (\(Just _, subsSet) -> subsSet == 50) . Map.toList
+      )
   it "handles tutorials with proportion" $ do
     ns <- liftIO . replicateM 5 . fmap fromInteger $ getRandomR (0, 100)
     let ns' = ns ++ [500 - sum ns]
-        loads = replicate 6 (Just $ Load Nothing 1) ++ replicate 2 (Just $ Load Nothing 2)
+        loads = replicate 6 (Just $ Load (Just True) 1) ++ replicate 2 (Just $ Load (Just True) 2)
+    tutSubIds <- liftIO $ newTVarIO Map.empty
     distributionExample
       (return [ (n, loads) | n <- ns' ])
       (\subs corrs -> do
@@ -146,6 +167,7 @@ spec = withApp . describe "Submission distribution" $ do
           subs' <- liftIO $ shuffleM subs
           forM_ (take tutSubmissions subs') $ \(Entity subId Submission{..}) -> do
             Entity _ SheetCorrector{..} <- liftIO $ uniform corrs
+            atomically . modifyTVar tutSubIds . Map.insertWith mappend sheetCorrectorUser $ Set.singleton subId
             Sheet{..} <- getJust submissionSheet
             tut <- liftIO $ generate arbitrary <&> \c -> c { tutorialName = CI.mk $ "Tut for " <> tshow (fromSqlKey subId), tutorialCourse = sheetCourse }
             tutId <- insert tut
@@ -157,6 +179,17 @@ spec = withApp . describe "Submission distribution" $ do
       (\result -> do
           let countResult = Map.map Set.size result
               countResult' = Map.mapKeysWith (+) (fmap $ \SheetCorrector{..} -> (fromSqlKey sheetCorrectorUser, byProportion sheetCorrectorLoad)) countResult
-          countResult `shouldNotSatisfy` Map.member Nothing
-          countResult' `shouldSatisfy` all (\(Just (_, prop), subsSet) -> (== 50 * prop) $ fromIntegral subsSet) . Map.toList
+          tutSubIds' <- liftIO $ readTVarIO tutSubIds
+
+          countResult' `shouldNotSatisfy` Map.member Nothing
+          countResult' `shouldSatisfy` all (\(Just (corr, prop), subsSet) -> fromIntegral subsSet <= max (50 * prop) (maybe 0 (fromIntegral . Set.size) $ tutSubIds' !? toSqlKey corr)) . Map.toList
+          
+          -- -- Does not currently work, because `User`s are reused within `distributionExample`, so submissions end up having more associated course-tutors, because the same user might be a member of a tutorial created for another submission
+          -- 
+          -- let subs = fold tutSubIds'
+          -- forM_ subs $ \subId -> do
+          --   let tutors = Map.keysSet $ Map.filter (Set.member subId) tutSubIds'
+          --       assignedTo = Set.map (sheetCorrectorUser . fromJust) . Map.keysSet $ Map.filter (Set.member subId) result
+          --   HUnit.assertEqual ("Submission " <> show (fromSqlKey subId) <> " assigned to multiple correctors") 1 $ Set.size assignedTo
+          --   HUnit.assertEqual ("Submission " <> show (fromSqlKey subId) <> " assigned to non-tutors (" <> show (Set.map fromSqlKey tutors) <> ")") Set.empty (Set.map fromSqlKey $ assignedTo `Set.difference` tutors)
       )

From 95ac8846aa466577b2dcebf8fe5afbb262c61ebb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 00:14:21 +0200
Subject: [PATCH 353/519] Percent-encode Alerts header

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

diff --git a/src/Foundation.hs b/src/Foundation.hs
index b1a1f6b97..0d18ad4d5 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1114,7 +1114,7 @@ instance Yesod UniWorX where
 
           lift . bracketOnError getMessages (mapM_ $ uncurry Yesod.addMessage) $ \msgs -> do
             Just msgs' <- return . forM msgs $ \(msgState, content) -> Message <$> fromPathPiece msgState <*> return content
-            addCustomHeader HeaderAlerts . decodeUtf8 $ JSON.encode msgs'
+            addCustomHeader HeaderAlerts . decodeUtf8 . urlEncode True . toStrict $ JSON.encode msgs'
 
     -- Since we implement `errorHandler` ourselves we don't need `defaultMessageWidget`
     defaultMessageWidget _title _body = error "defaultMessageWidget: undefined"

From 10b34b9915b3298ef6cfcbdd0bc3a75123bc0d7e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 14:07:25 +0200
Subject: [PATCH 354/519] Bump ChangeLog

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

diff --git a/ChangeLog.md b/ChangeLog.md
index 9f07bd783..64cf0b8f7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+  * Version 20.05.2019
+  
+    Komplett überarbeitete Funktionalität zur automatischen Verteilung von Korrekturen
+
   * Version 13.05.2019
   
     Kursverwalter können Teilnehmer hinzufügen

From 0c1c647189904bfa9a78e85c22d74f685761729e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 14:10:12 +0200
Subject: [PATCH 355/519] Handle AssignSubmissionException in correctionsR

Fix #382
---
 messages/uniworx/de.msg                             |  4 ++++
 src/Handler/Corrections.hs                          | 13 ++++++++++++-
 src/Handler/Utils/Submission.hs                     |  2 +-
 templates/messages/submissionsAssignNotFound.hamlet |  4 ++++
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 templates/messages/submissionsAssignNotFound.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 70f005dfc..1ab2e4bf5 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -394,6 +394,10 @@ UpdatedAssignedCorrectorsAuto num@Int64: #{display num} Abgaben wurden unter den
 CouldNotAssignCorrectorsAuto num@Int64: #{display num} Abgaben konnten nicht automatisch zugewiesen werden:
 SelfCorrectors num@Int64: #{display num} Abgaben wurden Abgebenden als eigenem Korrektor zugeteilt!
 
+AssignSubmissionExceptionNoCorrectors: Es sind keine Korrektoren eingestellt
+AssignSubmissionExceptionNoCorrectorsByProportion: Es sind keine Korrektoren mit Anteil ungleich Null eingestellt
+AssignSubmissionExceptionSubmissionsNotFound n@Int: #{tshow n} Abgaben konnten nicht gefunden werden
+
 
 CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
 NoCorrectionsUploaded: In der hochgeladenen Datei wurden keine Korrekturen gefunden.
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 78b5d187a..ca358a335 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -432,7 +432,18 @@ correctionsR whereClause displayColumns dbtFilterUI psValidator actions = do
       redirect currentRoute
     FormSuccess (CorrAutoSetCorrectorData shid, subs') -> do
       subs <- mapM decrypt $ Set.toList subs'
-      runDB $ do
+      let
+        assignExceptions :: AssignSubmissionException -> Handler ()
+        assignExceptions NoCorrectors = addMessageI Error MsgAssignSubmissionExceptionNoCorrectors
+        assignExceptions NoCorrectorsByProportion = addMessageI Error MsgAssignSubmissionExceptionNoCorrectorsByProportion
+        assignExceptions (SubmissionsNotFound subIds) = do
+          subCIDs <- mapM encrypt . Set.toList $ toNullable subIds :: Handler [CryptoFileNameSubmission]
+          let errorModal = msgModal
+                [whamlet|_{MsgAssignSubmissionExceptionSubmissionsNotFound (length subCIDs)}|]
+                (Right $(widgetFile "messages/submissionsAssignNotFound"))
+          addMessageWidget Error errorModal
+                
+      handle assignExceptions . runDB $ do
         alreadyAssigned <- selectList [SubmissionId <-. subs, SubmissionRatingBy !=. Nothing] []
         unless (null alreadyAssigned) $ do
           mr <- (toHtml . ) <$> getMessageRender
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 8fededf3f..be6745a6a 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -57,7 +57,7 @@ import qualified Control.Monad.Catch as E (Handler(..))
 data AssignSubmissionException = NoCorrectors
                                | NoCorrectorsByProportion
                                | SubmissionsNotFound (NonNull (Set SubmissionId))
-  deriving (Typeable, Show)
+  deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 instance Exception AssignSubmissionException
 
diff --git a/templates/messages/submissionsAssignNotFound.hamlet b/templates/messages/submissionsAssignNotFound.hamlet
new file mode 100644
index 000000000..570e81459
--- /dev/null
+++ b/templates/messages/submissionsAssignNotFound.hamlet
@@ -0,0 +1,4 @@
+<h2>_{MsgAssignSubmissionExceptionSubmissionsNotFound (length subCIDs)}
+<ul>
+  $forall cID <- subCIDs
+    <li><pre>#{toPathPiece cID}

From 88b91108650ba2978858b4a57032ad79101d9f8a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 14:23:15 +0200
Subject: [PATCH 356/519] Make test produce fewer false negatives

---
 test/Handler/Utils/SubmissionSpec.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/Handler/Utils/SubmissionSpec.hs b/test/Handler/Utils/SubmissionSpec.hs
index 4caeba5fa..763c40b14 100644
--- a/test/Handler/Utils/SubmissionSpec.hs
+++ b/test/Handler/Utils/SubmissionSpec.hs
@@ -163,7 +163,7 @@ spec = withApp . describe "Submission distribution" $ do
     distributionExample
       (return [ (n, loads) | n <- ns' ])
       (\subs corrs -> do
-          tutSubmissions <- liftIO $ getRandomR (1,500)
+          tutSubmissions <- liftIO $ getRandomR (1,50)
           subs' <- liftIO $ shuffleM subs
           forM_ (take tutSubmissions subs') $ \(Entity subId Submission{..}) -> do
             Entity _ SheetCorrector{..} <- liftIO $ uniform corrs
@@ -179,10 +179,8 @@ spec = withApp . describe "Submission distribution" $ do
       (\result -> do
           let countResult = Map.map Set.size result
               countResult' = Map.mapKeysWith (+) (fmap $ \SheetCorrector{..} -> (fromSqlKey sheetCorrectorUser, byProportion sheetCorrectorLoad)) countResult
-          tutSubIds' <- liftIO $ readTVarIO tutSubIds
-
           countResult' `shouldNotSatisfy` Map.member Nothing
-          countResult' `shouldSatisfy` all (\(Just (corr, prop), subsSet) -> fromIntegral subsSet <= max (50 * prop) (maybe 0 (fromIntegral . Set.size) $ tutSubIds' !? toSqlKey corr)) . Map.toList
+          countResult' `shouldSatisfy` all (\(Just (corr, prop), subsSet) -> fromIntegral subsSet == 50 * prop) . Map.toList
           
           -- -- Does not currently work, because `User`s are reused within `distributionExample`, so submissions end up having more associated course-tutors, because the same user might be a member of a tutorial created for another submission
           -- 

From 8152b3b5cab0b091d2c4b3d60cbe207f3fbd5315 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 14:37:52 +0200
Subject: [PATCH 357/519] fix tests

---
 test/Handler/Utils/SubmissionSpec.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/Handler/Utils/SubmissionSpec.hs b/test/Handler/Utils/SubmissionSpec.hs
index 763c40b14..32aba67df 100644
--- a/test/Handler/Utils/SubmissionSpec.hs
+++ b/test/Handler/Utils/SubmissionSpec.hs
@@ -9,7 +9,6 @@ import Handler.Utils.Submission
 import ModelSpec ()
 
 import qualified Data.Set as Set
-import Data.Map ((!?))
 import qualified Data.Map as Map
 
 import Data.List (genericLength)
@@ -21,7 +20,7 @@ import System.IO.Unsafe
 import System.Random.Shuffle
 import Control.Monad.Random.Class
 
-import Database.Persist.Sql (toSqlKey, fromSqlKey)
+import Database.Persist.Sql (fromSqlKey)
 
 import qualified Database.Esqueleto as E
 
@@ -180,7 +179,7 @@ spec = withApp . describe "Submission distribution" $ do
           let countResult = Map.map Set.size result
               countResult' = Map.mapKeysWith (+) (fmap $ \SheetCorrector{..} -> (fromSqlKey sheetCorrectorUser, byProportion sheetCorrectorLoad)) countResult
           countResult' `shouldNotSatisfy` Map.member Nothing
-          countResult' `shouldSatisfy` all (\(Just (corr, prop), subsSet) -> fromIntegral subsSet == 50 * prop) . Map.toList
+          countResult' `shouldSatisfy` all (\(Just (_, prop), subsSet) -> fromIntegral subsSet == 50 * prop) . Map.toList
           
           -- -- Does not currently work, because `User`s are reused within `distributionExample`, so submissions end up having more associated course-tutors, because the same user might be a member of a tutorial created for another submission
           -- 

From aa7f451a81a5e37f12ef5d0a43d8d702fdfb9a8a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 15:22:41 +0200
Subject: [PATCH 358/519] Adjust JSON-Encoding of UploadMode to avoid migration

---
 src/Model/Types/Sheet.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Model/Types/Sheet.hs b/src/Model/Types/Sheet.hs
index 6ec4ae4f0..426e375c5 100644
--- a/src/Model/Types/Sheet.hs
+++ b/src/Model/Types/Sheet.hs
@@ -250,7 +250,9 @@ defaultExtensionRestriction :: Maybe (NonNull (Set Extension))
 defaultExtensionRestriction = fromNullable $ Set.fromList ["txt", "pdf"]
 
 deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece
+  { constructorTagModifier = \c -> if
+      | c == "UploadAny" -> "upload"
+      | otherwise        -> camelToPathPiece c
   , fieldLabelModifier = camelToPathPiece
   , sumEncoding = TaggedObject "mode" "settings"
   , omitNothingFields = True

From e2315dd28eb9ad1750f85ed66bb02ec61cdac446 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 18:22:53 +0200
Subject: [PATCH 359/519] Fix sheetForm

---
 messages/uniworx/de.msg   |  1 +
 src/Handler/Utils/Form.hs |  6 +++---
 src/Utils/Form.hs         | 33 +++++++++++++++++++++------------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 1ab2e4bf5..d7a6a484b 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -525,6 +525,7 @@ UploadModeUnpackZipsTip: Wenn die Abgabe mehrerer Dateien erlaubt ist, werden au
 
 UploadModeExtensionRestriction: Zulässige Dateiendungen
 UploadModeExtensionRestrictionTip: Komma-separiert. Wenn keine Dateiendungen angegeben werden erfolgt keine Einschränkung.
+UploadModeExtensionRestrictionEmpty: Liste von zulässigen Dateiendungen darf nicht leer sein
 
 UploadSpecificFiles: Vorgegebene Dateinamen
 NoUploadSpecificFilesConfigured: Wenn der Abgabemodus vorgegebene Dateinamen vorsieht, muss mindestens ein vorgegebener Dateiname konfiguriert werden.
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index a9dbe1ede..12fdc847c 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -359,15 +359,15 @@ uploadModeForm prev = multiActionA actions (fslI MsgSheetUploadMode) (classifyUp
       , ( UploadModeAny
         , UploadAny
           <$> apreq checkBoxField (fslI MsgUploadModeUnpackZips & setTooltip MsgUploadModeUnpackZipsTip) (prev ^? _Just . _unpackZips)
-          <*> apreq extensionRestrictionField (fslI MsgUploadModeExtensionRestriction & setTooltip MsgUploadModeExtensionRestrictionTip) ((prev ^? _Just . _extensionRestriction) <|> fmap Just defaultExtensionRestriction)
+          <*> aopt extensionRestrictionField (fslI MsgUploadModeExtensionRestriction & setTooltip MsgUploadModeExtensionRestrictionTip) ((prev ^? _Just . _extensionRestriction) <|> fmap Just defaultExtensionRestriction)
         )
       , ( UploadModeSpecific
         , UploadSpecific <$> specificFileForm
         )
       ]
   
-    extensionRestrictionField :: Field Handler (Maybe (NonNull (Set Extension)))
-    extensionRestrictionField = convertField (fromNullable . toSet) (maybe "" $ intercalate ", " . Set.toList . toNullable) textField
+    extensionRestrictionField :: Field Handler (NonNull (Set Extension))
+    extensionRestrictionField = checkMMap (return . maybe (Left MsgUploadModeExtensionRestrictionEmpty) Right . fromNullable . toSet) (intercalate ", " . Set.toList . toNullable) textField
       where
         toSet = Set.fromList . filter (not . Text.null) . map (stripDot . Text.strip) . Text.splitOn ","
         stripDot ext
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index c2797980d..2c04192ec 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -690,23 +690,32 @@ mforced Field{..} FieldSettings{..} val = do
 
 aforced :: (RenderMessage site FormMessage, HandlerSite m ~ site, MonadHandler m)
         => Field m a -> FieldSettings site -> a -> AForm m a
-aforced field settings val = formToAForm $ second pure <$> mforced field settings val
-
-apreq :: (RenderMessage site FormMessage, HandlerSite m ~ site, MonadHandler m)
-      => Field m a -> FieldSettings site -> Maybe a -> AForm m a
--- ^ Pseudo required
-apreq f fs mx = formToAForm $ do
-  mr <- getMessageRender
-  over _1 (maybe (FormFailure [mr MsgValueRequired]) return =<<) . over _2 (pure . (\fv -> fv { fvRequired = True } )) <$> mopt f fs (Just <$> mx)
+aforced field settings val = formToAForm $ over _2 pure <$> mforced field settings val
 
 mpreq :: (RenderMessage site FormMessage, HandlerSite m ~ site, MonadHandler m)
       => Field m a -> FieldSettings site -> Maybe a -> MForm m (FormResult a, FieldView site)
+-- ^ Pseudo required
+--
+-- `FieldView` has `fvRequired` set to `True` and @FormSuccess Nothing@ is cast to `FormFailure`.
+-- Otherwise acts exactly like `mopt`.
 mpreq f fs mx = do
   mr <- getMessageRender
-  over _1 (maybe (FormFailure [mr MsgValueRequired]) return =<<) . over _2 (\fv -> fv { fvRequired = True } ) <$> mopt f fs (Just <$> mx)
+  (res, fv) <- mopt f fs (Just <$> mx)
+  let fv' = fv { fvRequired = True }
+  return $ case res of
+    FormSuccess (Just res')
+      -> (FormSuccess res', fv')
+    FormSuccess Nothing
+      -> (FormFailure [mr MsgValueRequired], fv' { fvErrors = Just . toHtml $ mr MsgValueRequired })
+    FormFailure errs
+      -> (FormFailure errs, fv')
+    FormMissing
+      -> (FormMissing, fv')
+
+apreq :: (RenderMessage site FormMessage, HandlerSite m ~ site, MonadHandler m)
+      => Field m a -> FieldSettings site -> Maybe a -> AForm m a
+apreq f fs mx = formToAForm $ over _2 pure <$> mpreq f fs mx
 
 wpreq :: (RenderMessage site FormMessage, HandlerSite m ~ site, MonadHandler m)
       => Field m a -> FieldSettings site -> Maybe a -> WForm m (FormResult a)
-wpreq f fs mx = mFormToWForm $ do
-  mr <- getMessageRender
-  over _1 (maybe (FormFailure [mr MsgValueRequired]) return =<<) . over _2 (\fv -> fv { fvRequired = True } ) <$> mopt f fs (Just <$> mx)
+wpreq f fs mx = mFormToWForm $ mpreq f fs mx

From c8f4a6f5281396e2010b134b547f395247f2f9f4 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 20 May 2019 23:07:40 +0200
Subject: [PATCH 360/519] take id nudging in async table into account

---
 static/js/utils/asyncTable.js | 40 +++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 174af2f94..8877c7991 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -58,7 +58,9 @@
         asyncTableHeader = element.dataset.asyncTableDbHeader;
       }
 
-      asyncTableId = element.querySelector('table').id;
+      var rawTableId = element.querySelector('table').id;
+      cssIdPrefix = findCssIdPrefix(rawTableId);
+      asyncTableId = rawTableId.replace(cssIdPrefix, '');
 
       // find scrolltable wrapper
       scrollTable = element.querySelector(ASYNC_TABLE_SCROLLTABLE_SELECTOR);
@@ -209,10 +211,11 @@
         var selectionStart = focusedInput.selectionStart;
         // remove the following part of the id to get rid of the random
         // (yet somewhat structured) prefix we got from nudging.
-        var matcher = /r\d*?__/;
-        var focusId = focusedInput.id.replace(matcher, '');
+        var prefix = findCssIdPrefix(focusedInput.id);
+        var focusId = focusedInput.id.replace(prefix, '');
         callback = function(wrapper) {
-          var toBeFocused = wrapper.querySelector('#' + cssIdPrefix + focusId);
+          var idPrefix = getLocalStorageParameter('cssIdPrefix');
+          var toBeFocused = wrapper.querySelector('#' + idPrefix + focusId);
           if (toBeFocused) {
             toBeFocused.focus();
             toBeFocused.selectionStart = selectionStart;
@@ -341,14 +344,18 @@
         // update table with new
         updateWrapperContents(response);
 
-        if (callback && typeof callback === 'function') {
-          callback(element);
+        if (UtilRegistry) {
+          UtilRegistry.setupAll(element);
         }
 
-        element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
-        element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
+        if (callback && typeof callback === 'function') {
+          setLocalStorageParameter('cssIdPrefix', response.idPrefix);
+          callback(element);
+          setLocalStorageParameter('cssIdPrefix', '');
+        }
       }).catch(function(err) {
         console.error(err);
+      }).finally(function() {
         element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
       });
     }
@@ -356,18 +363,23 @@
     function updateWrapperContents(response) {
       var newPage = document.createElement('div');
       newPage.appendChild(response.element);
-      cssIdPrefix = response.idPrefix;
-      var newWrapperContents = newPage.querySelector('#' + cssIdPrefix + element.id);
+      var newWrapperContents = newPage.querySelector('#' + response.idPrefix + element.id);
       element.innerHTML = newWrapperContents.innerHTML;
-
-      if (UtilRegistry) {
-        UtilRegistry.setupAll(element);
-      }
     }
 
     return init();
   };
 
+  // returns any random nudged prefix found in the given id
+  function findCssIdPrefix(id) {
+    var matcher = /r\d*?__/;
+    var maybePrefix = id.match(matcher);
+    if (maybePrefix && maybePrefix[0]) {
+      return maybePrefix[0]
+    }
+    return '';
+  }
+
   function setLocalStorageParameter(key, value) {
     var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
     if (value !== null) {

From 283ad9c42107ff2e3f41cd10bcbee98da463e1fa Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 23:24:18 +0200
Subject: [PATCH 361/519] Make modal-ids always css-compatible

---
 src/Utils/Frontend/Modal.hs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Utils/Frontend/Modal.hs b/src/Utils/Frontend/Modal.hs
index dd83497ea..f5ddbf67a 100644
--- a/src/Utils/Frontend/Modal.hs
+++ b/src/Utils/Frontend/Modal.hs
@@ -11,8 +11,8 @@ import Utils.Route
 
 import Settings (widgetFile)
 
-import Control.Monad.Random.Class (MonadRandom(..))
-import qualified Data.UUID as UUID
+import Control.Monad.Random.Class (uniform)
+import Control.Monad.Trans.Random (evalRandTIO)
 
 
 data Modal site = Modal
@@ -47,8 +47,17 @@ msgModal :: WidgetT site IO ()
          -> Either (SomeRoute site) (WidgetT site IO ())
          -> WidgetT site IO ()
 msgModal modalTrigger' modalContent = do
-  modalTriggerId <- Just . UUID.toText <$> liftIO getRandom
-  modalId <- Just . UUID.toText <$> liftIO getRandom
+  let
+    randomIdentifier :: MonadIO m => m Text
+    -- ^ Generates valid CSS-Identifiers with roughly 128 bits of entropy
+    --
+    -- See https://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+    randomIdentifier = fmap pack . evalRandTIO $ do
+      prefix <- uniform $ ['a'..'z'] ++ ['A'..'Z'] ++ ['0'..'9']
+      suffix <- replicateM 21 . uniform $ ['a'..'z'] ++ ['A'..'Z']
+      return $ prefix : suffix
+  modalTriggerId <- Just <$> randomIdentifier
+  modalId <- Just <$> randomIdentifier
   customModal Modal{..}
   where
     modalTrigger mRoute triggerId = $(widgetFile "widgets/modal/trigger")

From 7e650c59338bd446ca7f502b2e95ffb2c9186034 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 20 May 2019 23:24:57 +0200
Subject: [PATCH 362/519] URI-decode alerts header in frontend

---
 static/js/utils/alerts.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/js/utils/alerts.js b/static/js/utils/alerts.js
index 52f620d12..427e38373 100644
--- a/static/js/utils/alerts.js
+++ b/static/js/utils/alerts.js
@@ -160,7 +160,8 @@
       var alerts;
       for (var header of response.headers) {
         if (header[0] === 'alerts') {
-          alerts = JSON.parse(header[1]);
+          var decodedHeader = decodeURIComponent(header[1]);
+          alerts = JSON.parse(decodedHeader);
           break;
         }
       }

From 91b8a903daaf3ea0282316a9434a50754f5c6449 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 20 May 2019 23:35:33 +0200
Subject: [PATCH 363/519] Open SystemMessages as modals

---
 src/Foundation.hs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index b1a1f6b97..4dfdfc166 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1387,12 +1387,8 @@ applySystemMessages = liftHandlerT . runDB . runConduit $ selectSource [] [] .|
           Nothing -> (systemMessageSummary, systemMessageContent)
           Just SystemMessageTranslation{..} -> (systemMessageTranslationSummary, systemMessageTranslationContent)
       case summary of
-        Just s -> do
-          html <- withUrlRenderer [hamlet|
-              <a href=@{MessageR cID}>
-                #{s}
-            |]
-          addMessage systemMessageSeverity html
+        Just s ->
+          addMessageWidget systemMessageSeverity $ msgModal (toWidget s) (Left . SomeRoute $ MessageR cID)
         Nothing -> addMessage systemMessageSeverity content
 
 -- Define breadcrumbs.

From 0a2b676a42bbdea45858a19a41671122c0116952 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 21 May 2019 00:50:39 +0200
Subject: [PATCH 364/519] Fix typo

---
 src/Utils/Frontend/Modal.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Utils/Frontend/Modal.hs b/src/Utils/Frontend/Modal.hs
index f5ddbf67a..94948aeba 100644
--- a/src/Utils/Frontend/Modal.hs
+++ b/src/Utils/Frontend/Modal.hs
@@ -53,8 +53,8 @@ msgModal modalTrigger' modalContent = do
     --
     -- See https://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
     randomIdentifier = fmap pack . evalRandTIO $ do
-      prefix <- uniform $ ['a'..'z'] ++ ['A'..'Z'] ++ ['0'..'9']
-      suffix <- replicateM 21 . uniform $ ['a'..'z'] ++ ['A'..'Z']
+      prefix <- uniform $ ['a'..'z'] ++ ['A'..'Z']
+      suffix <- replicateM 21 . uniform $ ['a'..'z'] ++ ['A'..'Z'] ++ ['0'..'9']
       return $ prefix : suffix
   modalTriggerId <- Just <$> randomIdentifier
   modalId <- Just <$> randomIdentifier

From 37644a242ffc782a61cdfce7d78d922562ac7c09 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 21 May 2019 13:03:09 +0200
Subject: [PATCH 365/519] Minor Cron cleanup

---
 src/Jobs/Crontab.hs | 52 +++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/Jobs/Crontab.hs b/src/Jobs/Crontab.hs
index 5dd98d9b8..fac38ae52 100644
--- a/src/Jobs/Crontab.hs
+++ b/src/Jobs/Crontab.hs
@@ -2,18 +2,17 @@ module Jobs.Crontab
   ( determineCrontab
   ) where
 
-import Import
+import Import 
 
 import qualified Data.HashMap.Strict as HashMap
 import Jobs.Types
 
-import Data.Maybe (fromJust)
 import qualified Data.Map as Map
 import Data.Semigroup (Max(..))
 
 import Data.Time.Zones
 
-import Control.Monad.Trans.Writer (execWriterT)
+import Control.Monad.Trans.Writer (WriterT, execWriterT)
 import Control.Monad.Writer.Class (MonadWriter(..))
 
 import qualified Data.Conduit.List as C
@@ -88,28 +87,31 @@ determineCrontab = execWriterT $ do
             , cronRateLimit = 3600 -- Irrelevant due to `cronRepeat`
             , cronNotAfter  = Left nominalDay
             }
-      
-      sheetSubmissions <- lift $ collateSubmissions <$> 
-          selectList [SubmissionRatingBy !=. Nothing, SubmissionSheet ==. nSheet] []      
-      tell $ flip Map.foldMapWithKey sheetSubmissions $
-        \nUser (Max mbTime) -> if
-          |  Just time <- mbTime -> HashMap.singleton 
-              (JobCtlQueue $ JobQueueNotification NotificationCorrectionsAssigned { nUser, nSheet } )
-              Cron 
-                { cronInitial   = CronTimestamp $ utcToLocalTimeTZ appTZ $ addUTCTime appNotificationCollateDelay time
-                , cronRepeat    = CronRepeatNever
-                , cronRateLimit = appNotificationRateLimit
-                , cronNotAfter  = Left appNotificationExpiration
-                }
-          | otherwise -> mempty
 
   runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ sheetJobs
 
--- | Partial function: Submission must not have Nothing at ratingBy
-collateSubmissions :: [Entity Submission] -> Map UserId (Max (Maybe UTCTime))
-collateSubmissions = Map.fromListWith (<>) . fmap procCorrector
-    where 
-      procCorrector :: Entity Submission -> (UserId ,Max (Maybe UTCTime))
-      procCorrector = (,) <$> fromJust . submissionRatingBy . entityVal 
-                          <*> Max . submissionRatingAssigned . entityVal
-      
+  let
+    correctorNotifications :: Map (UserId, SheetId) (Max UTCTime) -> WriterT (Crontab JobCtl) DB ()
+    correctorNotifications = (tell .) . Map.foldMapWithKey $ \(nUser, nSheet) (Max time) -> HashMap.singleton
+      (JobCtlQueue $ JobQueueNotification NotificationCorrectionsAssigned { nUser, nSheet } )
+      Cron 
+        { cronInitial   = CronTimestamp . utcToLocalTimeTZ appTZ $ addUTCTime appNotificationCollateDelay time
+        , cronRepeat    = CronRepeatNever
+        , cronRateLimit = appNotificationRateLimit
+        , cronNotAfter  = Left appNotificationExpiration
+        }
+    
+    submissionsByCorrector :: Entity Submission -> Map (UserId, SheetId) (Max UTCTime)
+    submissionsByCorrector (Entity _ sub)
+      | Just ratingBy <- submissionRatingBy sub
+      , Just assigned <- submissionRatingAssigned sub
+      , not $ submissionRatingDone sub
+      = Map.singleton (ratingBy, submissionSheet sub) $ Max assigned
+      | otherwise
+      = Map.empty
+
+    collateSubmissionsByCorrector acc entity = Map.unionWith (<>) acc $ submissionsByCorrector entity
+  correctorNotifications <=< runConduit $
+       transPipe lift ( selectSource [ SubmissionRatingBy !=. Nothing, SubmissionRatingAssigned !=. Nothing ] []
+                      )
+    .| C.fold collateSubmissionsByCorrector Map.empty

From 874252edbd9326445f288a1e90cdb422da23e6f8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 21 May 2019 13:03:20 +0200
Subject: [PATCH 366/519] Fix test

---
 test/Handler/Utils/SubmissionSpec.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Handler/Utils/SubmissionSpec.hs b/test/Handler/Utils/SubmissionSpec.hs
index 32aba67df..3e05115dc 100644
--- a/test/Handler/Utils/SubmissionSpec.hs
+++ b/test/Handler/Utils/SubmissionSpec.hs
@@ -162,7 +162,7 @@ spec = withApp . describe "Submission distribution" $ do
     distributionExample
       (return [ (n, loads) | n <- ns' ])
       (\subs corrs -> do
-          tutSubmissions <- liftIO $ getRandomR (1,50)
+          tutSubmissions <- liftIO $ getRandomR (5,10)
           subs' <- liftIO $ shuffleM subs
           forM_ (take tutSubmissions subs') $ \(Entity subId Submission{..}) -> do
             Entity _ SheetCorrector{..} <- liftIO $ uniform corrs

From cc83427912bcd8f1ecfeed5bae93d2e5791aa050 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 21 May 2019 13:40:32 +0200
Subject: [PATCH 367/519] Add assigned submission to test data

---
 test/Database.hs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/Database.hs b/test/Database.hs
index 6332584b4..ea044ac75 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -511,11 +511,21 @@ fillDb = do
   void . insert $ SheetFile sh1 h103 SheetSolution
   void . insert $ SheetFile sh1 pdf10 SheetExercise
   --
-  sub1 <- insert $ Submission sh1 Nothing Nothing Nothing Nothing Nothing
+  sub1 <- insert $ Submission
+    { submissionSheet = sh1
+    , submissionRatingPoints = Nothing
+    , submissionRatingComment = Nothing
+    , submissionRatingBy = Just gkleen
+    , submissionRatingAssigned = Just now
+    , submissionRatingTime = Nothing
+    }
   void . insert $ SubmissionEdit maxMuster (nominalDay `addUTCTime` now) sub1
   void . insert $ SubmissionUser maxMuster sub1
   sub1fid1 <- insertFile "AbgabeH10-1.hs"
   void . insert $ SubmissionFile sub1 sub1fid1 False False
+  sub2 <- insert $ Submission sh1 Nothing Nothing Nothing Nothing Nothing
+  void . insert $ SubmissionEdit fhamann now sub2
+  void . insert $ SubmissionUser fhamann sub2
   sh2 <- insert Sheet
     { sheetCourse = pmo
     , sheetName = "Spezifische Abgabe"

From 94335c70e086edc1f7be36ceac259e7e5d000cc4 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 21 May 2019 21:53:13 +0200
Subject: [PATCH 368/519] add missing checks for already initialized js utils
 in form.js

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

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index da02abd5d..e610a7c0b 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -270,6 +270,10 @@
       throw new Error('Auto Submit Button utility needs to be passed an element!');
     }
 
+    if (element.classList.contains(AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
+      return false;
+    }
+
     // hide and mark initialized
     element.classList.add(AUTO_SUBMIT_BUTTON_HIDDEN_CLASS, AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS);
 
@@ -315,6 +319,10 @@
         throw new Error('Auto Submit Input utility needs to be passed an element!');
       }
 
+      if (element.classList.contains(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS)) {
+        return false;
+      }
+
       form = element.form;
       if (!form) {
         throw new Error('Could not determine associated form for auto submit input');
@@ -374,6 +382,10 @@
         throw new Error('Form Error Remover utility needs to be passed an element!');
       }
 
+      if (element.classList.contains(FORM_ERROR_REMOVER_INITIALIZED_CLASS)) {
+        return false;
+      }
+
       // find form groups
       formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
 
@@ -428,6 +440,8 @@
   var DATEPICKER_UTIL_NAME = 'datepicker';
   var DATEPICKER_UTIL_SELECTOR = 'input[type="date"], input[type="time"], input[type="datetime-local"]';
 
+  var DATEPICKER_INITIALIZED_CLASS = 'datepicker--initialized';
+
   var DATEPICKER_CONFIG = {
     "datetime-local": {
       enableTime: true,
@@ -459,6 +473,10 @@
         throw new Error('Datepicker utility needs to be passed an element!');
       }
 
+      if (element.classList.contains(DATEPICKER_INITIALIZED_CLASS)) {
+        return false;
+      }
+
       var flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute("type")];
 
       if (!flatpickrConfig) {
@@ -467,6 +485,9 @@
 
       flatpickrInstance = flatpickr(element, flatpickrConfig);
 
+      // mark initialized
+      element.classList.add(DATEPICKER_INITIALIZED_CLASS);
+
       return {
         name: DATEPICKER_UTIL_NAME,
         element: element,

From 9d49de4382d8c67e69bfcb9e2569243dd57430c5 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 21 May 2019 21:54:32 +0200
Subject: [PATCH 369/519] add navigate away prompt js utility

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

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index e610a7c0b..3cbbbd852 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -247,6 +247,86 @@
     setup: interactiveFieldsetUtil,
   });
 
+  /**
+   *
+   * Navigate Away Prompt Utility
+   *  This utility asks the user if (s)he really wants to navigate away
+   *  from a page containing a form if (s)he already touched an input.
+   *  Form-Submits will not trigger the prompt.
+   *  Utility will ignore forms that contain auto submit elements (buttons, inputs).
+   *
+   * Attribute: [none]
+   *  (automatically setup on all form tags that dont automatically submit, see AutoSubmitButtonUtil)
+   *
+   * Example usage:
+   *  (any page with a form)
+   */
+
+  var NAVIGATE_AWAY_PROMPT_UTIL_NAME = 'navigateAwayPrompt';
+  var NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR = 'form';
+
+  var NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS = 'navigate-away-prompt--initialized';
+
+  var navigateAwayPromptUtil = function(element) {
+    var touched = false;
+    var unloadDueToSubmit = false;
+
+    function init() {
+      if (!element) {
+        throw new Error('Navigate Away Prompt utility needs to be passed an element!');
+      }
+
+      if (element.classList.contains(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      // ignore forms that get submitted automatically
+      if (element.querySelector(AUTO_SUBMIT_BUTTON_UTIL_SELECTOR) || element.querySelector(AUTO_SUBMIT_INPUT_UTIL_SELECTOR)) {
+        return false;
+      }
+
+      window.addEventListener('beforeunload', beforeUnloadHandler);
+
+      element.addEventListener('submit', function() {
+        unloadDueToSubmit = true;
+      });
+      element.addEventListener('change', function() {
+        touched = true;
+        unloadDueToSubmit = false;
+      });
+
+      // mark initialized
+      element.classList.add(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS);
+
+      return {
+        name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
+        element: element,
+        destroy: function() {
+          window.removeEventListener('beforeunload', beforeUnloadHandler);
+        },
+      };
+    }
+
+    function beforeUnloadHandler(event) {
+      if (!touched || unloadDueToSubmit) {
+        return false;
+      }
+
+      // cancel the unload event. This is the standard to force the prompt to appear.
+      event.preventDefault();
+      // for all non standard compliant browsers we return a truthy value to activate the prompt.
+      return true;
+    }
+
+    return init();
+  };
+
+  formUtilities.push({
+    name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
+    selector: NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR,
+    setup: navigateAwayPromptUtil,
+  });
+
   /**
    *
    * Auto Submit Button Utility

From 8b4bdf9489fbe8fc40357003ed2f10d7e974c90d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 21 May 2019 21:57:34 +0200
Subject: [PATCH 370/519] more documentation for navigate away pompt js util

closes #377
---
 static/js/utils/form.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 3cbbbd852..ed8b0fa9a 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -308,6 +308,8 @@
     }
 
     function beforeUnloadHandler(event) {
+      // allow the event to happen if the form was not touched by the
+      // user or the unload event was initiated by a form submit
       if (!touched || unloadDueToSubmit) {
         return false;
       }

From b0df82483525794db976781bb69f00af0d6b4b92 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 22 May 2019 22:51:55 +0200
Subject: [PATCH 371/519] add node_modules to gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b85a1c848..a301f0f29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,5 @@ src/Handler/Course.SnapCustom.hs
 .stack-work-*
 .directory
 tags
-test.log
\ No newline at end of file
+test.log
+node_modules

From 3aa081131fb49964b9688a7a5d4b190d5b267258 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 22 May 2019 22:52:25 +0200
Subject: [PATCH 372/519] add package.json, babel and test file

---
 .babelrc               |    3 +
 package-lock.json      | 3111 ++++++++++++++++++++++++++++++++++++++++
 package.json           |   18 +
 static/es/test/test.js |    3 +
 4 files changed, 3135 insertions(+)
 create mode 100644 .babelrc
 create mode 100644 package-lock.json
 create mode 100644 package.json
 create mode 100644 static/es/test/test.js

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 000000000..1320b9a32
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-env"]
+}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..957856920
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,3111 @@
+{
+  "name": "uni2work",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/cli": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.4.4.tgz",
+      "integrity": "sha512-XGr5YjQSjgTa6OzQZY57FAJsdeVSAKR/u/KA5exWIz66IKtv/zXtHy+fIZcMry/EgYegwuHE7vzGnrFhjdIAsQ==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.4",
+        "commander": "^2.8.1",
+        "convert-source-map": "^1.1.0",
+        "fs-readdir-recursive": "^1.1.0",
+        "glob": "^7.0.0",
+        "lodash": "^4.17.11",
+        "mkdirp": "^0.5.1",
+        "output-file-sync": "^2.0.0",
+        "slash": "^2.0.0",
+        "source-map": "^0.5.0"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/core": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz",
+      "integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.4.4",
+        "@babel/helpers": "^7.4.4",
+        "@babel/parser": "^7.4.5",
+        "@babel/template": "^7.4.4",
+        "@babel/traverse": "^7.4.5",
+        "@babel/types": "^7.4.4",
+        "convert-source-map": "^1.1.0",
+        "debug": "^4.1.0",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.11",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz",
+      "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.4.4",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.11",
+        "source-map": "^0.5.0",
+        "trim-right": "^1.0.1"
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
+      "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
+      "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-call-delegate": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
+      "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-define-map": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz",
+      "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/types": "^7.4.4",
+        "lodash": "^4.17.11"
+      }
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
+      "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
+      "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz",
+      "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
+      "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz",
+      "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/template": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "lodash": "^4.17.11"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
+      "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
+      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+      "dev": true
+    },
+    "@babel/helper-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz",
+      "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.11"
+      }
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
+      "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-wrap-function": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz",
+      "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.0.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
+      "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
+      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.2.0"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz",
+      "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
+      "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==",
+      "dev": true
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
+      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0",
+        "@babel/plugin-syntax-async-generators": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
+      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz",
+      "integrity": "sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz",
+      "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
+      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
+      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
+      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
+      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz",
+      "integrity": "sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
+      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz",
+      "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "lodash": "^4.17.11"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz",
+      "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-define-map": "^7.4.4",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.4.4",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
+      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz",
+      "integrity": "sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz",
+      "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz",
+      "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
+      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
+      "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
+      "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
+      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
+      "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz",
+      "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz",
+      "integrity": "sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz",
+      "integrity": "sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
+      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz",
+      "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==",
+      "dev": true,
+      "requires": {
+        "regexp-tree": "^0.1.6"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
+      "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz",
+      "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.1.0"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
+      "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-call-delegate": "^7.4.4",
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
+      "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
+      "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.0"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz",
+      "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
+      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz",
+      "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
+      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
+      "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
+      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz",
+      "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.5.tgz",
+      "integrity": "sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+        "@babel/plugin-proposal-json-strings": "^7.2.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-syntax-async-generators": "^7.2.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-transform-arrow-functions": "^7.2.0",
+        "@babel/plugin-transform-async-to-generator": "^7.4.4",
+        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+        "@babel/plugin-transform-block-scoping": "^7.4.4",
+        "@babel/plugin-transform-classes": "^7.4.4",
+        "@babel/plugin-transform-computed-properties": "^7.2.0",
+        "@babel/plugin-transform-destructuring": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/plugin-transform-duplicate-keys": "^7.2.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+        "@babel/plugin-transform-for-of": "^7.4.4",
+        "@babel/plugin-transform-function-name": "^7.4.4",
+        "@babel/plugin-transform-literals": "^7.2.0",
+        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
+        "@babel/plugin-transform-modules-amd": "^7.2.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.4.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.4.4",
+        "@babel/plugin-transform-modules-umd": "^7.2.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+        "@babel/plugin-transform-new-target": "^7.4.4",
+        "@babel/plugin-transform-object-super": "^7.2.0",
+        "@babel/plugin-transform-parameters": "^7.4.4",
+        "@babel/plugin-transform-property-literals": "^7.2.0",
+        "@babel/plugin-transform-regenerator": "^7.4.5",
+        "@babel/plugin-transform-reserved-words": "^7.2.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+        "@babel/plugin-transform-spread": "^7.2.0",
+        "@babel/plugin-transform-sticky-regex": "^7.2.0",
+        "@babel/plugin-transform-template-literals": "^7.4.4",
+        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+        "@babel/plugin-transform-unicode-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "browserslist": "^4.6.0",
+        "core-js-compat": "^3.1.1",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.5.0"
+      }
+    },
+    "@babel/template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
+      "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz",
+      "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.4.4",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/parser": "^7.4.5",
+        "@babel/types": "^7.4.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.11"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+      "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.11",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true,
+      "optional": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "optional": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "browserslist": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.0.tgz",
+      "integrity": "sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30000967",
+        "electron-to-chromium": "^1.3.133",
+        "node-releases": "^1.1.19"
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000971",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz",
+      "integrity": "sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chokidar": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+      "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "core-js-compat": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.2.tgz",
+      "integrity": "sha512-X0Ch5f6itrHxhg5HSJucX6nNLNAGr+jq+biBh6nPGc3YAWz2a8p/ZIZY8cUkDzSRNG54omAuu3hoEF8qZbu/6Q==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.6.0",
+        "core-js-pure": "3.1.2",
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+          "dev": true
+        }
+      }
+    },
+    "core-js-pure": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.2.tgz",
+      "integrity": "sha512-5ckIdBF26B3ldK9PM177y2ZcATP2oweam9RskHSoqfZCrJ2As6wVg8zJ1zTriFsZf6clj/N1ThDFRGaomMsh9w==",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true,
+      "optional": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.3.136",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.136.tgz",
+      "integrity": "sha512-xHkYkbEi4kI+2w5v6yBGCQTRXL7N0PWscygTFZu/1bArnPSo2WR9xjdw4m06RR4J5PncrWJcuOVv+MAG2mK5JQ==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "exec-sh": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+      "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
+      "dev": true,
+      "requires": {
+        "merge": "^1.2.0"
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fs-readdir-recursive": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
+      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "graceful-fs": {
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "js-levenshtein": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
+    },
+    "lodash": {
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "merge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "node-releases": {
+      "version": "1.1.21",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.21.tgz",
+      "integrity": "sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "optional": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "output-file-sync": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz",
+      "integrity": "sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "is-plain-obj": "^1.1.0",
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true,
+      "optional": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true,
+      "optional": true
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
+    },
+    "regenerate-unicode-properties": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0"
+      }
+    },
+    "regenerator-transform": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.0.tgz",
+      "integrity": "sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==",
+      "dev": true,
+      "requires": {
+        "private": "^0.1.6"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexp-tree": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.10.tgz",
+      "integrity": "sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==",
+      "dev": true
+    },
+    "regexpu-core": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
+      "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.0.2",
+        "regjsgen": "^0.5.0",
+        "regjsparser": "^0.6.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.1.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
+      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true,
+      "optional": true
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
+      "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "semver": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+      "dev": true
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
+          }
+        }
+      }
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+      "dev": true,
+      "optional": true
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true,
+      "optional": true
+    },
+    "watch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
+      "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=",
+      "dev": true,
+      "requires": {
+        "exec-sh": "^0.2.0",
+        "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..01b344a8e
--- /dev/null
+++ b/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "uni2work",
+  "version": "1.0.0",
+  "description": "",
+  "scripts": {
+    "watch": "watch babel static/es",
+    "babel": "babel static/es -d static/js"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/cli": "^7.4.4",
+    "@babel/core": "^7.4.5",
+    "watch": "^1.0.2",
+    "@babel/preset-env": "^7.4.5"
+  }
+}
diff --git a/static/es/test/test.js b/static/es/test/test.js
new file mode 100644
index 000000000..4b98567e1
--- /dev/null
+++ b/static/es/test/test.js
@@ -0,0 +1,3 @@
+let x = (a) => console.log(a * 2);
+
+x(4);

From 30fe78ebdc0098e75dcc9bcd876fee5d985df615 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 24 May 2019 22:24:48 +0200
Subject: [PATCH 373/519] Decouple HealthCheck intervals

---
 config/settings.yml                           |   9 +-
 package.yaml                                  |   1 +
 src/Application.hs                            |  70 ++++++++----
 .../Instances/Reverse/MonoTraversable.hs      |  17 +++
 src/Foundation.hs                             |   2 +-
 src/Handler/Health.hs                         | 104 ++++++++++--------
 src/Import/NoFoundation.hs                    |   2 +
 src/Jobs.hs                                   |  19 ++--
 src/Jobs/Crontab.hs                           |  19 ++--
 src/Jobs/HealthReport.hs                      |  33 +++---
 src/Jobs/Types.hs                             |   2 +-
 src/Model/Types/Security.hs                   |  82 +++++++++-----
 src/Settings.hs                               |   6 +-
 src/Utils.hs                                  |  12 ++
 src/Utils/PathPiece.hs                        |  13 +++
 15 files changed, 253 insertions(+), 138 deletions(-)
 create mode 100644 src/Data/Universe/Instances/Reverse/MonoTraversable.hs

diff --git a/config/settings.yml b/config/settings.yml
index 049692e5b..edd971e64 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -30,9 +30,14 @@ session-timeout: 7200
 jwt-expiration: 604800
 jwt-encoding: HS256
 maximum-content-length: "_env:MAX_UPLOAD_SIZE:134217728"
-health-check-interval: "_env:HEALTHCHECK_INTERVAL:600" # or WATCHDOG_USEC/2, whichever is smaller
-health-check-http: "_env:HEALTHCHECK_HTTP:true"
+health-check-interval:
+  matching-cluster-config: "_env:HEALTHCHECK_INTERVAL_MATCHING_CLUSTER_CONFIG:600"
+  http-reachable: "_env:HEALTHCHECK_INTERVAL_HTTP_REACHABLE:600"
+  ldap-admins: "_env:HEALTHCHECK_INTERVAL_LDAP_ADMINS:600"
+  smtp-connect: "_env:HEALTHCHECK_INTERVAL_SMTP_CONNECT:600"
+  widget-memcached: "_env:HEALTHCHECK_INTERVAL_WIDGET_MEMCACHED:600"
 health-check-delay-notify: "_env:HEALTHCHECK_DELAY_NOTIFY:true"
+health-check-http: "_env:HEALTHCHECK_HTTP:true" # Can we assume, that we can reach ourselves under APPROOT via HTTP (reverse proxies or firewalls might prevent this)?
 
 log-settings:
   detailed:      "_env:DETAILED_LOGGING:false"
diff --git a/package.yaml b/package.yaml
index 417b74e26..b9561aa88 100644
--- a/package.yaml
+++ b/package.yaml
@@ -126,6 +126,7 @@ dependencies:
   - streaming-commons
   - hourglass
   - unix
+  - stm-delay
 
 other-extensions:
   - GeneralizedNewtypeDeriving
diff --git a/src/Application.hs b/src/Application.hs
index b39657de7..a4112003d 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -19,7 +19,7 @@ module Application
 import Control.Monad.Logger                 (liftLoc, LoggingT(..), MonadLoggerIO(..))
 import Database.Persist.Postgresql          (createPostgresqlPool, pgConnStr,
                                              pgPoolSize, runSqlPool)
-import Import
+import Import                        hiding (cancel)
 import Language.Haskell.TH.Syntax           (qLocation)
 import Network.Wai (Middleware)
 import Network.Wai.Handler.Warp             (Settings, defaultSettings,
@@ -75,17 +75,22 @@ import System.Exit
 import qualified Database.Memcached.Binary.IO as Memcached
 
 import qualified System.Systemd.Daemon as Systemd
-import Control.Concurrent.Async.Lifted.Safe (async, waitAnyCancel)
+import Control.Concurrent.Async.Lifted.Safe
 import System.Environment (lookupEnv)
 import System.Posix.Process (getProcessID)
 import System.Posix.Signals (SignalInfo(..), installHandler, sigTERM)
 import qualified System.Posix.Signals as Signals (Handler(..))
 
-import Control.Monad.Trans.State (execStateT)
-
 import Network (socketPort)
 import qualified Network.Socket as Socket (close)
 
+import Control.Concurrent.STM.Delay
+import Control.Monad.STM (retry)
+
+import qualified Data.Set as Set
+
+import Data.Semigroup (Max(..), Min(..))
+
 -- Import all relevant handler modules here.
 -- (HPack takes care to add new modules to our cabal file nowadays.)
 import Handler.Common
@@ -152,7 +157,7 @@ makeFoundation appSettings'@AppSettings{..} = do
 
     appJobCtl <- liftIO $ newTVarIO Map.empty
     appCronThread <- liftIO newEmptyTMVarIO
-    appHealthReport <- liftIO $ newTVarIO Nothing
+    appHealthReport <- liftIO $ newTVarIO Set.empty
 
     -- 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
@@ -333,7 +338,12 @@ warpSettings foundation = defaultSettings
                             if
                               | foundation ^. _appHealthCheckDelayNotify
                                 -> void . fork $ do
-                                  atomically $ readTVar (foundation ^. _appHealthReport) >>= guard . maybe False ((== HealthSuccess) . classifyHealthReport . snd)
+                                  let activeChecks = Set.fromList universeF
+                                                   & Set.filter (is _Just . (foundation ^. _appHealthCheckInterval))
+                                  atomically $ do
+                                    results <- readTVar $ foundation ^. _appHealthReport
+                                    guard $ activeChecks == Set.map (classifyHealthReport . snd) results
+                                    guard . (== Min HealthSuccess) $ foldMap (Min . healthReportStatus . snd) results
                                   notifyReady
                               | otherwise
                                 -> notifyReady
@@ -354,19 +364,8 @@ warpSettings foundation = defaultSettings
                            
 
 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 ()
+getAppDevSettings = liftIO $ loadYamlSettings [configSettingsYml] [configSettingsYmlValue] useEnv
+getAppSettings = liftIO $ loadYamlSettingsArgs [configSettingsYmlValue] useEnv
 
 -- | main function for use by yesod devel
 develMain :: IO ()
@@ -417,7 +416,38 @@ appMain = runResourceT $ do
         case didStore of
           Just () -> $logInfoS "shutdown" "Stored all bound sockets for restart"
           Nothing -> forM_ sockets $ liftIO . Socket.close
-        liftIO . throwTo mainThreadId . ExitFailure $ 0b10000000 + fromIntegral siginfoSignal
+        liftIO $ throwTo mainThreadId ExitSuccess
+
+      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
+            -> let notifyWatchdog :: IO ()
+                   notifyWatchdog = forever $ do
+                     d <- liftIO . newDelay . floor $ wInterval % 2
+
+                     status <- atomically $ asum
+                       [ Nothing <$ waitDelay d
+                       , Just <$> do
+                           results <- readTVar $ foundation ^. _appHealthReport
+                           case fromNullable results of
+                             Nothing -> retry
+                             Just rs -> return $ ofoldMap1 (Max *** Min . healthReportStatus) rs
+                       ]
+
+                     case status of
+                       Just (_, Min status') -> void . Systemd.notifyStatus . unpack $ toPathPiece status'
+                       Nothing -> return ()
+
+                     case status of
+                       Just (_, Min HealthSuccess)
+                         -> void Systemd.notifyWatchdog
+                       _other
+                         -> return ()
+                in void $ allocate (async notifyWatchdog >>= \a -> a <$ link a) cancel
+        _other -> return ()
 
       let runWarp socket = runSettingsSocket (warpSettings foundation) socket app
       case sockets of
diff --git a/src/Data/Universe/Instances/Reverse/MonoTraversable.hs b/src/Data/Universe/Instances/Reverse/MonoTraversable.hs
new file mode 100644
index 000000000..aaa50ca73
--- /dev/null
+++ b/src/Data/Universe/Instances/Reverse/MonoTraversable.hs
@@ -0,0 +1,17 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Universe.Instances.Reverse.MonoTraversable
+  (
+  ) where
+
+import Data.Universe
+import Data.MonoTraversable
+
+import Data.Universe.Instances.Reverse 
+  
+
+type instance Element (a -> b) = b
+
+instance Finite a => MonoFoldable (a -> b)
+instance (Ord a, Finite a) => MonoTraversable (a -> b)
+  
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 8fb2ec86e..b3826a51a 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -130,7 +130,7 @@ data UniWorX = UniWorX
     , appSessionKey      :: ClientSession.Key
     , appSecretBoxKey    :: SecretBox.Key
     , appJSONWebKeySet   :: Jose.JwkSet
-    , appHealthReport    :: TVar (Maybe (UTCTime, HealthReport))
+    , appHealthReport    :: TVar (Set (UTCTime, HealthReport))
     }
 
 makeLenses_ ''UniWorX
diff --git a/src/Handler/Health.hs b/src/Handler/Health.hs
index 872ab3410..046c16aff 100644
--- a/src/Handler/Health.hs
+++ b/src/Handler/Health.hs
@@ -9,55 +9,71 @@ import Utils.Lens
 
 import qualified Data.UUID as UUID
 
+import Data.Semigroup (Min(..), Max(..))
+
+import qualified Data.Set as Set
+
+import Control.Concurrent.STM.Delay
+
 
 getHealthR :: Handler TypedContent
 getHealthR = do
-  healthReport' <- liftIO . readTVarIO =<< getsYesod appHealthReport
-  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
-  (lastUpdated, healthReport) <- maybe handleMissing return healthReport'
+  reportStore <- getsYesod appHealthReport
+  healthReports' <- liftIO $ readTVarIO reportStore
   interval <- getsYesod $ view _appHealthCheckInterval
-  instanceId <- getsYesod appInstanceID
 
-  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
+  case fromNullable healthReports' of
+    Nothing -> do
+      let Min (NTop minInterval) = ofoldMap1 (Min . NTop) $ impureNonNull interval
+      delay <- for minInterval $ \minInterval' -> liftIO . newDelay . round $ toRational minInterval' * 1e6
+      waitResult <- atomically $ maybe (pure $ Left False) (fmap (const $ Left True) . waitDelay) delay <|> (fmap Right . assertM (not. Set.null) $ readTVar reportStore)
+      case waitResult of
+        Left False -> sendResponseStatus noContent204 ()
+        Left True  -> fail "System is not generating HealthReports"
+        Right _    -> redirect HealthR
+    Just healthReports -> do
+      let (Max lastUpdated, Min status) = ofoldMap1 (Max *** Min . healthReportStatus) healthReports
+          reportNextUpdate (lastCheck, classifyHealthReport -> kind)
+            = fromMaybe 0 (interval kind) `addUTCTime` lastCheck
+          Max nextUpdate = ofoldMap1 (Max . reportNextUpdate) healthReports
+      instanceId <- getsYesod appInstanceID
+
+      setWeakEtagHashable (instanceId, lastUpdated)
+      expiresAt nextUpdate
+      setLastModified lastUpdated
+
+      let status'
+            | HealthSuccess <- status
+            = ok200
+            | otherwise
+            = internalServerError500
+      sendResponseStatus status' <=< selectRep $ do
+        provideRep . siteLayoutMsg MsgHealthReport $ do
+          setTitleI MsgHealthReport
+          [whamlet|
+            $newline never
+            <dl .deflist>
+              $forall (_, report) <- healthReports'
+                $case report
+                  $of HealthMatchingClusterConfig passed
+                    <dt .deflist__dt>_{MsgHealthMatchingClusterConfig}
+                    <dd .deflist__dd>#{boolSymbol passed}
+                  $of HealthHTTPReachable (Just passed)
+                    <dt .deflist__dt>_{MsgHealthHTTPReachable}
+                    <dd .deflist__dd>#{boolSymbol passed}
+                  $of HealthLDAPAdmins (Just found)
+                    <dt .deflist__dt>_{MsgHealthLDAPAdmins}
+                    <dd .deflist__dd>#{textPercent found}
+                  $of HealthSMTPConnect (Just passed)
+                    <dt .deflist__dt>_{MsgHealthSMTPConnect}
+                    <dd .deflist__dd>#{boolSymbol passed}
+                  $of HealthWidgetMemcached (Just passed)
+                    <dt .deflist__dt>_{MsgHealthWidgetMemcached}
+                    <dd .deflist__dd>#{boolSymbol passed}
+                  $of _
+          |]
+        provideJson healthReports
+        provideRep . return . Builder.toLazyText $ Aeson.encodePrettyToTextBuilder healthReports
 
 getInstanceR :: Handler TypedContent
 getInstanceR = do
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 975ae3925..7043c799e 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -101,6 +101,8 @@ import Data.Ratio as Import ((%))
 
 import Network.Mime as Import
 
+import Data.Universe.Instances.Reverse.MonoTraversable ()
+
 
 import Control.Monad.Trans.RWS (RWST)
 
diff --git a/src/Jobs.hs b/src/Jobs.hs
index efbe126b6..5ba9f1fa4 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -32,6 +32,7 @@ import Control.Monad.Random (evalRand, mkStdGen, getRandomR)
 import Cron
 import qualified Data.HashMap.Strict as HashMap
 import Data.HashMap.Strict (HashMap)
+import qualified Data.Set as Set
 
 import qualified Data.List.NonEmpty as NonEmpty
 
@@ -51,8 +52,6 @@ import Data.Time.Zones
 
 import Control.Concurrent.STM (retry)
 
-import qualified System.Systemd.Daemon as Systemd
-
 
 import Jobs.Handler.SendNotification
 import Jobs.Handler.SendTestEmail
@@ -284,21 +283,19 @@ handleJobs' wNum = C.mapM_ $ \jctl -> do
       -- logDebugS logIdent $ tshow newCTab
       mapReaderT (liftIO . atomically) $ 
         lift . void . flip swapTMVar newCTab =<< asks jobCrontab
-    handleCmd JobCtlGenerateHealthReport = do
+    handleCmd (JobCtlGenerateHealthReport kind) = do
       hrStorage <- getsYesod appHealthReport
-      newReport@(classifyHealthReport -> newStatus) <- lift generateHealthReport
+      newReport@(healthReportStatus -> newStatus) <- lift $ generateHealthReport kind
 
-      $logInfoS "HealthReport" $ toPathPiece newStatus
+      $logInfoS (tshow kind) $ toPathPiece newStatus
       unless (newStatus == HealthSuccess) $ do
-        $logErrorS "HealthReport" $ tshow newReport
+        $logErrorS (tshow kind) $ tshow newReport
   
       liftIO $ do
         now <- getCurrentTime
-        atomically . writeTVar hrStorage $ Just (now, newReport)
-        
-        void . Systemd.notifyStatus . unpack $ toPathPiece newStatus
-        when (newStatus == HealthSuccess) $
-          void Systemd.notifyWatchdog
+        let updateReports = Set.insert (now, newReport)
+                          . Set.filter (((/=) `on` classifyHealthReport) newReport . snd)
+        atomically . modifyTVar' hrStorage $ force . updateReports
 
 jLocked :: QueuedJobId -> (QueuedJob -> Handler a) -> Handler a
 jLocked jId act = do
diff --git a/src/Jobs/Crontab.hs b/src/Jobs/Crontab.hs
index fac38ae52..aecca927e 100644
--- a/src/Jobs/Crontab.hs
+++ b/src/Jobs/Crontab.hs
@@ -43,14 +43,17 @@ determineCrontab = execWriterT $ do
       , cronNotAfter = Right CronNotScheduled
       }
 
-  tell $ HashMap.singleton
-    JobCtlGenerateHealthReport
-    Cron
-      { cronInitial = CronAsap
-      , cronRepeat = CronRepeatScheduled CronAsap
-      , cronRateLimit = appHealthCheckInterval
-      , cronNotAfter = Right CronNotScheduled
-      }
+  tell . flip foldMap universeF $ \kind -> 
+    case appHealthCheckInterval kind of
+      Just int -> HashMap.singleton
+        (JobCtlGenerateHealthReport kind)
+        Cron
+          { cronInitial = CronAsap
+          , cronRepeat = CronRepeatScheduled CronAsap
+          , cronRateLimit = int
+          , cronNotAfter = Right CronNotScheduled
+          }
+      Nothing  -> mempty
 
   let
     sheetJobs (Entity nSheet Sheet{..}) = do
diff --git a/src/Jobs/HealthReport.hs b/src/Jobs/HealthReport.hs
index a8f6a0ff4..45500a8bb 100644
--- a/src/Jobs/HealthReport.hs
+++ b/src/Jobs/HealthReport.hs
@@ -28,18 +28,13 @@ import qualified Network.HaskellNet.SMTP as SMTP
 import Data.Pool (withResource)
 
 
-generateHealthReport :: Handler HealthReport
-generateHealthReport
-  = runConcurrently $ HealthReport
-    <$> Concurrently matchingClusterConfig
-    <*> Concurrently httpReachable
-    <*> Concurrently ldapAdmins
-    <*> Concurrently smtpConnect
-    <*> Concurrently widgetMemcached
+generateHealthReport :: HealthCheck -> Handler HealthReport
+generateHealthReport = $(dispatchTH ''HealthCheck)
   
-matchingClusterConfig :: Handler Bool
+dispatchHealthCheckMatchingClusterConfig :: Handler HealthReport
 -- ^ Can the cluster configuration be read from the database and does it match our configuration?
-matchingClusterConfig = runDB $ and <$> forM universeF clusterSettingMatches
+dispatchHealthCheckMatchingClusterConfig
+  = fmap HealthMatchingClusterConfig . runDB $ and <$> forM universeF clusterSettingMatches
   where
     clusterSettingMatches ClusterCryptoIDKey = do
       ourSetting <- getsYesod appCryptoIDKey
@@ -74,11 +69,11 @@ matchingClusterConfig = runDB $ and <$> forM universeF clusterSettingMatches
         _other                 -> return Nothing
 
 
-httpReachable :: Handler (Maybe Bool)
-httpReachable = do
+dispatchHealthCheckHTTPReachable :: Handler HealthReport
+dispatchHealthCheckHTTPReachable = HealthHTTPReachable <$> do
   staticAppRoot <- getsYesod $ view _appRoot
   doHTTP <- getsYesod $ view _appHealthCheckHTTP
-  for (staticAppRoot <* guard doHTTP) $ \_textAppRoot -> do
+  for (staticAppRoot <* guard doHTTP) $ \_ -> do
     url <- getUrlRender <*> pure InstanceR
     baseRequest <- HTTP.parseRequest $ unpack url
     httpManager <- getsYesod appHttpManager
@@ -88,8 +83,8 @@ httpReachable = do
     getsYesod $ (== clusterId) . appClusterID
 
 
-ldapAdmins :: Handler (Maybe Rational)
-ldapAdmins = do
+dispatchHealthCheckLDAPAdmins :: Handler HealthReport
+dispatchHealthCheckLDAPAdmins = HealthLDAPAdmins <$> 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
@@ -109,8 +104,8 @@ ldapAdmins = do
     _other -> return Nothing
 
 
-smtpConnect :: Handler (Maybe Bool)
-smtpConnect = do
+dispatchHealthCheckSMTPConnect :: Handler HealthReport
+dispatchHealthCheckSMTPConnect = HealthSMTPConnect <$> do
   smtpPool <- getsYesod appSmtpPool
   for smtpPool . flip withResource $ \smtpConn -> do
     response@(rCode, _) <- liftIO $ SMTP.sendCommand smtpConn SMTP.NOOP
@@ -121,8 +116,8 @@ smtpConnect = do
         return False
 
 
-widgetMemcached :: Handler (Maybe Bool)
-widgetMemcached = do
+dispatchHealthCheckWidgetMemcached :: Handler HealthReport
+dispatchHealthCheckWidgetMemcached = HealthWidgetMemcached <$> do
   memcachedConn <- getsYesod appWidgetMemcached
   for memcachedConn $ \_memcachedConn' -> do
     let ext = "bin"
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index f333f0c7d..3522ff802 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -69,7 +69,7 @@ data JobCtl = JobCtlFlush
             | JobCtlPerform QueuedJobId
             | JobCtlDetermineCrontab
             | JobCtlQueue Job
-            | JobCtlGenerateHealthReport
+            | JobCtlGenerateHealthReport HealthCheck
   deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 instance Hashable JobCtl
diff --git a/src/Model/Types/Security.hs b/src/Model/Types/Security.hs
index 27be35f81..04aad122b 100644
--- a/src/Model/Types/Security.hs
+++ b/src/Model/Types/Security.hs
@@ -60,10 +60,6 @@ import Data.Text.Metrics (damerauLevenshtein)
 import Data.Binary (Binary)
 import qualified Data.Binary as Binary
 
-import Data.Semigroup (Min(..))
-import Control.Monad.Trans.Writer (execWriter)
-import Control.Monad.Writer.Class (MonadWriter(..))
-
 
 ----
 -- Security, Authentification, Notification Stuff
@@ -361,28 +357,55 @@ type AuthLiteral = PredLiteral AuthTag
 type AuthDNF = PredDNF AuthTag
 
 
-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
-  , 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
-  , 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)
+data HealthCheck
+  = HealthCheckMatchingClusterConfig
+  | HealthCheckHTTPReachable
+  | HealthCheckLDAPAdmins
+  | HealthCheckSMTPConnect
+  | HealthCheckWidgetMemcached
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe HealthCheck
+instance Finite HealthCheck
+instance Hashable HealthCheck
 
 deriveJSON defaultOptions
-  { fieldLabelModifier = camelToPathPiece' 1
+  { constructorTagModifier = camelToPathPiece' 2
+  } ''HealthCheck
+nullaryPathPiece ''HealthCheck $ camelToPathPiece' 2
+pathPieceJSONKey ''HealthCheck
+  
+data HealthReport
+  = HealthMatchingClusterConfig { healthMatchingClusterConfig :: Bool }
+    -- ^ Is the database-stored configuration we're running under still up to date?
+    --
+    -- Also tests database connection as a side effect
+  | HealthHTTPReachable { healthHTTPReachable :: Maybe Bool }
+    -- ^ Can we reach a uni2work-instance with the same `ClusterId` under our configured `approot` via HTTP?
+  | HealthLDAPAdmins { healthLDAPAdmins :: Maybe Rational }
+    -- ^ Proportion of school admins that could be found in LDAP
+  | HealthSMTPConnect { healthSMTPConnect :: Maybe Bool }
+    -- ^ Can we connect to the SMTP server and say @NOOP@?
+  | HealthWidgetMemcached { healthWidgetMemcached :: Maybe Bool }
+    -- ^ Can we store values in memcached and retrieve them via HTTP?
+  deriving (Eq, Ord, Read, Show, Data, Generic, Typeable)
+
+instance NFData HealthReport
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  , fieldLabelModifier = camelToPathPiece' 1
   , omitNothingFields  = True
+  , sumEncoding = TaggedObject "test" "result"
+  , tagSingleConstructors = True
   } ''HealthReport
 
+classifyHealthReport :: HealthReport -> HealthCheck
+classifyHealthReport HealthMatchingClusterConfig{} = HealthCheckMatchingClusterConfig
+classifyHealthReport HealthLDAPAdmins{}            = HealthCheckLDAPAdmins
+classifyHealthReport HealthHTTPReachable{}         = HealthCheckHTTPReachable
+classifyHealthReport HealthSMTPConnect{}           = HealthCheckSMTPConnect
+classifyHealthReport HealthWidgetMemcached{}       = HealthCheckWidgetMemcached
+
 -- | `HealthReport` classified (`classifyHealthReport`) by badness
 --
 -- > a < b = a `worseThan` b
@@ -400,12 +423,13 @@ deriveJSON defaultOptions
   } ''HealthStatus
 nullaryPathPiece ''HealthStatus $ camelToPathPiece' 1
 
-classifyHealthReport :: HealthReport -> HealthStatus
+healthReportStatus :: HealthReport -> HealthStatus
 -- ^ 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
-  unless (fromMaybe True healthWidgetMemcached) . tell $ Min HealthFailure
-
+healthReportStatus = \case
+  HealthMatchingClusterConfig       False  -> HealthFailure
+  HealthHTTPReachable         (Just False) -> HealthFailure
+  HealthLDAPAdmins            (Just prop )
+    | prop <= 0                            -> HealthFailure
+  HealthSMTPConnect           (Just False) -> HealthFailure 
+  HealthWidgetMemcached       (Just False) -> HealthFailure -- TODO: investigate this failure mode; do we just handle it gracefully?
+  _other                                   -> maxBound -- Minimum badness
diff --git a/src/Settings.hs b/src/Settings.hs
index a60b4597b..ce28237a3 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -118,9 +118,9 @@ data AppSettings = AppSettings
     , appJwtExpiration          :: Maybe NominalDiffTime
     , appJwtEncoding            :: JwtEncoding
     
-    , appHealthCheckInterval    :: NominalDiffTime
-    , appHealthCheckHTTP        :: Bool
+    , appHealthCheckInterval    :: HealthCheck -> Maybe NominalDiffTime
     , appHealthCheckDelayNotify :: Bool
+    , appHealthCheckHTTP        :: Bool
 
     , appInitialLogSettings     :: LogSettings
 
@@ -390,8 +390,8 @@ instance FromJSON AppSettings where
         appJwtEncoding            <- o .: "jwt-encoding"
 
         appHealthCheckInterval    <- o .:  "health-check-interval"
-        appHealthCheckHTTP        <- o .:  "health-check-http"
         appHealthCheckDelayNotify <- o .:  "health-check-delay-notify"
+        appHealthCheckHTTP        <- o .:  "health-check-http"
 
         appSessionTimeout         <- o .: "session-timeout"
 
diff --git a/src/Utils.hs b/src/Utils.hs
index 4f9d28a25..81f08b684 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -79,6 +79,8 @@ import Data.Time.Clock
 
 import Data.List.NonEmpty (NonEmpty, nonEmpty)
 
+import Algebra.Lattice (top, bottom, (/\), (\/), BoundedJoinSemiLattice, BoundedMeetSemiLattice)
+
 {-# ANN choice ("HLint: ignore Use asum" :: String) #-}
 
 
@@ -936,3 +938,13 @@ setLastModified lastModified = do
     precision = 1
 
     safeMethods = [ methodGet, methodHead, methodOptions ]
+
+--------------
+-- Lattices --
+--------------
+
+foldJoin :: (MonoFoldable mono, BoundedJoinSemiLattice (Element mono)) => mono -> Element mono
+foldJoin = foldr (\/) bottom
+
+foldMeet :: (MonoFoldable mono, BoundedMeetSemiLattice (Element mono)) => mono -> Element mono
+foldMeet = foldr (/\) top
diff --git a/src/Utils/PathPiece.hs b/src/Utils/PathPiece.hs
index c7434b54f..2d9b8b860 100644
--- a/src/Utils/PathPiece.hs
+++ b/src/Utils/PathPiece.hs
@@ -5,6 +5,7 @@ module Utils.PathPiece
   , splitCamel
   , camelToPathPiece, camelToPathPiece'
   , tuplePathPiece
+  , pathPieceJSONKey
   ) where
 
 import ClassyPrelude.Yesod
@@ -22,6 +23,8 @@ import qualified Data.Map as Map
 import Numeric.Natural
 
 import Data.List (foldl)
+
+import Data.Aeson.Types
   
 
 finiteFromPathPiece :: (PathPiece a, Finite a) => Text -> Maybe a
@@ -109,3 +112,13 @@ tuplePathPiece tupleDim = do
                          ]) []
       ]
     ]
+
+
+pathPieceJSONKey :: Name -> DecsQ
+-- ^ Derive `ToJSONKey`- and `FromJSONKey`-Instances from a `PathPiece`-Instance
+pathPieceJSONKey tName
+  = [d| instance ToJSONKey $(conT tName) where
+          toJSONKey = toJSONKeyText toPathPiece
+        instance FromJSONKey $(conT tName) where
+          fromJSONKey = FromJSONKeyTextParser $ \t -> maybe (fail $ "Could not parse ‘" <> unpack t <> "’ as value for " <> $(TH.lift $ nameBase tName) <> "via PathPiece") return $ fromPathPiece t
+      |]

From d49eed8f4862feeecd7246ec247a5b5c17f249b5 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 16:46:16 +0200
Subject: [PATCH 374/519] include hidden pagination input in async table
 requests

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

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 8877c7991..ccc441038 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -309,11 +309,19 @@
     }
 
     function changePagesizeHandler(event) {
+      var paginationParamKey = asyncTableId + '-pagination';
       var pagesizeParamKey = asyncTableId + '-pagesize';
       var pageParamKey = asyncTableId + '-page';
+
+      var paginationParamEl = pagesizeForm.querySelector('[name="' + paginationParamKey + '"]');
       var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
       url.searchParams.set(pagesizeParamKey, event.target.value);
       url.searchParams.set(pageParamKey, 0);
+
+      if (paginationParamEl) {
+        var encodedValue = encodeURIComponent(paginationParamEl.value);
+        url.searchParams.set(paginationParamKey, encodedValue);
+      }
       updateTableFrom(url.href);
     }
 

From 02b0bf3aefbc6216b158e307fa5b77ca66e33b2e Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 18:36:31 +0200
Subject: [PATCH 375/519] add pre commit hook for auto js linting

---
 .babelrc          |    3 +-
 .eslintrc.json    |   27 +
 package-lock.json | 1836 ++++++++++++++++++++++++++++++++++++++++++++-
 package.json      |   29 +-
 4 files changed, 1880 insertions(+), 15 deletions(-)
 create mode 100644 .eslintrc.json

diff --git a/.babelrc b/.babelrc
index 1320b9a32..644dde977 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,4 @@
 {
-  "presets": ["@babel/preset-env"]
+  "presets": ["@babel/preset-env"],
+  "plugins": ["@babel/plugin-proposal-class-properties"]
 }
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000000000..4215ffb75
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,27 @@
+{
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly",
+        "HttpClient": "readonly",
+        "UtilRegistry": "readonly",
+        "HtmlHelpers": "readonly",
+        "I18n": "readonly",
+        "flatpickr": "readonly",
+        "$": "readonly"
+    },
+    "parser": "babel-eslint",
+    "parserOptions": {
+        "ecmaVersion": 2018
+    },
+    "rules": {
+        "no-console": "off",
+        "no-extra-semi": "off",
+        "semi": ["error", "always"],
+        "comma-dangle": ["error", "always-multiline"]
+    }
+}
diff --git a/package-lock.json b/package-lock.json
index 957856920..93f0290f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -113,6 +113,20 @@
         "@babel/types": "^7.4.4"
       }
     },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz",
+      "integrity": "sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-member-expression-to-functions": "^7.0.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.4.4",
+        "@babel/helper-split-export-declaration": "^7.4.4"
+      }
+    },
     "@babel/helper-define-map": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz",
@@ -314,6 +328,16 @@
         "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz",
+      "integrity": "sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
     "@babel/plugin-proposal-json-strings": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
@@ -752,6 +776,15 @@
         "semver": "^5.5.0"
       }
     },
+    "@babel/runtime": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
+      "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.2"
+      }
+    },
     "@babel/template": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
@@ -808,6 +841,57 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@samverschueren/stream-to-observable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz",
+      "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==",
+      "dev": true,
+      "requires": {
+        "any-observable": "^0.3.0"
+      }
+    },
+    "@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+      "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
+      "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+      "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "dev": true
+    },
     "ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -817,6 +901,12 @@
         "color-convert": "^1.9.0"
       }
     },
+    "any-observable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz",
+      "integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==",
+      "dev": true
+    },
     "anymatch": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
@@ -840,6 +930,15 @@
         }
       }
     },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -858,18 +957,45 @@
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true
+    },
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -883,6 +1009,20 @@
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
+    "babel-eslint": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
+      "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.0.0",
+        "@babel/traverse": "^7.0.0",
+        "@babel/types": "^7.0.0",
+        "eslint-scope": "3.7.1",
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1018,6 +1158,30 @@
         "unset-value": "^1.0.0"
       }
     },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "requires": {
+        "callsites": "^2.0.0"
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "requires": {
+        "caller-callsite": "^2.0.0"
+      }
+    },
+    "callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "dev": true
+    },
     "caniuse-lite": {
       "version": "1.0.30000971",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz",
@@ -1035,6 +1199,12 @@
         "supports-color": "^5.3.0"
       }
     },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
     "chokidar": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
@@ -1056,6 +1226,12 @@
         "upath": "^1.1.1"
       }
     },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -1079,6 +1255,80 @@
         }
       }
     },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-truncate": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
+      "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=",
+      "dev": true,
+      "requires": {
+        "slice-ansi": "0.0.4",
+        "string-width": "^1.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "slice-ansi": {
+          "version": "0.0.4",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+          "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -1169,6 +1419,37 @@
       "dev": true,
       "optional": true
     },
+    "cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "dev": true,
+      "requires": {
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      }
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "date-fns": {
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
+      "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
+      "dev": true
+    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1184,6 +1465,18 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -1225,18 +1518,221 @@
         }
       }
     },
+    "del": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "dev": true,
+      "requires": {
+        "globby": "^6.1.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
     "electron-to-chromium": {
       "version": "1.3.136",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.136.tgz",
       "integrity": "sha512-xHkYkbEi4kI+2w5v6yBGCQTRXL7N0PWscygTFZu/1bArnPSo2WR9xjdw4m06RR4J5PncrWJcuOVv+MAG2mK5JQ==",
       "dev": true
     },
+    "elegant-spinner": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
+      "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
+    "eslint": {
+      "version": "5.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
+      "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.9.1",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
+        "eslint-utils": "^1.3.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^5.0.1",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^6.2.2",
+        "js-yaml": "^3.13.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^5.5.1",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "^2.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "eslint-scope": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "import-fresh": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
+          "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
+          "dev": true,
+          "requires": {
+            "parent-module": "^1.0.0",
+            "resolve-from": "^4.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+      "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "dev": true
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "dev": true
+    },
+    "espree": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
+      "dev": true,
+      "requires": {
+        "acorn": "^6.0.7",
+        "acorn-jsx": "^5.0.0",
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
     "esutils": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
@@ -1252,6 +1748,21 @@
         "merge": "^1.2.0"
       }
     },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -1308,6 +1819,17 @@
         }
       }
     },
+    "external-editor": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+      "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -1373,6 +1895,42 @@
         }
       }
     },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^2.0.1"
+      }
+    },
     "fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -1396,6 +1954,44 @@
         }
       }
     },
+    "find-parent-dir": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
+      "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
+      "dev": true
+    },
+    "find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^3.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      }
+    },
+    "flatted": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
+      "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
+      "dev": true
+    },
+    "fn-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz",
+      "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=",
+      "dev": true
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -1464,12 +2060,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1484,17 +2082,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1611,7 +2212,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1623,6 +2225,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1637,6 +2240,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1644,12 +2248,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -1668,6 +2274,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -1748,7 +2355,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1760,6 +2368,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1881,6 +2490,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -1952,6 +2562,44 @@
         }
       }
     },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "g-status": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/g-status/-/g-status-2.0.2.tgz",
+      "integrity": "sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==",
+      "dev": true,
+      "requires": {
+        "arrify": "^1.0.1",
+        "matcher": "^1.0.0",
+        "simple-git": "^1.85.0"
+      }
+    },
+    "get-own-enumerable-property-symbols": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz",
+      "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
+      "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -2001,12 +2649,50 @@
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
+    "globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
     "graceful-fs": {
       "version": "4.1.15",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
       "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
       "dev": true
     },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        }
+      }
+    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -2045,6 +2731,75 @@
         }
       }
     },
+    "hosted-git-info": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "dev": true
+    },
+    "husky": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-2.3.0.tgz",
+      "integrity": "sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.2.0",
+        "execa": "^1.0.0",
+        "find-up": "^3.0.0",
+        "get-stdin": "^7.0.0",
+        "is-ci": "^2.0.0",
+        "pkg-dir": "^4.1.0",
+        "please-upgrade-node": "^3.1.1",
+        "read-pkg": "^5.1.1",
+        "run-node": "^1.0.0",
+        "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "dev": true
+        }
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+      "dev": true
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -2061,6 +2816,44 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true
     },
+    "inquirer": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
+      "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.11",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -2090,6 +2883,12 @@
         }
       }
     },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
     "is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
@@ -2106,6 +2905,15 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^2.0.0"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -2145,6 +2953,12 @@
         }
       }
     },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -2157,12 +2971,17 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
     "is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -2187,6 +3006,45 @@
         }
       }
     },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "dev": true
+    },
+    "is-observable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz",
+      "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==",
+      "dev": true,
+      "requires": {
+        "symbol-observable": "^1.1.0"
+      }
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -2202,6 +3060,24 @@
         "isobject": "^3.0.1"
       }
     },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -2214,6 +3090,12 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -2232,12 +3114,40 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
     "json5": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
@@ -2261,12 +3171,222 @@
       "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
       "dev": true
     },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "lint-staged": {
+      "version": "8.1.7",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-8.1.7.tgz",
+      "integrity": "sha512-egT0goFhIFoOGk6rasPngTFh2qDqxZddM0PwI58oi66RxCDcn5uDwxmiasWIF0qGnchHSYVJ8HPRD5LrFo7TKA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.3.1",
+        "commander": "^2.14.1",
+        "cosmiconfig": "^5.2.0",
+        "debug": "^3.1.0",
+        "dedent": "^0.7.0",
+        "del": "^3.0.0",
+        "execa": "^1.0.0",
+        "find-parent-dir": "^0.3.0",
+        "g-status": "^2.0.2",
+        "is-glob": "^4.0.0",
+        "is-windows": "^1.0.2",
+        "listr": "^0.14.2",
+        "listr-update-renderer": "^0.5.0",
+        "lodash": "^4.17.11",
+        "log-symbols": "^2.2.0",
+        "micromatch": "^3.1.8",
+        "npm-which": "^3.0.1",
+        "p-map": "^1.1.1",
+        "path-is-inside": "^1.0.2",
+        "pify": "^3.0.0",
+        "please-upgrade-node": "^3.0.2",
+        "staged-git-files": "1.1.2",
+        "string-argv": "^0.0.2",
+        "stringify-object": "^3.2.2",
+        "yup": "^0.27.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "listr": {
+      "version": "0.14.3",
+      "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz",
+      "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==",
+      "dev": true,
+      "requires": {
+        "@samverschueren/stream-to-observable": "^0.3.0",
+        "is-observable": "^1.1.0",
+        "is-promise": "^2.1.0",
+        "is-stream": "^1.1.0",
+        "listr-silent-renderer": "^1.1.1",
+        "listr-update-renderer": "^0.5.0",
+        "listr-verbose-renderer": "^0.5.0",
+        "p-map": "^2.0.0",
+        "rxjs": "^6.3.3"
+      },
+      "dependencies": {
+        "p-map": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+          "dev": true
+        }
+      }
+    },
+    "listr-silent-renderer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
+      "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=",
+      "dev": true
+    },
+    "listr-update-renderer": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz",
+      "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "cli-truncate": "^0.2.1",
+        "elegant-spinner": "^1.0.1",
+        "figures": "^1.7.0",
+        "indent-string": "^3.0.0",
+        "log-symbols": "^1.0.2",
+        "log-update": "^2.3.0",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "figures": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
+          }
+        },
+        "log-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+          "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+          "dev": true,
+          "requires": {
+            "chalk": "^1.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "listr-verbose-renderer": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz",
+      "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "cli-cursor": "^2.1.0",
+        "date-fns": "^1.27.2",
+        "figures": "^2.0.0"
+      }
+    },
+    "locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
     "lodash": {
       "version": "4.17.11",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
       "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
       "dev": true
     },
+    "log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1"
+      }
+    },
+    "log-update": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz",
+      "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "cli-cursor": "^2.0.0",
+        "wrap-ansi": "^3.0.1"
+      }
+    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -2291,6 +3411,15 @@
         "object-visit": "^1.0.0"
       }
     },
+    "matcher": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz",
+      "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.4"
+      }
+    },
     "merge": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
@@ -2318,6 +3447,12 @@
         "to-regex": "^3.0.2"
       }
     },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -2369,6 +3504,12 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
     "nan": {
       "version": "2.14.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
@@ -2395,6 +3536,18 @@
         "to-regex": "^3.0.1"
       }
     },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
     "node-releases": {
       "version": "1.1.21",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.21.tgz",
@@ -2404,6 +3557,18 @@
         "semver": "^5.3.0"
       }
     },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -2411,6 +3576,47 @@
       "dev": true,
       "optional": true
     },
+    "npm-path": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz",
+      "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==",
+      "dev": true,
+      "requires": {
+        "which": "^1.2.10"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "npm-which": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz",
+      "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=",
+      "dev": true,
+      "requires": {
+        "commander": "^2.9.0",
+        "npm-path": "^2.0.2",
+        "which": "^1.2.10"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
     "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
@@ -2469,6 +3675,35 @@
         "wrappy": "1"
       }
     },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
     "output-file-sync": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz",
@@ -2480,6 +3715,69 @@
         "mkdirp": "^0.5.1"
       }
     },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.0.0"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+          "dev": true
+        }
+      }
+    },
+    "parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      }
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -2493,24 +3791,116 @@
       "dev": true,
       "optional": true
     },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
     "path-parse": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.0.0.tgz",
+          "integrity": "sha512-zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        }
+      }
+    },
+    "please-upgrade-node": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz",
+      "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==",
+      "dev": true,
+      "requires": {
+        "semver-compare": "^1.0.0"
+      }
+    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
       "dev": true
     },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -2524,6 +3914,46 @@
       "dev": true,
       "optional": true
     },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "property-expr": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-1.5.1.tgz",
+      "integrity": "sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==",
+      "dev": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "read-pkg": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.1.1.tgz",
+      "integrity": "sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==",
+      "dev": true,
+      "requires": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^4.0.0",
+        "type-fest": "^0.4.1"
+      }
+    },
     "readable-stream": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
@@ -2567,6 +3997,12 @@
         "regenerate": "^1.4.0"
       }
     },
+    "regenerator-runtime": {
+      "version": "0.13.2",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+      "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+      "dev": true
+    },
     "regenerator-transform": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.0.tgz",
@@ -2592,6 +4028,12 @@
       "integrity": "sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==",
       "dev": true
     },
+    "regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "dev": true
+    },
     "regexpu-core": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
@@ -2657,18 +4099,67 @@
         "path-parse": "^1.0.6"
       }
     },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz",
+      "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==",
+      "dev": true
+    },
+    "rxjs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
+      "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -2684,12 +4175,24 @@
         "ret": "~0.1.10"
       }
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
     "semver": {
       "version": "5.7.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
       "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
       "dev": true
     },
+    "semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
+      "dev": true
+    },
     "set-value": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
@@ -2713,12 +4216,70 @@
         }
       }
     },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "simple-git": {
+      "version": "1.113.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.113.0.tgz",
+      "integrity": "sha512-i9WVsrK2u0G/cASI9nh7voxOk9mhanWY9eGtWBDSYql6m49Yk5/Fan6uZsDr/xmzv8n+eQ8ahKCoEr8cvU3h+g==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
     "slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
       "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
       "dev": true
     },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -2851,6 +4412,38 @@
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
       "dev": true
     },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
+      "dev": true
+    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -2860,6 +4453,18 @@
         "extend-shallow": "^3.0.0"
       }
     },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "staged-git-files": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/staged-git-files/-/staged-git-files-1.1.2.tgz",
+      "integrity": "sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==",
+      "dev": true
+    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -2881,6 +4486,22 @@
         }
       }
     },
+    "string-argv": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz",
+      "integrity": "sha1-2sMECGkMIfPDYwo/86BYd73L1zY=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -2891,6 +4512,38 @@
         "safe-buffer": "~5.1.0"
       }
     },
+    "stringify-object": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "dev": true,
+      "requires": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -2900,6 +4553,79 @@
         "has-flag": "^3.0.0"
       }
     },
+    "symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "dev": true
+    },
+    "synchronous-promise": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.9.tgz",
+      "integrity": "sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==",
+      "dev": true
+    },
+    "table": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.0.tgz",
+      "integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.9.1",
+        "lodash": "^4.17.11",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -2948,12 +4674,39 @@
         "repeat-string": "^1.6.1"
       }
     },
+    "toposort": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
+      "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=",
+      "dev": true
+    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-fest": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz",
+      "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==",
+      "dev": true
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -3064,6 +4817,15 @@
       "dev": true,
       "optional": true
     },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
@@ -3083,6 +4845,16 @@
       "dev": true,
       "optional": true
     },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
     "watch": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
@@ -3101,11 +4873,59 @@
         }
       }
     },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
+      "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=",
+      "dev": true,
+      "requires": {
+        "string-width": "^2.1.1",
+        "strip-ansi": "^4.0.0"
+      }
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
+    },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "yup": {
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/yup/-/yup-0.27.0.tgz",
+      "integrity": "sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.0.0",
+        "fn-name": "~2.0.1",
+        "lodash": "^4.17.11",
+        "property-expr": "^1.5.0",
+        "synchronous-promise": "^2.0.6",
+        "toposort": "^2.0.2"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 01b344a8e..6c60d6838 100644
--- a/package.json
+++ b/package.json
@@ -2,17 +2,34 @@
   "name": "uni2work",
   "version": "1.0.0",
   "description": "",
-  "scripts": {
-    "watch": "watch babel static/es",
-    "babel": "babel static/es -d static/js"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",
+  "scripts": {
+    "babel": "babel static/es -d static/js",
+    "babel:watch": "watch 'npm run babel' static/es",
+    "lint": "eslint static/es"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "static/es/**/*.js": [
+      "eslint",
+      "git add"
+    ]
+  },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
     "@babel/core": "^7.4.5",
-    "watch": "^1.0.2",
-    "@babel/preset-env": "^7.4.5"
+    "@babel/plugin-proposal-class-properties": "^7.4.4",
+    "@babel/preset-env": "^7.4.5",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.16.0",
+    "husky": "^2.3.0",
+    "lint-staged": "^8.1.7",
+    "watch": "^1.0.2"
   }
 }

From 6f2b887b01c59ae8b281f2d276c45cb03b60ac6d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 18:40:54 +0200
Subject: [PATCH 376/519] gitignore generated js files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a301f0f29..6360f1249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 dist*
+static/js/
 static/tmp/
 static/combined/
 *.hi

From f6c0ddf45ca10d49a572649f1fedc738e734f409 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 18:45:10 +0200
Subject: [PATCH 377/519] port js services to class syntax and move to
 static/es

---
 static/es/services/htmlHelpers.js  |  43 ++++++++++
 static/es/services/httpClient.js   |  58 ++++++++++++++
 static/es/services/i18n.js         |  34 ++++++++
 static/es/services/utilRegistry.js | 121 +++++++++++++++++++++++++++++
 4 files changed, 256 insertions(+)
 create mode 100644 static/es/services/htmlHelpers.js
 create mode 100644 static/es/services/httpClient.js
 create mode 100644 static/es/services/i18n.js
 create mode 100644 static/es/services/utilRegistry.js

diff --git a/static/es/services/htmlHelpers.js b/static/es/services/htmlHelpers.js
new file mode 100644
index 000000000..60b9f1471
--- /dev/null
+++ b/static/es/services/htmlHelpers.js
@@ -0,0 +1,43 @@
+class HtmlHelpers {
+
+  // `parseResponse` takes a raw HttpClient response and an options object.
+  // Returns an object with `element` being an contextual fragment of the
+  // HTML in the response and `ifPrefix` being the prefix that was used to
+  // "unique-ify" the ids of the received HTML.
+  // Original Response IDs can optionally be kept by adding `keepIds: true`
+  // to the `options` object.
+  parseResponse(response, options = {}) {
+    return response.text()
+      .then(
+        (responseText) => {
+          const docFrag = document.createRange().createContextualFragment(responseText);
+          let idPrefix;
+          if (!options.keepIds) {
+            idPrefix = this._getIdPrefix();
+            this._prefixIds(docFrag, idPrefix);
+          }
+          return Promise.resolve({ idPrefix, element: docFrag });
+        },
+        Promise.reject,
+      ).catch(console.error);
+  }
+
+  _prefixIds(element, idPrefix) {
+    const idAttrs = ['id', 'for', 'data-conditional-input', 'data-modal-trigger'];
+
+    idAttrs.forEach((attr) => {
+      Array.from(element.querySelectorAll('[' + attr + ']')).forEach((input) => {
+        const value = idPrefix + input.getAttribute(attr);
+        input.setAttribute(attr, value);
+      });
+    });
+  }
+
+  _getIdPrefix() {
+    // leading 'r'(andom) to overcome the fact that IDs
+    // starting with a numeric value are not valid in CSS
+    return 'r' + Math.floor(Math.random() * 100000) + '__';
+  }
+}
+
+window.HtmlHelpers = new HtmlHelpers();
diff --git a/static/es/services/httpClient.js b/static/es/services/httpClient.js
new file mode 100644
index 000000000..a0199a8fa
--- /dev/null
+++ b/static/es/services/httpClient.js
@@ -0,0 +1,58 @@
+class HttpClient {
+
+  static ACCEPT = {
+    TEXT_HTML: 'text/html',
+    JSON: 'application/json',
+  };
+
+  _responseInterceptors = [];
+
+  addResponseInterceptor(interceptor) {
+    if (typeof interceptor === 'function') {
+      this._responseInterceptors.push(interceptor);
+    }
+  }
+
+  get(args) {
+    args.method = 'GET';
+    return this._fetch(args);
+  }
+
+  post(args) {
+    args.method = 'POST';
+    return this._fetch(args);
+  }
+
+  _fetch(options) {
+    const requestOptions = {
+      credentials: 'same-origin',
+      ...options,
+    };
+
+    return fetch(options.url, requestOptions)
+      .then(
+        (response) => {
+          this._responseInterceptors.forEach((interceptor) => interceptor(response, options));
+          return Promise.resolve(response);
+        },
+        Promise.reject,
+      ).catch(console.error);
+  }
+}
+
+window.HttpClient = new HttpClient();
+
+// HttpClient ships with its own little interceptor to throw an error
+// if the response does not match the expected content-type
+function contentTypeInterceptor(response, options) {
+  if (!options || !options.accept) {
+    return;
+  }
+
+  const contentType = response.headers.get("content-type");
+  if (!contentType.match(options.accept)) {
+    throw new Error('Server returned with "' + contentType + '" when "' + options.accept + '" was expected');
+  }
+}
+
+window.HttpClient.addResponseInterceptor(contentTypeInterceptor);
diff --git a/static/es/services/i18n.js b/static/es/services/i18n.js
new file mode 100644
index 000000000..f36de73ab
--- /dev/null
+++ b/static/es/services/i18n.js
@@ -0,0 +1,34 @@
+  /**
+   * 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.
+   *
+   */
+
+class I18n {
+
+  translations = {};
+
+  add(id, translation) {
+    this.translations[id] = translation;
+  }
+
+  addMany(manyTranslations) {
+    Object.keys(manyTranslations).forEach((key) => this.add(key, manyTranslations[key]));
+  }
+
+  get(id) {
+    if (!this.translations[id]) {
+      throw new Error('I18N Error: Translation missing for »' + id + '«!');
+    }
+    return this.translations[id];
+  }
+}
+
+window.I18n = new I18n();
diff --git a/static/es/services/utilRegistry.js b/static/es/services/utilRegistry.js
new file mode 100644
index 000000000..712721cc6
--- /dev/null
+++ b/static/es/services/utilRegistry.js
@@ -0,0 +1,121 @@
+const DEBUG_MODE = /localhost/.test(window.location.href) && 0;
+
+class UtilRegistry {
+
+  _registeredUtils = [];
+  _activeUtilInstances = [];
+
+  constructor() {
+    document.addEventListener('DOMContentLoaded', () => this.setupAll());
+  }
+
+  /**
+   * 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
+   */
+  register(util) {
+    if (DEBUG_MODE > 2) {
+      console.log('registering util "' + util.name + '"');
+      console.log({ util });
+    }
+    console.log('register...', { this: this });
+    this._registeredUtils.push(util);
+  }
+
+  deregister(name, destroy) {
+    const utilIndex = this._findUtilIndex(name);
+
+    if (utilIndex >= 0) {
+      if (destroy === true) {
+        this._destroyUtilInstances(name);
+      }
+
+      this._registeredUtils.splice(utilIndex, 1);
+    }
+  }
+
+  setupAll = (scope) => {
+    console.log('setupAll', { scope });
+    if (DEBUG_MODE > 1) {
+      console.info('registered js utilities:');
+      console.table(this._registeredUtils);
+    }
+
+    this._registeredUtils.forEach((util) => this.setup(util, scope));
+  }
+
+  setup(util, scope = document.body) {
+    if (DEBUG_MODE > 2) {
+      console.log('setting up util', { util });
+    }
+
+    if (util && typeof util.setup === 'function') {
+      const elements = this._findUtilElements(util, scope);
+
+      elements.forEach((element) => {
+        let utilInstance = null;
+
+        try {
+          utilInstance = util.setup(element);
+        } catch(err) {
+          if (DEBUG_MODE > 0) {
+            console.warn('Error while trying to initialize a utility!', { util , element, err });
+          }
+        }
+
+        if (utilInstance) {
+          if (DEBUG_MODE > 2) {
+            console.info('Got utility instance for utility "' + util.name + '"', { utilInstance });
+          }
+
+          this._activeUtilInstances.push(utilInstance);
+        }
+      });
+    }
+  }
+
+  find(name) {
+    return this._registeredUtils.find((util) => util.name === name);
+  }
+
+  _findUtilElements(util, scope) {
+    if (scope && scope.matches(util.selector)) {
+      return [scope];
+    }
+    return Array.from(scope.querySelectorAll(util.selector));
+  }
+
+  _findUtilIndex(name) {
+    return this._registeredUtils.findIndex((util) => util.name === name);
+  }
+
+  _destroyUtilInstances(name) {
+    this._activeUtilInstances
+      .map((util, index) => ({
+        util: util,
+        index: index,
+      }))
+      .filter((activeUtil) => activeUtil.util.name === name)
+      .forEach((activeUtil) => {
+        // destroy util instance
+        activeUtil.util.destroy();
+        delete this._activeUtilInstances[activeUtil.index];
+      });
+
+    // get rid of now empty array slots
+    this._activeUtilInstances = this._activeUtilInstances.filter((util) => !!util);
+  }
+}
+
+window.UtilRegistry = new UtilRegistry();

From b7af8249d7cf66dc89fe1540861f5421502404ec Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 18:45:58 +0200
Subject: [PATCH 378/519] move js utils to static/es and fix linting warnings

---
 static/es/utils/alerts.js     | 212 ++++++++++++
 static/es/utils/asidenav.js   | 109 ++++++
 static/es/utils/asyncForm.js  | 126 +++++++
 static/es/utils/asyncTable.js | 422 +++++++++++++++++++++++
 static/es/utils/checkAll.js   | 150 +++++++++
 static/es/utils/form.js       | 611 ++++++++++++++++++++++++++++++++++
 static/es/utils/inputs.js     | 200 +++++++++++
 static/es/utils/massInput.js  | 232 +++++++++++++
 static/es/utils/modal.js      | 212 ++++++++++++
 static/es/utils/showHide.js   | 114 +++++++
 static/es/utils/tabber.js     |  90 +++++
 11 files changed, 2478 insertions(+)
 create mode 100644 static/es/utils/alerts.js
 create mode 100644 static/es/utils/asidenav.js
 create mode 100644 static/es/utils/asyncForm.js
 create mode 100644 static/es/utils/asyncTable.js
 create mode 100644 static/es/utils/checkAll.js
 create mode 100644 static/es/utils/form.js
 create mode 100644 static/es/utils/inputs.js
 create mode 100644 static/es/utils/massInput.js
 create mode 100644 static/es/utils/modal.js
 create mode 100644 static/es/utils/showHide.js
 create mode 100644 static/es/utils/tabber.js

diff --git a/static/es/utils/alerts.js b/static/es/utils/alerts.js
new file mode 100644
index 000000000..427e38373
--- /dev/null
+++ b/static/es/utils/alerts.js
@@ -0,0 +1,212 @@
+(function() {
+  'use strict';
+
+  /**
+   *
+   * 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_UTIL_NAME = 'alerts';
+  var ALERTS_UTIL_SELECTOR = '[uw-alerts]';
+
+  var ALERTS_INITIALIZED_CLASS = 'alerts--initialized';
+  var ALERTS_ELEVATED_CLASS = 'alerts--elevated';
+  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_ICON_CLASS = 'alert__icon';
+  var ALERT_CONTENT_CLASS = 'alert__content';
+  var ALERT_INVISIBLE_CLASS = 'alert--invisible';
+  var ALERT_AUTO_HIDE_DELAY = 10;
+  var ALERT_AUTOCLOSING_MATCHER = '.alert-info, .alert-success';
+
+  var alertsUtil = function(element) {
+    var togglerCheckRequested = false;
+    var togglerElement;
+    var alertElements;
+
+    function init() {
+      if (!element) {
+        throw new Error('Alerts util has to be called with an element!');
+      }
+
+      if (element.classList.contains(ALERTS_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      togglerElement = element.querySelector('.' + ALERTS_TOGGLER_CLASS);
+      alertElements = gatherAlertElements();
+
+      initToggler();
+      initAlerts();
+
+      // register http client interceptor to filter out Alerts Header
+      setupHttpInterceptor();
+
+      // 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() {
+      togglerElement.addEventListener('click', function() {
+        alertElements.forEach(function(alertEl) {
+          toggleAlert(alertEl, true);
+        });
+        togglerElement.classList.remove(ALERTS_TOGGLER_VISIBLE_CLASS);
+      });
+    }
+
+    function initAlerts() {
+      alertElements.forEach(initAlert);
+    }
+
+    function initAlert(alertElement) {
+      var autoHideDelay = ALERT_AUTO_HIDE_DELAY;
+      if (alertElement.dataset.decay) {
+        autoHideDelay = parseInt(alertElement.dataset.decay, 10);
+      }
+
+      var closeEl = alertElement.querySelector('.' + ALERT_CLOSER_CLASS);
+      closeEl.addEventListener('click', function() {
+        toggleAlert(alertElement);
+      });
+
+      if (autoHideDelay > 0 && alertElement.matches(ALERT_AUTOCLOSING_MATCHER)) {
+        window.setTimeout(function() {
+          toggleAlert(alertElement);
+        }, autoHideDelay * 1000);
+      }
+    }
+
+    function toggleAlert(alertEl, visible) {
+      alertEl.classList.toggle(ALERT_INVISIBLE_CLASS, !visible);
+      checkToggler();
+    }
+
+    function checkToggler() {
+      if (togglerCheckRequested) {
+        return;
+      }
+
+      var alertsHidden = alertElements.reduce(function(acc, alert) {
+        return acc && alert.classList.contains(ALERT_INVISIBLE_CLASS);
+      }, true);
+
+      window.setTimeout(function() {
+        togglerElement.classList.toggle(ALERTS_TOGGLER_VISIBLE_CLASS, alertsHidden);
+        togglerCheckRequested = false;
+      }, ALERTS_TOGGLER_APPEAR_DELAY);
+    }
+
+    function setupHttpInterceptor() {
+      if (HttpClient) {
+        HttpClient.addResponseInterceptor(responseInterceptor.bind(this));
+      }
+    }
+
+    function elevateAlerts() {
+      element.classList.add(ALERTS_ELEVATED_CLASS);
+    }
+
+    function responseInterceptor(response) {
+      var alerts;
+      for (var header of response.headers) {
+        if (header[0] === 'alerts') {
+          var decodedHeader = decodeURIComponent(header[1]);
+          alerts = JSON.parse(decodedHeader);
+          break;
+        }
+      }
+
+      if (alerts) {
+        alerts.forEach(function(alert) {
+          var alertElement = createAlertElement(alert.status, alert.content);
+          element.appendChild(alertElement);
+          alertElements.push(alertElement);
+          initAlert(alertElement);
+        });
+
+        elevateAlerts();
+      }
+    }
+
+    function createAlertElement(type, content) {
+      var alertElement = document.createElement('div');
+      alertElement.classList.add(ALERT_CLASS, 'alert-' + type);
+
+      var alertCloser = document.createElement('div');
+      alertCloser.classList.add(ALERT_CLOSER_CLASS);
+
+      var alertIcon = document.createElement('div');
+      alertIcon.classList.add(ALERT_ICON_CLASS);
+
+      var alertContent = document.createElement('div');
+      alertContent.classList.add(ALERT_CONTENT_CLASS);
+      alertContent.innerHTML = content;
+
+      alertElement.appendChild(alertCloser);
+      alertElement.appendChild(alertIcon);
+      alertElement.appendChild(alertContent);
+
+      return alertElement;
+    }
+
+    return init();
+  };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: ALERTS_UTIL_NAME,
+      selector: ALERTS_UTIL_SELECTOR,
+      setup: alertsUtil,
+    });
+  }
+})();
diff --git a/static/es/utils/asidenav.js b/static/es/utils/asidenav.js
new file mode 100644
index 000000000..b9fc1e323
--- /dev/null
+++ b/static/es/utils/asidenav.js
@@ -0,0 +1,109 @@
+(function() {
+  'use strict';
+
+  /**
+   *
+   * 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';
+
+  var asidenavUtil = function(element) {
+
+    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);
+        element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
+        event.preventDefault();
+      }, true);
+    }
+
+    function initAsidenavSubmenus() {
+      var asidenavLinksWithSubmenus = Array.from(element.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
+        .map(function(listItem) {
+          var submenu = listItem.querySelector('.' + ASIDENAV_SUBMENU_CLASS);
+          return { listItem, submenu };
+        }).filter(function(union) {
+          return union.submenu !== null;
+        });
+
+      asidenavLinksWithSubmenus.forEach(function(union) {
+        union.listItem.addEventListener('mouseover', createMouseoverHandler(union));
+      });
+    }
+
+    function createMouseoverHandler(union) {
+      return function mouseoverHanlder() {
+        var rectListItem = union.listItem.getBoundingClientRect();
+        var rectSubMenu = union.submenu.getBoundingClientRect();
+
+        union.submenu.style.left = (rectListItem.left + rectListItem.width) + 'px';
+        if (window.innerHeight - rectListItem.top < rectSubMenu.height) {
+          union.submenu.style.top = (rectListItem.top + rectListItem.height - rectSubMenu.height) + 'px';
+        } else {
+          union.submenu.style.top = rectListItem.top + 'px';
+        }
+
+      };
+    }
+
+    return init();
+  };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: ASIDENAV_UTIL_NAME,
+      selector: ASIDENAV_UTIL_SELECTOR,
+      setup: asidenavUtil,
+    });
+  }
+})();
diff --git a/static/es/utils/asyncForm.js b/static/es/utils/asyncForm.js
new file mode 100644
index 000000000..38ecb1f5f
--- /dev/null
+++ b/static/es/utils/asyncForm.js
@@ -0,0 +1,126 @@
+(function collonadeClosure() {
+  'use strict';
+
+  /**
+   *
+   * 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='...'>
+   *     ...
+   *
+   * 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';
+  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 MODAL_SELECTOR = '.modal';
+  var MODAL_HEADER_KEY = 'Is-Modal';
+  var MODAL_HEADER_VALUE = 'True';
+
+  var asyncFormUtil = function(element) {
+
+    var lastRequestTimestamp = 0;
+
+    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 = 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, element);
+        element.remove();
+      }, delay);
+    }
+
+    function makeResponseElement(content, status) {
+      var responseElement = document.createElement('div');
+      status = status || 'info';
+      responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS);
+      responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS + '--' + status);
+      responseElement.innerHTML = content;
+      return responseElement;
+    }
+
+    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();
+
+      var url = element.getAttribute('action');
+      var headers = { };
+      var body = new FormData(element);
+
+      var isModal = element.closest(MODAL_SELECTOR);
+      if (isModal) {
+        headers[MODAL_HEADER_KEY] = MODAL_HEADER_VALUE;
+      }
+
+      HttpClient.post({
+        url: url,
+        headers: headers,
+        body: body,
+        accept: HttpClient.ACCEPT.JSON,
+      }).then(function(response) {
+        return response.json();
+      }).then(function(response) {
+        processResponse(response[0]);
+      }).catch(function() {
+        var failureMessage = I18n.get('asyncFormFailure');
+        processResponse({ content: failureMessage });
+
+        element.classList.remove(ASYNC_FORM_LOADING_CLASS);
+      });
+    }
+
+    return init();
+  };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: ASYNC_FORM_UTIL_NAME,
+      selector: ASYNC_FORM_UTIL_SELECTOR,
+      setup: asyncFormUtil,
+    });
+  }
+})();
diff --git a/static/es/utils/asyncTable.js b/static/es/utils/asyncTable.js
new file mode 100644
index 000000000..8d3b4c8d8
--- /dev/null
+++ b/static/es/utils/asyncTable.js
@@ -0,0 +1,422 @@
+(function collonadeClosure() {
+  'use strict';
+
+  /**
+   *
+   * Async Table Utility
+   *  makes table filters, sorting and pagination behave asynchronously via AJAX calls
+   *
+   * Attribute: uw-async-table
+   *
+   * Example usage:
+  *   (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 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;
+
+    var ths = [];
+    var pageLinks = [];
+    var pagesizeForm;
+    var scrollTable;
+    var cssIdPrefix = '';
+
+    var tableFilterInputs = {
+      search: [],
+      input: [],
+      change: [],
+      select: [],
+    };
+
+    function init() {
+      if (!element) {
+        throw new Error('Async Table utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(ASYNC_TABLE_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      // param asyncTableDbHeader
+      if (element.dataset.asyncTableDbHeader !== undefined) {
+        asyncTableHeader = element.dataset.asyncTableDbHeader;
+      }
+
+      var rawTableId = element.querySelector('table').id;
+      cssIdPrefix = findCssIdPrefix(rawTableId);
+      asyncTableId = rawTableId.replace(cssIdPrefix, '');
+
+      // find scrolltable wrapper
+      scrollTable = element.querySelector(ASYNC_TABLE_SCROLLTABLE_SELECTOR);
+      if (!scrollTable) {
+        throw new Error('Async Table cannot be set up without a scrolltable element!');
+      }
+
+      setupSortableHeaders();
+      setupPagination();
+      setupPageSizeSelect();
+      setupTableFilter();
+
+      processLocalStorage();
+
+      // clear currentTableUrl from previous requests
+      setLocalStorageParameter('currentTableUrl', null);
+
+      // mark initialized
+      element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
+
+      return {
+        name: ASYNC_TABLE_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
+    }
+
+    function setupSortableHeaders() {
+      ths = Array.from(scrollTable.querySelectorAll('th.sortable')).map(function(th) {
+        return { element: th };
+      });
+
+      ths.forEach(function(th) {
+        th.clickHandler = function(event) {
+          setLocalStorageParameter('horizPos', (scrollTable || {}).scrollLeft);
+          linkClickHandler(event);
+        };
+        th.element.addEventListener('click', th.clickHandler);
+      });
+    }
+
+    function setupPagination() {
+      var pagination = element.querySelector('#' + cssIdPrefix + 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);
+            }
+            linkClickHandler(event);
+          };
+          link.element.addEventListener('click', link.clickHandler);
+        });
+      }
+    }
+
+    function setupPageSizeSelect() {
+      // pagesize form
+      pagesizeForm = element.querySelector('#' + cssIdPrefix + asyncTableId + '-pagesize-form');
+
+      if (pagesizeForm) {
+        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
+        pagesizeSelect.addEventListener('change', changePagesizeHandler);
+      }
+    }
+
+    function setupTableFilter() {
+      var tableFilterForm = element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
+
+      if (tableFilterForm) {
+        gatherTableFilterInputs(tableFilterForm);
+        addTableFilterEventListeners(tableFilterForm);
+      }
+    }
+
+    function gatherTableFilterInputs(tableFilterForm) {
+      Array.from(tableFilterForm.querySelectorAll('input[type="search"]')).forEach(function(input) {
+        tableFilterInputs.search.push(input);
+      });
+
+      Array.from(tableFilterForm.querySelectorAll('input[type="text"]')).forEach(function(input) {
+        tableFilterInputs.input.push(input);
+      });
+
+      Array.from(tableFilterForm.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
+        tableFilterInputs.change.push(input);
+      });
+
+      Array.from(tableFilterForm.querySelectorAll('select')).forEach(function(input) {
+        tableFilterInputs.select.push(input);
+      });
+    }
+
+    function addTableFilterEventListeners(tableFilterForm) {
+      tableFilterInputs.search.forEach(function(input) {
+        var debouncedInput = debounce(function() {
+          if (input.value.length === 0 || input.value.length > 2) {
+            updateFromTableFilter(tableFilterForm);
+          }
+        }, 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(tableFilterForm);
+          }
+        }, INPUT_DEBOUNCE);
+        input.addEventListener('input', debouncedInput);
+      });
+
+      tableFilterInputs.change.forEach(function(input) {
+        input.addEventListener('change', function() {
+          updateFromTableFilter(tableFilterForm);
+        });
+      });
+
+      tableFilterInputs.select.forEach(function(input) {
+        input.addEventListener('change', function() {
+          updateFromTableFilter(tableFilterForm);
+        });
+      });
+
+      tableFilterForm.addEventListener('submit', function(event) {
+        event.preventDefault();
+        updateFromTableFilter(tableFilterForm);
+      });
+    }
+
+    function updateFromTableFilter(tableFilterForm) {
+      var url = serializeTableFilterToURL();
+      var callback = null;
+
+      var focusedInput = tableFilterForm.querySelector(':focus, :active');
+      // focus previously focused input
+      if (focusedInput && focusedInput.selectionStart !== null) {
+        var selectionStart = focusedInput.selectionStart;
+        // remove the following part of the id to get rid of the random
+        // (yet somewhat structured) prefix we got from nudging.
+        var prefix = findCssIdPrefix(focusedInput.id);
+        var focusId = focusedInput.id.replace(prefix, '');
+        callback = function(wrapper) {
+          var idPrefix = getLocalStorageParameter('cssIdPrefix');
+          var toBeFocused = wrapper.querySelector('#' + idPrefix + focusId);
+          if (toBeFocused) {
+            toBeFocused.focus();
+            toBeFocused.selectionStart = selectionStart;
+          }
+        };
+      }
+      updateTableFrom(url, callback);
+    }
+
+    function serializeTableFilterToURL() {
+      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
+
+      var formIdElement = element.querySelector(ASYNC_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 processLocalStorage() {
+      var scrollTo = getLocalStorageParameter('scrollTo');
+      if (scrollTo && scrollTable) {
+        window.scrollTo(scrollTo);
+      }
+      setLocalStorageParameter('scrollTo', null);
+
+      var horizPos = getLocalStorageParameter('horizPos');
+      if (horizPos && scrollTable) {
+        scrollTable.scrollLeft = horizPos;
+      }
+      setLocalStorageParameter('horizPos', null);
+    }
+
+    function removeListeners() {
+      ths.forEach(function(th) {
+        th.element.removeEventListener('click', th.clickHandler);
+      });
+
+      pageLinks.forEach(function(link) {
+        link.element.removeEventListener('click', link.clickHandler);
+      });
+
+      if (pagesizeForm) {
+        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
+        pagesizeSelect.removeEventListener('change', changePagesizeHandler);
+      }
+    }
+
+    function linkClickHandler(event) {
+      event.preventDefault();
+      var url = getClickDestination(event.target);
+      if (!url.match(/^http/)) {
+        url = window.location.origin + window.location.pathname + url;
+      }
+      updateTableFrom(url);
+    }
+
+    function getClickDestination(el) {
+      if (!el.matches('a') && !el.querySelector('a')) {
+        return '';
+      }
+      return el.getAttribute('href') || el.querySelector('a').getAttribute('href');
+    }
+
+    function changePagesizeHandler(event) {
+      var pagesizeParamKey = asyncTableId + '-pagesize';
+      var pageParamKey = asyncTableId + '-page';
+      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
+      url.searchParams.set(pagesizeParamKey, event.target.value);
+      url.searchParams.set(pageParamKey, 0);
+      updateTableFrom(url.href);
+    }
+
+    // fetches new sorted element from url with params and replaces contents of current element
+    function updateTableFrom(url, callback) {
+      if (!HttpClient) {
+        throw new Error('HttpClient not found!');
+      }
+
+      element.classList.add(ASYNC_TABLE_LOADING_CLASS);
+
+      var headers = {
+        'Accept': 'text/html',
+        [asyncTableHeader]: asyncTableId,
+      };
+
+      HttpClient.get({
+        url: url,
+        headers: headers,
+        accept: HttpClient.ACCEPT.TEXT_HTML,
+      }).then(function(response) {
+        return HtmlHelpers.parseResponse(response);
+      }).then(function(response) {
+        setLocalStorageParameter('currentTableUrl', url.href);
+        // reset table
+        removeListeners();
+        element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
+        // update table with new
+        updateWrapperContents(response);
+
+        if (UtilRegistry) {
+          UtilRegistry.setupAll(element);
+        }
+
+        if (callback && typeof callback === 'function') {
+          setLocalStorageParameter('cssIdPrefix', response.idPrefix);
+          callback(element);
+          setLocalStorageParameter('cssIdPrefix', '');
+        }
+      }).catch(function(err) {
+        console.error(err);
+      }).finally(function() {
+        element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
+      });
+    }
+
+    function updateWrapperContents(response) {
+      var newPage = document.createElement('div');
+      newPage.appendChild(response.element);
+      var newWrapperContents = newPage.querySelector('#' + response.idPrefix + element.id);
+      element.innerHTML = newWrapperContents.innerHTML;
+    }
+
+    return init();
+  };
+
+  // returns any random nudged prefix found in the given id
+  function findCssIdPrefix(id) {
+    var matcher = /r\d*?__/;
+    var maybePrefix = id.match(matcher);
+    if (maybePrefix && maybePrefix[0]) {
+      return maybePrefix[0];
+    }
+    return '';
+  }
+
+  function setLocalStorageParameter(key, value) {
+    var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
+    if (value !== null) {
+      currentLSState[key] = value;
+    } else {
+      delete currentLSState[key];
+    }
+    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/es/utils/checkAll.js b/static/es/utils/checkAll.js
new file mode 100644
index 000000000..7886fc9e6
--- /dev/null
+++ b/static/es/utils/checkAll.js
@@ -0,0 +1,150 @@
+(function() {
+  'use strict';
+
+  /**
+   *
+   * 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"]';
+
+  var CHECK_ALL_INITIALIZED_CLASS = 'check-all--initialized';
+
+  var checkAllUtil = function(element) {
+    var columns = [];
+    var checkboxColumn = [];
+    var checkAllCheckbox = null;
+
+    function init() {
+      if (!element) {
+        throw new Error('Check All utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(CHECK_ALL_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      gatherColumns();
+      setupCheckAllCheckbox();
+
+      // mark initialized
+      element.classList.add(CHECK_ALL_INITIALIZED_CLASS);
+
+      return {
+        name: CHECK_ALL_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
+    }
+
+    function getCheckboxId() {
+      return 'check-all-checkbox-' + Math.floor(Math.random() * 100000);
+    }
+
+    function gatherColumns() {
+      var rows = Array.from(element.querySelectorAll('tr'));
+      var cols = [];
+      rows.forEach(function(tr) {
+        var cells = Array.from(tr.querySelectorAll('td'));
+        cells.forEach(function(cell, cellIndex) {
+          if (!cols[cellIndex]) {
+            cols[cellIndex] = [];
+          }
+          cols[cellIndex].push(cell);
+        });
+      });
+      columns = cols;
+    }
+
+    function findCheckboxColumn(columns) {
+      var checkboxColumnId = null;
+      columns.forEach(function(col, i) {
+        if (isCheckboxColumn(col)) {
+          checkboxColumnId = i;
+        }
+      });
+      return checkboxColumnId;
+    }
+
+    function isCheckboxColumn(col) {
+      var onlyCheckboxes = true;
+      col.forEach(function(cell) {
+        if (onlyCheckboxes && !cell.querySelector(CHECKBOX_SELECTOR)) {
+          onlyCheckboxes = false;
+        }
+      });
+      return onlyCheckboxes;
+    }
+
+    function setupCheckAllCheckbox() {
+      var checkboxColumnId = findCheckboxColumn(columns);
+      if (checkboxColumnId === null) {
+        return;
+      }
+
+      checkboxColumn = columns[checkboxColumnId];
+      var firstRow = element.querySelector('tr');
+      var th = Array.from(firstRow.querySelectorAll('th, td'))[checkboxColumnId];
+      checkAllCheckbox = document.createElement('input');
+      checkAllCheckbox.setAttribute('type', 'checkbox');
+      checkAllCheckbox.setAttribute('id', getCheckboxId());
+      th.insertBefore(checkAllCheckbox, th.firstChild);
+
+      // manually set up new checkbox
+      if (UtilRegistry) {
+        UtilRegistry.setup(UtilRegistry.find('checkbox'), th);
+      }
+
+      checkAllCheckbox.addEventListener('input', onCheckAllCheckboxInput);
+      setupCheckboxListeners();
+    }
+
+    function onCheckAllCheckboxInput() {
+      toggleAll(checkAllCheckbox.checked);
+    }
+
+    function setupCheckboxListeners() {
+      checkboxColumn
+        .map(function(cell) {
+          return cell.querySelector(CHECKBOX_SELECTOR);
+        })
+        .forEach(function(checkbox) {
+          checkbox.addEventListener('input', updateCheckAllCheckboxState);
+        });
+    }
+
+    function updateCheckAllCheckboxState() {
+      var allChecked = checkboxColumn.every(function(cell) {
+        return cell.querySelector(CHECKBOX_SELECTOR).checked;
+      });
+      checkAllCheckbox.checked = allChecked;
+    }
+
+    function toggleAll(checked) {
+      checkboxColumn.forEach(function(cell) {
+        cell.querySelector(CHECKBOX_SELECTOR).checked = checked;
+      });
+    }
+
+    return init();
+  };
+
+  // register check all checkbox util
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: CHECK_ALL_UTIL_NAME,
+      selector: CHECK_ALL_UTIL_SELECTOR,
+      setup: checkAllUtil,
+    });
+  }
+})();
diff --git a/static/es/utils/form.js b/static/es/utils/form.js
new file mode 100644
index 000000000..fe9bf351d
--- /dev/null
+++ b/static/es/utils/form.js
@@ -0,0 +1,611 @@
+(function() {
+  'use strict';
+
+  var formUtilities = [];
+
+  /**
+   *
+   * 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: [none]
+   *  (automatically setup on all form tags)
+   *
+   * 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>
+   */
+
+  var REACTIVE_SUBMIT_BUTTON_UTIL_NAME = 'reactiveSubmitButton';
+  // var REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR = 'form';
+
+  var REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS = 'reactive-submit-button--initialized';
+
+  /* eslint-disable-next-line */
+  var reactiveSubmitButtonUtil = 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)) {
+        return false;
+      }
+
+      // 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 || !submitButtons.length) {
+        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() {},
+      };
+    }
+
+    function setupInputs() {
+      requiredInputs.forEach(function(el) {
+        var checkbox = el.getAttribute('type') === 'checkbox';
+        var eventType = checkbox ? 'change' : 'input';
+        el.addEventListener(eventType, function() {
+          updateButtonState();
+        });
+      });
+    }
+
+    function updateButtonState() {
+      if (inputsValid()) {
+        submitButton.removeAttribute('disabled');
+      } else {
+        submitButton.setAttribute('disabled', 'true');
+      }
+    }
+
+    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();
+  };
+
+  // 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,
+  // });
+
+  /**
+   *
+   * 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
+   *    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>
+   * ## 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>
+   * ## 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';
+  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 INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled])';
+
+  var interactiveFieldsetUtil = function(element) {
+    var conditionalInput;
+    var conditionalValue;
+    var target;
+    var childInputs;
+
+    function init() {
+      if (!element) {
+        throw new Error('Interactive Fieldset utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      // 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.');
+      }
+
+      // param conditionalValue
+      if (!element.dataset.conditionalValue && !isCheckbox()) {
+        throw new Error('Interactive Fieldset needs a conditional value!');
+      }
+      conditionalValue = element.dataset.conditionalValue;
+
+      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));
+
+      // add event listener
+      var observer = new MutationObserver(() => updateVisibility());
+      observer.observe(conditionalInput, { attributes: true, attributeFilter: ['disabled'] });
+      conditionalInput.addEventListener('input', updateVisibility);
+
+      // initial visibility update
+      updateVisibility();
+
+      // mark as initialized
+      element.classList.add(INTERACTIVE_FIELDSET_INITIALIZED_CLASS);
+
+      return {
+        name: INTERACTIVE_FIELDSET_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
+    }
+
+    function updateVisibility() {
+      var active = matchesConditionalValue() && !conditionalInput.disabled;
+
+      target.classList.toggle('hidden', !active);
+
+      childInputs.forEach(function(el) {
+        el.disabled = !active;
+        if (el._flatpickr) {
+          el._flatpickr.altInput.disabled = !active;
+        }
+      });
+    }
+
+    function matchesConditionalValue() {
+      if (isCheckbox()) {
+        return conditionalInput.checked === true;
+      }
+
+      return conditionalInput.value === conditionalValue;
+    }
+
+    function isCheckbox() {
+      return conditionalInput.getAttribute('type') === 'checkbox';
+    }
+
+    return init();
+  };
+
+  formUtilities.push({
+    name: INTERACTIVE_FIELDSET_UTIL_NAME,
+    selector: INTERACTIVE_FIELDSET_UTIL_SELECTOR,
+    setup: interactiveFieldsetUtil,
+  });
+
+  /**
+   *
+   * Navigate Away Prompt Utility
+   *  This utility asks the user if (s)he really wants to navigate away
+   *  from a page containing a form if (s)he already touched an input.
+   *  Form-Submits will not trigger the prompt.
+   *  Utility will ignore forms that contain auto submit elements (buttons, inputs).
+   *
+   * Attribute: [none]
+   *  (automatically setup on all form tags that dont automatically submit, see AutoSubmitButtonUtil)
+   *
+   * Example usage:
+   *  (any page with a form)
+   */
+
+  var NAVIGATE_AWAY_PROMPT_UTIL_NAME = 'navigateAwayPrompt';
+  var NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR = 'form';
+
+  var NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS = 'navigate-away-prompt--initialized';
+
+  var navigateAwayPromptUtil = function(element) {
+    var touched = false;
+    var unloadDueToSubmit = false;
+
+    function init() {
+      if (!element) {
+        throw new Error('Navigate Away Prompt utility needs to be passed an element!');
+      }
+
+      if (element.classList.contains(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      // ignore forms that get submitted automatically
+      if (element.querySelector(AUTO_SUBMIT_BUTTON_UTIL_SELECTOR) || element.querySelector(AUTO_SUBMIT_INPUT_UTIL_SELECTOR)) {
+        return false;
+      }
+
+      window.addEventListener('beforeunload', beforeUnloadHandler);
+
+      element.addEventListener('submit', function() {
+        unloadDueToSubmit = true;
+      });
+      element.addEventListener('change', function() {
+        touched = true;
+        unloadDueToSubmit = false;
+      });
+
+      // mark initialized
+      element.classList.add(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS);
+
+      return {
+        name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
+        element: element,
+        destroy: function() {
+          window.removeEventListener('beforeunload', beforeUnloadHandler);
+        },
+      };
+    }
+
+    function beforeUnloadHandler(event) {
+      // allow the event to happen if the form was not touched by the
+      // user or the unload event was initiated by a form submit
+      if (!touched || unloadDueToSubmit) {
+        return false;
+      }
+
+      // cancel the unload event. This is the standard to force the prompt to appear.
+      event.preventDefault();
+      // for all non standard compliant browsers we return a truthy value to activate the prompt.
+      return true;
+    }
+
+    return init();
+  };
+
+  formUtilities.push({
+    name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
+    selector: NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR,
+    setup: navigateAwayPromptUtil,
+  });
+
+  /**
+   *
+   * 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
+   */
+
+  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!');
+    }
+
+    if (element.classList.contains(AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // hide and mark initialized
+    element.classList.add(AUTO_SUBMIT_BUTTON_HIDDEN_CLASS, AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS);
+
+    return {
+      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,
+  });
+
+  /**
+   *
+   * Auto Submit Input Utility
+   *  Programmatically submits forms when a certain input changes value
+   *
+   * Attribute: uw-auto-submit-input
+   *
+   * Example usage:
+   *  <input type="text" uw-auto-submit-input />
+   */
+
+  var AUTO_SUBMIT_INPUT_UTIL_NAME = 'autoSubmitInput';
+  var AUTO_SUBMIT_INPUT_UTIL_SELECTOR = '[uw-auto-submit-input]';
+
+  var AUTO_SUBMIT_INPUT_INITIALIZED_CLASS = 'auto-submit-input--initialized';
+
+  var autoSubmitInputUtil = function(element) {
+    var form;
+    var debouncedHandler;
+
+    function autoSubmit() {
+      form.submit();
+    }
+
+    function init() {
+      if (!element) {
+        throw new Error('Auto Submit Input utility needs to be passed an element!');
+      }
+
+      if (element.classList.contains(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      form = element.form;
+      if (!form) {
+        throw new Error('Could not determine associated form for auto submit input');
+      }
+
+      debouncedHandler = debounce(autoSubmit, 500);
+
+      element.addEventListener('input', debouncedHandler);
+
+      element.classList.add(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS);
+
+      return {
+        name: AUTO_SUBMIT_INPUT_UTIL_NAME,
+        element: element,
+        destroy: function() {
+          element.removeEventListener('input', debouncedHandler);
+        },
+      };
+    }
+
+    return init();
+  };
+
+  formUtilities.push({
+    name: AUTO_SUBMIT_INPUT_UTIL_NAME,
+    selector: AUTO_SUBMIT_INPUT_UTIL_SELECTOR,
+    setup: autoSubmitInputUtil,
+  });
+
+  /**
+   *
+   * 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)
+   */
+
+  var FORM_ERROR_REMOVER_UTIL_NAME = 'formErrorRemover';
+  var FORM_ERROR_REMOVER_UTIL_SELECTOR = 'form';
+
+  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!');
+      }
+
+      if (element.classList.contains(FORM_ERROR_REMOVER_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      // find form groups
+      formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
+
+      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 {
+        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,
+  });
+
+  /**
+   *
+   * 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_INITIALIZED_CLASS = 'datepicker--initialized';
+
+  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!');
+      }
+
+      if (element.classList.contains(DATEPICKER_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      var flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute("type")];
+
+      if (!flatpickrConfig) {
+        throw new Error('Datepicker utility called on unsupported element!');
+      }
+
+      flatpickrInstance = flatpickr(element, flatpickrConfig);
+
+      // mark initialized
+      element.classList.add(DATEPICKER_INITIALIZED_CLASS);
+
+      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,
+  });
+
+  // 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 the collected form utilities
+  if (UtilRegistry) {
+    formUtilities.forEach((util) => {
+      UtilRegistry.register(util);
+    });
+  }
+
+})();
diff --git a/static/es/utils/inputs.js b/static/es/utils/inputs.js
new file mode 100644
index 000000000..2fd8b8b30
--- /dev/null
+++ b/static/es/utils/inputs.js
@@ -0,0 +1,200 @@
+(function() {
+  'use strict';
+
+  var inputUtilities = [];
+
+  /**
+   *
+   * FileInput Utility
+   *  wraps native file input
+   *
+   * Attribute: uw-file-input
+   *  (element must be an input of type='file')
+   *
+   * Example usage:
+   * <input type='file' uw-file-input>
+   *
+   * Internationalization:
+   *  This utility expects the following translations to be available:
+   *    »filesSelected«: label of multi-input button after selection
+   *      example: "Dateien ausgewählt" (will be prepended by number of selected files)
+   *    »selectFile«: label of single-input button before selection
+   *      example: "Datei auswählen"
+   *    »selectFiles«: label of multi-input button before selection
+   *      example: "Datei(en) auswählen"
+   *
+   */
+
+  var FILE_INPUT_UTIL_NAME = 'fileInput';
+  var FILE_INPUT_UTIL_SELECTOR = 'input[type="file"][uw-file-input]';
+
+  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 fileInputUtil = function(element) {
+    var isMultiFileInput = false;
+    var fileList;
+    var label;
+
+    function init() {
+      if (!element) {
+        throw new Error('FileInput utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(FILE_INPUT_INITIALIZED_CLASS)) {
+        throw new Error('FileInput utility already initialized!');
+      }
+
+      // check if is multi-file input
+      isMultiFileInput = element.hasAttribute('multiple');
+      if (isMultiFileInput) {
+        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_INPUT_CLASS, FILE_INPUT_INITIALIZED_CLASS);
+
+      return {
+        name: FILE_INPUT_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
+    }
+
+    function renderFileList() {
+      if (!fileList) {
+        return;
+      }
+
+      var files = element.files;
+      fileList.innerHTML = '';
+      Array.from(files).forEach(function(file) {
+        var fileDisplayEl = document.createElement('li');
+        fileDisplayEl.innerHTML = file.name;
+        fileList.appendChild(fileDisplayEl);
+      });
+    }
+
+    function createFileList() {
+      var list = document.createElement('ol');
+      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 {
+        element.parentElement.appendChild(list);
+      }
+      return list;
+    }
+
+    function createFileLabel() {
+      var label = document.createElement('label');
+      label.classList.add(FILE_INPUT_LABEL_CLASS);
+      label.setAttribute('for', element.id);
+      element.parentElement.insertBefore(label, element);
+      return label;
+    }
+
+    function updateLabel() {
+      var files = element.files;
+      if (files && files.length) {
+        label.innerText = isMultiFileInput ? files.length + ' ' + I18n.get('filesSelected') : files[0].name;
+      } else {
+        label.innerText = isMultiFileInput ? I18n.get('selectFiles') : I18n.get('selectFile');
+      }
+    }
+
+    return init();
+  };
+
+  inputUtilities.push({
+    name: FILE_INPUT_UTIL_NAME,
+    selector: FILE_INPUT_UTIL_SELECTOR,
+    setup: fileInputUtil,
+  });
+
+  /**
+   *
+   * Checkbox Utility
+   *  wraps native checkbox
+   *
+   * Attribute: (none)
+   *  (element must be an input of type="checkbox")
+   *
+   * Example usage:
+   * <input type="checkbox">
+   *
+   */
+
+  var CHECKBOX_UTIL_NAME = 'checkbox';
+  var CHECKBOX_UTIL_SELECTOR = 'input[type="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!');
+        return false;
+      }
+
+      if (element.parentElement.classList.contains(CHECKBOX_CLASS)) {
+        // throw new Error('Checkbox element\'s wrapper already has class "' + CHECKBOX_CLASS + '"!');
+        return false;
+      }
+
+      var siblingEl = element.nextSibling;
+      var parentEl = element.parentElement;
+
+      var wrapperEl = document.createElement('div');
+      wrapperEl.classList.add(CHECKBOX_CLASS);
+
+      var labelEl = document.createElement('label');
+      labelEl.setAttribute('for', element.id);
+
+      wrapperEl.appendChild(element);
+      wrapperEl.appendChild(labelEl);
+
+      parentEl.insertBefore(wrapperEl, siblingEl);
+
+      element.classList.add(CHECKBOX_INITIALIZED_CLASS);
+
+      return {
+        name: CHECKBOX_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
+    }
+
+    return init();
+  };
+
+  inputUtilities.push({
+    name: CHECKBOX_UTIL_NAME,
+    selector: CHECKBOX_UTIL_SELECTOR,
+    setup: checkboxUtil,
+  });
+
+  // register the collected input utilities
+  if (UtilRegistry) {
+    inputUtilities.forEach(UtilRegistry.register);
+  }
+})();
diff --git a/static/es/utils/massInput.js b/static/es/utils/massInput.js
new file mode 100644
index 000000000..8094bfac9
--- /dev/null
+++ b/static/es/utils/massInput.js
@@ -0,0 +1,232 @@
+(function() {
+  'use strict';
+
+  /**
+   *
+   * Mass Input Utility
+   *  allows form shapes to be manipulated asynchronously:
+   *  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
+   *
+   * Example usage:
+   *  <form method="POST" action="...">
+   *   <input type="text">
+   *   <div uw-mass-input>
+   *     <input type="text">
+   *     <button type="submit">
+   */
+
+  var MASS_INPUT_UTIL_NAME = 'massInput';
+  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_SUBMIT_BUTTON_CLASS = 'massinput__submit-button';
+  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!');
+      }
+
+      if (element.classList.contains(MASS_INPUT_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      massInputId = element.dataset.massInputIdent || '_';
+      massInputForm = element.closest('form');
+
+      if (!massInputForm) {
+        throw new Error('Mass Input utility cannot be setup without being wrapped in a <form>!');
+      }
+
+      massInputFormSubmitHandler = makeSubmitHandler();
+
+      // setup submit buttons inside this massinput so browser
+      // uses correct submit button for form submission.
+      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);
+
+      return {
+        name: MASS_INPUT_UTIL_NAME,
+        element: element,
+        destroy: function() {
+          reset();
+        },
+      };
+    }
+
+    function makeSubmitHandler() {
+      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) {
+        var activeElement;
+
+        // check if event occured from either a mass input add/delete button or
+        // from inside one of massinput's inputs (i.e. a child is focused/active)
+        activeElement = element.querySelector(':focus, :active');
+
+        if (!activeElement) {
+          return false;
+        }
+
+        // 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('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS);
+        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(submitButton, enctype);
+
+        if (requestFn && requestBody) {
+          var headers = {'Mass-Input-Shortcircuit': massInputId};
+
+          if (enctype !== 'multipart/form-data')
+            headers['Content-Type'] = enctype;
+
+          requestFn({
+            url: url,
+            headers: headers,
+            body: requestBody,
+            accept: HttpClient.ACCEPT.TEXT_HTML,
+          }).then(function(response) {
+            return HtmlHelpers.parseResponse(response);
+          }).then(function(response) {
+              processResponse(response.element);
+              if (isAddCell) {
+                reFocusAddCell();
+              }
+            });
+        }
+      };
+    }
+
+    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));
+    }
+
+    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(responseElement) {
+      element.innerHTML = "";
+      element.appendChild(responseElement);
+
+      reset();
+
+      if (UtilRegistry) {
+        UtilRegistry.setupAll(element);
+      }
+    }
+
+    function serializeForm(submitButton, enctype) {
+      var formData = new FormData(massInputForm);
+
+      // manually add name and value of submit button to formData
+      formData.append(submitButton.name, submitButton.value);
+
+      if (enctype === 'application/x-www-form-urlencoded') {
+        return new URLSearchParams(formData);
+      } else if (enctype === 'multipart/form-data') {
+        return formData;
+      } else {
+        throw new Error('Unsupported form enctype: ' + enctype);
+      }
+    }
+
+    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) {
+        // Clearing of add-inputs is done in the backend
+        addCellInput.focus();
+      }
+    }
+
+    function reset() {
+      element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
+      massInputForm.removeEventListener('submit', massInputFormSubmitHandler);
+      massInputForm.removeEventListener('keypress', keypressHandler);
+
+      var buttons = getMassInputSubmitButtons();
+      buttons.forEach(function(button) {
+        resetSubmitButton(button);
+      });
+    }
+
+    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/static/es/utils/modal.js b/static/es/utils/modal.js
new file mode 100644
index 000000000..46cb5ef51
--- /dev/null
+++ b/static/es/utils/modal.js
@@ -0,0 +1,212 @@
+(function() {
+  'use strict';
+
+  /**
+   *
+   * 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 MODAL_HEADERS = {
+    'Is-Modal': 'True',
+  };
+
+  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';
+
+  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 modalsWrapper;
+    var modalOverlay;
+    var modalUrl;
+
+    function _init() {
+      if (!element) {
+        throw new Error('Modal utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(MODAL_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      ensureModalWrapper();
+
+      // param modalTrigger
+      if (!element.dataset.modalTrigger) {
+        throw new Error('Modal utility cannot be setup without a trigger element!');
+      } else {
+        setupTrigger();
+      }
+
+      // param modalCloseable
+      if (element.dataset.modalCloseable !== undefined) {
+        setupCloser();
+      }
+
+      // 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 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('#')) {
+        triggerSelector = '#' + triggerSelector;
+      }
+      var triggerElement = document.querySelector(triggerSelector);
+
+      if (!triggerElement) {
+        throw new Error('Trigger element for Modal not found: "' + triggerSelector + '"');
+      }
+
+      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);
+      modalOverlay.addEventListener('click', onCloseClicked, false);
+    }
+
+    function onTriggerClicked(event) {
+      event.preventDefault();
+      open();
+    }
+
+    function onCloseClicked(event) {
+      event.preventDefault();
+      close();
+    }
+
+    function onKeyUp(event) {
+      if (event.key === 'Escape') {
+        close();
+      }
+    }
+
+    function open() {
+      element.classList.add(MODAL_OPEN_CLASS);
+      modalOverlay.classList.add(MODAL_OVERLAY_OPEN_CLASS);
+      modalsWrapper.classList.add(MODALS_WRAPPER_OPEN_CLASS);
+      modalsWrapper.appendChild(element);
+
+      if (modalUrl) {
+        fillModal(modalUrl);
+      }
+
+      document.addEventListener('keyup', onKeyUp);
+    }
+
+    function close() {
+      modalOverlay.classList.remove(MODAL_OVERLAY_OPEN_CLASS);
+      element.classList.remove(MODAL_OPEN_CLASS);
+      modalsWrapper.classList.remove(MODALS_WRAPPER_OPEN_CLASS);
+
+      document.removeEventListener('keyup', onKeyUp);
+    };
+
+    function fillModal(url) {
+      if (!HttpClient) {
+        throw new Error('HttpClient not found! Can\'t fetch modal content from ' + url);
+      }
+
+      HttpClient.get({
+        url: url,
+        headers: MODAL_HEADERS,
+        accept: HttpClient.ACCEPT.TEXT_HTML,
+      }).then(function(response) {
+        return HtmlHelpers.parseResponse(response);
+      }).then(function(response) {
+        processResponse(response.element);
+      });
+    }
+
+    function processResponse(responseElement) {
+      var modalContent = document.createElement('div');
+      modalContent.classList.add(MODAL_CONTENT_CLASS);
+
+      var contentBody = responseElement.querySelector('.' + MAIN_CONTENT_CLASS);
+
+      if (contentBody) {
+        modalContent.innerHTML = contentBody.innerHTML;
+      }
+
+      var previousModalContent = element.querySelector('.' + MODAL_CONTENT_CLASS);
+      if (previousModalContent) {
+        previousModalContent.remove();
+      }
+
+      element.insertBefore(modalContent, null);
+
+      // setup any newly arrived utils
+      UtilRegistry.setupAll(element);
+    }
+
+    return _init();
+  };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: MODAL_UTIL_NAME,
+      selector: MODAL_UTIL_SELECTOR,
+      setup: modalUtil,
+    });
+  }
+})();
diff --git a/static/es/utils/showHide.js b/static/es/utils/showHide.js
new file mode 100644
index 000000000..a9bb9bc89
--- /dev/null
+++ b/static/es/utils/showHide.js
@@ -0,0 +1,114 @@
+(function() {
+  'use strict';
+
+  var SHOW_HIDE_UTIL_NAME = 'showHide';
+  var SHOW_HIDE_UTIL_SELECTOR = '[uw-show-hide]';
+
+  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>Click me
+   *   <div>This will be toggled
+   *   <div>This will be toggled as well
+   */
+  var showHideUtil = function(element) {
+
+    var showHideId;
+
+    function init() {
+      if (!element) {
+        throw new Error('ShowHide utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(SHOW_HIDE_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      // 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 addClickListener() {
+      element.addEventListener('click', function clickListener() {
+        var newState = element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
+
+        if (showHideId) {
+          setLocalStorage(showHideId, newState);
+        }
+      });
+    }
+
+    function setLocalStorage(id, state) {
+      var lsData = getLocalStorage();
+      lsData[id] = state;
+      window.localStorage.setItem(SHOW_HIDE_LOCAL_STORAGE_KEY, JSON.stringify(lsData));
+    }
+
+    function getLocalStorage() {
+      return JSON.parse(window.localStorage.getItem(SHOW_HIDE_LOCAL_STORAGE_KEY)) || {};
+    }
+
+    return init();
+  };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: SHOW_HIDE_UTIL_NAME,
+      selector: SHOW_HIDE_UTIL_SELECTOR,
+      setup: showHideUtil,
+    });
+  }
+
+})();
diff --git a/static/es/utils/tabber.js b/static/es/utils/tabber.js
new file mode 100644
index 000000000..e1c906d6b
--- /dev/null
+++ b/static/es/utils/tabber.js
@@ -0,0 +1,90 @@
+(function($) {
+
+  document.addEventListener('DOMContentLoaded', function() {
+    'use strict';
+
+    // define plugin
+    $.fn.tabgroup = function() {
+
+      var $this = $(this);
+      var $openers = $('<div class="tab-group-openers"></div>');
+      $this.prepend($openers);
+
+      var openedByDefault = $this.data('tab-open') || 0;
+      var tabs = [];
+      var currentTab = {};
+
+      $this.find('.tab').each(function(i, t) {
+        var tab = $(t);
+        tab.data('tab-index', i);
+        var tabName = tab.data('tab-name') || 'Tab '+i;
+        var tabFile = tab.data('tab-file') || false;
+        var $opener = makeOpener(tabName, i);
+        $openers.append($opener);
+        if (tab.find('.tab-title')) {
+          tab.find('.tab-title').remove();
+        }
+        tab.hide();
+        var loaded = false;
+        tabs.push({index: i, name: tabName, file: tabFile, dom: tab, opener: $opener, loaded: loaded });
+      });
+
+      $this.on('click', 'a[href^="#"]', function(event) {
+        var $target = $(event.currentTarget);
+        var tab = getTabByName($target.attr('href').replace('#', ''));
+        if ( tab ) {
+          showTab(tab.index);
+        }
+        event.preventDefault();
+      });
+
+      function getTabByName(name) {
+        var it = -1;
+        $.each(tabs, function(i, t) {
+          if ( t.name.toLowerCase() === name.toLowerCase() ) {
+            it = i;
+          }
+        });
+        if ( it >= 0 ) {
+          return tabs[it];
+        } else {
+          return false;
+        }
+      }
+
+      function makeOpener(tabName, i) {
+        return $('<span class="tab-opener">'+tabName+'</span>').
+                on('click', function() {
+                  showTab(i);
+                });
+      }
+
+      function showTab(i) {
+        tabs.forEach(function(t) {
+          t.dom.hide();
+          t.opener.removeClass('tab-visible');
+        });
+        currentTab = tabs[i];
+        if ( !currentTab.loaded && currentTab.file ){
+          $.get(currentTab.file, function(res) {
+            currentTab.dom.html(res);
+            currentTab.loaded = true;
+          });
+        }
+        currentTab.opener.addClass('tab-visible');
+        currentTab.dom.show();
+      }
+
+      showTab(openedByDefault);
+      currentTab = tabs[openedByDefault];
+
+    };
+
+    // apply plugin to all available tab-groups if on wide screen
+    if (window.innerWidth > 768) {
+      $('.tab-group').each(function(i, t) {
+        $(t).tabgroup();
+      });
+    }
+  });
+})($);

From e0801c21107dfea902fa41eed2b68fc696f9f31f Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 19:11:47 +0200
Subject: [PATCH 379/519] update .gitignore

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

diff --git a/.gitignore b/.gitignore
index 6360f1249..fb55045ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ dist*
 static/js/
 static/tmp/
 static/combined/
+frontend/node_modules/
 *.hi
 *.o
 *.sqlite3
@@ -33,4 +34,3 @@ src/Handler/Course.SnapCustom.hs
 .directory
 tags
 test.log
-node_modules

From 2e9e7e2d9cfda36d8a57813696faa0bd73457632 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:09:16 +0200
Subject: [PATCH 380/519] added webpack

---
 .babelrc => frontend/.babelrc                 |    0
 .eslintrc.json => frontend/.eslintrc.json     |    4 -
 .../package-lock.json                         | 4169 ++++++++++++++++-
 frontend/package.json                         |   48 +
 frontend/postcss.config.js                    |    6 +
 frontend/webpack.config.js                    |  108 +
 package.json                                  |   35 -
 7 files changed, 4279 insertions(+), 91 deletions(-)
 rename .babelrc => frontend/.babelrc (100%)
 rename .eslintrc.json => frontend/.eslintrc.json (79%)
 rename package-lock.json => frontend/package-lock.json (54%)
 create mode 100644 frontend/package.json
 create mode 100644 frontend/postcss.config.js
 create mode 100644 frontend/webpack.config.js
 delete mode 100644 package.json

diff --git a/.babelrc b/frontend/.babelrc
similarity index 100%
rename from .babelrc
rename to frontend/.babelrc
diff --git a/.eslintrc.json b/frontend/.eslintrc.json
similarity index 79%
rename from .eslintrc.json
rename to frontend/.eslintrc.json
index 4215ffb75..17b895f2d 100644
--- a/.eslintrc.json
+++ b/frontend/.eslintrc.json
@@ -7,10 +7,6 @@
     "globals": {
         "Atomics": "readonly",
         "SharedArrayBuffer": "readonly",
-        "HttpClient": "readonly",
-        "UtilRegistry": "readonly",
-        "HtmlHelpers": "readonly",
-        "I18n": "readonly",
         "flatpickr": "readonly",
         "$": "readonly"
     },
diff --git a/package-lock.json b/frontend/package-lock.json
similarity index 54%
rename from package-lock.json
rename to frontend/package-lock.json
index 93f0290f1..68363cdde 100644
--- a/package-lock.json
+++ b/frontend/package-lock.json
@@ -856,12 +856,212 @@
       "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
       "dev": true
     },
+    "@webassemblyjs/ast": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "dev": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
     "acorn": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
       "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
       "dev": true
     },
+    "acorn-dynamic-import": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
+      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
+      "dev": true
+    },
     "acorn-jsx": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
@@ -880,6 +1080,24 @@
         "uri-js": "^4.2.2"
       }
     },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+      "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
+      "dev": true
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
     "ansi-escapes": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
@@ -912,7 +1130,6 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "micromatch": "^3.1.4",
         "normalize-path": "^2.1.1"
@@ -923,13 +1140,28 @@
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
           }
         }
       }
     },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "dev": true,
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      }
+    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -957,6 +1189,12 @@
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -984,6 +1222,59 @@
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true
     },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -996,12 +1287,32 @@
       "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
       "dev": true
     },
+    "async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+      "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.11"
+      }
+    },
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
       "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true,
-      "optional": true
+      "dev": true
+    },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
     },
     "atob": {
       "version": "2.1.2",
@@ -1009,6 +1320,132 @@
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
+    "autoprefixer": {
+      "version": "9.5.1",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.1.tgz",
+      "integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.5.4",
+        "caniuse-lite": "^1.0.30000957",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.14",
+        "postcss-value-parser": "^3.3.1"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "dev": true
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "js-tokens": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "babel-core": {
+      "version": "6.26.3",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.1",
+        "debug": "^2.6.9",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.8",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.7"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        },
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+          "dev": true
+        }
+      }
+    },
     "babel-eslint": {
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
@@ -1023,6 +1460,605 @@
         "eslint-visitor-keys": "^1.0.0"
       }
     },
+    "babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "dev": true,
+      "requires": {
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+          "dev": true
+        }
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-loader": {
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
+      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-syntax-dynamic-import": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "^6.24.1",
+        "babel-helper-function-name": "^6.24.1",
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
+      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "^6.24.1",
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        },
+        "regexpu-core": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+          "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+          "dev": true,
+          "requires": {
+            "regenerate": "^1.2.1",
+            "regjsgen": "^0.2.0",
+            "regjsparser": "^0.1.4"
+          }
+        },
+        "regjsgen": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+          "dev": true
+        },
+        "regjsparser": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+          "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+          "dev": true,
+          "requires": {
+            "jsesc": "~0.5.0"
+          }
+        }
+      }
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.10.0"
+      },
+      "dependencies": {
+        "regenerator-transform": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+          "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+          "dev": true,
+          "requires": {
+            "babel-runtime": "^6.18.0",
+            "babel-types": "^6.19.0",
+            "private": "^0.1.6"
+          }
+        }
+      }
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-preset-es2015": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+        "babel-plugin-transform-es2015-classes": "^6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+        "babel-plugin-transform-es2015-for-of": "^6.22.0",
+        "babel-plugin-transform-es2015-function-name": "^6.24.1",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+        "babel-plugin-transform-es2015-object-super": "^6.24.1",
+        "babel-plugin-transform-es2015-parameters": "^6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+        "babel-plugin-transform-regenerator": "^6.24.1"
+      }
+    },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "dev": true,
+      "requires": {
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+          "dev": true
+        }
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
+      },
+      "dependencies": {
+        "globals": {
+          "version": "9.18.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+          "dev": true
+        }
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
+      },
+      "dependencies": {
+        "to-fast-properties": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+          "dev": true
+        }
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1084,12 +2120,53 @@
         }
       }
     },
+    "base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
+    },
     "binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true
+    },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
-      "optional": true
+      "requires": {
+        "inherits": "~2.0.0"
+      }
+    },
+    "bluebird": {
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
     },
     "brace-expansion": {
       "version": "1.1.11",
@@ -1130,6 +2207,83 @@
         }
       }
     },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
     "browserslist": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.0.tgz",
@@ -1141,6 +2295,80 @@
         "node-releases": "^1.1.19"
       }
     },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "11.3.2",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+      "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.3",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.1.15",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.2",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "dev": true
+        }
+      }
+    },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -1182,12 +2410,34 @@
       "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
       "dev": true
     },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      }
+    },
     "caniuse-lite": {
       "version": "1.0.30000971",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz",
       "integrity": "sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==",
       "dev": true
     },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -1210,7 +2460,6 @@
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
       "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
       "dev": true,
-      "optional": true,
       "requires": {
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
@@ -1226,12 +2475,37 @@
         "upath": "^1.1.1"
       }
     },
+    "chownr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+      "dev": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
+      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
     "ci-info": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -1323,6 +2597,76 @@
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          }
+        }
+      }
+    },
+    "clone-deep": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.0",
+        "shallow-clone": "^1.0.0"
+      }
+    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -1354,12 +2698,27 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
     "commander": {
       "version": "2.20.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
       "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
       "dev": true
     },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
     "component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -1372,6 +2731,39 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "dev": true
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
     "convert-source-map": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
@@ -1381,12 +2773,32 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
+    "core-js": {
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.8.tgz",
+      "integrity": "sha512-RWlREFU74TEkdXzyl1bka66O3kYp8jeTXrvJZDzVVMH8AiHUSOFpL1yfhQJ+wHocAm1m+4971W1PPzfLuCv1vg==",
+      "dev": true
+    },
     "core-js-compat": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.2.tgz",
@@ -1399,9 +2811,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
-          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.0.tgz",
+          "integrity": "sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==",
           "dev": true
         }
       }
@@ -1416,8 +2828,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "cosmiconfig": {
       "version": "5.2.1",
@@ -1431,6 +2842,43 @@
         "parse-json": "^4.0.0"
       }
     },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
     "cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -1444,12 +2892,130 @@
         "which": "^1.2.9"
       }
     },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css-loader": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.0.tgz",
+      "integrity": "sha512-MoOu+CStsGrSt5K2OeZ89q3Snf+IkxRfAIt9aAKg4piioTrhtP1iEFPu+OVn3Ohz24FO6L+rw9UJxBILiSBw5Q==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^4.0.0",
+        "loader-utils": "^1.2.1",
+        "lodash": "^4.17.11",
+        "postcss": "^7.0.6",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^2.0.3",
+        "postcss-modules-scope": "^2.0.0",
+        "postcss-modules-values": "^2.0.0",
+        "postcss-value-parser": "^3.3.0",
+        "schema-utils": "^1.0.0"
+      }
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
+      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^0.1.0",
+        "fastparse": "^1.1.1",
+        "regexpu-core": "^1.0.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        },
+        "regexpu-core": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+          "dev": true,
+          "requires": {
+            "regenerate": "^1.2.1",
+            "regjsgen": "^0.2.0",
+            "regjsparser": "^0.1.4"
+          }
+        },
+        "regjsgen": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+          "dev": true
+        },
+        "regjsparser": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+          "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+          "dev": true,
+          "requires": {
+            "jsesc": "~0.5.0"
+          }
+        }
+      }
+    },
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "dev": true
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
     "date-fns": {
       "version": "1.30.1",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
       "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
       "dev": true
     },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1459,6 +3025,12 @@
         "ms": "2.0.0"
       }
     },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -1532,6 +3104,54 @@
         "rimraf": "^2.2.8"
       }
     },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1541,6 +3161,34 @@
         "esutils": "^2.0.2"
       }
     },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
     "electron-to-chromium": {
       "version": "1.3.136",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.136.tgz",
@@ -1553,12 +3201,33 @@
       "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
       "dev": true
     },
+    "elliptic": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
     "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
     "end-of-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -1568,6 +3237,26 @@
         "once": "^1.4.0"
       }
     },
+    "enhanced-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -1739,6 +3428,22 @@
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
       "dev": true
     },
+    "events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "dev": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "exec-sh": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
@@ -1798,6 +3503,21 @@
         }
       }
     },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
     "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -1895,6 +3615,36 @@
         }
       }
     },
+    "extract-text-webpack-plugin": {
+      "version": "4.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz",
+      "integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
+      "dev": true,
+      "requires": {
+        "async": "^2.4.1",
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.4.5",
+        "webpack-sources": "^1.1.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "0.4.7",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+          "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
     "fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
@@ -1913,6 +3663,18 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "fastparse": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
+      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
+      "dev": true
+    },
+    "figgy-pudding": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "dev": true
+    },
     "figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -1954,6 +3716,28 @@
         }
       }
     },
+    "find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "dependencies": {
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        }
+      }
+    },
     "find-parent-dir": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
@@ -1969,6 +3753,29 @@
         "locate-path": "^3.0.0"
       }
     },
+    "findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+      "dev": true,
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
     "flat-cache": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
@@ -1986,6 +3793,16 @@
       "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
       "dev": true
     },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
     "fn-name": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz",
@@ -1998,6 +3815,32 @@
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
+    "for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -2007,12 +3850,34 @@
         "map-cache": "^0.2.2"
       }
     },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
     "fs-readdir-recursive": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
       "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
       "dev": true
     },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -2060,14 +3925,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2082,20 +3945,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2212,8 +4072,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2225,7 +4084,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2240,7 +4098,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2248,14 +4105,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -2274,7 +4129,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2355,8 +4209,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2368,7 +4221,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2490,7 +4342,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2562,6 +4413,18 @@
         }
       }
     },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      }
+    },
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
@@ -2579,6 +4442,74 @@
         "simple-git": "^1.85.0"
       }
     },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "requires": {
+        "globule": "^1.0.0"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
     "get-own-enumerable-property-symbols": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz",
@@ -2606,6 +4537,15 @@
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true
     },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
     "glob": {
       "version": "7.1.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
@@ -2625,7 +4565,6 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-glob": "^3.1.0",
         "path-dirname": "^1.0.0"
@@ -2636,13 +4575,36 @@
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^2.1.0"
           }
         }
       }
     },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -2670,12 +4632,39 @@
         }
       }
     },
+    "globule": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "dev": true,
+      "requires": {
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
+      }
+    },
     "graceful-fs": {
       "version": "4.1.15",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
       "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
       "dev": true
     },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -2699,6 +4688,12 @@
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "dev": true
+    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -2731,12 +4726,79 @@
         }
       }
     },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
     "hosted-git-info": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
       "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
       "dev": true
     },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
     "husky": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/husky/-/husky-2.3.0.tgz",
@@ -2772,12 +4834,48 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+      "dev": true
+    },
+    "icss-utils": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.0.tgz",
+      "integrity": "sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.14"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
     "ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true
     },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
     "import-fresh": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
@@ -2788,18 +4886,60 @@
         "resolve-from": "^3.0.0"
       }
     },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      },
+      "dependencies": {
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        }
+      }
+    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true
+    },
     "indent-string": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
       "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
       "dev": true
     },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -2816,6 +4956,12 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true
     },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
     "inquirer": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
@@ -2854,6 +5000,12 @@
         }
       }
     },
+    "interpret": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+      "dev": true
+    },
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -2863,6 +5015,12 @@
         "loose-envify": "^1.0.0"
       }
     },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
     "is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -2894,7 +5052,6 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
-      "optional": true,
       "requires": {
         "binary-extensions": "^1.0.0"
       }
@@ -2971,6 +5128,15 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
     "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -3078,12 +5244,30 @@
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true
     },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true
     },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -3102,6 +5286,18 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
+      "dev": true
+    },
     "js-levenshtein": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
@@ -3124,6 +5320,12 @@
         "esprima": "^4.0.0"
       }
     },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -3136,6 +5338,12 @@
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
       "dev": true
     },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -3148,6 +5356,12 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
     "json5": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
@@ -3165,12 +5379,33 @@
         }
       }
     },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
     "kind-of": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
       "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
       "dev": true
     },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -3351,6 +5586,70 @@
         "figures": "^2.0.0"
       }
     },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
     "locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -3367,6 +5666,30 @@
       "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
       "dev": true
     },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.mergewith": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+      "dev": true
+    },
+    "lodash.tail": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
+      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
+      "dev": true
+    },
     "log-symbols": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
@@ -3396,12 +5719,71 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "requires": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
+      }
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "dev": true,
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
       "dev": true
     },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
     "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
@@ -3420,6 +5802,72 @@
         "escape-string-regexp": "^1.0.4"
       }
     },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "mem": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "dev": true,
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        }
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
     "merge": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
@@ -3447,12 +5895,49 @@
         "to-regex": "^3.0.2"
       }
     },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true
     },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -3468,6 +5953,24 @@
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
       "dev": true
     },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
     "mixin-deep": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
@@ -3489,6 +5992,24 @@
         }
       }
     },
+    "mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "dev": true,
+      "requires": {
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
+      },
+      "dependencies": {
+        "for-in": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+          "dev": true
+        }
+      }
+    },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -3498,6 +6019,20 @@
         "minimist": "0.0.8"
       }
     },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -3514,8 +6049,7 @@
       "version": "2.14.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
       "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -3542,12 +6076,85 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "dev": true
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "node-gyp": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "dev": true,
+      "requires": {
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true
+        }
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
+      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
     "node-releases": {
       "version": "1.1.21",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.21.tgz",
@@ -3557,6 +6164,100 @@
         "semver": "^5.3.0"
       }
     },
+    "node-sass": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
+      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
+      "dev": true,
+      "requires": {
+        "async-foreach": "^0.1.3",
+        "chalk": "^1.1.1",
+        "cross-spawn": "^3.0.0",
+        "gaze": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "glob": "^7.0.3",
+        "in-publish": "^2.0.0",
+        "lodash.assign": "^4.2.0",
+        "lodash.clonedeep": "^4.3.2",
+        "lodash.mergewith": "^4.6.0",
+        "meow": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "nan": "^2.10.0",
+        "node-gyp": "^3.8.0",
+        "npmlog": "^4.0.0",
+        "request": "^2.88.0",
+        "sass-graph": "^2.2.4",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^1.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
+          }
+        },
+        "get-stdin": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -3573,8 +6274,13 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "optional": true
+      "dev": true
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
     },
     "npm-path": {
       "version": "2.0.4",
@@ -3605,12 +6311,36 @@
         "which": "^1.2.10"
       }
     },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
+      "requires": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
       "dev": true
     },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -3698,12 +6428,43 @@
         "wordwrap": "~1.0.0"
       }
     },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "requires": {
+        "lcid": "^1.0.0"
+      }
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
     "output-file-sync": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz",
@@ -3715,12 +6476,24 @@
         "mkdirp": "^0.5.1"
       }
     },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
       "dev": true
     },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+      "dev": true
+    },
     "p-limit": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
@@ -3751,6 +6524,23 @@
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
+      "requires": {
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -3768,6 +6558,20 @@
         }
       }
     },
+    "parse-asn1": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -3778,18 +6582,29 @@
         "json-parse-better-errors": "^1.0.1"
       }
     },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
       "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "path-exists": {
       "version": "3.0.0",
@@ -3821,6 +6636,44 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
     "pify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -3895,6 +6748,116 @@
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
       "dev": true
     },
+    "postcss": {
+      "version": "7.0.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
+      "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
+      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^4.0.0",
+        "import-cwd": "^2.0.0"
+      },
+      "dependencies": {
+        "cosmiconfig": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+          "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+          "dev": true,
+          "requires": {
+            "is-directory": "^0.3.1",
+            "js-yaml": "^3.9.0",
+            "parse-json": "^4.0.0",
+            "require-from-string": "^2.0.1"
+          }
+        }
+      }
+    },
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.5"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.5.tgz",
+      "integrity": "sha512-iFgxlCAVLno5wIJq+4hyuOmc4VjZEZxzpdeuZcBytLNWEK5Bx2oRF9PPcAz5TALbaFvrZm8sJYtJ3hV+tMSEIg==",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^7.0.6",
+        "postcss-value-parser": "^3.3.1"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.0.1.tgz",
+      "integrity": "sha512-7+6k9c3/AuZ5c596LJx9n923A/j3nF3ormewYBF1RrIQvjvjXe1xE8V8A1KFyFwXbvnshT6FBZFX0k/F1igneg==",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^7.0.6"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
+      "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
+      "dev": true,
+      "requires": {
+        "icss-replace-symbols": "^1.1.0",
+        "postcss": "^7.0.6"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -3907,12 +6870,17 @@
       "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
       "dev": true
     },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
       "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "progress": {
       "version": "2.0.3",
@@ -3920,12 +6888,50 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
     "property-expr": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-1.5.1.tgz",
       "integrity": "sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==",
       "dev": true
     },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -3936,12 +6942,72 @@
         "once": "^1.3.1"
       }
     },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "read-pkg": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.1.1.tgz",
@@ -3954,12 +7020,53 @@
         "type-fest": "^0.4.1"
       }
     },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
+          }
+        }
+      }
+    },
     "readable-stream": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -3975,13 +7082,33 @@
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-fs": "^4.1.11",
         "micromatch": "^3.1.10",
         "readable-stream": "^2.0.2"
       }
     },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      },
+      "dependencies": {
+        "indent-string": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+          "dev": true,
+          "requires": {
+            "repeating": "^2.0.0"
+          }
+        }
+      }
+    },
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
@@ -4075,8 +7202,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "repeat-element": {
       "version": "1.1.3",
@@ -4090,6 +7216,61 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
     "resolve": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
@@ -4099,6 +7280,25 @@
         "path-parse": "^1.0.6"
       }
     },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
     "resolve-from": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
@@ -4136,6 +7336,16 @@
         "glob": "^7.1.3"
       }
     },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
     "run-async": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
@@ -4151,6 +7361,15 @@
       "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==",
       "dev": true
     },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
     "rxjs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
@@ -4181,6 +7400,64 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.0",
+        "lodash": "^4.0.0",
+        "scss-tokenizer": "^0.2.3",
+        "yargs": "^7.0.0"
+      }
+    },
+    "sass-loader": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
+      "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+      "dev": true,
+      "requires": {
+        "clone-deep": "^2.0.1",
+        "loader-utils": "^1.0.1",
+        "lodash.tail": "^4.1.1",
+        "neo-async": "^2.5.0",
+        "pify": "^3.0.0",
+        "semver": "^5.5.0"
+      }
+    },
+    "schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      }
+    },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "requires": {
+        "js-base64": "^2.1.8",
+        "source-map": "^0.4.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
     "semver": {
       "version": "5.7.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
@@ -4193,6 +7470,18 @@
       "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
       "dev": true
     },
+    "serialize-javascript": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
+      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
     "set-value": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
@@ -4216,6 +7505,41 @@
         }
       }
     },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-clone": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+      "dev": true,
+      "requires": {
+        "is-extendable": "^0.1.1",
+        "kind-of": "^5.0.0",
+        "mixin-object": "^2.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -4387,6 +7711,12 @@
         }
       }
     },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -4406,6 +7736,15 @@
         "urix": "^0.1.0"
       }
     },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.5.6"
+      }
+    },
     "source-map-url": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
@@ -4459,6 +7798,32 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
     "staged-git-files": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/staged-git-files/-/staged-git-files-1.1.2.tgz",
@@ -4486,6 +7851,54 @@
         }
       }
     },
+    "stdout-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
+      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
     "string-argv": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz",
@@ -4507,7 +7920,6 @@
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "safe-buffer": "~5.1.0"
       }
@@ -4532,18 +7944,54 @@
         "ansi-regex": "^3.0.0"
       }
     },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^4.0.1"
+      },
+      "dependencies": {
+        "get-stdin": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+          "dev": true
+        }
+      }
+    },
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
       "dev": true
     },
+    "style-loader": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
+      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0"
+      }
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -4605,6 +8053,78 @@
         }
       }
     },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
+    },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "dev": true,
+      "requires": {
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
+      }
+    },
+    "terser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.0.0.tgz",
+      "integrity": "sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.19.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.10"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.12",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+          "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
+      "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
+      "dev": true,
+      "requires": {
+        "cacache": "^11.3.2",
+        "find-cache-dir": "^2.0.0",
+        "is-wsl": "^1.1.0",
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.0.0",
+        "webpack-sources": "^1.3.0",
+        "worker-farm": "^1.7.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -4617,6 +8137,25 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -4626,6 +8165,12 @@
         "os-tmpdir": "~1.0.2"
       }
     },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -4680,18 +8225,72 @@
       "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=",
       "dev": true
     },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "dev": true,
+      "requires": {
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
+    "true-case-path": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.2"
+      }
+    },
     "tslib": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
       "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
       "dev": true
     },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -4707,6 +8306,54 @@
       "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==",
       "dev": true
     },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.5.15",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.15.tgz",
+      "integrity": "sha512-fe7aYFotptIddkwcm6YuA0HmknBZ52ZzOsUxZEdhhkSsz7RfjHDX2QDxwKTiv4JQ5t5NhfmpgAK+J7LiDhKSqg==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.20.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.0.1.tgz",
+      "integrity": "sha512-1HhCHkOB6wRCcv7htcz1QRPVbWPEY074RP9vzt/X0LF4xXm9l4YGd0qja7z88abDixQlnVwBjXsTBs+Xsn/eeQ==",
+      "dev": true,
+      "requires": {
+        "cacache": "^11.2.0",
+        "find-cache-dir": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.4.0",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.0.0",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -4770,6 +8417,24 @@
         }
       }
     },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -4814,8 +8479,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
       "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
@@ -4832,18 +8496,56 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true,
-      "optional": true
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "dev": true
+    },
+    "v8-compile-cache": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
+      "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
+      "dev": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -4855,6 +8557,26 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
     "watch": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
@@ -4873,6 +8595,226 @@
         }
       }
     },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "webpack": {
+      "version": "4.32.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.32.2.tgz",
+      "integrity": "sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.0.5",
+        "acorn-dynamic-import": "^4.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.0",
+        "terser-webpack-plugin": "^1.1.0",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.3.0"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        }
+      }
+    },
+    "webpack-cli": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.2.tgz",
+      "integrity": "sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "enhanced-resolve": "^4.1.0",
+        "findup-sync": "^2.0.0",
+        "global-modules": "^1.0.0",
+        "import-local": "^2.0.0",
+        "interpret": "^1.1.0",
+        "loader-utils": "^1.1.0",
+        "supports-color": "^5.5.0",
+        "v8-compile-cache": "^2.0.2",
+        "yargs": "^12.0.5"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "dev": true,
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "dev": true,
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            }
+          }
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "webpack-sources": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
+      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -4882,12 +8824,36 @@
         "isexe": "^2.0.0"
       }
     },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
       "dev": true
     },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
     "wrap-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
@@ -4913,6 +8879,105 @@
         "mkdirp": "^0.5.1"
       }
     },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^3.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        }
+      }
+    },
     "yup": {
       "version": "0.27.0",
       "resolved": "https://registry.npmjs.org/yup/-/yup-0.27.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
new file mode 100644
index 000000000..497812cb1
--- /dev/null
+++ b/frontend/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "uni2work",
+  "version": "1.0.0",
+  "description": "",
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "scripts": {
+    "lint": "eslint src",
+    "dev": "webpack --watch"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/js/**/*.js": [
+      "eslint",
+      "git add"
+    ]
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.4.4",
+    "@babel/core": "^7.4.5",
+    "@babel/plugin-proposal-class-properties": "^7.4.4",
+    "@babel/preset-env": "^7.4.5",
+    "autoprefixer": "^9.5.1",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^10.0.1",
+    "babel-loader": "^8.0.6",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-preset-es2015": "^6.24.1",
+    "css-loader": "^2.1.0",
+    "eslint": "^5.16.0",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
+    "husky": "^2.3.0",
+    "lint-staged": "^8.1.7",
+    "node-sass": "^4.11.0",
+    "postcss-loader": "^3.0.0",
+    "sass-loader": "^7.1.0",
+    "style-loader": "^0.23.1",
+    "uglifyjs-webpack-plugin": "^2.0.1",
+    "watch": "^1.0.2",
+    "webpack": "^4.32.2",
+    "webpack-cli": "^3.3.2"
+  }
+}
diff --git a/frontend/postcss.config.js b/frontend/postcss.config.js
new file mode 100644
index 000000000..01cfec59b
--- /dev/null
+++ b/frontend/postcss.config.js
@@ -0,0 +1,6 @@
+/* eslint-disable */
+module.exports = {
+  plugins: [
+    require('autoprefixer')
+  ]
+}
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js
new file mode 100644
index 000000000..9d6eb44d5
--- /dev/null
+++ b/frontend/webpack.config.js
@@ -0,0 +1,108 @@
+/* eslint-disable */
+const webpack = require('webpack');
+const path = require('path');
+const ExtractTextWebpackPlugin = require('extract-text-webpack-plugin');
+
+/*
+ * SplitChunksPlugin is enabled by default and replaced
+ * deprecated CommonsChunkPlugin. It automatically identifies modules which
+ * should be splitted of chunk by heuristics using module duplication count and
+ * module category (i. e. node_modules). And splits the chunks…
+ *
+ * It is safe to remove "splitChunks" from the generated configuration
+ * and was added as an educational example.
+ *
+ * https://webpack.js.org/plugins/split-chunks-plugin/
+ *
+ */
+
+/*
+ * We've enabled UglifyJSPlugin for you! This minifies your app
+ * in order to load faster and run less javascript.
+ *
+ * https://github.com/webpack-contrib/uglifyjs-webpack-plugin
+ *
+ */
+const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+
+module.exports = {
+	module: {
+		rules: [
+			{
+				loader: 'babel-loader',
+
+				options: {
+					plugins: ['syntax-dynamic-import'],
+
+					presets: [
+						[
+							'@babel/preset-env',
+							{
+								modules: false
+							}
+						]
+					]
+				},
+
+				test: /\.js$/
+			},
+      {
+        test: /\.css$/,
+        use: ExtractTextWebpackPlugin.extract({
+          fallback: "style-loader",
+          use: "css-loader"
+        })
+      },
+			{
+				test: /\.scss$/,
+				use: ExtractTextWebpackPlugin.extract({
+					fallback: 'style-loader',
+					use: ['css-loader', 'sass-loader', 'postcss-loader']
+				}),
+				exclude: /node_modules/
+			}
+		]
+	},
+
+	entry: {
+		main: [
+			path.resolve(__dirname, 'src', 'main.js'),
+		],
+		vendor: [
+			path.resolve(__dirname, 'vendor', 'main.js'),
+		],
+		polyfills: [
+			path.resolve(__dirname, 'polyfills', 'main.js'),
+		],
+	},
+
+	plugins: [
+		new ExtractTextWebpackPlugin({
+			filename: 'css/[name].css'
+		})
+	],
+
+	output: {
+		chunkFilename: 'js/[name].[chunkname].js',
+		filename: 'js/[name].js',
+		path: path.resolve(__dirname, '..', 'static', 'bundles')
+	},
+
+	mode: 'development',
+
+	optimization: {
+		splitChunks: {
+			cacheGroups: {
+				vendors: {
+					priority: -10,
+					test: /[\\/]node_modules[\\/]/
+				}
+			},
+
+			chunks: 'async',
+			minChunks: 1,
+			minSize: 30000,
+			name: true
+		}
+	}
+};
diff --git a/package.json b/package.json
deleted file mode 100644
index 6c60d6838..000000000
--- a/package.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "uni2work",
-  "version": "1.0.0",
-  "description": "",
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "scripts": {
-    "babel": "babel static/es -d static/js",
-    "babel:watch": "watch 'npm run babel' static/es",
-    "lint": "eslint static/es"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "static/es/**/*.js": [
-      "eslint",
-      "git add"
-    ]
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.4.4",
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/preset-env": "^7.4.5",
-    "babel-eslint": "^10.0.1",
-    "eslint": "^5.16.0",
-    "husky": "^2.3.0",
-    "lint-staged": "^8.1.7",
-    "watch": "^1.0.2"
-  }
-}

From b2706ce22481263f3fc406cb0e009ad68657c4aa Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:10:21 +0200
Subject: [PATCH 381/519] remove pre commit hook for now

---
 frontend/package.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 497812cb1..54dffc78d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,9 +10,7 @@
     "dev": "webpack --watch"
   },
   "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+    "hooks": { }
   },
   "lint-staged": {
     "src/js/**/*.js": [

From 2c69532a14d1278747030aa1332583242ce8cdc2 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:12:09 +0200
Subject: [PATCH 382/519] remove js and css from static folder

---
 static/css/fonts.css                   |  129 --
 static/css/utils/alerts.scss           |  210 ---
 static/css/utils/asidenav.scss         |  364 ------
 static/css/utils/asyncForm.scss        |   78 --
 static/css/utils/asyncTable.scss       |    5 -
 static/css/utils/asyncTableFilter.scss |    5 -
 static/css/utils/checkbox.scss         |   82 --
 static/css/utils/form.scss             |   45 -
 static/css/utils/inputs.scss           |  239 ----
 static/css/utils/modal.scss            |  115 --
 static/css/utils/radio.scss            |   72 --
 static/css/utils/showHide.scss         |   54 -
 static/css/utils/tabber.scss           |   39 -
 static/css/utils/tooltip.scss          |   88 --
 static/css/vendor/flatpickr.css        |  740 -----------
 static/css/vendor/fontawesome.css      |    5 -
 static/es/services/htmlHelpers.js      |   43 -
 static/es/services/httpClient.js       |   58 -
 static/es/services/i18n.js             |   34 -
 static/es/services/utilRegistry.js     |  121 --
 static/es/test/test.js                 |    3 -
 static/es/utils/alerts.js              |  212 ---
 static/es/utils/asidenav.js            |  109 --
 static/es/utils/asyncForm.js           |  126 --
 static/es/utils/asyncTable.js          |  422 ------
 static/es/utils/checkAll.js            |  150 ---
 static/es/utils/form.js                |  611 ---------
 static/es/utils/inputs.js              |  200 ---
 static/es/utils/massInput.js           |  232 ----
 static/es/utils/modal.js               |  212 ---
 static/es/utils/showHide.js            |  114 --
 static/es/utils/tabber.js              |   90 --
 static/js/polyfills/fetchPolyfill.js   |  466 -------
 static/js/polyfills/urlPolyfill.js     |  348 -----
 static/js/services/htmlHelpers.js      |   50 -
 static/js/services/httpClient.js       |   72 --
 static/js/services/i18n.js             |   44 -
 static/js/services/utilRegistry.js     |  147 ---
 static/js/utils/alerts.js              |  212 ---
 static/js/utils/asidenav.js            |  109 --
 static/js/utils/asyncForm.js           |  126 --
 static/js/utils/asyncTable.js          |  422 ------
 static/js/utils/checkAll.js            |  150 ---
 static/js/utils/form.js                |  610 ---------
 static/js/utils/inputs.js              |  200 ---
 static/js/utils/massInput.js           |  232 ----
 static/js/utils/modal.js               |  212 ---
 static/js/utils/showHide.js            |  114 --
 static/js/utils/tabber.js              |   90 --
 static/js/vendor/flatpickr.js          |    2 -
 static/js/vendor/zepto.js              | 1650 ------------------------
 51 files changed, 10263 deletions(-)
 delete mode 100644 static/css/fonts.css
 delete mode 100644 static/css/utils/alerts.scss
 delete mode 100644 static/css/utils/asidenav.scss
 delete mode 100644 static/css/utils/asyncForm.scss
 delete mode 100644 static/css/utils/asyncTable.scss
 delete mode 100644 static/css/utils/asyncTableFilter.scss
 delete mode 100644 static/css/utils/checkbox.scss
 delete mode 100644 static/css/utils/form.scss
 delete mode 100644 static/css/utils/inputs.scss
 delete mode 100644 static/css/utils/modal.scss
 delete mode 100644 static/css/utils/radio.scss
 delete mode 100644 static/css/utils/showHide.scss
 delete mode 100644 static/css/utils/tabber.scss
 delete mode 100644 static/css/utils/tooltip.scss
 delete mode 100644 static/css/vendor/flatpickr.css
 delete mode 100644 static/css/vendor/fontawesome.css
 delete mode 100644 static/es/services/htmlHelpers.js
 delete mode 100644 static/es/services/httpClient.js
 delete mode 100644 static/es/services/i18n.js
 delete mode 100644 static/es/services/utilRegistry.js
 delete mode 100644 static/es/test/test.js
 delete mode 100644 static/es/utils/alerts.js
 delete mode 100644 static/es/utils/asidenav.js
 delete mode 100644 static/es/utils/asyncForm.js
 delete mode 100644 static/es/utils/asyncTable.js
 delete mode 100644 static/es/utils/checkAll.js
 delete mode 100644 static/es/utils/form.js
 delete mode 100644 static/es/utils/inputs.js
 delete mode 100644 static/es/utils/massInput.js
 delete mode 100644 static/es/utils/modal.js
 delete mode 100644 static/es/utils/showHide.js
 delete mode 100644 static/es/utils/tabber.js
 delete mode 100644 static/js/polyfills/fetchPolyfill.js
 delete mode 100644 static/js/polyfills/urlPolyfill.js
 delete mode 100644 static/js/services/htmlHelpers.js
 delete mode 100644 static/js/services/httpClient.js
 delete mode 100644 static/js/services/i18n.js
 delete mode 100644 static/js/services/utilRegistry.js
 delete mode 100644 static/js/utils/alerts.js
 delete mode 100644 static/js/utils/asidenav.js
 delete mode 100644 static/js/utils/asyncForm.js
 delete mode 100644 static/js/utils/asyncTable.js
 delete mode 100644 static/js/utils/checkAll.js
 delete mode 100644 static/js/utils/form.js
 delete mode 100644 static/js/utils/inputs.js
 delete mode 100644 static/js/utils/massInput.js
 delete mode 100644 static/js/utils/modal.js
 delete mode 100644 static/js/utils/showHide.js
 delete mode 100644 static/js/utils/tabber.js
 delete mode 100644 static/js/vendor/flatpickr.js
 delete mode 100644 static/js/vendor/zepto.js

diff --git a/static/css/fonts.css b/static/css/fonts.css
deleted file mode 100644
index 785fe33d3..000000000
--- a/static/css/fonts.css
+++ /dev/null
@@ -1,129 +0,0 @@
-/*!
- * Font Awesome Free 5.1.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
- @font-face{
-  font-family:"Font Awesome 5 Free";
-  font-style:normal;
-  font-weight:900;
-  src:url(../fonts/fontawesome/fa-solid-900.eot);
-  src:url(../fonts/fontawesome/fa-solid-900.eot?#iefix) format("embedded-opentype"),
-      url(../fonts/fontawesome/fa-solid-900.woff2) format("woff2"),
-      url(../fonts/fontawesome/fa-solid-900.woff) format("woff"),
-      url(../fonts/fontawesome/fa-solid-900.ttf) format("truetype"),
-      url(../fonts/fontawesome/fa-solid-900.svg#fontawesome) format("svg");
-}
-.fa,.fas{
-  font-family:"Font Awesome 5 Free";
-  font-weight:900;
-}
-
-@font-face {
-	font-family: 'Source Sans Pro';
-	font-style: normal;
-	font-weight: 300;
-	src:
-		local('Source Sans Pro Light'),
-		local('SourceSansPro-Light'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdu.woff2 */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_300.woff2') format('woff2'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdo.woff */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_300.woff') format('woff'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdq.eot */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_300.eot?#iefix') format('embedded-opentype'),
-		/* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdp&skey=e2b26fc7e9e1ade8&v=v11#SourceSansPro */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_300.svg#SourceSansPro') format('svg'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdr.ttf */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_300.ttf') format('truetype');
-}
-@font-face {
-	font-family: 'Source Sans Pro';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Source Sans Pro Regular'),
-		local('SourceSansPro-Regular'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_400.woff2') format('woff2'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7j.woff */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_400.woff') format('woff'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7h.eot */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_400.eot?#iefix') format('embedded-opentype'),
-		/* from https://fonts.gstatic.com/l/font?kit=6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7i&skey=1e026b1c27170b9b&v=v11#SourceSansPro */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_400.svg#SourceSansPro') format('svg'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7g.ttf */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_400.ttf') format('truetype');
-}
-@font-face {
-	font-family: 'Source Sans Pro';
-	font-style: normal;
-	font-weight: 600;
-	src:
-		local('Source Sans Pro SemiBold'),
-		local('SourceSansPro-SemiBold'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_600.woff2') format('woff2'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdo.woff */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_600.woff') format('woff'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdq.eot */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_600.eot?#iefix') format('embedded-opentype'),
-		/* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdp&skey=227a890402fab339&v=v11#SourceSansPro */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_600.svg#SourceSansPro') format('svg'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdr.ttf */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_600.ttf') format('truetype');
-}
-@font-face {
-	font-family: 'Source Sans Pro';
-	font-style: normal;
-	font-weight: 900;
-	src:
-		local('Source Sans Pro Black'),
-		local('SourceSansPro-Black'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdu.woff2 */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_900.woff2') format('woff2'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdo.woff */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_900.woff') format('woff'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdq.eot */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_900.eot?#iefix') format('embedded-opentype'),
-		/* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdp&skey=cf4dfcb31d72fb0a&v=v11#SourceSansPro */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_900.svg#SourceSansPro') format('svg'),
-		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdr.ttf */
-		url('../fonts/sourcesanspro/Source_Sans_Pro_900.ttf') format('truetype');
-}
-
-@font-face {
-	font-family: 'Roboto';
-	font-style: normal;
-	font-weight: 300;
-	src:
-		local('Roboto Light'),
-		local('Roboto-Light'),
-		/* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 */
-		url('../fonts/roboto/Roboto_300.woff2') format('woff2'),
-		/* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc-.woff */
-		url('../fonts/roboto/Roboto_300.woff') format('woff'),
-		/* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc8.eot */
-		url('../fonts/roboto/Roboto_300.eot?#iefix') format('embedded-opentype'),
-		/* from https://fonts.gstatic.com/l/font?kit=KFOlCnqEu92Fr1MmSU5fBBc_&skey=11ce8ad5f54705ca&v=v18#Roboto */
-		url('../fonts/roboto/Roboto_300.svg#Roboto') format('svg'),
-		/* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc9.ttf */
-		url('../fonts/roboto/Roboto_300.ttf') format('truetype');
-}
-@font-face {
-	font-family: 'Roboto';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Roboto'),
-		local('Roboto-Regular'),
-		/* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxK.woff2 */
-		url('../fonts/roboto/Roboto_400.woff2') format('woff2'),
-		/* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxM.woff */
-		url('../fonts/roboto/Roboto_400.woff') format('woff'),
-		/* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxO.eot */
-		url('../fonts/roboto/Roboto_400.eot?#iefix') format('embedded-opentype'),
-		/* from https://fonts.gstatic.com/l/font?kit=KFOmCnqEu92Fr1Mu4mxN&skey=a0a0114a1dcab3ac&v=v18#Roboto */
-		url('../fonts/roboto/Roboto_400.svg#Roboto') format('svg'),
-		/* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxP.ttf */
-		url('../fonts/roboto/Roboto_400.ttf') format('truetype');
-}
diff --git a/static/css/utils/alerts.scss b/static/css/utils/alerts.scss
deleted file mode 100644
index cd0492f11..000000000
--- a/static/css/utils/alerts.scss
+++ /dev/null
@@ -1,210 +0,0 @@
-.alerts {
-  position: fixed;
-  bottom: 0;
-  right: 5%;
-  z-index: 20;
-  text-align: right;
-  display: flex;
-  flex-direction: column;
-}
-
-.alerts__toggler {
-  width: 40px;
-  height: 40px;
-  position: absolute;
-  top: 400px;
-  left: 50%;
-  transform: translateX(-50%);
-  cursor: pointer;
-
-  &::before {
-    content: '\f077';
-    position: absolute;
-    font-family: "Font Awesome 5 Free";
-    left: 50%;
-    top: 0;
-    height: 30px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 30px;
-    color: var(--color-grey);
-    font-size: 30px;
-    transform: translateX(-50%);
-  }
-}
-
-.alerts--elevated {
-  z-index: 1000;
-}
-
-.alerts__toggler--visible {
-  top: -40px;
-  opacity: 1;
-  transition: top     .5s cubic-bezier(0.73, 1.25, 0.61, 1),
-              opacity .5s cubic-bezier(0.73, 1.25, 0.61, 1);
-}
-
-@media (max-width: 425px) {
-
-  .alerts {
-    left: 5%;
-  }
-}
-
-.alert {
-  position: relative;
-  display: block;
-  background-color: var(--color-lightblack);
-  font-size: 1rem;
-  color: var(--color-lightwhite);
-  z-index: 0;
-  padding: 0 50px;
-  padding-right: 60px;
-  animation: slide-in-alert .2s ease-out forwards;
-  margin-bottom: 10px;
-  transition: margin-bottom .2s ease-out;
-}
-
-.alert a {
-  color: var(--color-lightwhite);
-}
-
-@keyframes slide-in-alert {
-  from {
-    transform: translateY(120%);
-  }
-  to {
-    transform: translateY(0);
-  }
-}
-
-@keyframes slide-out-alert {
-  from {
-    transform: translateY(0);
-    max-height: 200px;
-  }
-  to {
-    transform: translateY(250%);
-    opacity: 0;
-    max-height: 0;
-    overflow: hidden;
-  }
-}
-
-@media (min-width: 425px) {
-
-  .alert {
-    max-width: 400px;
-  }
-}
-
-.alert--invisible {
-  animation: slide-out-alert .2s ease-out forwards;
-  margin-bottom: 0;
-}
-
-.alert__content {
-  padding: 8px 0;
-  min-height: 40px;
-  position: relative;
-  display: flex;
-  font-weight: 600;
-  align-items: center;
-  text-align: left;
-}
-
-.alert__icon {
-  text-align: right;
-  position: absolute;
-  left: 0px;
-  top: 0;
-  width: 50px;
-  height: 100%;
-  z-index: 40;
-
-  &::before {
-    content: '\f05a';
-    position: absolute;
-    font-family: "Font Awesome 5 Free";
-    font-size: 24px;
-    top: 50%;
-    left: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transform: translate(-50%, -50%);
-    border-radius: 50%;
-    width: 30px;
-    height: 30px;
-  }
-}
-
-.alert__closer {
-  cursor: pointer;
-  text-align: right;
-  position: absolute;
-  right: 0px;
-  top: 0;
-  width: 60px;
-  height: 100%;
-  transition: all .3s ease;
-  z-index: 40;
-
-  &:hover {
-    transform: scale(1.05, 1.05);
-
-    &::before {
-      box-shadow: 0 0 4px white;
-      background-color: rgba(255, 255, 255, 0.1);
-      color: white;
-    }
-  }
-
-  &::before {
-    content: '\f00d';
-    position: absolute;
-    font-family: "Font Awesome 5 Free";
-    top: 50%;
-    left: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transform: translate(-50%, -50%);
-    border-radius: 50%;
-    width: 30px;
-    height: 30px;
-    transition: all .15s ease;
-  }
-}
-
-@media (max-width: 768px) {
-
-  .alert__closer {
-    width: 40px;
-  }
-}
-
-.alert-success {
-  background-color: var(--color-success);
-
-  .alert__icon::before {
-    content: '\f058';
-  }
-}
-
-.alert-warning {
-  background-color: var(--color-warning);
-
-  .alert__icon::before {
-    content: '\f06a';
-  }
-}
-
-.alert-error {
-  background-color: var(--color-error);
-
-  .alert__icon::before {
-    content: '\f071';
-  }
-}
diff --git a/static/css/utils/asidenav.scss b/static/css/utils/asidenav.scss
deleted file mode 100644
index e7ab3b50d..000000000
--- a/static/css/utils/asidenav.scss
+++ /dev/null
@@ -1,364 +0,0 @@
-.main__aside {
-  position: fixed;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-  z-index: 1;
-  top: 0;
-  left: 0;
-  width: var(--asidenav-width-lg, 20%);
-  height: 100%;
-  flex: 0 0 0;
-  flex-basis: var(--asidenav-width-lg, 20%);
-  transition: all .2s ease-out;
-
-  &::before {
-    position: absolute;
-    z-index: -1;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background-color: var(--color-dark);
-    opacity: 0.05;
-  }
-
-  &::after {
-    content: '';
-    position: absolute;
-    z-index: -2;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background-color: var(--color-grey-light);
-  }
-}
-
-@media (max-width: 425px) {
-
-  .main__aside {
-    position: fixed;
-    top: var(--header-height-collapsed);
-    left: 0;
-    right: 0;
-    bottom: 0;
-    height: 100% !important;
-    width: 100%;
-    z-index: 5;
-    overflow: hidden;
-    transform: translateX(-110%);
-    transition: transform .2s ease-out;
-
-    &.main__aside--expanded {
-      transform: translateX(0%);
-    }
-
-    .asidenav__box-title {
-      font-size: 18px;
-      padding-left: 10px;
-    }
-  }
-}
-
-@media (min-width: 1200px) {
-  .main__aside {
-    width: var(--asidenav-width-xl, 250px)
-  }
-}
-
-.asidenav {
-  color: var(--color-font);
-  min-height: calc(100% - var(--header-height));
-  height: 400px;
-  overflow-y: auto;
-  overflow-x: hidden;
-
-  &::-webkit-scrollbar {
-    width: 0;
-  }
-}
-
-.asidenav__box {
-  transition: opacity .2s ease;
-
-  + .asidenav__box {
-    margin-top: 10px;
-  }
-}
-
-.asidenav__box-title {
-  padding: 7px 13px;
-  margin-top: 30px;
-  background-color: transparent;
-  transition: all .2s ease;
-  padding: 10px 13px;
-  margin: 0;
-  border-bottom: 1px solid var(--color-grey);
-}
-
-/* LOGO */
-
-.asidenav__logo {
-  height: var(--header-height);
-  display: flex;
-  align-items: center;
-}
-
-@media (max-width: 768px) {
-
-  .asidenav__logo {
-    display: none;
-  }
-}
-
-.asidenav__logo-link {
-  flex: 1;
-  top: 10px;
-  left: 20px;
-  height: 80px;
-  padding: 0 20px;
-  display: flex;
-  flex-basis: var(--asidenav-width-xl, 250px);
-  font-size: 16px;
-  align-items: center;
-  color: var(--color-dark);
-  transform-origin: left;
-
-  &:hover {
-    color: var(--color-primary);
-  }
-}
-
-.asidenav__logo-lmu {
-  width: 80px;
-  height: 100%;
-}
-
-.asidenav__logo-uni2work {
-  display: flex;
-  align-items: flex-end;
-  min-width: 70px;
-  margin-left: 12px;
-  text-transform: uppercase;
-  width: 100%;
-  height: 100%;
-  padding: 2px 4px;
-  border: 1px solid currentColor;
-  letter-spacing: 2px;
-  background-color: white;
-  transition: background-color .3s ease;
-}
-
-@media (max-width: 1199px) {
-
-  .asidenav__logo-link {
-    flex-basis: var(--asidenav-width-lg, 20%);
-    font-size: 16px;
-  }
-
-  .asidenav__logo-lmu {
-    display: none;
-  }
-
-  .asidenav__logo-uni2work {
-    margin-left: 0;
-  }
-}
-
-/* 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 {
-  color: var(--color-font);
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-  align-items: center;
-
-  &:not(.asidenav__list-item--active):hover {
-    background-color: var(--color-lightwhite);
-
-    > .asidenav__link-wrapper {
-      color: var(--color-font);
-    }
-  }
-
-  &:hover {
-
-    .asidenav__link-shorthand {
-      transform: scale(1.05, 1.0);
-      transform-origin: right;
-      text-shadow: none;
-    }
-
-    .asidenav__nested-list-wrapper {
-      display: block;
-    }
-  }
-}
-
-/* small list-item-padding for medium to large screens */
-@media (min-width: 769px) {
-
-  .asidenav__list-item {
-    padding-left: 10px;
-  }
-}
-
-.asidenav__list-item--active {
-  background-color: var(--color-lightwhite);
-
-  .asidenav__link-wrapper {
-    color: var(--color-link);
-  }
-
-  .asidenav__link-shorthand {
-    transform: scale(1.05, 1.0);
-    transform-origin: right;
-    text-shadow: none;
-  }
-}
-
-.asidenav__link-wrapper {
-  position: relative;
-  display: flex;
-  flex: 1;
-  align-items: center;
-  padding: 8px 3px;
-  justify-content: flex-start;
-  color: var(--color-font);
-  width: 100%;
-  z-index: 1;
-}
-
-.asidenav__link-shorthand {
-  display: none;
-}
-
-.asidenav__link-label {
-  line-height: 1;
-}
-
-/* hover sub-menus */
-.asidenav__nested-list-wrapper {
-  position: absolute;
-  z-index: 10;
-  display: none;
-  color: var(--color-font);
-  background-color: var(--color-grey-light);
-  box-shadow: 1px 1px 1px 0px var(--color-grey);
-}
-
-.asidenav__nested-list {
-  min-width: 200px;
-}
-
-@media (max-width: 425px) {
-
-  .asidenav__nested-list {
-    display: none;
-  }
-}
-
-.asidenav__nested-list-item {
-  position: relative;
-
-  &:hover {
-    background-color: var(--color-lightwhite);
-  }
-
-  .asidenav__link-wrapper {
-    padding-left: 13px;
-    padding-right: 13px;
-    transition: all .2s ease;
-    color: var(--color-font);
-  }
-}
-
-/* TABLET */
-@media (min-width: 426px) and (max-width: 768px) {
-
-  .main__aside {
-    width: var(--asidenav-width-md, 50px);
-    flex-basis: var(--asidenav-width-md, 50px);
-    overflow: hidden;
-    min-height: calc(100% - var(--header-height-collapsed));
-    top: var(--header-height-collapsed);
-
-    .asidenav__box-title {
-      width: var(--asidenav-width-md, 50px);
-      font-size: 18px;
-      text-align: center;
-      padding: 10px 1px;
-      word-break: break-all;
-      background-color: var(--color-dark);
-      color: var(--color-lightwhite);
-
-      &:hover {
-        background-color: var(--color-dark);
-      }
-    }
-
-    .asidenav__link-shorthand {
-      display: flex;
-      position: static;
-      height: 50px;
-      width: var(--asidenav-width-md, 50px);
-      text-align: center;
-      opacity: 1;
-      font-size: 15px;
-      line-height: 1em;
-      margin-right: 13px;
-      flex-shrink: 0;
-      padding: 1px;
-      outline: 1px solid white;
-      word-break: break-all;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .asidenav__list-item {
-      padding-left: 0;
-
-      + .asidenav__list-item {
-        margin: 0;
-      }
-    }
-
-    .asidenav__link-wrapper {
-      color: var(--color-font);
-      padding: 0;
-    }
-
-    .asidenav__nested-list,
-    .asidenav__link-label {
-      display: none;
-    }
-
-    .asidenav__list-item--active {
-
-      .asidenav__link-wrapper {
-        background-color: var(--color-lightwhite);
-      }
-    }
-  }
-}
diff --git a/static/css/utils/asyncForm.scss b/static/css/utils/asyncForm.scss
deleted file mode 100644
index bd5a97a41..000000000
--- a/static/css/utils/asyncForm.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-.async-form__response {
-  margin: 20px 0;
-  position: relative;
-  width: 100%;
-  font-size: 18px;
-  text-align: center;
-  padding-top: 60px;
-}
-
-.async-form__response::before,
-.async-form__response::after {
-  position: absolute;
-  top: 0px;
-  left: 50%;
-  display: block;
-}
-
-.async-form__response--success::before {
-  content: '';
-  width: 17px;
-  height: 28px;
-  border: solid #069e04;
-  border-width: 0 5px 5px 0;
-  transform: translateX(-50%) rotate(45deg);
-}
-
-.async-form__response--info::before {
-  content: '';
-  width: 5px;
-  height: 30px;
-  top: 10px;
-  background-color: #777;
-  transform: translateX(-50%);
-}
-.async-form__response--info::after {
-  content: '';
-  width: 5px;
-  height: 5px;
-  background-color: #777;
-  transform: translateX(-50%);
-}
-
-.async-form__response--warning::before {
-  content: '';
-  width: 5px;
-  height: 30px;
-  background-color: rgb(255, 187, 0);
-  transform: translateX(-50%);
-}
-.async-form__response--warning::after {
-  content: '';
-  width: 5px;
-  height: 5px;
-  top: 35px;
-  background-color: rgb(255, 187, 0);
-  transform: translateX(-50%);
-}
-
-.async-form__response--error::before {
-  content: '';
-  width: 5px;
-  height: 40px;
-  background-color: #940d0d;
-  transform: translateX(-50%) rotate(-45deg);
-}
-.async-form__response--error::after {
-  content: '';
-  width: 5px;
-  height: 40px;
-  background-color: #940d0d;
-  transform: translateX(-50%) rotate(45deg);
-}
-
-.async-form--loading {
-  opacity: 0.1;
-  transition: opacity 800ms ease-out;
-  pointer-events: none;
-}
diff --git a/static/css/utils/asyncTable.scss b/static/css/utils/asyncTable.scss
deleted file mode 100644
index 9766daa84..000000000
--- a/static/css/utils/asyncTable.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.async-table--loading {
-  opacity: 0.7;
-  pointer-events: none;
-  transition: opacity 400ms ease-out;
-}
diff --git a/static/css/utils/asyncTableFilter.scss b/static/css/utils/asyncTableFilter.scss
deleted file mode 100644
index 794240f3f..000000000
--- a/static/css/utils/asyncTableFilter.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.async-table-filter--loading {
-  opacity: 0.7;
-  pointer-events: none;
-  transition: opacity 400ms ease-out;
-}
diff --git a/static/css/utils/checkbox.scss b/static/css/utils/checkbox.scss
deleted file mode 100644
index 6db7f97e3..000000000
--- a/static/css/utils/checkbox.scss
+++ /dev/null
@@ -1,82 +0,0 @@
-
-/* CUSTOM CHECKBOXES */
-/* Completely replaces legacy checkbox */
-.checkbox {
-  position: relative;
-  display: inline-block;
-
-  [type="checkbox"] {
-    position: fixed;
-    top: -1px;
-    left: -1px;
-    width: 1px;
-    height: 1px;
-    overflow: hidden;
-  }
-
-  label {
-    display: block;
-    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);
-    border-radius: 4px;
-    color: white;
-    cursor: pointer;
-  }
-
-  label::before,
-  label::after {
-    position: absolute;
-    display: block;
-    top: 12px;
-    left: 8px;
-    height: 2px;
-    width: 8px;
-    background-color: var(--color-font);
-  }
-
-  :checked + label {
-    background-color: var(--color-primary);
-  }
-
-  [type="checkbox"]:focus + label {
-    border-color: #3273dc;
-    box-shadow: 0 0 0 0.125em rgba(50,115,220,.25);
-    outline: 0;
-  }
-
-  :checked + label::before,
-  :checked + label::after {
-    content: '';
-  }
-
-  :checked + label::before {
-    background-color: white;
-    transform: rotate(45deg);
-    left: 2px;
-    top: 11px;
-  }
-
-  :checked + label::after {
-    background-color: white;
-    transform: rotate(-45deg);
-    top: 9px;
-    width: 12px;
-    left: 7px;
-  }
-
-  [disabled] + label {
-    pointer-events: none;
-    border: none;
-    opacity: 0.6;
-    filter: grayscale(1);
-  }
-}
-
-/* special treatment for checkboxes in table headers */
-th .checkbox {
-  margin-right: 7px;
-  vertical-align: bottom;
-}
diff --git a/static/css/utils/form.scss b/static/css/utils/form.scss
deleted file mode 100644
index 6612beeb1..000000000
--- a/static/css/utils/form.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-fieldset {
-  border: 0;
-  margin: 0;
-  padding: 0;
-
-  legend {
-    display: none;
-  }
-}
-
-@media (min-width: 769px) {
-  .form-group__input {
-    grid-column: 2;
-  }
-}
-
-[uw-auto-submit-button][type="submit"] {
-  animation: fade-in 500ms ease-in-out backwards;
-  animation-delay: 500ms;
-}
-
-@keyframes fade-in {
-  from {
-    opacity: 0;
-  }
-}
-
-.hidden {
-  visibility: hidden !important;
-  height: 0 !important;
-  width: 0 !important;
-  opacity: 0 !important;
-  margin: 0 !important;
-  padding: 0 !important;
-  min-width: 0 !important;
-}
-
-.select--pagesize {
-  width: 5em;
-  min-width: 75px;
-}
-
-.label-pagesize {
-  margin-right: 13px;
-}
diff --git a/static/css/utils/inputs.scss b/static/css/utils/inputs.scss
deleted file mode 100644
index 3290094d0..000000000
--- a/static/css/utils/inputs.scss
+++ /dev/null
@@ -1,239 +0,0 @@
-/* GENERAL STYLES FOR FORMS */
-
-/* FORM GROUPS */
-.form-group {
-  position: relative;
-  display: flex;
-  display: grid;
-  grid-template-columns: 1fr 3fr;
-  grid-gap: 5px;
-  justify-content: flex-start;
-  align-items: flex-start;
-  padding: 4px 0;
-  border-left: 2px solid transparent;
-
-  + .form-group {
-    margin-top: 7px;
-  }
-
-  + .form-section-title {
-    margin-top: 40px;
-  }
-}
-
-.form-section-title {
-  color: var(--color-fontsec);
-}
-
-.form-group-label {
-  font-weight: 600;
-  padding-top: 6px;
-}
-
-.form-group-label__hint {
-  margin-top: 7px;
-  color: var(--color-fontsec);
-  font-size: 0.9rem;
-}
-
-.form-group--required {
-  .form-group-label__caption::after {
-    content: ' *';
-    color: var(--color-error);
-  }
-}
-
-.form-group--optional {
-  .form-group-label__caption::after {
-    content: '';
-  }
-}
-
-.form-group--submit .form-group__input {
-  grid-column: 2;
-}
-
-@media (max-width: 768px) {
-  .form-group--submit .form-group__input {
-    grid-column: 1;
-  }
-}
-
-.form-group--has-error {
-  background-color: rgba(255, 0, 0, 0.1);
-
-  input, textarea {
-    border-color: var(--color-error) !important;
-  }
-
-  .form-error {
-    display: block;
-  }
-}
-
-.form-error {
-  display: none;
-}
-
-@media (max-width: 768px) {
-  .form-group {
-    grid-template-columns: 1fr;
-    align-items: baseline;
-    margin-top: 17px;
-    flex-direction: column;
-  }
-}
-
-/* TEXT INPUTS */
-input[type="text"],
-input[type="search"],
-input[type="password"],
-input[type="url"],
-input[type="number"],
-input[type="email"],
-input[type*="date"],
-input[type*="time"],
-select {
-  /* from bulma.css */
-  color: #363636;
-  border-color: #dbdbdb;
-  background-color: #f3f3f3;
-  box-shadow: inset 0 1px 2px 1px rgba(50,50,50,.05);
-
-  width: 100%;
-  max-width: 600px;
-  align-items: center;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  font-size: 1rem;
-  font-family: var(--font-base);
-  line-height: 1.5;
-  padding: 4px 13px;
-}
-
-input[type="number"] {
-  width: 100px;
-}
-
-input[type*="date"],
-input[type*="time"],
-.flatpickr-input[type="text"] {
-  width: 50%;
-  width: 250px;
-}
-
-/* BUTTON STYLE SEE default-layout.lucius */
-
-/* TEXTAREAS */
-textarea {
-  width: 100%;
-  height: 170px;
-  max-width: 600px;
-  line-height: 1.5;
-  color: #363636;
-  background-color: #f3f3f3;
-  padding: 4px 13px;
-  font-size: 1rem;
-  font-family: var(--font-base);
-  -webkit-appearance: none;
-  appearance: none;
-  border: 1px solid #dbdbdb;
-  border-radius: 2px;
-  box-shadow: inset 0 1px 2px 1px rgba(50,50,50,.05);
-  vertical-align: top;
-}
-
-/* SHARED STATE RELATED STYLES */
-
-input,
-select,
-textarea {
-  &:focus {
-    border-color: #3273dc;
-    box-shadow: 0 0 0 0.125em rgba(50,115,220,.25);
-    outline: 0;
-  }
-
-  &[disabled] {
-    background-color: #f3f3f3;
-    color: #7a7a7a;
-    box-shadow: none;
-    border-color: #dbdbdb;
-  }
-
-  &[readonly] {
-    background-color: #f5f5f5;
-    border-color: #dbdbdb;
-  }
-}
-
-/* OPTIONS */
-
-select {
-  -webkit-appearance: menulist;
-}
-
-select,
-option {
-  font-size: 1rem;
-  line-height: 1.5;
-  padding: 4px 13px;
-  border: 1px solid #dbdbdb;
-  border-radius: 2px;
-  outline: 0;
-  color: #363636;
-  min-width: 250px;
-  width: auto;
-  background-color: #f3f3f3;
-  box-shadow: inset 0 1px 2px 1px rgba(50,50,50,.05);
-}
-
-@media (max-width: 425px) {
-
-  select, option {
-    width: 100%;
-  }
-}
-
-/* FILE INPUT */
-.file-input {
-  display: none;
-}
-
-.file-input__label {
-  cursor: pointer;
-  display: inline-block;
-  background-color: var(--color-primary);
-  color: white;
-  padding: 10px 17px;
-  border-radius: 3px;
-}
-
-.file-input__info {
-  font-size: .9rem;
-  font-style: italic;
-  margin: 10px 0;
-  color: var(--color-fontsec);
-}
-
-.file-input__list {
-  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;
-
-  .checkbox {
-    margin-left: 12px;
-  }
-}
diff --git a/static/css/utils/modal.scss b/static/css/utils/modal.scss
deleted file mode 100644
index 2cecac941..000000000
--- a/static/css/utils/modal.scss
+++ /dev/null
@@ -1,115 +0,0 @@
-.modals-wrapper {
-  position: fixed;
-  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 40px;
-  overflow: auto;
-  overscroll-behavior: contain;
-  pointer-events: none;
-  opacity: 0;
-
-  &.modal--open {
-    display: flex;
-    opacity: 1;
-    pointer-events: auto;
-    z-index: 200;
-    transition:
-      opacity .2s .1s ease-in-out,
-      transform .3s ease-in-out;
-  }
-}
-
-@media (max-width: 1024px) {
-  .modal {
-    min-width: 80vw;
-  }
-}
-@media (max-width: 768px) {
-  .modal {
-    min-width: 90vw;
-  }
-}
-@media (max-width: 425px) {
-  .modal {
-    min-width: calc(100vw - 20px);
-  }
-}
-
-.modal__overlay {
-  position: fixed;
-  left: 0;
-  top: 0;
-  height: 100%;
-  width: 100%;
-  background-color: transparent;
-  z-index: -1;
-  transition: all .2s ease;
-  display: none;
-
-  &.modal__overlay--open {
-    display: block;
-    z-index: 199;
-    opacity: 1;
-    background-color: rgba(0, 0, 0, 0.4);
-  }
-}
-
-.modal__trigger {
-  cursor: pointer;
-}
-
-.modal__trigger-label {
-  font-style: italic;
-  text-decoration: underline;
-}
-
-.modal__closer {
-  position: absolute;
-  top: 20px;
-  right: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 30px;
-  height: 30px;
-  background-color: var(--color-darker);
-  border-radius: 2px;
-  cursor: pointer;
-  z-index: 20;
-
-  &::before {
-    content: '\f00d';
-    font-family: 'Font Awesome 5 Free';
-    color: white;
-  }
-}
-
-.modal__content {
-  margin: 20px 0;
-  width: 100%;
-}
diff --git a/static/css/utils/radio.scss b/static/css/utils/radio.scss
deleted file mode 100644
index 1b26ae1ae..000000000
--- a/static/css/utils/radio.scss
+++ /dev/null
@@ -1,72 +0,0 @@
-/* CUSTOM RADIO BOXES */
-/* Completely replaces native radiobox */
-
-.radio-group {
-  display: flex;
-}
-
-.radio {
-  position: relative;
-  display: inline-block;
-
-  [type="radio"] {
-    position: fixed;
-    top: -1px;
-    left: -1px;
-    width: 1px;
-    height: 1px;
-    overflow: hidden;
-  }
-
-  label {
-    display: block;
-    height: 34px;
-    min-width: 42px;
-    line-height: 34px;
-    text-align: center;
-    padding: 0 13px;
-    background-color: #f3f3f3;
-    box-shadow: inset 2px 1px 2px 1px rgba(50, 50, 50, 0.05);
-    color: var(--color-font);
-    cursor: pointer;
-  }
-
-  :checked + label {
-    background-color: var(--color-primary);
-    color: var(--color-lightwhite);
-    box-shadow: inset -2px -1px 2px 1px rgba(255, 255, 255, 0.15);
-  }
-
-  :focus + label {
-    border-color: #3273dc;
-    box-shadow: 0 0 0.125em 0 rgba(50,115,220,0.8);
-    outline: 0;
-  }
-
-  [disabled] + label {
-    pointer-events: none;
-    border: none;
-    opacity: 0.6;
-    filter: grayscale(1);
-  }
-}
-
-.radio:first-child {
-  label {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-  }
-}
-
-.radio:last-child {
-  label {
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-  }
-}
-
-@media (max-width: 768px) {
-  .radio + .radio {
-    margin-left: 10px;
-  }
-}
diff --git a/static/css/utils/showHide.scss b/static/css/utils/showHide.scss
deleted file mode 100644
index 04143d0ae..000000000
--- a/static/css/utils/showHide.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-$show-hide-toggle-size: 6px;
-
-.show-hide__toggle {
-
-  position: relative;
-  cursor: pointer;
-
-  &:hover {
-    background-color: var(--color-grey-lighter);
-    cursor: pointer;
-  }
-}
-
-.show-hide__toggle::before {
-  content: '';
-  position: absolute;
-  width: $show-hide-toggle-size;
-  height: $show-hide-toggle-size;
-  left: -15px;
-  top: 50%;
-  color: var(--color-primary);
-  border-right: 2px solid currentColor;
-  border-top: 2px solid currentColor;
-  transition: transform .2s ease;
-  transform: translateY(-50%) rotate(-45deg);
-
-  @media (max-width: 768px) {
-    left: auto;
-    right: 20px;
-    color: var(--color-font);
-  }
-}
-
-.show-hide__toggle--right::before {
-  left: auto;
-  right: 20px;
-  color: var(--color-font);
-}
-
-.show-hide--collapsed {
-
-  .show-hide__toggle::before {
-    transform: translateY(-50%) rotate(135deg);
-  }
-
-  :not(.show-hide__toggle) {
-    display: block;
-    height: 0;
-    margin: 0;
-    padding: 0;
-    max-height: 0;
-    overflow-y: hidden;
-  }
-}
diff --git a/static/css/utils/tabber.scss b/static/css/utils/tabber.scss
deleted file mode 100644
index d135a5f27..000000000
--- a/static/css/utils/tabber.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-.tab-group {
-  border-top: 2px solid #dcdcdc;
-  padding-top: 30px;
-}
-
-.tab-group-openers {
-  display: flex;
-  justify-content: stretch;
-  line-height: 40px;
-  font-size: 14px;
-  margin-bottom: 40px;
-}
-
-.tab-opener {
-  display: inline-block;
-  flex: 1;
-  text-align: center;
-  padding: 0 13px;
-  margin: 0 2px;
-  background-color: var(--color-dark);
-  color: white;
-  font-size: 16px;
-  text-transform: uppercase;
-  font-weight: 600;
-  transition: all .1s ease;
-  border-bottom: 5px solid rgba(100, 100, 100, 0.2);
-}
-.tab-opener:not(.tab-visible):hover {
-  cursor: pointer;
-  background-color: transparent;
-  color: rgb(52, 48, 58);
-  border-bottom-color: grey;
-}
-
-.tab-opener.tab-visible {
-  background-color: transparent;
-  color: rgb(52, 48, 58);
-  border-bottom-color: var(--color-primary);
-}
diff --git a/static/css/utils/tooltip.scss b/static/css/utils/tooltip.scss
deleted file mode 100644
index ed6b5fd5d..000000000
--- a/static/css/utils/tooltip.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-.tooltip {
-  position: relative;
-  display: inline-block;
-  height: 1.5rem;
-  vertical-align: -0.375rem;
-
-  &:hover .tooltip__content {
-    display: inline-block;
-  }
-}
-
-.tooltip__handle {
-  background-color: var(--color-dark);
-  border-radius: 50%;
-  height: 1.5rem;
-  width: 1.5rem;
-  line-height: 1.5rem;
-  font-size: 1.2rem;
-  color: white;
-  display: inline-block;
-  text-align: center;
-  margin: 0 10px;
-  cursor: default;
-  position: relative;
-
-  &::before {
-    content: '\f128';
-    position: absolute;
-    top: 0;
-    left: 0;
-    font-family: "Font Awesome 5 Free";
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    font-size: 15px;
-  }
-
-  &.tooltip__handle--danger::before {
-    content: '\f12a';
-  }
-
-  &.tooltip__handle--danger {
-      background-color: var(--color-warning);
-  }
-
-  &:hover {
-    background-color: var(--color-light);
-  }
-}
-
-.tooltip__content {
-  position: absolute;
-  display: none;
-  top: -10px;
-  transform: translateY(-100%);
-  right: 3px;
-  width: 275px;
-  z-index: 10;
-  background-color: #fafafa;
-  border-radius: 4px;
-  padding: 13px 17px;
-  box-shadow: 0 0 20px 4px rgba(0, 0, 0, 0.1);
-
-  &::after {
-    content: '';
-    width: 16px;
-    height: 16px;
-    background-color: #fafafa;
-    transform: rotate(45deg);
-    position: absolute;
-    right: 10px;
-    bottom: -8px;
-  }
-}
-
-@media (max-width: 768px) {
-
-  .tooltip {
-    display: block;
-    margin-top: 10px;
-
-    .tooltip__content {
-      left: 3px;
-      right: 3px;
-      width: auto;
-    }
-  }
-}
diff --git a/static/css/vendor/flatpickr.css b/static/css/vendor/flatpickr.css
deleted file mode 100644
index 2e9c517e9..000000000
--- a/static/css/vendor/flatpickr.css
+++ /dev/null
@@ -1,740 +0,0 @@
-.flatpickr-calendar {
-  background: transparent;
-  opacity: 0;
-  display: none;
-  text-align: center;
-  visibility: hidden;
-  padding: 0;
-  -webkit-animation: none;
-          animation: none;
-  direction: ltr;
-  border: 0;
-  font-size: 14px;
-  line-height: 24px;
-  border-radius: 5px;
-  position: absolute;
-  width: 307.875px;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  -ms-touch-action: manipulation;
-      touch-action: manipulation;
-  background: #fff;
-  -webkit-box-shadow: 1px 0 0 #e6e6e6, -1px 0 0 #e6e6e6, 0 1px 0 #e6e6e6, 0 -1px 0 #e6e6e6, 0 3px 13px rgba(0,0,0,0.08);
-          box-shadow: 1px 0 0 #e6e6e6, -1px 0 0 #e6e6e6, 0 1px 0 #e6e6e6, 0 -1px 0 #e6e6e6, 0 3px 13px rgba(0,0,0,0.08);
-}
-.flatpickr-calendar.open,
-.flatpickr-calendar.inline {
-  opacity: 1;
-  max-height: 640px;
-  visibility: visible;
-}
-.flatpickr-calendar.open {
-  display: inline-block;
-  z-index: 99999;
-}
-.flatpickr-calendar.animate.open {
-  -webkit-animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
-          animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
-}
-.flatpickr-calendar.inline {
-  display: block;
-  position: relative;
-  top: 2px;
-}
-.flatpickr-calendar.static {
-  position: absolute;
-  top: calc(100% + 2px);
-}
-.flatpickr-calendar.static.open {
-  z-index: 999;
-  display: block;
-}
-.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7) {
-  -webkit-box-shadow: none !important;
-          box-shadow: none !important;
-}
-.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1) {
-  -webkit-box-shadow: -2px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
-          box-shadow: -2px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
-}
-.flatpickr-calendar .hasWeeks .dayContainer,
-.flatpickr-calendar .hasTime .dayContainer {
-  border-bottom: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.flatpickr-calendar .hasWeeks .dayContainer {
-  border-left: 0;
-}
-.flatpickr-calendar.showTimeInput.hasTime .flatpickr-time {
-  height: 40px;
-  border-top: 1px solid #e6e6e6;
-}
-.flatpickr-calendar.noCalendar.hasTime .flatpickr-time {
-  height: auto;
-}
-.flatpickr-calendar:before,
-.flatpickr-calendar:after {
-  position: absolute;
-  display: block;
-  pointer-events: none;
-  border: solid transparent;
-  content: '';
-  height: 0;
-  width: 0;
-  left: 22px;
-}
-.flatpickr-calendar.rightMost:before,
-.flatpickr-calendar.rightMost:after {
-  left: auto;
-  right: 22px;
-}
-.flatpickr-calendar:before {
-  border-width: 5px;
-  margin: 0 -5px;
-}
-.flatpickr-calendar:after {
-  border-width: 4px;
-  margin: 0 -4px;
-}
-.flatpickr-calendar.arrowTop:before,
-.flatpickr-calendar.arrowTop:after {
-  bottom: 100%;
-}
-.flatpickr-calendar.arrowTop:before {
-  border-bottom-color: #e6e6e6;
-}
-.flatpickr-calendar.arrowTop:after {
-  border-bottom-color: #fff;
-}
-.flatpickr-calendar.arrowBottom:before,
-.flatpickr-calendar.arrowBottom:after {
-  top: 100%;
-}
-.flatpickr-calendar.arrowBottom:before {
-  border-top-color: #e6e6e6;
-}
-.flatpickr-calendar.arrowBottom:after {
-  border-top-color: #fff;
-}
-.flatpickr-calendar:focus {
-  outline: 0;
-}
-.flatpickr-wrapper {
-  position: relative;
-  display: inline-block;
-}
-.flatpickr-months {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-.flatpickr-months .flatpickr-month {
-  background: transparent;
-  color: rgba(0,0,0,0.9);
-  fill: rgba(0,0,0,0.9);
-  height: 28px;
-  line-height: 1;
-  text-align: center;
-  position: relative;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  overflow: hidden;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
-}
-.flatpickr-months .flatpickr-prev-month,
-.flatpickr-months .flatpickr-next-month {
-  text-decoration: none;
-  cursor: pointer;
-  position: absolute;
-  top: 0px;
-  line-height: 16px;
-  height: 28px;
-  padding: 10px;
-  z-index: 3;
-}
-.flatpickr-months .flatpickr-prev-month.disabled,
-.flatpickr-months .flatpickr-next-month.disabled {
-  display: none;
-}
-.flatpickr-months .flatpickr-prev-month i,
-.flatpickr-months .flatpickr-next-month i {
-  position: relative;
-}
-.flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,
-.flatpickr-months .flatpickr-next-month.flatpickr-prev-month {
-/*
-      /*rtl:begin:ignore*/
-/*
-      */
-  left: 0;
-/*
-      /*rtl:end:ignore*/
-/*
-      */
-}
-/*
-      /*rtl:begin:ignore*/
-/*
-      /*rtl:end:ignore*/
-.flatpickr-months .flatpickr-prev-month.flatpickr-next-month,
-.flatpickr-months .flatpickr-next-month.flatpickr-next-month {
-/*
-      /*rtl:begin:ignore*/
-/*
-      */
-  right: 0;
-/*
-      /*rtl:end:ignore*/
-/*
-      */
-}
-/*
-      /*rtl:begin:ignore*/
-/*
-      /*rtl:end:ignore*/
-.flatpickr-months .flatpickr-prev-month:hover,
-.flatpickr-months .flatpickr-next-month:hover {
-  color: #959ea9;
-}
-.flatpickr-months .flatpickr-prev-month:hover svg,
-.flatpickr-months .flatpickr-next-month:hover svg {
-  fill: #f64747;
-}
-.flatpickr-months .flatpickr-prev-month svg,
-.flatpickr-months .flatpickr-next-month svg {
-  width: 14px;
-  height: 14px;
-}
-.flatpickr-months .flatpickr-prev-month svg path,
-.flatpickr-months .flatpickr-next-month svg path {
-  -webkit-transition: fill 0.1s;
-  transition: fill 0.1s;
-  fill: inherit;
-}
-.numInputWrapper {
-  position: relative;
-  height: auto;
-}
-.numInputWrapper input,
-.numInputWrapper span {
-  display: inline-block;
-}
-.numInputWrapper input {
-  width: 100%;
-  min-width: auto !important;
-}
-.numInputWrapper input::-ms-clear {
-  display: none;
-}
-.numInputWrapper span {
-  position: absolute;
-  right: 0;
-  width: 14px;
-  padding: 0 4px 0 2px;
-  height: 50%;
-  line-height: 50%;
-  opacity: 0;
-  cursor: pointer;
-  border: 1px solid rgba(57,57,57,0.15);
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-}
-.numInputWrapper span:hover {
-  background: rgba(0,0,0,0.1);
-}
-.numInputWrapper span:active {
-  background: rgba(0,0,0,0.2);
-}
-.numInputWrapper span:after {
-  display: block;
-  content: "";
-  position: absolute;
-}
-.numInputWrapper span.arrowUp {
-  top: 0;
-  border-bottom: 0;
-}
-.numInputWrapper span.arrowUp:after {
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-bottom: 4px solid rgba(57,57,57,0.6);
-  top: 26%;
-}
-.numInputWrapper span.arrowDown {
-  top: 50%;
-}
-.numInputWrapper span.arrowDown:after {
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid rgba(57,57,57,0.6);
-  top: 40%;
-}
-.numInputWrapper span svg {
-  width: inherit;
-  height: auto;
-}
-.numInputWrapper span svg path {
-  fill: rgba(0,0,0,0.5);
-}
-.numInputWrapper:hover {
-  background: rgba(0,0,0,0.05);
-}
-.numInputWrapper:hover span {
-  opacity: 1;
-}
-.flatpickr-current-month {
-  font-size: 135%;
-  line-height: inherit;
-  font-weight: 300;
-  color: inherit;
-  position: absolute;
-  width: 75%;
-  left: 12.5%;
-  padding: 6.16px 0 0 0;
-  line-height: 1;
-  height: 28px;
-  display: inline-block;
-  text-align: center;
-  -webkit-transform: translate3d(0px, 0px, 0px);
-          transform: translate3d(0px, 0px, 0px);
-}
-.flatpickr-current-month span.cur-month {
-  font-family: inherit;
-  font-weight: 700;
-  color: inherit;
-  display: inline-block;
-  margin-left: 0.5ch;
-  padding: 0;
-}
-.flatpickr-current-month span.cur-month:hover {
-  background: rgba(0,0,0,0.05);
-}
-.flatpickr-current-month .numInputWrapper {
-  width: 6ch;
-  width: 7ch\0;
-  display: inline-block;
-}
-.flatpickr-current-month .numInputWrapper span.arrowUp:after {
-  border-bottom-color: rgba(0,0,0,0.9);
-}
-.flatpickr-current-month .numInputWrapper span.arrowDown:after {
-  border-top-color: rgba(0,0,0,0.9);
-}
-.flatpickr-current-month input.cur-year {
-  background: transparent;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  color: inherit;
-  cursor: text;
-  padding: 0 0 0 0.5ch;
-  margin: 0;
-  display: inline-block;
-  font-size: inherit;
-  font-family: inherit;
-  font-weight: 300;
-  line-height: inherit;
-  height: auto;
-  border: 0;
-  border-radius: 0;
-  vertical-align: initial;
-}
-.flatpickr-current-month input.cur-year:focus {
-  outline: 0;
-}
-.flatpickr-current-month input.cur-year[disabled],
-.flatpickr-current-month input.cur-year[disabled]:hover {
-  font-size: 100%;
-  color: rgba(0,0,0,0.5);
-  background: transparent;
-  pointer-events: none;
-}
-.flatpickr-weekdays {
-  background: transparent;
-  text-align: center;
-  overflow: hidden;
-  width: 100%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  height: 28px;
-}
-.flatpickr-weekdays .flatpickr-weekdaycontainer {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
-}
-span.flatpickr-weekday {
-  cursor: default;
-  font-size: 90%;
-  background: transparent;
-  color: rgba(0,0,0,0.54);
-  line-height: 1;
-  margin: 0;
-  text-align: center;
-  display: block;
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
-  font-weight: bolder;
-}
-.dayContainer,
-.flatpickr-weeks {
-  padding: 1px 0 0 0;
-}
-.flatpickr-days {
-  position: relative;
-  overflow: hidden;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: start;
-  -webkit-align-items: flex-start;
-      -ms-flex-align: start;
-          align-items: flex-start;
-  width: 307.875px;
-}
-.flatpickr-days:focus {
-  outline: 0;
-}
-.dayContainer {
-  padding: 0;
-  outline: 0;
-  text-align: left;
-  width: 307.875px;
-  min-width: 307.875px;
-  max-width: 307.875px;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  display: inline-block;
-  display: -ms-flexbox;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-flex-wrap: wrap;
-          flex-wrap: wrap;
-  -ms-flex-wrap: wrap;
-  -ms-flex-pack: justify;
-  -webkit-justify-content: space-around;
-          justify-content: space-around;
-  -webkit-transform: translate3d(0px, 0px, 0px);
-          transform: translate3d(0px, 0px, 0px);
-  opacity: 1;
-}
-.dayContainer + .dayContainer {
-  -webkit-box-shadow: -1px 0 0 #e6e6e6;
-          box-shadow: -1px 0 0 #e6e6e6;
-}
-.flatpickr-day {
-  background: none;
-  border: 1px solid transparent;
-  border-radius: 150px;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  color: #393939;
-  cursor: pointer;
-  font-weight: 400;
-  width: 14.2857143%;
-  -webkit-flex-basis: 14.2857143%;
-      -ms-flex-preferred-size: 14.2857143%;
-          flex-basis: 14.2857143%;
-  max-width: 39px;
-  height: 39px;
-  line-height: 39px;
-  margin: 0;
-  display: inline-block;
-  position: relative;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-      -ms-flex-pack: center;
-          justify-content: center;
-  text-align: center;
-}
-.flatpickr-day.inRange,
-.flatpickr-day.prevMonthDay.inRange,
-.flatpickr-day.nextMonthDay.inRange,
-.flatpickr-day.today.inRange,
-.flatpickr-day.prevMonthDay.today.inRange,
-.flatpickr-day.nextMonthDay.today.inRange,
-.flatpickr-day:hover,
-.flatpickr-day.prevMonthDay:hover,
-.flatpickr-day.nextMonthDay:hover,
-.flatpickr-day:focus,
-.flatpickr-day.prevMonthDay:focus,
-.flatpickr-day.nextMonthDay:focus {
-  cursor: pointer;
-  outline: 0;
-  background: #e6e6e6;
-  border-color: #e6e6e6;
-}
-.flatpickr-day.today {
-  border-color: #959ea9;
-}
-.flatpickr-day.today:hover,
-.flatpickr-day.today:focus {
-  border-color: #959ea9;
-  background: #959ea9;
-  color: #fff;
-}
-.flatpickr-day.selected,
-.flatpickr-day.startRange,
-.flatpickr-day.endRange,
-.flatpickr-day.selected.inRange,
-.flatpickr-day.startRange.inRange,
-.flatpickr-day.endRange.inRange,
-.flatpickr-day.selected:focus,
-.flatpickr-day.startRange:focus,
-.flatpickr-day.endRange:focus,
-.flatpickr-day.selected:hover,
-.flatpickr-day.startRange:hover,
-.flatpickr-day.endRange:hover,
-.flatpickr-day.selected.prevMonthDay,
-.flatpickr-day.startRange.prevMonthDay,
-.flatpickr-day.endRange.prevMonthDay,
-.flatpickr-day.selected.nextMonthDay,
-.flatpickr-day.startRange.nextMonthDay,
-.flatpickr-day.endRange.nextMonthDay {
-  background: #569ff7;
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  color: #fff;
-  border-color: #569ff7;
-}
-.flatpickr-day.selected.startRange,
-.flatpickr-day.startRange.startRange,
-.flatpickr-day.endRange.startRange {
-  border-radius: 50px 0 0 50px;
-}
-.flatpickr-day.selected.endRange,
-.flatpickr-day.startRange.endRange,
-.flatpickr-day.endRange.endRange {
-  border-radius: 0 50px 50px 0;
-}
-.flatpickr-day.selected.startRange + .endRange,
-.flatpickr-day.startRange.startRange + .endRange,
-.flatpickr-day.endRange.startRange + .endRange {
-  -webkit-box-shadow: -10px 0 0 #569ff7;
-          box-shadow: -10px 0 0 #569ff7;
-}
-.flatpickr-day.selected.startRange.endRange,
-.flatpickr-day.startRange.startRange.endRange,
-.flatpickr-day.endRange.startRange.endRange {
-  border-radius: 50px;
-}
-.flatpickr-day.inRange {
-  border-radius: 0;
-  -webkit-box-shadow: -5px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
-          box-shadow: -5px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
-}
-.flatpickr-day.disabled,
-.flatpickr-day.disabled:hover,
-.flatpickr-day.prevMonthDay,
-.flatpickr-day.nextMonthDay,
-.flatpickr-day.notAllowed,
-.flatpickr-day.notAllowed.prevMonthDay,
-.flatpickr-day.notAllowed.nextMonthDay {
-  color: rgba(57,57,57,0.3);
-  background: transparent;
-  border-color: transparent;
-  cursor: default;
-}
-.flatpickr-day.disabled,
-.flatpickr-day.disabled:hover {
-  cursor: not-allowed;
-  color: rgba(57,57,57,0.1);
-}
-.flatpickr-day.week.selected {
-  border-radius: 0;
-  -webkit-box-shadow: -5px 0 0 #569ff7, 5px 0 0 #569ff7;
-          box-shadow: -5px 0 0 #569ff7, 5px 0 0 #569ff7;
-}
-.flatpickr-day.hidden {
-  visibility: hidden;
-}
-.rangeMode .flatpickr-day {
-  margin-top: 1px;
-}
-.flatpickr-weekwrapper {
-  display: inline-block;
-  float: left;
-}
-.flatpickr-weekwrapper .flatpickr-weeks {
-  padding: 0 12px;
-  -webkit-box-shadow: 1px 0 0 #e6e6e6;
-          box-shadow: 1px 0 0 #e6e6e6;
-}
-.flatpickr-weekwrapper .flatpickr-weekday {
-  float: none;
-  width: 100%;
-  line-height: 28px;
-}
-.flatpickr-weekwrapper span.flatpickr-day,
-.flatpickr-weekwrapper span.flatpickr-day:hover {
-  display: block;
-  width: 100%;
-  max-width: none;
-  color: rgba(57,57,57,0.3);
-  background: transparent;
-  cursor: default;
-  border: none;
-}
-.flatpickr-innerContainer {
-  display: block;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  overflow: hidden;
-}
-.flatpickr-rContainer {
-  display: inline-block;
-  padding: 0;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-}
-.flatpickr-time {
-  text-align: center;
-  outline: 0;
-  display: block;
-  height: 0;
-  line-height: 40px;
-  max-height: 40px;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  overflow: hidden;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-.flatpickr-time:after {
-  content: "";
-  display: table;
-  clear: both;
-}
-.flatpickr-time .numInputWrapper {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
-  width: 40%;
-  height: 40px;
-  float: left;
-}
-.flatpickr-time .numInputWrapper span.arrowUp:after {
-  border-bottom-color: #393939;
-}
-.flatpickr-time .numInputWrapper span.arrowDown:after {
-  border-top-color: #393939;
-}
-.flatpickr-time.hasSeconds .numInputWrapper {
-  width: 26%;
-}
-.flatpickr-time.time24hr .numInputWrapper {
-  width: 49%;
-}
-.flatpickr-time input {
-  background: transparent;
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  border: 0;
-  border-radius: 0;
-  text-align: center;
-  margin: 0;
-  padding: 0;
-  height: inherit;
-  line-height: inherit;
-  cursor: pointer;
-  color: #393939;
-  font-size: 14px;
-  position: relative;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-}
-.flatpickr-time input.flatpickr-hour {
-  font-weight: bold;
-}
-.flatpickr-time input.flatpickr-minute,
-.flatpickr-time input.flatpickr-second {
-  font-weight: 400;
-}
-.flatpickr-time input:focus {
-  outline: 0;
-  border: 0;
-}
-.flatpickr-time .flatpickr-time-separator,
-.flatpickr-time .flatpickr-am-pm {
-  height: inherit;
-  display: inline-block;
-  float: left;
-  line-height: inherit;
-  color: #393939;
-  font-weight: bold;
-  width: 2%;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  -webkit-align-self: center;
-      -ms-flex-item-align: center;
-          align-self: center;
-}
-.flatpickr-time .flatpickr-am-pm {
-  outline: 0;
-  width: 18%;
-  cursor: pointer;
-  text-align: center;
-  font-weight: 400;
-}
-.flatpickr-time .flatpickr-am-pm:hover,
-.flatpickr-time .flatpickr-am-pm:focus {
-  background: #f0f0f0;
-}
-.flatpickr-input[readonly] {
-  cursor: pointer;
-  min-width: auto;
-}
-@-webkit-keyframes fpFadeInDown {
-  from {
-    opacity: 0;
-    -webkit-transform: translate3d(0, -20px, 0);
-            transform: translate3d(0, -20px, 0);
-  }
-  to {
-    opacity: 1;
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-  }
-}
-@keyframes fpFadeInDown {
-  from {
-    opacity: 0;
-    -webkit-transform: translate3d(0, -20px, 0);
-            transform: translate3d(0, -20px, 0);
-  }
-  to {
-    opacity: 1;
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-  }
-}
diff --git a/static/css/vendor/fontawesome.css b/static/css/vendor/fontawesome.css
deleted file mode 100644
index 68b26ef9b..000000000
--- a/static/css/vendor/fontawesome.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Font Awesome Free 5.1.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:a 2s infinite linear}.fa-pulse{animation:a 1s infinite steps(8)}@keyframes a{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-balance-scale:before{content:"\f24e"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bicycle:before{content:"\f206"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blind:before{content:"\f29d"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-open:before{content:"\f518"}.fa-bookmark:before{content:"\f02e"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-certificate:before{content:"\f0a3"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-concierge-bell:before{content:"\f562"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-credit-card:before{content:"\f09d"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-deviantart:before{content:"\f1bd"}.fa-diagnoses:before{content:"\f470"}.fa-dice:before{content:"\f522"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-gift:before{content:"\f06b"}.fa-git:before{content:"\f1d3"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hashtag:before{content:"\f292"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hot-tub:before{content:"\f593"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-houzz:before{content:"\f27c"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-internet-explorer:before{content:"\f26b"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mercury:before{content:"\f223"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-motorcycle:before{content:"\f21c"}.fa-mouse-pointer:before{content:"\f245"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-nintendo-switch:before{content:"\f418"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-old-republic:before{content:"\f510"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-people-carry:before{content:"\f4ce"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-volume:before{content:"\f2a0"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poo:before{content:"\f2fe"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-r-project:before{content:"\f4f7"}.fa-random:before{content:"\f074"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-rendact:before{content:"\f3e4"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-retweet:before{content:"\f079"}.fa-ribbon:before{content:"\f4d6"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-rupee-sign:before{content:"\f156"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-sass:before{content:"\f41e"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-search:before{content:"\f002"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skull:before{content:"\f54c"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowflake:before{content:"\f2dc"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-swatchbook:before{content:"\f5c3"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toolbox:before{content:"\f552"}.fa-tooth:before{content:"\f5c9"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-train:before{content:"\f238"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-moving:before{content:"\f4df"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}
\ No newline at end of file
diff --git a/static/es/services/htmlHelpers.js b/static/es/services/htmlHelpers.js
deleted file mode 100644
index 60b9f1471..000000000
--- a/static/es/services/htmlHelpers.js
+++ /dev/null
@@ -1,43 +0,0 @@
-class HtmlHelpers {
-
-  // `parseResponse` takes a raw HttpClient response and an options object.
-  // Returns an object with `element` being an contextual fragment of the
-  // HTML in the response and `ifPrefix` being the prefix that was used to
-  // "unique-ify" the ids of the received HTML.
-  // Original Response IDs can optionally be kept by adding `keepIds: true`
-  // to the `options` object.
-  parseResponse(response, options = {}) {
-    return response.text()
-      .then(
-        (responseText) => {
-          const docFrag = document.createRange().createContextualFragment(responseText);
-          let idPrefix;
-          if (!options.keepIds) {
-            idPrefix = this._getIdPrefix();
-            this._prefixIds(docFrag, idPrefix);
-          }
-          return Promise.resolve({ idPrefix, element: docFrag });
-        },
-        Promise.reject,
-      ).catch(console.error);
-  }
-
-  _prefixIds(element, idPrefix) {
-    const idAttrs = ['id', 'for', 'data-conditional-input', 'data-modal-trigger'];
-
-    idAttrs.forEach((attr) => {
-      Array.from(element.querySelectorAll('[' + attr + ']')).forEach((input) => {
-        const value = idPrefix + input.getAttribute(attr);
-        input.setAttribute(attr, value);
-      });
-    });
-  }
-
-  _getIdPrefix() {
-    // leading 'r'(andom) to overcome the fact that IDs
-    // starting with a numeric value are not valid in CSS
-    return 'r' + Math.floor(Math.random() * 100000) + '__';
-  }
-}
-
-window.HtmlHelpers = new HtmlHelpers();
diff --git a/static/es/services/httpClient.js b/static/es/services/httpClient.js
deleted file mode 100644
index a0199a8fa..000000000
--- a/static/es/services/httpClient.js
+++ /dev/null
@@ -1,58 +0,0 @@
-class HttpClient {
-
-  static ACCEPT = {
-    TEXT_HTML: 'text/html',
-    JSON: 'application/json',
-  };
-
-  _responseInterceptors = [];
-
-  addResponseInterceptor(interceptor) {
-    if (typeof interceptor === 'function') {
-      this._responseInterceptors.push(interceptor);
-    }
-  }
-
-  get(args) {
-    args.method = 'GET';
-    return this._fetch(args);
-  }
-
-  post(args) {
-    args.method = 'POST';
-    return this._fetch(args);
-  }
-
-  _fetch(options) {
-    const requestOptions = {
-      credentials: 'same-origin',
-      ...options,
-    };
-
-    return fetch(options.url, requestOptions)
-      .then(
-        (response) => {
-          this._responseInterceptors.forEach((interceptor) => interceptor(response, options));
-          return Promise.resolve(response);
-        },
-        Promise.reject,
-      ).catch(console.error);
-  }
-}
-
-window.HttpClient = new HttpClient();
-
-// HttpClient ships with its own little interceptor to throw an error
-// if the response does not match the expected content-type
-function contentTypeInterceptor(response, options) {
-  if (!options || !options.accept) {
-    return;
-  }
-
-  const contentType = response.headers.get("content-type");
-  if (!contentType.match(options.accept)) {
-    throw new Error('Server returned with "' + contentType + '" when "' + options.accept + '" was expected');
-  }
-}
-
-window.HttpClient.addResponseInterceptor(contentTypeInterceptor);
diff --git a/static/es/services/i18n.js b/static/es/services/i18n.js
deleted file mode 100644
index f36de73ab..000000000
--- a/static/es/services/i18n.js
+++ /dev/null
@@ -1,34 +0,0 @@
-  /**
-   * 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.
-   *
-   */
-
-class I18n {
-
-  translations = {};
-
-  add(id, translation) {
-    this.translations[id] = translation;
-  }
-
-  addMany(manyTranslations) {
-    Object.keys(manyTranslations).forEach((key) => this.add(key, manyTranslations[key]));
-  }
-
-  get(id) {
-    if (!this.translations[id]) {
-      throw new Error('I18N Error: Translation missing for »' + id + '«!');
-    }
-    return this.translations[id];
-  }
-}
-
-window.I18n = new I18n();
diff --git a/static/es/services/utilRegistry.js b/static/es/services/utilRegistry.js
deleted file mode 100644
index 712721cc6..000000000
--- a/static/es/services/utilRegistry.js
+++ /dev/null
@@ -1,121 +0,0 @@
-const DEBUG_MODE = /localhost/.test(window.location.href) && 0;
-
-class UtilRegistry {
-
-  _registeredUtils = [];
-  _activeUtilInstances = [];
-
-  constructor() {
-    document.addEventListener('DOMContentLoaded', () => this.setupAll());
-  }
-
-  /**
-   * 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
-   */
-  register(util) {
-    if (DEBUG_MODE > 2) {
-      console.log('registering util "' + util.name + '"');
-      console.log({ util });
-    }
-    console.log('register...', { this: this });
-    this._registeredUtils.push(util);
-  }
-
-  deregister(name, destroy) {
-    const utilIndex = this._findUtilIndex(name);
-
-    if (utilIndex >= 0) {
-      if (destroy === true) {
-        this._destroyUtilInstances(name);
-      }
-
-      this._registeredUtils.splice(utilIndex, 1);
-    }
-  }
-
-  setupAll = (scope) => {
-    console.log('setupAll', { scope });
-    if (DEBUG_MODE > 1) {
-      console.info('registered js utilities:');
-      console.table(this._registeredUtils);
-    }
-
-    this._registeredUtils.forEach((util) => this.setup(util, scope));
-  }
-
-  setup(util, scope = document.body) {
-    if (DEBUG_MODE > 2) {
-      console.log('setting up util', { util });
-    }
-
-    if (util && typeof util.setup === 'function') {
-      const elements = this._findUtilElements(util, scope);
-
-      elements.forEach((element) => {
-        let utilInstance = null;
-
-        try {
-          utilInstance = util.setup(element);
-        } catch(err) {
-          if (DEBUG_MODE > 0) {
-            console.warn('Error while trying to initialize a utility!', { util , element, err });
-          }
-        }
-
-        if (utilInstance) {
-          if (DEBUG_MODE > 2) {
-            console.info('Got utility instance for utility "' + util.name + '"', { utilInstance });
-          }
-
-          this._activeUtilInstances.push(utilInstance);
-        }
-      });
-    }
-  }
-
-  find(name) {
-    return this._registeredUtils.find((util) => util.name === name);
-  }
-
-  _findUtilElements(util, scope) {
-    if (scope && scope.matches(util.selector)) {
-      return [scope];
-    }
-    return Array.from(scope.querySelectorAll(util.selector));
-  }
-
-  _findUtilIndex(name) {
-    return this._registeredUtils.findIndex((util) => util.name === name);
-  }
-
-  _destroyUtilInstances(name) {
-    this._activeUtilInstances
-      .map((util, index) => ({
-        util: util,
-        index: index,
-      }))
-      .filter((activeUtil) => activeUtil.util.name === name)
-      .forEach((activeUtil) => {
-        // destroy util instance
-        activeUtil.util.destroy();
-        delete this._activeUtilInstances[activeUtil.index];
-      });
-
-    // get rid of now empty array slots
-    this._activeUtilInstances = this._activeUtilInstances.filter((util) => !!util);
-  }
-}
-
-window.UtilRegistry = new UtilRegistry();
diff --git a/static/es/test/test.js b/static/es/test/test.js
deleted file mode 100644
index 4b98567e1..000000000
--- a/static/es/test/test.js
+++ /dev/null
@@ -1,3 +0,0 @@
-let x = (a) => console.log(a * 2);
-
-x(4);
diff --git a/static/es/utils/alerts.js b/static/es/utils/alerts.js
deleted file mode 100644
index 427e38373..000000000
--- a/static/es/utils/alerts.js
+++ /dev/null
@@ -1,212 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * 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_UTIL_NAME = 'alerts';
-  var ALERTS_UTIL_SELECTOR = '[uw-alerts]';
-
-  var ALERTS_INITIALIZED_CLASS = 'alerts--initialized';
-  var ALERTS_ELEVATED_CLASS = 'alerts--elevated';
-  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_ICON_CLASS = 'alert__icon';
-  var ALERT_CONTENT_CLASS = 'alert__content';
-  var ALERT_INVISIBLE_CLASS = 'alert--invisible';
-  var ALERT_AUTO_HIDE_DELAY = 10;
-  var ALERT_AUTOCLOSING_MATCHER = '.alert-info, .alert-success';
-
-  var alertsUtil = function(element) {
-    var togglerCheckRequested = false;
-    var togglerElement;
-    var alertElements;
-
-    function init() {
-      if (!element) {
-        throw new Error('Alerts util has to be called with an element!');
-      }
-
-      if (element.classList.contains(ALERTS_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      togglerElement = element.querySelector('.' + ALERTS_TOGGLER_CLASS);
-      alertElements = gatherAlertElements();
-
-      initToggler();
-      initAlerts();
-
-      // register http client interceptor to filter out Alerts Header
-      setupHttpInterceptor();
-
-      // 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() {
-      togglerElement.addEventListener('click', function() {
-        alertElements.forEach(function(alertEl) {
-          toggleAlert(alertEl, true);
-        });
-        togglerElement.classList.remove(ALERTS_TOGGLER_VISIBLE_CLASS);
-      });
-    }
-
-    function initAlerts() {
-      alertElements.forEach(initAlert);
-    }
-
-    function initAlert(alertElement) {
-      var autoHideDelay = ALERT_AUTO_HIDE_DELAY;
-      if (alertElement.dataset.decay) {
-        autoHideDelay = parseInt(alertElement.dataset.decay, 10);
-      }
-
-      var closeEl = alertElement.querySelector('.' + ALERT_CLOSER_CLASS);
-      closeEl.addEventListener('click', function() {
-        toggleAlert(alertElement);
-      });
-
-      if (autoHideDelay > 0 && alertElement.matches(ALERT_AUTOCLOSING_MATCHER)) {
-        window.setTimeout(function() {
-          toggleAlert(alertElement);
-        }, autoHideDelay * 1000);
-      }
-    }
-
-    function toggleAlert(alertEl, visible) {
-      alertEl.classList.toggle(ALERT_INVISIBLE_CLASS, !visible);
-      checkToggler();
-    }
-
-    function checkToggler() {
-      if (togglerCheckRequested) {
-        return;
-      }
-
-      var alertsHidden = alertElements.reduce(function(acc, alert) {
-        return acc && alert.classList.contains(ALERT_INVISIBLE_CLASS);
-      }, true);
-
-      window.setTimeout(function() {
-        togglerElement.classList.toggle(ALERTS_TOGGLER_VISIBLE_CLASS, alertsHidden);
-        togglerCheckRequested = false;
-      }, ALERTS_TOGGLER_APPEAR_DELAY);
-    }
-
-    function setupHttpInterceptor() {
-      if (HttpClient) {
-        HttpClient.addResponseInterceptor(responseInterceptor.bind(this));
-      }
-    }
-
-    function elevateAlerts() {
-      element.classList.add(ALERTS_ELEVATED_CLASS);
-    }
-
-    function responseInterceptor(response) {
-      var alerts;
-      for (var header of response.headers) {
-        if (header[0] === 'alerts') {
-          var decodedHeader = decodeURIComponent(header[1]);
-          alerts = JSON.parse(decodedHeader);
-          break;
-        }
-      }
-
-      if (alerts) {
-        alerts.forEach(function(alert) {
-          var alertElement = createAlertElement(alert.status, alert.content);
-          element.appendChild(alertElement);
-          alertElements.push(alertElement);
-          initAlert(alertElement);
-        });
-
-        elevateAlerts();
-      }
-    }
-
-    function createAlertElement(type, content) {
-      var alertElement = document.createElement('div');
-      alertElement.classList.add(ALERT_CLASS, 'alert-' + type);
-
-      var alertCloser = document.createElement('div');
-      alertCloser.classList.add(ALERT_CLOSER_CLASS);
-
-      var alertIcon = document.createElement('div');
-      alertIcon.classList.add(ALERT_ICON_CLASS);
-
-      var alertContent = document.createElement('div');
-      alertContent.classList.add(ALERT_CONTENT_CLASS);
-      alertContent.innerHTML = content;
-
-      alertElement.appendChild(alertCloser);
-      alertElement.appendChild(alertIcon);
-      alertElement.appendChild(alertContent);
-
-      return alertElement;
-    }
-
-    return init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: ALERTS_UTIL_NAME,
-      selector: ALERTS_UTIL_SELECTOR,
-      setup: alertsUtil,
-    });
-  }
-})();
diff --git a/static/es/utils/asidenav.js b/static/es/utils/asidenav.js
deleted file mode 100644
index b9fc1e323..000000000
--- a/static/es/utils/asidenav.js
+++ /dev/null
@@ -1,109 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * 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';
-
-  var asidenavUtil = function(element) {
-
-    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);
-        element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
-        event.preventDefault();
-      }, true);
-    }
-
-    function initAsidenavSubmenus() {
-      var asidenavLinksWithSubmenus = Array.from(element.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
-        .map(function(listItem) {
-          var submenu = listItem.querySelector('.' + ASIDENAV_SUBMENU_CLASS);
-          return { listItem, submenu };
-        }).filter(function(union) {
-          return union.submenu !== null;
-        });
-
-      asidenavLinksWithSubmenus.forEach(function(union) {
-        union.listItem.addEventListener('mouseover', createMouseoverHandler(union));
-      });
-    }
-
-    function createMouseoverHandler(union) {
-      return function mouseoverHanlder() {
-        var rectListItem = union.listItem.getBoundingClientRect();
-        var rectSubMenu = union.submenu.getBoundingClientRect();
-
-        union.submenu.style.left = (rectListItem.left + rectListItem.width) + 'px';
-        if (window.innerHeight - rectListItem.top < rectSubMenu.height) {
-          union.submenu.style.top = (rectListItem.top + rectListItem.height - rectSubMenu.height) + 'px';
-        } else {
-          union.submenu.style.top = rectListItem.top + 'px';
-        }
-
-      };
-    }
-
-    return init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: ASIDENAV_UTIL_NAME,
-      selector: ASIDENAV_UTIL_SELECTOR,
-      setup: asidenavUtil,
-    });
-  }
-})();
diff --git a/static/es/utils/asyncForm.js b/static/es/utils/asyncForm.js
deleted file mode 100644
index 38ecb1f5f..000000000
--- a/static/es/utils/asyncForm.js
+++ /dev/null
@@ -1,126 +0,0 @@
-(function collonadeClosure() {
-  'use strict';
-
-  /**
-   *
-   * 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='...'>
-   *     ...
-   *
-   * 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';
-  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 MODAL_SELECTOR = '.modal';
-  var MODAL_HEADER_KEY = 'Is-Modal';
-  var MODAL_HEADER_VALUE = 'True';
-
-  var asyncFormUtil = function(element) {
-
-    var lastRequestTimestamp = 0;
-
-    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 = 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, element);
-        element.remove();
-      }, delay);
-    }
-
-    function makeResponseElement(content, status) {
-      var responseElement = document.createElement('div');
-      status = status || 'info';
-      responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS);
-      responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS + '--' + status);
-      responseElement.innerHTML = content;
-      return responseElement;
-    }
-
-    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();
-
-      var url = element.getAttribute('action');
-      var headers = { };
-      var body = new FormData(element);
-
-      var isModal = element.closest(MODAL_SELECTOR);
-      if (isModal) {
-        headers[MODAL_HEADER_KEY] = MODAL_HEADER_VALUE;
-      }
-
-      HttpClient.post({
-        url: url,
-        headers: headers,
-        body: body,
-        accept: HttpClient.ACCEPT.JSON,
-      }).then(function(response) {
-        return response.json();
-      }).then(function(response) {
-        processResponse(response[0]);
-      }).catch(function() {
-        var failureMessage = I18n.get('asyncFormFailure');
-        processResponse({ content: failureMessage });
-
-        element.classList.remove(ASYNC_FORM_LOADING_CLASS);
-      });
-    }
-
-    return init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: ASYNC_FORM_UTIL_NAME,
-      selector: ASYNC_FORM_UTIL_SELECTOR,
-      setup: asyncFormUtil,
-    });
-  }
-})();
diff --git a/static/es/utils/asyncTable.js b/static/es/utils/asyncTable.js
deleted file mode 100644
index 8d3b4c8d8..000000000
--- a/static/es/utils/asyncTable.js
+++ /dev/null
@@ -1,422 +0,0 @@
-(function collonadeClosure() {
-  'use strict';
-
-  /**
-   *
-   * Async Table Utility
-   *  makes table filters, sorting and pagination behave asynchronously via AJAX calls
-   *
-   * Attribute: uw-async-table
-   *
-   * Example usage:
-  *   (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 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;
-
-    var ths = [];
-    var pageLinks = [];
-    var pagesizeForm;
-    var scrollTable;
-    var cssIdPrefix = '';
-
-    var tableFilterInputs = {
-      search: [],
-      input: [],
-      change: [],
-      select: [],
-    };
-
-    function init() {
-      if (!element) {
-        throw new Error('Async Table utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(ASYNC_TABLE_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // param asyncTableDbHeader
-      if (element.dataset.asyncTableDbHeader !== undefined) {
-        asyncTableHeader = element.dataset.asyncTableDbHeader;
-      }
-
-      var rawTableId = element.querySelector('table').id;
-      cssIdPrefix = findCssIdPrefix(rawTableId);
-      asyncTableId = rawTableId.replace(cssIdPrefix, '');
-
-      // find scrolltable wrapper
-      scrollTable = element.querySelector(ASYNC_TABLE_SCROLLTABLE_SELECTOR);
-      if (!scrollTable) {
-        throw new Error('Async Table cannot be set up without a scrolltable element!');
-      }
-
-      setupSortableHeaders();
-      setupPagination();
-      setupPageSizeSelect();
-      setupTableFilter();
-
-      processLocalStorage();
-
-      // clear currentTableUrl from previous requests
-      setLocalStorageParameter('currentTableUrl', null);
-
-      // mark initialized
-      element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
-
-      return {
-        name: ASYNC_TABLE_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    function setupSortableHeaders() {
-      ths = Array.from(scrollTable.querySelectorAll('th.sortable')).map(function(th) {
-        return { element: th };
-      });
-
-      ths.forEach(function(th) {
-        th.clickHandler = function(event) {
-          setLocalStorageParameter('horizPos', (scrollTable || {}).scrollLeft);
-          linkClickHandler(event);
-        };
-        th.element.addEventListener('click', th.clickHandler);
-      });
-    }
-
-    function setupPagination() {
-      var pagination = element.querySelector('#' + cssIdPrefix + 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);
-            }
-            linkClickHandler(event);
-          };
-          link.element.addEventListener('click', link.clickHandler);
-        });
-      }
-    }
-
-    function setupPageSizeSelect() {
-      // pagesize form
-      pagesizeForm = element.querySelector('#' + cssIdPrefix + asyncTableId + '-pagesize-form');
-
-      if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
-        pagesizeSelect.addEventListener('change', changePagesizeHandler);
-      }
-    }
-
-    function setupTableFilter() {
-      var tableFilterForm = element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
-
-      if (tableFilterForm) {
-        gatherTableFilterInputs(tableFilterForm);
-        addTableFilterEventListeners(tableFilterForm);
-      }
-    }
-
-    function gatherTableFilterInputs(tableFilterForm) {
-      Array.from(tableFilterForm.querySelectorAll('input[type="search"]')).forEach(function(input) {
-        tableFilterInputs.search.push(input);
-      });
-
-      Array.from(tableFilterForm.querySelectorAll('input[type="text"]')).forEach(function(input) {
-        tableFilterInputs.input.push(input);
-      });
-
-      Array.from(tableFilterForm.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
-        tableFilterInputs.change.push(input);
-      });
-
-      Array.from(tableFilterForm.querySelectorAll('select')).forEach(function(input) {
-        tableFilterInputs.select.push(input);
-      });
-    }
-
-    function addTableFilterEventListeners(tableFilterForm) {
-      tableFilterInputs.search.forEach(function(input) {
-        var debouncedInput = debounce(function() {
-          if (input.value.length === 0 || input.value.length > 2) {
-            updateFromTableFilter(tableFilterForm);
-          }
-        }, 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(tableFilterForm);
-          }
-        }, INPUT_DEBOUNCE);
-        input.addEventListener('input', debouncedInput);
-      });
-
-      tableFilterInputs.change.forEach(function(input) {
-        input.addEventListener('change', function() {
-          updateFromTableFilter(tableFilterForm);
-        });
-      });
-
-      tableFilterInputs.select.forEach(function(input) {
-        input.addEventListener('change', function() {
-          updateFromTableFilter(tableFilterForm);
-        });
-      });
-
-      tableFilterForm.addEventListener('submit', function(event) {
-        event.preventDefault();
-        updateFromTableFilter(tableFilterForm);
-      });
-    }
-
-    function updateFromTableFilter(tableFilterForm) {
-      var url = serializeTableFilterToURL();
-      var callback = null;
-
-      var focusedInput = tableFilterForm.querySelector(':focus, :active');
-      // focus previously focused input
-      if (focusedInput && focusedInput.selectionStart !== null) {
-        var selectionStart = focusedInput.selectionStart;
-        // remove the following part of the id to get rid of the random
-        // (yet somewhat structured) prefix we got from nudging.
-        var prefix = findCssIdPrefix(focusedInput.id);
-        var focusId = focusedInput.id.replace(prefix, '');
-        callback = function(wrapper) {
-          var idPrefix = getLocalStorageParameter('cssIdPrefix');
-          var toBeFocused = wrapper.querySelector('#' + idPrefix + focusId);
-          if (toBeFocused) {
-            toBeFocused.focus();
-            toBeFocused.selectionStart = selectionStart;
-          }
-        };
-      }
-      updateTableFrom(url, callback);
-    }
-
-    function serializeTableFilterToURL() {
-      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
-
-      var formIdElement = element.querySelector(ASYNC_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 processLocalStorage() {
-      var scrollTo = getLocalStorageParameter('scrollTo');
-      if (scrollTo && scrollTable) {
-        window.scrollTo(scrollTo);
-      }
-      setLocalStorageParameter('scrollTo', null);
-
-      var horizPos = getLocalStorageParameter('horizPos');
-      if (horizPos && scrollTable) {
-        scrollTable.scrollLeft = horizPos;
-      }
-      setLocalStorageParameter('horizPos', null);
-    }
-
-    function removeListeners() {
-      ths.forEach(function(th) {
-        th.element.removeEventListener('click', th.clickHandler);
-      });
-
-      pageLinks.forEach(function(link) {
-        link.element.removeEventListener('click', link.clickHandler);
-      });
-
-      if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
-        pagesizeSelect.removeEventListener('change', changePagesizeHandler);
-      }
-    }
-
-    function linkClickHandler(event) {
-      event.preventDefault();
-      var url = getClickDestination(event.target);
-      if (!url.match(/^http/)) {
-        url = window.location.origin + window.location.pathname + url;
-      }
-      updateTableFrom(url);
-    }
-
-    function getClickDestination(el) {
-      if (!el.matches('a') && !el.querySelector('a')) {
-        return '';
-      }
-      return el.getAttribute('href') || el.querySelector('a').getAttribute('href');
-    }
-
-    function changePagesizeHandler(event) {
-      var pagesizeParamKey = asyncTableId + '-pagesize';
-      var pageParamKey = asyncTableId + '-page';
-      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
-      url.searchParams.set(pagesizeParamKey, event.target.value);
-      url.searchParams.set(pageParamKey, 0);
-      updateTableFrom(url.href);
-    }
-
-    // fetches new sorted element from url with params and replaces contents of current element
-    function updateTableFrom(url, callback) {
-      if (!HttpClient) {
-        throw new Error('HttpClient not found!');
-      }
-
-      element.classList.add(ASYNC_TABLE_LOADING_CLASS);
-
-      var headers = {
-        'Accept': 'text/html',
-        [asyncTableHeader]: asyncTableId,
-      };
-
-      HttpClient.get({
-        url: url,
-        headers: headers,
-        accept: HttpClient.ACCEPT.TEXT_HTML,
-      }).then(function(response) {
-        return HtmlHelpers.parseResponse(response);
-      }).then(function(response) {
-        setLocalStorageParameter('currentTableUrl', url.href);
-        // reset table
-        removeListeners();
-        element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
-        // update table with new
-        updateWrapperContents(response);
-
-        if (UtilRegistry) {
-          UtilRegistry.setupAll(element);
-        }
-
-        if (callback && typeof callback === 'function') {
-          setLocalStorageParameter('cssIdPrefix', response.idPrefix);
-          callback(element);
-          setLocalStorageParameter('cssIdPrefix', '');
-        }
-      }).catch(function(err) {
-        console.error(err);
-      }).finally(function() {
-        element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
-      });
-    }
-
-    function updateWrapperContents(response) {
-      var newPage = document.createElement('div');
-      newPage.appendChild(response.element);
-      var newWrapperContents = newPage.querySelector('#' + response.idPrefix + element.id);
-      element.innerHTML = newWrapperContents.innerHTML;
-    }
-
-    return init();
-  };
-
-  // returns any random nudged prefix found in the given id
-  function findCssIdPrefix(id) {
-    var matcher = /r\d*?__/;
-    var maybePrefix = id.match(matcher);
-    if (maybePrefix && maybePrefix[0]) {
-      return maybePrefix[0];
-    }
-    return '';
-  }
-
-  function setLocalStorageParameter(key, value) {
-    var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
-    if (value !== null) {
-      currentLSState[key] = value;
-    } else {
-      delete currentLSState[key];
-    }
-    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/es/utils/checkAll.js b/static/es/utils/checkAll.js
deleted file mode 100644
index 7886fc9e6..000000000
--- a/static/es/utils/checkAll.js
+++ /dev/null
@@ -1,150 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * 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"]';
-
-  var CHECK_ALL_INITIALIZED_CLASS = 'check-all--initialized';
-
-  var checkAllUtil = function(element) {
-    var columns = [];
-    var checkboxColumn = [];
-    var checkAllCheckbox = null;
-
-    function init() {
-      if (!element) {
-        throw new Error('Check All utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(CHECK_ALL_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      gatherColumns();
-      setupCheckAllCheckbox();
-
-      // mark initialized
-      element.classList.add(CHECK_ALL_INITIALIZED_CLASS);
-
-      return {
-        name: CHECK_ALL_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    function getCheckboxId() {
-      return 'check-all-checkbox-' + Math.floor(Math.random() * 100000);
-    }
-
-    function gatherColumns() {
-      var rows = Array.from(element.querySelectorAll('tr'));
-      var cols = [];
-      rows.forEach(function(tr) {
-        var cells = Array.from(tr.querySelectorAll('td'));
-        cells.forEach(function(cell, cellIndex) {
-          if (!cols[cellIndex]) {
-            cols[cellIndex] = [];
-          }
-          cols[cellIndex].push(cell);
-        });
-      });
-      columns = cols;
-    }
-
-    function findCheckboxColumn(columns) {
-      var checkboxColumnId = null;
-      columns.forEach(function(col, i) {
-        if (isCheckboxColumn(col)) {
-          checkboxColumnId = i;
-        }
-      });
-      return checkboxColumnId;
-    }
-
-    function isCheckboxColumn(col) {
-      var onlyCheckboxes = true;
-      col.forEach(function(cell) {
-        if (onlyCheckboxes && !cell.querySelector(CHECKBOX_SELECTOR)) {
-          onlyCheckboxes = false;
-        }
-      });
-      return onlyCheckboxes;
-    }
-
-    function setupCheckAllCheckbox() {
-      var checkboxColumnId = findCheckboxColumn(columns);
-      if (checkboxColumnId === null) {
-        return;
-      }
-
-      checkboxColumn = columns[checkboxColumnId];
-      var firstRow = element.querySelector('tr');
-      var th = Array.from(firstRow.querySelectorAll('th, td'))[checkboxColumnId];
-      checkAllCheckbox = document.createElement('input');
-      checkAllCheckbox.setAttribute('type', 'checkbox');
-      checkAllCheckbox.setAttribute('id', getCheckboxId());
-      th.insertBefore(checkAllCheckbox, th.firstChild);
-
-      // manually set up new checkbox
-      if (UtilRegistry) {
-        UtilRegistry.setup(UtilRegistry.find('checkbox'), th);
-      }
-
-      checkAllCheckbox.addEventListener('input', onCheckAllCheckboxInput);
-      setupCheckboxListeners();
-    }
-
-    function onCheckAllCheckboxInput() {
-      toggleAll(checkAllCheckbox.checked);
-    }
-
-    function setupCheckboxListeners() {
-      checkboxColumn
-        .map(function(cell) {
-          return cell.querySelector(CHECKBOX_SELECTOR);
-        })
-        .forEach(function(checkbox) {
-          checkbox.addEventListener('input', updateCheckAllCheckboxState);
-        });
-    }
-
-    function updateCheckAllCheckboxState() {
-      var allChecked = checkboxColumn.every(function(cell) {
-        return cell.querySelector(CHECKBOX_SELECTOR).checked;
-      });
-      checkAllCheckbox.checked = allChecked;
-    }
-
-    function toggleAll(checked) {
-      checkboxColumn.forEach(function(cell) {
-        cell.querySelector(CHECKBOX_SELECTOR).checked = checked;
-      });
-    }
-
-    return init();
-  };
-
-  // register check all checkbox util
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: CHECK_ALL_UTIL_NAME,
-      selector: CHECK_ALL_UTIL_SELECTOR,
-      setup: checkAllUtil,
-    });
-  }
-})();
diff --git a/static/es/utils/form.js b/static/es/utils/form.js
deleted file mode 100644
index fe9bf351d..000000000
--- a/static/es/utils/form.js
+++ /dev/null
@@ -1,611 +0,0 @@
-(function() {
-  'use strict';
-
-  var formUtilities = [];
-
-  /**
-   *
-   * 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: [none]
-   *  (automatically setup on all form tags)
-   *
-   * 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>
-   */
-
-  var REACTIVE_SUBMIT_BUTTON_UTIL_NAME = 'reactiveSubmitButton';
-  // var REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR = 'form';
-
-  var REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS = 'reactive-submit-button--initialized';
-
-  /* eslint-disable-next-line */
-  var reactiveSubmitButtonUtil = 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)) {
-        return false;
-      }
-
-      // 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 || !submitButtons.length) {
-        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() {},
-      };
-    }
-
-    function setupInputs() {
-      requiredInputs.forEach(function(el) {
-        var checkbox = el.getAttribute('type') === 'checkbox';
-        var eventType = checkbox ? 'change' : 'input';
-        el.addEventListener(eventType, function() {
-          updateButtonState();
-        });
-      });
-    }
-
-    function updateButtonState() {
-      if (inputsValid()) {
-        submitButton.removeAttribute('disabled');
-      } else {
-        submitButton.setAttribute('disabled', 'true');
-      }
-    }
-
-    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();
-  };
-
-  // 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,
-  // });
-
-  /**
-   *
-   * 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
-   *    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>
-   * ## 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>
-   * ## 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';
-  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 INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled])';
-
-  var interactiveFieldsetUtil = function(element) {
-    var conditionalInput;
-    var conditionalValue;
-    var target;
-    var childInputs;
-
-    function init() {
-      if (!element) {
-        throw new Error('Interactive Fieldset utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // 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.');
-      }
-
-      // param conditionalValue
-      if (!element.dataset.conditionalValue && !isCheckbox()) {
-        throw new Error('Interactive Fieldset needs a conditional value!');
-      }
-      conditionalValue = element.dataset.conditionalValue;
-
-      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));
-
-      // add event listener
-      var observer = new MutationObserver(() => updateVisibility());
-      observer.observe(conditionalInput, { attributes: true, attributeFilter: ['disabled'] });
-      conditionalInput.addEventListener('input', updateVisibility);
-
-      // initial visibility update
-      updateVisibility();
-
-      // mark as initialized
-      element.classList.add(INTERACTIVE_FIELDSET_INITIALIZED_CLASS);
-
-      return {
-        name: INTERACTIVE_FIELDSET_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    function updateVisibility() {
-      var active = matchesConditionalValue() && !conditionalInput.disabled;
-
-      target.classList.toggle('hidden', !active);
-
-      childInputs.forEach(function(el) {
-        el.disabled = !active;
-        if (el._flatpickr) {
-          el._flatpickr.altInput.disabled = !active;
-        }
-      });
-    }
-
-    function matchesConditionalValue() {
-      if (isCheckbox()) {
-        return conditionalInput.checked === true;
-      }
-
-      return conditionalInput.value === conditionalValue;
-    }
-
-    function isCheckbox() {
-      return conditionalInput.getAttribute('type') === 'checkbox';
-    }
-
-    return init();
-  };
-
-  formUtilities.push({
-    name: INTERACTIVE_FIELDSET_UTIL_NAME,
-    selector: INTERACTIVE_FIELDSET_UTIL_SELECTOR,
-    setup: interactiveFieldsetUtil,
-  });
-
-  /**
-   *
-   * Navigate Away Prompt Utility
-   *  This utility asks the user if (s)he really wants to navigate away
-   *  from a page containing a form if (s)he already touched an input.
-   *  Form-Submits will not trigger the prompt.
-   *  Utility will ignore forms that contain auto submit elements (buttons, inputs).
-   *
-   * Attribute: [none]
-   *  (automatically setup on all form tags that dont automatically submit, see AutoSubmitButtonUtil)
-   *
-   * Example usage:
-   *  (any page with a form)
-   */
-
-  var NAVIGATE_AWAY_PROMPT_UTIL_NAME = 'navigateAwayPrompt';
-  var NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR = 'form';
-
-  var NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS = 'navigate-away-prompt--initialized';
-
-  var navigateAwayPromptUtil = function(element) {
-    var touched = false;
-    var unloadDueToSubmit = false;
-
-    function init() {
-      if (!element) {
-        throw new Error('Navigate Away Prompt utility needs to be passed an element!');
-      }
-
-      if (element.classList.contains(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // ignore forms that get submitted automatically
-      if (element.querySelector(AUTO_SUBMIT_BUTTON_UTIL_SELECTOR) || element.querySelector(AUTO_SUBMIT_INPUT_UTIL_SELECTOR)) {
-        return false;
-      }
-
-      window.addEventListener('beforeunload', beforeUnloadHandler);
-
-      element.addEventListener('submit', function() {
-        unloadDueToSubmit = true;
-      });
-      element.addEventListener('change', function() {
-        touched = true;
-        unloadDueToSubmit = false;
-      });
-
-      // mark initialized
-      element.classList.add(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS);
-
-      return {
-        name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
-        element: element,
-        destroy: function() {
-          window.removeEventListener('beforeunload', beforeUnloadHandler);
-        },
-      };
-    }
-
-    function beforeUnloadHandler(event) {
-      // allow the event to happen if the form was not touched by the
-      // user or the unload event was initiated by a form submit
-      if (!touched || unloadDueToSubmit) {
-        return false;
-      }
-
-      // cancel the unload event. This is the standard to force the prompt to appear.
-      event.preventDefault();
-      // for all non standard compliant browsers we return a truthy value to activate the prompt.
-      return true;
-    }
-
-    return init();
-  };
-
-  formUtilities.push({
-    name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
-    selector: NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR,
-    setup: navigateAwayPromptUtil,
-  });
-
-  /**
-   *
-   * 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
-   */
-
-  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!');
-    }
-
-    if (element.classList.contains(AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
-      return false;
-    }
-
-    // hide and mark initialized
-    element.classList.add(AUTO_SUBMIT_BUTTON_HIDDEN_CLASS, AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS);
-
-    return {
-      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,
-  });
-
-  /**
-   *
-   * Auto Submit Input Utility
-   *  Programmatically submits forms when a certain input changes value
-   *
-   * Attribute: uw-auto-submit-input
-   *
-   * Example usage:
-   *  <input type="text" uw-auto-submit-input />
-   */
-
-  var AUTO_SUBMIT_INPUT_UTIL_NAME = 'autoSubmitInput';
-  var AUTO_SUBMIT_INPUT_UTIL_SELECTOR = '[uw-auto-submit-input]';
-
-  var AUTO_SUBMIT_INPUT_INITIALIZED_CLASS = 'auto-submit-input--initialized';
-
-  var autoSubmitInputUtil = function(element) {
-    var form;
-    var debouncedHandler;
-
-    function autoSubmit() {
-      form.submit();
-    }
-
-    function init() {
-      if (!element) {
-        throw new Error('Auto Submit Input utility needs to be passed an element!');
-      }
-
-      if (element.classList.contains(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      form = element.form;
-      if (!form) {
-        throw new Error('Could not determine associated form for auto submit input');
-      }
-
-      debouncedHandler = debounce(autoSubmit, 500);
-
-      element.addEventListener('input', debouncedHandler);
-
-      element.classList.add(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS);
-
-      return {
-        name: AUTO_SUBMIT_INPUT_UTIL_NAME,
-        element: element,
-        destroy: function() {
-          element.removeEventListener('input', debouncedHandler);
-        },
-      };
-    }
-
-    return init();
-  };
-
-  formUtilities.push({
-    name: AUTO_SUBMIT_INPUT_UTIL_NAME,
-    selector: AUTO_SUBMIT_INPUT_UTIL_SELECTOR,
-    setup: autoSubmitInputUtil,
-  });
-
-  /**
-   *
-   * 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)
-   */
-
-  var FORM_ERROR_REMOVER_UTIL_NAME = 'formErrorRemover';
-  var FORM_ERROR_REMOVER_UTIL_SELECTOR = 'form';
-
-  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!');
-      }
-
-      if (element.classList.contains(FORM_ERROR_REMOVER_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // find form groups
-      formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
-
-      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 {
-        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,
-  });
-
-  /**
-   *
-   * 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_INITIALIZED_CLASS = 'datepicker--initialized';
-
-  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!');
-      }
-
-      if (element.classList.contains(DATEPICKER_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      var flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute("type")];
-
-      if (!flatpickrConfig) {
-        throw new Error('Datepicker utility called on unsupported element!');
-      }
-
-      flatpickrInstance = flatpickr(element, flatpickrConfig);
-
-      // mark initialized
-      element.classList.add(DATEPICKER_INITIALIZED_CLASS);
-
-      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,
-  });
-
-  // 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 the collected form utilities
-  if (UtilRegistry) {
-    formUtilities.forEach((util) => {
-      UtilRegistry.register(util);
-    });
-  }
-
-})();
diff --git a/static/es/utils/inputs.js b/static/es/utils/inputs.js
deleted file mode 100644
index 2fd8b8b30..000000000
--- a/static/es/utils/inputs.js
+++ /dev/null
@@ -1,200 +0,0 @@
-(function() {
-  'use strict';
-
-  var inputUtilities = [];
-
-  /**
-   *
-   * FileInput Utility
-   *  wraps native file input
-   *
-   * Attribute: uw-file-input
-   *  (element must be an input of type='file')
-   *
-   * Example usage:
-   * <input type='file' uw-file-input>
-   *
-   * Internationalization:
-   *  This utility expects the following translations to be available:
-   *    »filesSelected«: label of multi-input button after selection
-   *      example: "Dateien ausgewählt" (will be prepended by number of selected files)
-   *    »selectFile«: label of single-input button before selection
-   *      example: "Datei auswählen"
-   *    »selectFiles«: label of multi-input button before selection
-   *      example: "Datei(en) auswählen"
-   *
-   */
-
-  var FILE_INPUT_UTIL_NAME = 'fileInput';
-  var FILE_INPUT_UTIL_SELECTOR = 'input[type="file"][uw-file-input]';
-
-  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 fileInputUtil = function(element) {
-    var isMultiFileInput = false;
-    var fileList;
-    var label;
-
-    function init() {
-      if (!element) {
-        throw new Error('FileInput utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(FILE_INPUT_INITIALIZED_CLASS)) {
-        throw new Error('FileInput utility already initialized!');
-      }
-
-      // check if is multi-file input
-      isMultiFileInput = element.hasAttribute('multiple');
-      if (isMultiFileInput) {
-        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_INPUT_CLASS, FILE_INPUT_INITIALIZED_CLASS);
-
-      return {
-        name: FILE_INPUT_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    function renderFileList() {
-      if (!fileList) {
-        return;
-      }
-
-      var files = element.files;
-      fileList.innerHTML = '';
-      Array.from(files).forEach(function(file) {
-        var fileDisplayEl = document.createElement('li');
-        fileDisplayEl.innerHTML = file.name;
-        fileList.appendChild(fileDisplayEl);
-      });
-    }
-
-    function createFileList() {
-      var list = document.createElement('ol');
-      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 {
-        element.parentElement.appendChild(list);
-      }
-      return list;
-    }
-
-    function createFileLabel() {
-      var label = document.createElement('label');
-      label.classList.add(FILE_INPUT_LABEL_CLASS);
-      label.setAttribute('for', element.id);
-      element.parentElement.insertBefore(label, element);
-      return label;
-    }
-
-    function updateLabel() {
-      var files = element.files;
-      if (files && files.length) {
-        label.innerText = isMultiFileInput ? files.length + ' ' + I18n.get('filesSelected') : files[0].name;
-      } else {
-        label.innerText = isMultiFileInput ? I18n.get('selectFiles') : I18n.get('selectFile');
-      }
-    }
-
-    return init();
-  };
-
-  inputUtilities.push({
-    name: FILE_INPUT_UTIL_NAME,
-    selector: FILE_INPUT_UTIL_SELECTOR,
-    setup: fileInputUtil,
-  });
-
-  /**
-   *
-   * Checkbox Utility
-   *  wraps native checkbox
-   *
-   * Attribute: (none)
-   *  (element must be an input of type="checkbox")
-   *
-   * Example usage:
-   * <input type="checkbox">
-   *
-   */
-
-  var CHECKBOX_UTIL_NAME = 'checkbox';
-  var CHECKBOX_UTIL_SELECTOR = 'input[type="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!');
-        return false;
-      }
-
-      if (element.parentElement.classList.contains(CHECKBOX_CLASS)) {
-        // throw new Error('Checkbox element\'s wrapper already has class "' + CHECKBOX_CLASS + '"!');
-        return false;
-      }
-
-      var siblingEl = element.nextSibling;
-      var parentEl = element.parentElement;
-
-      var wrapperEl = document.createElement('div');
-      wrapperEl.classList.add(CHECKBOX_CLASS);
-
-      var labelEl = document.createElement('label');
-      labelEl.setAttribute('for', element.id);
-
-      wrapperEl.appendChild(element);
-      wrapperEl.appendChild(labelEl);
-
-      parentEl.insertBefore(wrapperEl, siblingEl);
-
-      element.classList.add(CHECKBOX_INITIALIZED_CLASS);
-
-      return {
-        name: CHECKBOX_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    return init();
-  };
-
-  inputUtilities.push({
-    name: CHECKBOX_UTIL_NAME,
-    selector: CHECKBOX_UTIL_SELECTOR,
-    setup: checkboxUtil,
-  });
-
-  // register the collected input utilities
-  if (UtilRegistry) {
-    inputUtilities.forEach(UtilRegistry.register);
-  }
-})();
diff --git a/static/es/utils/massInput.js b/static/es/utils/massInput.js
deleted file mode 100644
index 8094bfac9..000000000
--- a/static/es/utils/massInput.js
+++ /dev/null
@@ -1,232 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * Mass Input Utility
-   *  allows form shapes to be manipulated asynchronously:
-   *  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
-   *
-   * Example usage:
-   *  <form method="POST" action="...">
-   *   <input type="text">
-   *   <div uw-mass-input>
-   *     <input type="text">
-   *     <button type="submit">
-   */
-
-  var MASS_INPUT_UTIL_NAME = 'massInput';
-  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_SUBMIT_BUTTON_CLASS = 'massinput__submit-button';
-  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!');
-      }
-
-      if (element.classList.contains(MASS_INPUT_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      massInputId = element.dataset.massInputIdent || '_';
-      massInputForm = element.closest('form');
-
-      if (!massInputForm) {
-        throw new Error('Mass Input utility cannot be setup without being wrapped in a <form>!');
-      }
-
-      massInputFormSubmitHandler = makeSubmitHandler();
-
-      // setup submit buttons inside this massinput so browser
-      // uses correct submit button for form submission.
-      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);
-
-      return {
-        name: MASS_INPUT_UTIL_NAME,
-        element: element,
-        destroy: function() {
-          reset();
-        },
-      };
-    }
-
-    function makeSubmitHandler() {
-      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) {
-        var activeElement;
-
-        // check if event occured from either a mass input add/delete button or
-        // from inside one of massinput's inputs (i.e. a child is focused/active)
-        activeElement = element.querySelector(':focus, :active');
-
-        if (!activeElement) {
-          return false;
-        }
-
-        // 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('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS);
-        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(submitButton, enctype);
-
-        if (requestFn && requestBody) {
-          var headers = {'Mass-Input-Shortcircuit': massInputId};
-
-          if (enctype !== 'multipart/form-data')
-            headers['Content-Type'] = enctype;
-
-          requestFn({
-            url: url,
-            headers: headers,
-            body: requestBody,
-            accept: HttpClient.ACCEPT.TEXT_HTML,
-          }).then(function(response) {
-            return HtmlHelpers.parseResponse(response);
-          }).then(function(response) {
-              processResponse(response.element);
-              if (isAddCell) {
-                reFocusAddCell();
-              }
-            });
-        }
-      };
-    }
-
-    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));
-    }
-
-    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(responseElement) {
-      element.innerHTML = "";
-      element.appendChild(responseElement);
-
-      reset();
-
-      if (UtilRegistry) {
-        UtilRegistry.setupAll(element);
-      }
-    }
-
-    function serializeForm(submitButton, enctype) {
-      var formData = new FormData(massInputForm);
-
-      // manually add name and value of submit button to formData
-      formData.append(submitButton.name, submitButton.value);
-
-      if (enctype === 'application/x-www-form-urlencoded') {
-        return new URLSearchParams(formData);
-      } else if (enctype === 'multipart/form-data') {
-        return formData;
-      } else {
-        throw new Error('Unsupported form enctype: ' + enctype);
-      }
-    }
-
-    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) {
-        // Clearing of add-inputs is done in the backend
-        addCellInput.focus();
-      }
-    }
-
-    function reset() {
-      element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
-      massInputForm.removeEventListener('submit', massInputFormSubmitHandler);
-      massInputForm.removeEventListener('keypress', keypressHandler);
-
-      var buttons = getMassInputSubmitButtons();
-      buttons.forEach(function(button) {
-        resetSubmitButton(button);
-      });
-    }
-
-    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/static/es/utils/modal.js b/static/es/utils/modal.js
deleted file mode 100644
index 46cb5ef51..000000000
--- a/static/es/utils/modal.js
+++ /dev/null
@@ -1,212 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * 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 MODAL_HEADERS = {
-    'Is-Modal': 'True',
-  };
-
-  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';
-
-  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 modalsWrapper;
-    var modalOverlay;
-    var modalUrl;
-
-    function _init() {
-      if (!element) {
-        throw new Error('Modal utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(MODAL_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      ensureModalWrapper();
-
-      // param modalTrigger
-      if (!element.dataset.modalTrigger) {
-        throw new Error('Modal utility cannot be setup without a trigger element!');
-      } else {
-        setupTrigger();
-      }
-
-      // param modalCloseable
-      if (element.dataset.modalCloseable !== undefined) {
-        setupCloser();
-      }
-
-      // 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 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('#')) {
-        triggerSelector = '#' + triggerSelector;
-      }
-      var triggerElement = document.querySelector(triggerSelector);
-
-      if (!triggerElement) {
-        throw new Error('Trigger element for Modal not found: "' + triggerSelector + '"');
-      }
-
-      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);
-      modalOverlay.addEventListener('click', onCloseClicked, false);
-    }
-
-    function onTriggerClicked(event) {
-      event.preventDefault();
-      open();
-    }
-
-    function onCloseClicked(event) {
-      event.preventDefault();
-      close();
-    }
-
-    function onKeyUp(event) {
-      if (event.key === 'Escape') {
-        close();
-      }
-    }
-
-    function open() {
-      element.classList.add(MODAL_OPEN_CLASS);
-      modalOverlay.classList.add(MODAL_OVERLAY_OPEN_CLASS);
-      modalsWrapper.classList.add(MODALS_WRAPPER_OPEN_CLASS);
-      modalsWrapper.appendChild(element);
-
-      if (modalUrl) {
-        fillModal(modalUrl);
-      }
-
-      document.addEventListener('keyup', onKeyUp);
-    }
-
-    function close() {
-      modalOverlay.classList.remove(MODAL_OVERLAY_OPEN_CLASS);
-      element.classList.remove(MODAL_OPEN_CLASS);
-      modalsWrapper.classList.remove(MODALS_WRAPPER_OPEN_CLASS);
-
-      document.removeEventListener('keyup', onKeyUp);
-    };
-
-    function fillModal(url) {
-      if (!HttpClient) {
-        throw new Error('HttpClient not found! Can\'t fetch modal content from ' + url);
-      }
-
-      HttpClient.get({
-        url: url,
-        headers: MODAL_HEADERS,
-        accept: HttpClient.ACCEPT.TEXT_HTML,
-      }).then(function(response) {
-        return HtmlHelpers.parseResponse(response);
-      }).then(function(response) {
-        processResponse(response.element);
-      });
-    }
-
-    function processResponse(responseElement) {
-      var modalContent = document.createElement('div');
-      modalContent.classList.add(MODAL_CONTENT_CLASS);
-
-      var contentBody = responseElement.querySelector('.' + MAIN_CONTENT_CLASS);
-
-      if (contentBody) {
-        modalContent.innerHTML = contentBody.innerHTML;
-      }
-
-      var previousModalContent = element.querySelector('.' + MODAL_CONTENT_CLASS);
-      if (previousModalContent) {
-        previousModalContent.remove();
-      }
-
-      element.insertBefore(modalContent, null);
-
-      // setup any newly arrived utils
-      UtilRegistry.setupAll(element);
-    }
-
-    return _init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: MODAL_UTIL_NAME,
-      selector: MODAL_UTIL_SELECTOR,
-      setup: modalUtil,
-    });
-  }
-})();
diff --git a/static/es/utils/showHide.js b/static/es/utils/showHide.js
deleted file mode 100644
index a9bb9bc89..000000000
--- a/static/es/utils/showHide.js
+++ /dev/null
@@ -1,114 +0,0 @@
-(function() {
-  'use strict';
-
-  var SHOW_HIDE_UTIL_NAME = 'showHide';
-  var SHOW_HIDE_UTIL_SELECTOR = '[uw-show-hide]';
-
-  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>Click me
-   *   <div>This will be toggled
-   *   <div>This will be toggled as well
-   */
-  var showHideUtil = function(element) {
-
-    var showHideId;
-
-    function init() {
-      if (!element) {
-        throw new Error('ShowHide utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(SHOW_HIDE_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // 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 addClickListener() {
-      element.addEventListener('click', function clickListener() {
-        var newState = element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
-
-        if (showHideId) {
-          setLocalStorage(showHideId, newState);
-        }
-      });
-    }
-
-    function setLocalStorage(id, state) {
-      var lsData = getLocalStorage();
-      lsData[id] = state;
-      window.localStorage.setItem(SHOW_HIDE_LOCAL_STORAGE_KEY, JSON.stringify(lsData));
-    }
-
-    function getLocalStorage() {
-      return JSON.parse(window.localStorage.getItem(SHOW_HIDE_LOCAL_STORAGE_KEY)) || {};
-    }
-
-    return init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: SHOW_HIDE_UTIL_NAME,
-      selector: SHOW_HIDE_UTIL_SELECTOR,
-      setup: showHideUtil,
-    });
-  }
-
-})();
diff --git a/static/es/utils/tabber.js b/static/es/utils/tabber.js
deleted file mode 100644
index e1c906d6b..000000000
--- a/static/es/utils/tabber.js
+++ /dev/null
@@ -1,90 +0,0 @@
-(function($) {
-
-  document.addEventListener('DOMContentLoaded', function() {
-    'use strict';
-
-    // define plugin
-    $.fn.tabgroup = function() {
-
-      var $this = $(this);
-      var $openers = $('<div class="tab-group-openers"></div>');
-      $this.prepend($openers);
-
-      var openedByDefault = $this.data('tab-open') || 0;
-      var tabs = [];
-      var currentTab = {};
-
-      $this.find('.tab').each(function(i, t) {
-        var tab = $(t);
-        tab.data('tab-index', i);
-        var tabName = tab.data('tab-name') || 'Tab '+i;
-        var tabFile = tab.data('tab-file') || false;
-        var $opener = makeOpener(tabName, i);
-        $openers.append($opener);
-        if (tab.find('.tab-title')) {
-          tab.find('.tab-title').remove();
-        }
-        tab.hide();
-        var loaded = false;
-        tabs.push({index: i, name: tabName, file: tabFile, dom: tab, opener: $opener, loaded: loaded });
-      });
-
-      $this.on('click', 'a[href^="#"]', function(event) {
-        var $target = $(event.currentTarget);
-        var tab = getTabByName($target.attr('href').replace('#', ''));
-        if ( tab ) {
-          showTab(tab.index);
-        }
-        event.preventDefault();
-      });
-
-      function getTabByName(name) {
-        var it = -1;
-        $.each(tabs, function(i, t) {
-          if ( t.name.toLowerCase() === name.toLowerCase() ) {
-            it = i;
-          }
-        });
-        if ( it >= 0 ) {
-          return tabs[it];
-        } else {
-          return false;
-        }
-      }
-
-      function makeOpener(tabName, i) {
-        return $('<span class="tab-opener">'+tabName+'</span>').
-                on('click', function() {
-                  showTab(i);
-                });
-      }
-
-      function showTab(i) {
-        tabs.forEach(function(t) {
-          t.dom.hide();
-          t.opener.removeClass('tab-visible');
-        });
-        currentTab = tabs[i];
-        if ( !currentTab.loaded && currentTab.file ){
-          $.get(currentTab.file, function(res) {
-            currentTab.dom.html(res);
-            currentTab.loaded = true;
-          });
-        }
-        currentTab.opener.addClass('tab-visible');
-        currentTab.dom.show();
-      }
-
-      showTab(openedByDefault);
-      currentTab = tabs[openedByDefault];
-
-    };
-
-    // apply plugin to all available tab-groups if on wide screen
-    if (window.innerWidth > 768) {
-      $('.tab-group').each(function(i, t) {
-        $(t).tabgroup();
-      });
-    }
-  });
-})($);
diff --git a/static/js/polyfills/fetchPolyfill.js b/static/js/polyfills/fetchPolyfill.js
deleted file mode 100644
index ac9a4fd87..000000000
--- a/static/js/polyfills/fetchPolyfill.js
+++ /dev/null
@@ -1,466 +0,0 @@
-(function(self) {
-  'use strict';
-
-  if (self.fetch) {
-    return
-  }
-
-  var support = {
-    searchParams: 'URLSearchParams' in self,
-    iterable: 'Symbol' in self && 'iterator' in Symbol,
-    blob: 'FileReader' in self && 'Blob' in self && (function() {
-      try {
-        new Blob()
-        return true
-      } catch(e) {
-        return false
-      }
-    })(),
-    formData: 'FormData' in self,
-    arrayBuffer: 'ArrayBuffer' in self
-  }
-
-  if (support.arrayBuffer) {
-    var viewClasses = [
-      '[object Int8Array]',
-      '[object Uint8Array]',
-      '[object Uint8ClampedArray]',
-      '[object Int16Array]',
-      '[object Uint16Array]',
-      '[object Int32Array]',
-      '[object Uint32Array]',
-      '[object Float32Array]',
-      '[object Float64Array]'
-    ]
-
-    var isDataView = function(obj) {
-      return obj && DataView.prototype.isPrototypeOf(obj)
-    }
-
-    var isArrayBufferView = ArrayBuffer.isView || function(obj) {
-      return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1
-    }
-  }
-
-  function normalizeName(name) {
-    if (typeof name !== 'string') {
-      name = String(name)
-    }
-    if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) {
-      throw new TypeError('Invalid character in header field name')
-    }
-    return name.toLowerCase()
-  }
-
-  function normalizeValue(value) {
-    if (typeof value !== 'string') {
-      value = String(value)
-    }
-    return value
-  }
-
-  // Build a destructive iterator for the value list
-  function iteratorFor(items) {
-    var iterator = {
-      next: function() {
-        var value = items.shift()
-        return {done: value === undefined, value: value}
-      }
-    }
-
-    if (support.iterable) {
-      iterator[Symbol.iterator] = function() {
-        return iterator
-      }
-    }
-
-    return iterator
-  }
-
-  function Headers(headers) {
-    this.map = {}
-
-    if (headers instanceof Headers) {
-      headers.forEach(function(value, name) {
-        this.append(name, value)
-      }, this)
-    } else if (Array.isArray(headers)) {
-      headers.forEach(function(header) {
-        this.append(header[0], header[1])
-      }, this)
-    } else if (headers) {
-      Object.getOwnPropertyNames(headers).forEach(function(name) {
-        this.append(name, headers[name])
-      }, this)
-    }
-  }
-
-  Headers.prototype.append = function(name, value) {
-    name = normalizeName(name)
-    value = normalizeValue(value)
-    var oldValue = this.map[name]
-    this.map[name] = oldValue ? oldValue+','+value : value
-  }
-
-  Headers.prototype['delete'] = function(name) {
-    delete this.map[normalizeName(name)]
-  }
-
-  Headers.prototype.get = function(name) {
-    name = normalizeName(name)
-    return this.has(name) ? this.map[name] : null
-  }
-
-  Headers.prototype.has = function(name) {
-    return this.map.hasOwnProperty(normalizeName(name))
-  }
-
-  Headers.prototype.set = function(name, value) {
-    this.map[normalizeName(name)] = normalizeValue(value)
-  }
-
-  Headers.prototype.forEach = function(callback, thisArg) {
-    for (var name in this.map) {
-      if (this.map.hasOwnProperty(name)) {
-        callback.call(thisArg, this.map[name], name, this)
-      }
-    }
-  }
-
-  Headers.prototype.keys = function() {
-    var items = []
-    this.forEach(function(value, name) { items.push(name) })
-    return iteratorFor(items)
-  }
-
-  Headers.prototype.values = function() {
-    var items = []
-    this.forEach(function(value) { items.push(value) })
-    return iteratorFor(items)
-  }
-
-  Headers.prototype.entries = function() {
-    var items = []
-    this.forEach(function(value, name) { items.push([name, value]) })
-    return iteratorFor(items)
-  }
-
-  if (support.iterable) {
-    Headers.prototype[Symbol.iterator] = Headers.prototype.entries
-  }
-
-  function consumed(body) {
-    if (body.bodyUsed) {
-      return Promise.reject(new TypeError('Already read'))
-    }
-    body.bodyUsed = true
-  }
-
-  function fileReaderReady(reader) {
-    return new Promise(function(resolve, reject) {
-      reader.onload = function() {
-        resolve(reader.result)
-      }
-      reader.onerror = function() {
-        reject(reader.error)
-      }
-    })
-  }
-
-  function readBlobAsArrayBuffer(blob) {
-    var reader = new FileReader()
-    var promise = fileReaderReady(reader)
-    reader.readAsArrayBuffer(blob)
-    return promise
-  }
-
-  function readBlobAsText(blob) {
-    var reader = new FileReader()
-    var promise = fileReaderReady(reader)
-    reader.readAsText(blob)
-    return promise
-  }
-
-  function readArrayBufferAsText(buf) {
-    var view = new Uint8Array(buf)
-    var chars = new Array(view.length)
-
-    for (var i = 0; i < view.length; i++) {
-      chars[i] = String.fromCharCode(view[i])
-    }
-    return chars.join('')
-  }
-
-  function bufferClone(buf) {
-    if (buf.slice) {
-      return buf.slice(0)
-    } else {
-      var view = new Uint8Array(buf.byteLength)
-      view.set(new Uint8Array(buf))
-      return view.buffer
-    }
-  }
-
-  function Body() {
-    this.bodyUsed = false
-
-    this._initBody = function(body) {
-      this._bodyInit = body
-      if (!body) {
-        this._bodyText = ''
-      } else if (typeof body === 'string') {
-        this._bodyText = body
-      } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
-        this._bodyBlob = body
-      } else if (support.formData && FormData.prototype.isPrototypeOf(body)) {
-        this._bodyFormData = body
-      } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
-        this._bodyText = body.toString()
-      } else if (support.arrayBuffer && support.blob && isDataView(body)) {
-        this._bodyArrayBuffer = bufferClone(body.buffer)
-        // IE 10-11 can't handle a DataView body.
-        this._bodyInit = new Blob([this._bodyArrayBuffer])
-      } else if (support.arrayBuffer && (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))) {
-        this._bodyArrayBuffer = bufferClone(body)
-      } else {
-        throw new Error('unsupported BodyInit type')
-      }
-
-      if (!this.headers.get('content-type')) {
-        if (typeof body === 'string') {
-          this.headers.set('content-type', 'text/plain;charset=UTF-8')
-        } else if (this._bodyBlob && this._bodyBlob.type) {
-          this.headers.set('content-type', this._bodyBlob.type)
-        } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
-          this.headers.set('content-type', 'application/x-www-form-urlencoded;charset=UTF-8')
-        }
-      }
-    }
-
-    if (support.blob) {
-      this.blob = function() {
-        var rejected = consumed(this)
-        if (rejected) {
-          return rejected
-        }
-
-        if (this._bodyBlob) {
-          return Promise.resolve(this._bodyBlob)
-        } else if (this._bodyArrayBuffer) {
-          return Promise.resolve(new Blob([this._bodyArrayBuffer]))
-        } else if (this._bodyFormData) {
-          throw new Error('could not read FormData body as blob')
-        } else {
-          return Promise.resolve(new Blob([this._bodyText]))
-        }
-      }
-
-      this.arrayBuffer = function() {
-        if (this._bodyArrayBuffer) {
-          return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
-        } else {
-          return this.blob().then(readBlobAsArrayBuffer)
-        }
-      }
-    }
-
-    this.text = function() {
-      var rejected = consumed(this)
-      if (rejected) {
-        return rejected
-      }
-
-      if (this._bodyBlob) {
-        return readBlobAsText(this._bodyBlob)
-      } else if (this._bodyArrayBuffer) {
-        return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer))
-      } else if (this._bodyFormData) {
-        throw new Error('could not read FormData body as text')
-      } else {
-        return Promise.resolve(this._bodyText)
-      }
-    }
-
-    if (support.formData) {
-      this.formData = function() {
-        return this.text().then(decode)
-      }
-    }
-
-    this.json = function() {
-      return this.text().then(JSON.parse)
-    }
-
-    return this
-  }
-
-  // HTTP methods whose capitalization should be normalized
-  var methods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT']
-
-  function normalizeMethod(method) {
-    var upcased = method.toUpperCase()
-    return (methods.indexOf(upcased) > -1) ? upcased : method
-  }
-
-  function Request(input, options) {
-    options = options || {}
-    var body = options.body
-
-    if (input instanceof Request) {
-      if (input.bodyUsed) {
-        throw new TypeError('Already read')
-      }
-      this.url = input.url
-      this.credentials = input.credentials
-      if (!options.headers) {
-        this.headers = new Headers(input.headers)
-      }
-      this.method = input.method
-      this.mode = input.mode
-      if (!body && input._bodyInit != null) {
-        body = input._bodyInit
-        input.bodyUsed = true
-      }
-    } else {
-      this.url = String(input)
-    }
-
-    this.credentials = options.credentials || this.credentials || 'omit'
-    if (options.headers || !this.headers) {
-      this.headers = new Headers(options.headers)
-    }
-    this.method = normalizeMethod(options.method || this.method || 'GET')
-    this.mode = options.mode || this.mode || null
-    this.referrer = null
-
-    if ((this.method === 'GET' || this.method === 'HEAD') && body) {
-      throw new TypeError('Body not allowed for GET or HEAD requests')
-    }
-    this._initBody(body)
-  }
-
-  Request.prototype.clone = function() {
-    return new Request(this, { body: this._bodyInit })
-  }
-
-  function decode(body) {
-    var form = new FormData()
-    body.trim().split('&').forEach(function(bytes) {
-      if (bytes) {
-        var split = bytes.split('=')
-        var name = split.shift().replace(/\+/g, ' ')
-        var value = split.join('=').replace(/\+/g, ' ')
-        form.append(decodeURIComponent(name), decodeURIComponent(value))
-      }
-    })
-    return form
-  }
-
-  function parseHeaders(rawHeaders) {
-    var headers = new Headers()
-    // Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
-    // https://tools.ietf.org/html/rfc7230#section-3.2
-    var preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ')
-    preProcessedHeaders.split(/\r?\n/).forEach(function(line) {
-      var parts = line.split(':')
-      var key = parts.shift().trim()
-      if (key) {
-        var value = parts.join(':').trim()
-        headers.append(key, value)
-      }
-    })
-    return headers
-  }
-
-  Body.call(Request.prototype)
-
-  function Response(bodyInit, options) {
-    if (!options) {
-      options = {}
-    }
-
-    this.type = 'default'
-    this.status = options.status === undefined ? 200 : options.status
-    this.ok = this.status >= 200 && this.status < 300
-    this.statusText = 'statusText' in options ? options.statusText : 'OK'
-    this.headers = new Headers(options.headers)
-    this.url = options.url || ''
-    this._initBody(bodyInit)
-  }
-
-  Body.call(Response.prototype)
-
-  Response.prototype.clone = function() {
-    return new Response(this._bodyInit, {
-      status: this.status,
-      statusText: this.statusText,
-      headers: new Headers(this.headers),
-      url: this.url
-    })
-  }
-
-  Response.error = function() {
-    var response = new Response(null, {status: 0, statusText: ''})
-    response.type = 'error'
-    return response
-  }
-
-  var redirectStatuses = [301, 302, 303, 307, 308]
-
-  Response.redirect = function(url, status) {
-    if (redirectStatuses.indexOf(status) === -1) {
-      throw new RangeError('Invalid status code')
-    }
-
-    return new Response(null, {status: status, headers: {location: url}})
-  }
-
-  self.Headers = Headers
-  self.Request = Request
-  self.Response = Response
-
-  self.fetch = function(input, init) {
-    return new Promise(function(resolve, reject) {
-      var request = new Request(input, init)
-      var xhr = new XMLHttpRequest()
-
-      xhr.onload = function() {
-        var options = {
-          status: xhr.status,
-          statusText: xhr.statusText,
-          headers: parseHeaders(xhr.getAllResponseHeaders() || '')
-        }
-        options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL')
-        var body = 'response' in xhr ? xhr.response : xhr.responseText
-        resolve(new Response(body, options))
-      }
-
-      xhr.onerror = function() {
-        reject(new TypeError('Network request failed'))
-      }
-
-      xhr.ontimeout = function() {
-        reject(new TypeError('Network request failed'))
-      }
-
-      xhr.open(request.method, request.url, true)
-
-      if (request.credentials === 'include') {
-        xhr.withCredentials = true
-      } else if (request.credentials === 'omit') {
-        xhr.withCredentials = false
-      }
-
-      if ('responseType' in xhr && support.blob) {
-        xhr.responseType = 'blob'
-      }
-
-      request.headers.forEach(function(value, name) {
-        xhr.setRequestHeader(name, value)
-      })
-
-      xhr.send(typeof request._bodyInit === 'undefined' ? null : request._bodyInit)
-    })
-  }
-  self.fetch.polyfill = true
-})(typeof self !== 'undefined' ? self : this);
\ No newline at end of file
diff --git a/static/js/polyfills/urlPolyfill.js b/static/js/polyfills/urlPolyfill.js
deleted file mode 100644
index e38c12021..000000000
--- a/static/js/polyfills/urlPolyfill.js
+++ /dev/null
@@ -1,348 +0,0 @@
-(function(global) {
-  /**
-   * Polyfill URLSearchParams
-   *
-   * Inspired from : https://github.com/WebReflection/url-search-params/blob/master/src/url-search-params.js
-   */
-
-  var checkIfIteratorIsSupported = function() {
-    try {
-      return !!Symbol.iterator;
-    } catch(error) {
-      return false;
-    }
-  };
-
-
-  var iteratorSupported = checkIfIteratorIsSupported();
-
-  var createIterator = function(items) {
-    var iterator = {
-      next: function() {
-        var value = items.shift();
-        return { done: value === void 0, value: value };
-      }
-    };
-
-    if(iteratorSupported) {
-      iterator[Symbol.iterator] = function() {
-        return iterator;
-      };
-    }
-
-    return iterator;
-  };
-
-  /**
-   * Search param name and values should be encoded according to https://url.spec.whatwg.org/#urlencoded-serializing
-   * encodeURIComponent() produces the same result except encoding spaces as `%20` instead of `+`.
-   */
-  var serializeParam = function(value) {
-    return encodeURIComponent(value).replace(/%20/g, '+');
-  };
-
-  var deserializeParam = function(value) {
-    return decodeURIComponent(value).replace(/\+/g, ' ');
-  };
-
-  var polyfillURLSearchParams= function() {
-
-    var URLSearchParams = function(searchString) {
-      Object.defineProperty(this, '_entries', { value: {} });
-
-      if(typeof searchString === 'string') {
-        if(searchString !== '') {
-          searchString = searchString.replace(/^\?/, '');
-          var attributes = searchString.split('&');
-          var attribute;
-          for(var i = 0; i < attributes.length; i++) {
-            attribute = attributes[i].split('=');
-            this.append(
-              deserializeParam(attribute[0]),
-              (attribute.length > 1) ? deserializeParam(attribute[1]) : ''
-            );
-          }
-        }
-      } else if(searchString instanceof URLSearchParams) {
-        var _this = this;
-        searchString.forEach(function(value, name) {
-          _this.append(value, name);
-        });
-      }
-    };
-
-    var proto = URLSearchParams.prototype;
-
-    proto.append = function(name, value) {
-      if(name in this._entries) {
-        this._entries[name].push(value.toString());
-      } else {
-        this._entries[name] = [value.toString()];
-      }
-    };
-
-    proto.delete = function(name) {
-      delete this._entries[name];
-    };
-
-    proto.get = function(name) {
-      return (name in this._entries) ? this._entries[name][0] : null;
-    };
-
-    proto.getAll = function(name) {
-      return (name in this._entries) ? this._entries[name].slice(0) : [];
-    };
-
-    proto.has = function(name) {
-      return (name in this._entries);
-    };
-
-    proto.set = function(name, value) {
-      this._entries[name] = [value.toString()];
-    };
-
-    proto.forEach = function(callback, thisArg) {
-      var entries;
-      for(var name in this._entries) {
-        if(this._entries.hasOwnProperty(name)) {
-          entries = this._entries[name];
-          for(var i = 0; i < entries.length; i++) {
-            callback.call(thisArg, entries[i], name, this);
-          }
-        }
-      }
-    };
-
-    proto.keys = function() {
-      var items = [];
-      this.forEach(function(value, name) { items.push(name); });
-      return createIterator(items);
-    };
-
-    proto.values = function() {
-      var items = [];
-      this.forEach(function(value) { items.push(value); });
-      return createIterator(items);
-    };
-
-    proto.entries = function() {
-      var items = [];
-      this.forEach(function(value, name) { items.push([name, value]); });
-      return createIterator(items);
-    };
-
-    if(iteratorSupported) {
-      proto[Symbol.iterator] = proto.entries;
-    }
-
-    proto.toString = function() {
-      var searchString = '';
-      this.forEach(function(value, name) {
-        if(searchString.length > 0) searchString+= '&';
-        searchString += serializeParam(name) + '=' + serializeParam(value);
-      });
-      return searchString;
-    };
-
-    global.URLSearchParams = URLSearchParams;
-  };
-
-  if(!('URLSearchParams' in global) || (new URLSearchParams('?a=1').toString() !== 'a=1')) {
-    polyfillURLSearchParams();
-  }
-
-  // HTMLAnchorElement
-
-})(
-  (typeof global !== 'undefined') ? global
-    : ((typeof window !== 'undefined') ? window
-    : ((typeof self !== 'undefined') ? self : this))
-);
-
-(function(global) {
-  /**
-   * Polyfill URL
-   *
-   * Inspired from : https://github.com/arv/DOM-URL-Polyfill/blob/master/src/url.js
-   */
-
-  var checkIfURLIsSupported = function() {
-    try {
-      var u = new URL('b', 'http://a');
-      u.pathname = 'c%20d';
-      return (u.href === 'http://a/c%20d') && u.searchParams;
-    } catch(e) {
-      return false;
-    }
-  };
-
-
-  var polyfillURL = function() {
-    var _URL = global.URL;
-
-    var URL = function(url, base) {
-      if(typeof url !== 'string') url = String(url);
-
-      var doc = document.implementation.createHTMLDocument('');
-      window.doc = doc;
-      if(base) {
-        var baseElement = doc.createElement('base');
-        baseElement.href = base;
-        doc.head.appendChild(baseElement);
-      }
-
-      var anchorElement = doc.createElement('a');
-      anchorElement.href = url;
-      doc.body.appendChild(anchorElement);
-      anchorElement.href = anchorElement.href; // force href to refresh
-
-      if(anchorElement.protocol === ':' || !/:/.test(anchorElement.href)) {
-        throw new TypeError('Invalid URL');
-      }
-
-      Object.defineProperty(this, '_anchorElement', {
-        value: anchorElement
-      });
-    };
-
-    var proto = URL.prototype;
-
-    var linkURLWithAnchorAttribute = function(attributeName) {
-      Object.defineProperty(proto, attributeName, {
-        get: function() {
-          return this._anchorElement[attributeName];
-        },
-        set: function(value) {
-          this._anchorElement[attributeName] = value;
-        },
-        enumerable: true
-      });
-    };
-
-    ['hash', 'host', 'hostname', 'port', 'protocol', 'search']
-    .forEach(function(attributeName) {
-      linkURLWithAnchorAttribute(attributeName);
-    });
-
-    Object.defineProperties(proto, {
-
-      'toString': {
-        get: function() {
-          var _this = this;
-          return function() {
-            return _this.href;
-          };
-        }
-      },
-
-      'href' : {
-        get: function() {
-          return this._anchorElement.href.replace(/\?$/,'');
-        },
-        set: function(value) {
-          this._anchorElement.href = value;
-        },
-        enumerable: true
-      },
-
-      'pathname' : {
-        get: function() {
-          return this._anchorElement.pathname.replace(/(^\/?)/,'/');
-        },
-        set: function(value) {
-          this._anchorElement.pathname = value;
-        },
-        enumerable: true
-      },
-
-      'origin': {
-        get: function() {
-          // get expected port from protocol
-          var expectedPort = {'http:': 80, 'https:': 443, 'ftp:': 21}[this._anchorElement.protocol];
-          // add port to origin if, expected port is different than actual port
-          // and it is not empty f.e http://foo:8080
-          // 8080 != 80 && 8080 != ''
-          var addPortToOrigin = this._anchorElement.port != expectedPort &&
-            this._anchorElement.port !== ''
-
-          return this._anchorElement.protocol +
-            '//' +
-            this._anchorElement.hostname +
-            (addPortToOrigin ? (':' + this._anchorElement.port) : '');
-        },
-        enumerable: true
-      },
-
-      'password': { // TODO
-        get: function() {
-          return '';
-        },
-        set: function(value) {
-        },
-        enumerable: true
-      },
-
-      'username': { // TODO
-        get: function() {
-          return '';
-        },
-        set: function(value) {
-        },
-        enumerable: true
-      },
-
-      'searchParams': {
-        get: function() {
-          var searchParams = new URLSearchParams(this.search);
-          var _this = this;
-          ['append', 'delete', 'set'].forEach(function(methodName) {
-            var method = searchParams[methodName];
-            searchParams[methodName] = function() {
-              method.apply(searchParams, arguments);
-              _this.search = searchParams.toString();
-            };
-          });
-          return searchParams;
-        },
-        enumerable: true
-      }
-    });
-
-    URL.createObjectURL = function(blob) {
-      return _URL.createObjectURL.apply(_URL, arguments);
-    };
-
-    URL.revokeObjectURL = function(url) {
-      return _URL.revokeObjectURL.apply(_URL, arguments);
-    };
-
-    global.URL = URL;
-
-  };
-
-  if(!checkIfURLIsSupported()) {
-    polyfillURL();
-  }
-
-  if((global.location !== void 0) && !('origin' in global.location)) {
-    var getOrigin = function() {
-      return global.location.protocol + '//' + global.location.hostname + (global.location.port ? (':' + global.location.port) : '');
-    };
-
-    try {
-      Object.defineProperty(global.location, 'origin', {
-        get: getOrigin,
-        enumerable: true
-      });
-    } catch(e) {
-      setInterval(function() {
-        global.location.origin = getOrigin();
-      }, 100);
-    }
-  }
-
-})(
-  (typeof global !== 'undefined') ? global
-    : ((typeof window !== 'undefined') ? window
-    : ((typeof self !== 'undefined') ? self : this))
-);
diff --git a/static/js/services/htmlHelpers.js b/static/js/services/htmlHelpers.js
deleted file mode 100644
index 30477314c..000000000
--- a/static/js/services/htmlHelpers.js
+++ /dev/null
@@ -1,50 +0,0 @@
-(function () {
-  'use strict';
-
-  window.HtmlHelpers = (function() {
-
-    // `parseResponse` takes a raw HttpClient response and an options object.
-    // Returns an object with `element` being an contextual fragment of the
-    // HTML in the response and `ifPrefix` being the prefix that was used to
-    // "unique-ify" the ids of the received HTML.
-    // Original Response IDs can optionally be kept by adding `keepIds: true`
-    // to the `options` object.
-    function parseResponse(response, options) {
-      options = options || {};
-
-      return response.text().then(function (responseText) {
-        var docFrag = document.createRange().createContextualFragment(responseText);
-        var idPrefix;
-        if (!options.keepIds) {
-          idPrefix = _getIdPrefix();
-          _prefixIds(docFrag, idPrefix);
-        }
-        return Promise.resolve({ idPrefix: idPrefix, element: docFrag });
-      },
-      function (error) {
-        return Promise.reject(error);
-      }).catch(function (error) { console.error(error); });
-    }
-
-    function _prefixIds(element, idPrefix) {
-      var idAttrs = ['id', 'for', 'data-conditional-input', 'data-modal-trigger'];
-
-      idAttrs.forEach(function(attr) {
-        Array.from(element.querySelectorAll('[' + attr + ']')).forEach(function(input) {
-          var value = idPrefix + input.getAttribute(attr);
-          input.setAttribute(attr, value);
-        });
-      });
-    }
-
-    function _getIdPrefix() {
-      // leading 'r'(andom) to overcome the fact that IDs
-      // starting with a numeric value are not valid in CSS
-      return 'r' + Math.floor(Math.random() * 100000) + '__';
-    }
-
-    return {
-      parseResponse: parseResponse,
-    }
-  })();
-})();
diff --git a/static/js/services/httpClient.js b/static/js/services/httpClient.js
deleted file mode 100644
index f65fb0e3f..000000000
--- a/static/js/services/httpClient.js
+++ /dev/null
@@ -1,72 +0,0 @@
-(function () {
-  'use strict';
-
-  window.HttpClient = (function() {
-
-    var _responseInterceptors = [];
-
-    function addResponseInterceptor(interceptor) {
-      if (typeof interceptor === 'function') {
-        _responseInterceptors.push(interceptor);
-      }
-    }
-
-    function _fetch(options) {
-      var requestOptions = {
-        credentials: 'same-origin',
-        headers: { },
-        method: options.method,
-        body: options.body,
-      };
-
-      Object.keys(options.headers).forEach(function(headerKey) {
-        requestOptions.headers[headerKey] = options.headers[headerKey];
-      });
-
-      return fetch(options.url, requestOptions).then(
-        function(response) {
-          _responseInterceptors.forEach(function(interceptor) {
-            interceptor(response, options);
-          });
-          return Promise.resolve(response);
-        },
-        function(error) {
-          return Promise.reject(error);
-        }
-      ).catch(function(error) {
-        console.error(error);
-      });
-    }
-
-    return {
-      get: function(args) {
-        args.method = 'GET';
-        return _fetch(args);
-      },
-      post: function(args) {
-        args.method = 'POST';
-        return _fetch(args);
-      },
-      addResponseInterceptor: addResponseInterceptor,
-      ACCEPT: {
-        TEXT_HTML: 'text/html',
-        JSON: 'application/json',
-      },
-    }
-  })();
-
-  // HttpClient ships with its own little interceptor to throw an error
-  // if the response does not match the expected content-type
-  function contentTypeInterceptor(response, options) {
-    if (!options || !options.accept) {
-      return;
-    }
-
-    var contentType = response.headers.get("content-type");
-    if (!contentType.match(options.accept)) {
-      throw new Error('Server returned with "' + contentType + '" when "' + options.accept + '" was expected');
-    }
-  }
-
-  HttpClient.addResponseInterceptor(contentTypeInterceptor);
-})();
diff --git a/static/js/services/i18n.js b/static/js/services/i18n.js
deleted file mode 100644
index 730e11935..000000000
--- a/static/js/services/i18n.js
+++ /dev/null
@@ -1,44 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   * 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 = {};
-
-    function addTranslation(id, translation) {
-      translations[id] = translation;
-    }
-
-    function addManyTranslations(manyTranslations) {
-      Object.keys(manyTranslations).forEach(function(key) {
-        addTranslation(key, manyTranslations[key]);
-      });
-    }
-
-    function getTranslation(id) {
-      if (!translations[id]) {
-        throw new Error('I18N Error: Translation missing for »' + id + '«!');
-      }
-      return translations[id];
-    }
-
-    // public API
-    return {
-      add: addTranslation,
-      addMany: addManyTranslations,
-      get: getTranslation,
-    };
-  })();
-})();
diff --git a/static/js/services/utilRegistry.js b/static/js/services/utilRegistry.js
deleted file mode 100644
index 259b828c0..000000000
--- a/static/js/services/utilRegistry.js
+++ /dev/null
@@ -1,147 +0,0 @@
-(function() {
-  'use strict';
-
-  var registeredUtils = [];
-  var activeUtilInstances = [];
-
-  var DEBUG_MODE = /localhost/.test(window.location.href) && 0;
-
-  // 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) {
-      if (DEBUG_MODE > 2) {
-        console.log('registering util "' + util.name + '"');
-        console.log({ 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(scope) {
-      if (DEBUG_MODE > 1) {
-        console.info('registered js utilities:');
-        console.table(registeredUtils);
-      }
-
-      registeredUtils.forEach(function(util) {
-        setupUtil(util, scope);
-      });
-    }
-
-    function setupUtil(util, scope) {
-      if (DEBUG_MODE > 2) {
-        console.log('setting up util', { util });
-      }
-
-      scope = scope || document.body;
-
-      if (util && typeof util.setup === 'function') {
-        const elements = _findUtilElements(util, scope);
-
-        elements.forEach(function(element) {
-          var utilInstance = null;
-
-          try {
-            utilInstance = util.setup(element);
-          } catch(err) {
-            if (DEBUG_MODE > 0) {
-              console.warn('Error while trying to initialize a utility!', { util , element, err });
-            }
-          }
-
-          if (utilInstance) {
-            if (DEBUG_MODE > 2) {
-              console.info('Got utility instance for utility "' + util.name + '"', { utilInstance });
-            }
-
-            activeUtilInstances.push(utilInstance);
-          }
-        });
-      }
-    }
-
-    function findUtil(name) {
-      return registeredUtils.find(function(util) {
-        return util.name === name;
-      });
-    }
-
-    function _findUtilElements(util, scope) {
-      if (scope && scope.matches(util.selector)) {
-        return [scope];
-      }
-      return Array.from(scope.querySelectorAll(util.selector));
-    }
-
-    function _findUtilIndex(name) {
-      return registeredUtils.findIndex(function(util) {
-        return util.name === name;
-      });
-    }
-
-    function _destroyUtilInstances(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
-    return {
-      register: registerUtil,
-      deregister: deregisterUtil,
-      setupAll: setupAllUtils,
-      setup: setupUtil,
-      find: findUtil,
-    }
-  })();
-
-  document.addEventListener('DOMContentLoaded', function() {
-    window.UtilRegistry.setupAll();
-  });
-
-})();
diff --git a/static/js/utils/alerts.js b/static/js/utils/alerts.js
deleted file mode 100644
index 427e38373..000000000
--- a/static/js/utils/alerts.js
+++ /dev/null
@@ -1,212 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * 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_UTIL_NAME = 'alerts';
-  var ALERTS_UTIL_SELECTOR = '[uw-alerts]';
-
-  var ALERTS_INITIALIZED_CLASS = 'alerts--initialized';
-  var ALERTS_ELEVATED_CLASS = 'alerts--elevated';
-  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_ICON_CLASS = 'alert__icon';
-  var ALERT_CONTENT_CLASS = 'alert__content';
-  var ALERT_INVISIBLE_CLASS = 'alert--invisible';
-  var ALERT_AUTO_HIDE_DELAY = 10;
-  var ALERT_AUTOCLOSING_MATCHER = '.alert-info, .alert-success';
-
-  var alertsUtil = function(element) {
-    var togglerCheckRequested = false;
-    var togglerElement;
-    var alertElements;
-
-    function init() {
-      if (!element) {
-        throw new Error('Alerts util has to be called with an element!');
-      }
-
-      if (element.classList.contains(ALERTS_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      togglerElement = element.querySelector('.' + ALERTS_TOGGLER_CLASS);
-      alertElements = gatherAlertElements();
-
-      initToggler();
-      initAlerts();
-
-      // register http client interceptor to filter out Alerts Header
-      setupHttpInterceptor();
-
-      // 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() {
-      togglerElement.addEventListener('click', function() {
-        alertElements.forEach(function(alertEl) {
-          toggleAlert(alertEl, true);
-        });
-        togglerElement.classList.remove(ALERTS_TOGGLER_VISIBLE_CLASS);
-      });
-    }
-
-    function initAlerts() {
-      alertElements.forEach(initAlert);
-    }
-
-    function initAlert(alertElement) {
-      var autoHideDelay = ALERT_AUTO_HIDE_DELAY;
-      if (alertElement.dataset.decay) {
-        autoHideDelay = parseInt(alertElement.dataset.decay, 10);
-      }
-
-      var closeEl = alertElement.querySelector('.' + ALERT_CLOSER_CLASS);
-      closeEl.addEventListener('click', function() {
-        toggleAlert(alertElement);
-      });
-
-      if (autoHideDelay > 0 && alertElement.matches(ALERT_AUTOCLOSING_MATCHER)) {
-        window.setTimeout(function() {
-          toggleAlert(alertElement);
-        }, autoHideDelay * 1000);
-      }
-    }
-
-    function toggleAlert(alertEl, visible) {
-      alertEl.classList.toggle(ALERT_INVISIBLE_CLASS, !visible);
-      checkToggler();
-    }
-
-    function checkToggler() {
-      if (togglerCheckRequested) {
-        return;
-      }
-
-      var alertsHidden = alertElements.reduce(function(acc, alert) {
-        return acc && alert.classList.contains(ALERT_INVISIBLE_CLASS);
-      }, true);
-
-      window.setTimeout(function() {
-        togglerElement.classList.toggle(ALERTS_TOGGLER_VISIBLE_CLASS, alertsHidden);
-        togglerCheckRequested = false;
-      }, ALERTS_TOGGLER_APPEAR_DELAY);
-    }
-
-    function setupHttpInterceptor() {
-      if (HttpClient) {
-        HttpClient.addResponseInterceptor(responseInterceptor.bind(this));
-      }
-    }
-
-    function elevateAlerts() {
-      element.classList.add(ALERTS_ELEVATED_CLASS);
-    }
-
-    function responseInterceptor(response) {
-      var alerts;
-      for (var header of response.headers) {
-        if (header[0] === 'alerts') {
-          var decodedHeader = decodeURIComponent(header[1]);
-          alerts = JSON.parse(decodedHeader);
-          break;
-        }
-      }
-
-      if (alerts) {
-        alerts.forEach(function(alert) {
-          var alertElement = createAlertElement(alert.status, alert.content);
-          element.appendChild(alertElement);
-          alertElements.push(alertElement);
-          initAlert(alertElement);
-        });
-
-        elevateAlerts();
-      }
-    }
-
-    function createAlertElement(type, content) {
-      var alertElement = document.createElement('div');
-      alertElement.classList.add(ALERT_CLASS, 'alert-' + type);
-
-      var alertCloser = document.createElement('div');
-      alertCloser.classList.add(ALERT_CLOSER_CLASS);
-
-      var alertIcon = document.createElement('div');
-      alertIcon.classList.add(ALERT_ICON_CLASS);
-
-      var alertContent = document.createElement('div');
-      alertContent.classList.add(ALERT_CONTENT_CLASS);
-      alertContent.innerHTML = content;
-
-      alertElement.appendChild(alertCloser);
-      alertElement.appendChild(alertIcon);
-      alertElement.appendChild(alertContent);
-
-      return alertElement;
-    }
-
-    return init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: ALERTS_UTIL_NAME,
-      selector: ALERTS_UTIL_SELECTOR,
-      setup: alertsUtil,
-    });
-  }
-})();
diff --git a/static/js/utils/asidenav.js b/static/js/utils/asidenav.js
deleted file mode 100644
index cb01836fd..000000000
--- a/static/js/utils/asidenav.js
+++ /dev/null
@@ -1,109 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * 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';
-
-  var asidenavUtil = function(element) {
-
-    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);
-        element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
-        event.preventDefault();
-      }, true);
-    }
-
-    function initAsidenavSubmenus() {
-      var asidenavLinksWithSubmenus = Array.from(element.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
-        .map(function(listItem) {
-          var submenu = listItem.querySelector('.' + ASIDENAV_SUBMENU_CLASS);
-          return { listItem, submenu };
-        }).filter(function(union) {
-          return union.submenu !== null;
-        });
-
-      asidenavLinksWithSubmenus.forEach(function(union) {
-        union.listItem.addEventListener('mouseover', createMouseoverHandler(union));
-      });
-    }
-
-    function createMouseoverHandler(union) {
-      return function mouseoverHanlder(event) {
-        var rectListItem = union.listItem.getBoundingClientRect();
-        var rectSubMenu = union.submenu.getBoundingClientRect();
-
-        union.submenu.style.left = (rectListItem.left + rectListItem.width) + 'px';
-        if (window.innerHeight - rectListItem.top < rectSubMenu.height) {
-          union.submenu.style.top = (rectListItem.top + rectListItem.height - rectSubMenu.height) + 'px';
-        } else {
-          union.submenu.style.top = rectListItem.top + 'px';
-        }
-
-      };
-    }
-
-    return init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: ASIDENAV_UTIL_NAME,
-      selector: ASIDENAV_UTIL_SELECTOR,
-      setup: asidenavUtil,
-    });
-  }
-})();
diff --git a/static/js/utils/asyncForm.js b/static/js/utils/asyncForm.js
deleted file mode 100644
index 4750a7e57..000000000
--- a/static/js/utils/asyncForm.js
+++ /dev/null
@@ -1,126 +0,0 @@
-(function collonadeClosure() {
-  'use strict';
-
-  /**
-   *
-   * 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='...'>
-   *     ...
-   *
-   * 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';
-  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 MODAL_SELECTOR = '.modal';
-  var MODAL_HEADER_KEY = 'Is-Modal';
-  var MODAL_HEADER_VALUE = 'True';
-
-  var asyncFormUtil = function(element) {
-
-    var lastRequestTimestamp = 0;
-
-    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 = 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, element);
-        element.remove();
-      }, delay);
-    }
-
-    function makeResponseElement(content, status) {
-      var responseElement = document.createElement('div');
-      status = status || 'info';
-      responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS);
-      responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS + '--' + status);
-      responseElement.innerHTML = content;
-      return responseElement;
-    }
-
-    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();
-
-      var url = element.getAttribute('action');
-      var headers = { };
-      var body = new FormData(element);
-
-      var isModal = element.closest(MODAL_SELECTOR);
-      if (!!isModal) {
-        headers[MODAL_HEADER_KEY] = MODAL_HEADER_VALUE;
-      }
-
-      HttpClient.post({
-        url: url,
-        headers: headers,
-        body: body,
-        accept: HttpClient.ACCEPT.JSON,
-      }).then(function(response) {
-        return response.json();
-      }).then(function(response) {
-        processResponse(response[0]);
-      }).catch(function(error) {
-        var failureMessage = I18n.get('asyncFormFailure');
-        processResponse({ content: failureMessage });
-
-        element.classList.remove(ASYNC_FORM_LOADING_CLASS);
-      });
-    }
-
-    return init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: ASYNC_FORM_UTIL_NAME,
-      selector: ASYNC_FORM_UTIL_SELECTOR,
-      setup: asyncFormUtil
-    });
-  }
-})();
diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
deleted file mode 100644
index 8877c7991..000000000
--- a/static/js/utils/asyncTable.js
+++ /dev/null
@@ -1,422 +0,0 @@
-(function collonadeClosure() {
-  'use strict';
-
-  /**
-   *
-   * Async Table Utility
-   *  makes table filters, sorting and pagination behave asynchronously via AJAX calls
-   *
-   * Attribute: uw-async-table
-   *
-   * Example usage:
-  *   (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 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;
-
-    var ths = [];
-    var pageLinks = [];
-    var pagesizeForm;
-    var scrollTable;
-    var cssIdPrefix = '';
-
-    var tableFilterInputs = {
-      search: [],
-      input: [],
-      change: [],
-      select: [],
-    }
-
-    function init() {
-      if (!element) {
-        throw new Error('Async Table utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(ASYNC_TABLE_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // param asyncTableDbHeader
-      if (element.dataset.asyncTableDbHeader !== undefined) {
-        asyncTableHeader = element.dataset.asyncTableDbHeader;
-      }
-
-      var rawTableId = element.querySelector('table').id;
-      cssIdPrefix = findCssIdPrefix(rawTableId);
-      asyncTableId = rawTableId.replace(cssIdPrefix, '');
-
-      // find scrolltable wrapper
-      scrollTable = element.querySelector(ASYNC_TABLE_SCROLLTABLE_SELECTOR);
-      if (!scrollTable) {
-        throw new Error('Async Table cannot be set up without a scrolltable element!');
-      }
-
-      setupSortableHeaders();
-      setupPagination();
-      setupPageSizeSelect();
-      setupTableFilter();
-
-      processLocalStorage();
-
-      // clear currentTableUrl from previous requests
-      setLocalStorageParameter('currentTableUrl', null);
-
-      // mark initialized
-      element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
-
-      return {
-        name: ASYNC_TABLE_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    function setupSortableHeaders() {
-      ths = Array.from(scrollTable.querySelectorAll('th.sortable')).map(function(th) {
-        return { element: th };
-      });
-
-      ths.forEach(function(th) {
-        th.clickHandler = function(event) {
-          setLocalStorageParameter('horizPos', (scrollTable || {}).scrollLeft);
-          linkClickHandler(event);
-        };
-        th.element.addEventListener('click', th.clickHandler);
-      });
-    }
-
-    function setupPagination() {
-      var pagination = element.querySelector('#' + cssIdPrefix + 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);
-            }
-            linkClickHandler(event);
-          }
-          link.element.addEventListener('click', link.clickHandler);
-        });
-      }
-    }
-
-    function setupPageSizeSelect() {
-      // pagesize form
-      pagesizeForm = element.querySelector('#' + cssIdPrefix + asyncTableId + '-pagesize-form');
-
-      if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
-        pagesizeSelect.addEventListener('change', changePagesizeHandler);
-      }
-    }
-
-    function setupTableFilter() {
-      var tableFilterForm = element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
-
-      if (tableFilterForm) {
-        gatherTableFilterInputs(tableFilterForm);
-        addTableFilterEventListeners(tableFilterForm);
-      }
-    }
-
-    function gatherTableFilterInputs(tableFilterForm) {
-      Array.from(tableFilterForm.querySelectorAll('input[type="search"]')).forEach(function(input) {
-        tableFilterInputs.search.push(input);
-      });
-
-      Array.from(tableFilterForm.querySelectorAll('input[type="text"]')).forEach(function(input) {
-        tableFilterInputs.input.push(input);
-      });
-
-      Array.from(tableFilterForm.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
-        tableFilterInputs.change.push(input);
-      });
-
-      Array.from(tableFilterForm.querySelectorAll('select')).forEach(function(input) {
-        tableFilterInputs.select.push(input);
-      });
-    }
-
-    function addTableFilterEventListeners(tableFilterForm) {
-      tableFilterInputs.search.forEach(function(input) {
-        var debouncedInput = debounce(function() {
-          if (input.value.length === 0 || input.value.length > 2) {
-            updateFromTableFilter(tableFilterForm);
-          }
-        }, 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(tableFilterForm);
-          }
-        }, INPUT_DEBOUNCE);
-        input.addEventListener('input', debouncedInput);
-      });
-
-      tableFilterInputs.change.forEach(function(input) {
-        input.addEventListener('change', function() {
-          updateFromTableFilter(tableFilterForm);
-        });
-      });
-
-      tableFilterInputs.select.forEach(function(input) {
-        input.addEventListener('change', function() {
-          updateFromTableFilter(tableFilterForm);
-        });
-      });
-
-      tableFilterForm.addEventListener('submit', function(event) {
-        event.preventDefault();
-        updateFromTableFilter(tableFilterForm);
-      });
-    }
-
-    function updateFromTableFilter(tableFilterForm) {
-      var url = serializeTableFilterToURL();
-      var callback = null;
-
-      var focusedInput = tableFilterForm.querySelector(':focus, :active');
-      // focus previously focused input
-      if (focusedInput && focusedInput.selectionStart !== null) {
-        var selectionStart = focusedInput.selectionStart;
-        // remove the following part of the id to get rid of the random
-        // (yet somewhat structured) prefix we got from nudging.
-        var prefix = findCssIdPrefix(focusedInput.id);
-        var focusId = focusedInput.id.replace(prefix, '');
-        callback = function(wrapper) {
-          var idPrefix = getLocalStorageParameter('cssIdPrefix');
-          var toBeFocused = wrapper.querySelector('#' + idPrefix + focusId);
-          if (toBeFocused) {
-            toBeFocused.focus();
-            toBeFocused.selectionStart = selectionStart;
-          }
-        };
-      }
-      updateTableFrom(url, callback);
-    }
-
-    function serializeTableFilterToURL() {
-      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
-
-      var formIdElement = element.querySelector(ASYNC_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 processLocalStorage() {
-      var scrollTo = getLocalStorageParameter('scrollTo');
-      if (scrollTo && scrollTable) {
-        window.scrollTo(scrollTo);
-      }
-      setLocalStorageParameter('scrollTo', null);
-
-      var horizPos = getLocalStorageParameter('horizPos');
-      if (horizPos && scrollTable) {
-        scrollTable.scrollLeft = horizPos;
-      }
-      setLocalStorageParameter('horizPos', null);
-    }
-
-    function removeListeners() {
-      ths.forEach(function(th) {
-        th.element.removeEventListener('click', th.clickHandler);
-      });
-
-      pageLinks.forEach(function(link) {
-        link.element.removeEventListener('click', link.clickHandler);
-      });
-
-      if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]')
-        pagesizeSelect.removeEventListener('change', changePagesizeHandler);
-      }
-    }
-
-    function linkClickHandler(event) {
-      event.preventDefault();
-      var url = getClickDestination(event.target);
-      if (!url.match(/^http/)) {
-        url = window.location.origin + window.location.pathname + url;
-      }
-      updateTableFrom(url);
-    }
-
-    function getClickDestination(el) {
-      if (!el.matches('a') && !el.querySelector('a')) {
-        return '';
-      }
-      return el.getAttribute('href') || el.querySelector('a').getAttribute('href');
-    }
-
-    function changePagesizeHandler(event) {
-      var pagesizeParamKey = asyncTableId + '-pagesize';
-      var pageParamKey = asyncTableId + '-page';
-      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
-      url.searchParams.set(pagesizeParamKey, event.target.value);
-      url.searchParams.set(pageParamKey, 0);
-      updateTableFrom(url.href);
-    }
-
-    // fetches new sorted element from url with params and replaces contents of current element
-    function updateTableFrom(url, callback) {
-      if (!HttpClient) {
-        throw new Error('HttpClient not found!');
-      }
-
-      element.classList.add(ASYNC_TABLE_LOADING_CLASS);
-
-      var headers = {
-        'Accept': 'text/html',
-        [asyncTableHeader]: asyncTableId
-      };
-
-      HttpClient.get({
-        url: url,
-        headers: headers,
-        accept: HttpClient.ACCEPT.TEXT_HTML,
-      }).then(function(response) {
-        return HtmlHelpers.parseResponse(response);
-      }).then(function(response) {
-        setLocalStorageParameter('currentTableUrl', url.href);
-        // reset table
-        removeListeners();
-        element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
-        // update table with new
-        updateWrapperContents(response);
-
-        if (UtilRegistry) {
-          UtilRegistry.setupAll(element);
-        }
-
-        if (callback && typeof callback === 'function') {
-          setLocalStorageParameter('cssIdPrefix', response.idPrefix);
-          callback(element);
-          setLocalStorageParameter('cssIdPrefix', '');
-        }
-      }).catch(function(err) {
-        console.error(err);
-      }).finally(function() {
-        element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
-      });
-    }
-
-    function updateWrapperContents(response) {
-      var newPage = document.createElement('div');
-      newPage.appendChild(response.element);
-      var newWrapperContents = newPage.querySelector('#' + response.idPrefix + element.id);
-      element.innerHTML = newWrapperContents.innerHTML;
-    }
-
-    return init();
-  };
-
-  // returns any random nudged prefix found in the given id
-  function findCssIdPrefix(id) {
-    var matcher = /r\d*?__/;
-    var maybePrefix = id.match(matcher);
-    if (maybePrefix && maybePrefix[0]) {
-      return maybePrefix[0]
-    }
-    return '';
-  }
-
-  function setLocalStorageParameter(key, value) {
-    var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
-    if (value !== null) {
-      currentLSState[key] = value;
-    } else {
-      delete currentLSState[key];
-    }
-    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
deleted file mode 100644
index 1c207be34..000000000
--- a/static/js/utils/checkAll.js
+++ /dev/null
@@ -1,150 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * 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"]';
-
-  var CHECK_ALL_INITIALIZED_CLASS = 'check-all--initialized';
-
-  var checkAllUtil = function(element) {
-    var columns = [];
-    var checkboxColumn = [];
-    var checkAllCheckbox = null;
-
-    function init() {
-      if (!element) {
-        throw new Error('Check All utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(CHECK_ALL_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      gatherColumns();
-      setupCheckAllCheckbox();
-
-      // mark initialized
-      element.classList.add(CHECK_ALL_INITIALIZED_CLASS);
-
-      return {
-        name: CHECK_ALL_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    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'));
-        cells.forEach(function(cell, cellIndex) {
-          if (!cols[cellIndex]) {
-            cols[cellIndex] = [];
-          }
-          cols[cellIndex].push(cell);
-        });
-      });
-      columns = cols;
-    }
-
-    function findCheckboxColumn(columns) {
-      var checkboxColumnId = null;
-      columns.forEach(function(col, i) {
-        if (isCheckboxColumn(col)) {
-          checkboxColumnId = i;
-        }
-      });
-      return checkboxColumnId;
-    }
-
-    function isCheckboxColumn(col) {
-      var onlyCheckboxes = true;
-      col.forEach(function(cell) {
-        if (onlyCheckboxes && !cell.querySelector(CHECKBOX_SELECTOR)) {
-          onlyCheckboxes = false;
-        }
-      });
-      return onlyCheckboxes;
-    }
-
-    function setupCheckAllCheckbox() {
-      var checkboxColumnId = findCheckboxColumn(columns);
-      if (checkboxColumnId === null) {
-        return;
-      }
-
-      checkboxColumn = columns[checkboxColumnId];
-      var firstRow = element.querySelector('tr');
-      var th = Array.from(firstRow.querySelectorAll('th, td'))[checkboxColumnId];
-      checkAllCheckbox = document.createElement('input');
-      checkAllCheckbox.setAttribute('type', 'checkbox');
-      checkAllCheckbox.setAttribute('id', getCheckboxId());
-      th.insertBefore(checkAllCheckbox, th.firstChild);
-
-      // manually set up new checkbox
-      if (UtilRegistry) {
-        UtilRegistry.setup(UtilRegistry.find('checkbox'), th);
-      }
-
-      checkAllCheckbox.addEventListener('input', onCheckAllCheckboxInput);
-      setupCheckboxListeners();
-    }
-
-    function onCheckAllCheckboxInput() {
-      toggleAll(checkAllCheckbox.checked);
-    }
-
-    function setupCheckboxListeners() {
-      checkboxColumn
-        .map(function(cell) {
-          return cell.querySelector(CHECKBOX_SELECTOR);
-        })
-        .forEach(function(checkbox) {
-          checkbox.addEventListener('input', updateCheckAllCheckboxState);
-        });
-    }
-
-    function updateCheckAllCheckboxState() {
-      var allChecked = checkboxColumn.every(function(cell) {
-        return cell.querySelector(CHECKBOX_SELECTOR).checked;
-      })
-      checkAllCheckbox.checked = allChecked;
-    }
-
-    function toggleAll(checked) {
-      checkboxColumn.forEach(function(cell) {
-        cell.querySelector(CHECKBOX_SELECTOR).checked = checked;
-      });
-    }
-
-    return init();
-  };
-
-  // register check all checkbox util
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: CHECK_ALL_UTIL_NAME,
-      selector: CHECK_ALL_UTIL_SELECTOR,
-      setup: checkAllUtil
-    });
-  }
-})();
diff --git a/static/js/utils/form.js b/static/js/utils/form.js
deleted file mode 100644
index ed8b0fa9a..000000000
--- a/static/js/utils/form.js
+++ /dev/null
@@ -1,610 +0,0 @@
-(function() {
-  'use strict';
-
-  var formUtilities = [];
-
-  /**
-   *
-   * 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: [none]
-   *  (automatically setup on all form tags)
-   *
-   * 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>
-   */
-
-  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 reactiveSubmitButtonUtil = 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)) {
-        return false;
-      }
-
-      // 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 || !submitButtons.length) {
-        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() {},
-      };
-    }
-
-    function setupInputs() {
-      requiredInputs.forEach(function(el) {
-        var checkbox = el.getAttribute('type') === 'checkbox';
-        var eventType = checkbox ? 'change' : 'input';
-        el.addEventListener(eventType, function() {
-          updateButtonState();
-        });
-      });
-    }
-
-    function updateButtonState() {
-      if (inputsValid()) {
-        submitButton.removeAttribute('disabled');
-      } else {
-        submitButton.setAttribute('disabled', 'true');
-      }
-    }
-
-    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();
-  };
-
-  // 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,
-  // });
-
-  /**
-   *
-   * 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
-   *    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>
-   * ## 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>
-   * ## 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';
-  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 INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled])';
-
-  var interactiveFieldsetUtil = function(element) {
-    var conditionalInput;
-    var conditionalValue;
-    var target;
-    var childInputs;
-
-    function init() {
-      if (!element) {
-        throw new Error('Interactive Fieldset utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // 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.');
-      }
-
-      // param conditionalValue
-      if (!element.dataset.conditionalValue && !isCheckbox()) {
-        throw new Error('Interactive Fieldset needs a conditional value!');
-      }
-      conditionalValue = element.dataset.conditionalValue;
-
-      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));
-
-      // 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
-      updateVisibility();
-
-      // mark as initialized
-      element.classList.add(INTERACTIVE_FIELDSET_INITIALIZED_CLASS);
-
-      return {
-        name: INTERACTIVE_FIELDSET_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    function updateVisibility() {
-      var active = matchesConditionalValue() && !conditionalInput.disabled;
-
-      target.classList.toggle('hidden', !active);
-
-      childInputs.forEach(function(el) {
-        el.disabled = !active;
-        if (el._flatpickr) {
-          el._flatpickr.altInput.disabled = !active;
-        }
-      });
-    }
-
-    function matchesConditionalValue() {
-      if (isCheckbox()) {
-        return conditionalInput.checked === true;
-      }
-
-      return conditionalInput.value === conditionalValue;
-    }
-
-    function isCheckbox() {
-      return conditionalInput.getAttribute('type') === 'checkbox';
-    }
-
-    return init();
-  };
-
-  formUtilities.push({
-    name: INTERACTIVE_FIELDSET_UTIL_NAME,
-    selector: INTERACTIVE_FIELDSET_UTIL_SELECTOR,
-    setup: interactiveFieldsetUtil,
-  });
-
-  /**
-   *
-   * Navigate Away Prompt Utility
-   *  This utility asks the user if (s)he really wants to navigate away
-   *  from a page containing a form if (s)he already touched an input.
-   *  Form-Submits will not trigger the prompt.
-   *  Utility will ignore forms that contain auto submit elements (buttons, inputs).
-   *
-   * Attribute: [none]
-   *  (automatically setup on all form tags that dont automatically submit, see AutoSubmitButtonUtil)
-   *
-   * Example usage:
-   *  (any page with a form)
-   */
-
-  var NAVIGATE_AWAY_PROMPT_UTIL_NAME = 'navigateAwayPrompt';
-  var NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR = 'form';
-
-  var NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS = 'navigate-away-prompt--initialized';
-
-  var navigateAwayPromptUtil = function(element) {
-    var touched = false;
-    var unloadDueToSubmit = false;
-
-    function init() {
-      if (!element) {
-        throw new Error('Navigate Away Prompt utility needs to be passed an element!');
-      }
-
-      if (element.classList.contains(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // ignore forms that get submitted automatically
-      if (element.querySelector(AUTO_SUBMIT_BUTTON_UTIL_SELECTOR) || element.querySelector(AUTO_SUBMIT_INPUT_UTIL_SELECTOR)) {
-        return false;
-      }
-
-      window.addEventListener('beforeunload', beforeUnloadHandler);
-
-      element.addEventListener('submit', function() {
-        unloadDueToSubmit = true;
-      });
-      element.addEventListener('change', function() {
-        touched = true;
-        unloadDueToSubmit = false;
-      });
-
-      // mark initialized
-      element.classList.add(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS);
-
-      return {
-        name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
-        element: element,
-        destroy: function() {
-          window.removeEventListener('beforeunload', beforeUnloadHandler);
-        },
-      };
-    }
-
-    function beforeUnloadHandler(event) {
-      // allow the event to happen if the form was not touched by the
-      // user or the unload event was initiated by a form submit
-      if (!touched || unloadDueToSubmit) {
-        return false;
-      }
-
-      // cancel the unload event. This is the standard to force the prompt to appear.
-      event.preventDefault();
-      // for all non standard compliant browsers we return a truthy value to activate the prompt.
-      return true;
-    }
-
-    return init();
-  };
-
-  formUtilities.push({
-    name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
-    selector: NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR,
-    setup: navigateAwayPromptUtil,
-  });
-
-  /**
-   *
-   * 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
-   */
-
-  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!');
-    }
-
-    if (element.classList.contains(AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
-      return false;
-    }
-
-    // hide and mark initialized
-    element.classList.add(AUTO_SUBMIT_BUTTON_HIDDEN_CLASS, AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS);
-
-    return {
-      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,
-  });
-
-  /**
-   *
-   * Auto Submit Input Utility
-   *  Programmatically submits forms when a certain input changes value
-   *
-   * Attribute: uw-auto-submit-input
-   *
-   * Example usage:
-   *  <input type="text" uw-auto-submit-input />
-   */
-
-  var AUTO_SUBMIT_INPUT_UTIL_NAME = 'autoSubmitInput';
-  var AUTO_SUBMIT_INPUT_UTIL_SELECTOR = '[uw-auto-submit-input]';
-
-  var AUTO_SUBMIT_INPUT_INITIALIZED_CLASS = 'auto-submit-input--initialized';
-
-  var autoSubmitInputUtil = function(element) {
-    var form;
-    var debouncedHandler;
-
-    function autoSubmit() {
-      form.submit();
-    }
-
-    function init() {
-      if (!element) {
-        throw new Error('Auto Submit Input utility needs to be passed an element!');
-      }
-
-      if (element.classList.contains(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      form = element.form;
-      if (!form) {
-        throw new Error('Could not determine associated form for auto submit input');
-      }
-
-      debouncedHandler = debounce(autoSubmit, 500);
-
-      element.addEventListener('input', debouncedHandler);
-
-      element.classList.add(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS);
-
-      return {
-        name: AUTO_SUBMIT_INPUT_UTIL_NAME,
-        element: element,
-        destroy: function() {
-          element.removeEventListener('input', debouncedHandler);
-        },
-      };
-    }
-
-    return init();
-  };
-
-  formUtilities.push({
-    name: AUTO_SUBMIT_INPUT_UTIL_NAME,
-    selector: AUTO_SUBMIT_INPUT_UTIL_SELECTOR,
-    setup: autoSubmitInputUtil,
-  });
-
-  /**
-   *
-   * 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)
-   */
-
-  var FORM_ERROR_REMOVER_UTIL_NAME = 'formErrorRemover';
-  var FORM_ERROR_REMOVER_UTIL_SELECTOR = 'form';
-
-  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!');
-      }
-
-      if (element.classList.contains(FORM_ERROR_REMOVER_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // find form groups
-      formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
-
-      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 {
-        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,
-  });
-
-  /**
-   *
-   * 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_INITIALIZED_CLASS = 'datepicker--initialized';
-
-  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!');
-      }
-
-      if (element.classList.contains(DATEPICKER_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      var flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute("type")];
-
-      if (!flatpickrConfig) {
-        throw new Error('Datepicker utility called on unsupported element!');
-      }
-
-      flatpickrInstance = flatpickr(element, flatpickrConfig);
-
-      // mark initialized
-      element.classList.add(DATEPICKER_INITIALIZED_CLASS);
-
-      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,
-  });
-
-  // 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 the collected form utilities
-  if (UtilRegistry) {
-    formUtilities.forEach(UtilRegistry.register);
-  }
-
-})();
diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
deleted file mode 100644
index f90517e51..000000000
--- a/static/js/utils/inputs.js
+++ /dev/null
@@ -1,200 +0,0 @@
-(function() {
-  'use strict';
-
-  var inputUtilities = [];
-
-  /**
-   *
-   * FileInput Utility
-   *  wraps native file input
-   *
-   * Attribute: uw-file-input
-   *  (element must be an input of type='file')
-   *
-   * Example usage:
-   * <input type='file' uw-file-input>
-   *
-   * Internationalization:
-   *  This utility expects the following translations to be available:
-   *    »filesSelected«: label of multi-input button after selection
-   *      example: "Dateien ausgewählt" (will be prepended by number of selected files)
-   *    »selectFile«: label of single-input button before selection
-   *      example: "Datei auswählen"
-   *    »selectFiles«: label of multi-input button before selection
-   *      example: "Datei(en) auswählen"
-   *
-   */
-
-  var FILE_INPUT_UTIL_NAME = 'fileInput';
-  var FILE_INPUT_UTIL_SELECTOR = 'input[type="file"][uw-file-input]';
-
-  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 fileInputUtil = function(element) {
-    var isMultiFileInput = false;
-    var fileList;
-    var label;
-
-    function init() {
-      if (!element) {
-        throw new Error('FileInput utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(FILE_INPUT_INITIALIZED_CLASS)) {
-        throw new Error('FileInput utility already initialized!');
-      }
-
-      // check if is multi-file input
-      isMultiFileInput = element.hasAttribute('multiple');
-      if (isMultiFileInput) {
-        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_INPUT_CLASS, FILE_INPUT_INITIALIZED_CLASS);
-
-      return {
-        name: FILE_INPUT_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    function renderFileList() {
-      if (!fileList) {
-        return;
-      }
-
-      var files = element.files;
-      fileList.innerHTML = '';
-      Array.from(files).forEach(function(file) {
-        var fileDisplayEl = document.createElement('li');
-        fileDisplayEl.innerHTML = file.name;
-        fileList.appendChild(fileDisplayEl);
-      });
-    }
-
-    function createFileList() {
-      var list = document.createElement('ol');
-      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 {
-        element.parentElement.appendChild(list);
-      }
-      return list;
-    }
-
-    function createFileLabel() {
-      var label = document.createElement('label');
-      label.classList.add(FILE_INPUT_LABEL_CLASS);
-      label.setAttribute('for', element.id);
-      element.parentElement.insertBefore(label, element);
-      return label;
-    }
-
-    function updateLabel() {
-      var files = element.files;
-      if (files && files.length) {
-        label.innerText = isMultiFileInput ? files.length + ' ' + I18n.get('filesSelected') : files[0].name;
-      } else {
-        label.innerText = isMultiFileInput ? I18n.get('selectFiles') : I18n.get('selectFile');
-      }
-    }
-
-    return init();
-  }
-
-  inputUtilities.push({
-    name: FILE_INPUT_UTIL_NAME,
-    selector: FILE_INPUT_UTIL_SELECTOR,
-    setup: fileInputUtil,
-  })
-
-  /**
-   *
-   * Checkbox Utility
-   *  wraps native checkbox
-   *
-   * Attribute: (none)
-   *  (element must be an input of type="checkbox")
-   *
-   * Example usage:
-   * <input type="checkbox">
-   *
-   */
-
-  var CHECKBOX_UTIL_NAME = 'checkbox';
-  var CHECKBOX_UTIL_SELECTOR = 'input[type="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!');
-        return false;
-      }
-
-      if (element.parentElement.classList.contains(CHECKBOX_CLASS)) {
-        // throw new Error('Checkbox element\'s wrapper already has class "' + CHECKBOX_CLASS + '"!');
-        return false;
-      }
-
-      var siblingEl = element.nextSibling;
-      var parentEl = element.parentElement;
-
-      var wrapperEl = document.createElement('div');
-      wrapperEl.classList.add(CHECKBOX_CLASS);
-
-      var labelEl = document.createElement('label');
-      labelEl.setAttribute('for', element.id);
-
-      wrapperEl.appendChild(element);
-      wrapperEl.appendChild(labelEl);
-
-      parentEl.insertBefore(wrapperEl, siblingEl);
-
-      element.classList.add(CHECKBOX_INITIALIZED_CLASS);
-
-      return {
-        name: CHECKBOX_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    return init();
-  }
-
-  inputUtilities.push({
-    name: CHECKBOX_UTIL_NAME,
-    selector: CHECKBOX_UTIL_SELECTOR,
-    setup: checkboxUtil,
-  });
-
-  // register the collected input utilities
-  if (UtilRegistry) {
-    inputUtilities.forEach(UtilRegistry.register);
-  }
-})();
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
deleted file mode 100644
index 8dbccdca3..000000000
--- a/static/js/utils/massInput.js
+++ /dev/null
@@ -1,232 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * Mass Input Utility
-   *  allows form shapes to be manipulated asynchronously:
-   *  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
-   *
-   * Example usage:
-   *  <form method="POST" action="...">
-   *   <input type="text">
-   *   <div uw-mass-input>
-   *     <input type="text">
-   *     <button type="submit">
-   */
-
-  var MASS_INPUT_UTIL_NAME = 'massInput';
-  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_SUBMIT_BUTTON_CLASS = 'massinput__submit-button';
-  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!');
-      }
-
-      if (element.classList.contains(MASS_INPUT_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      massInputId = element.dataset.massInputIdent || '_';
-      massInputForm = element.closest('form');
-
-      if (!massInputForm) {
-        throw new Error('Mass Input utility cannot be setup without being wrapped in a <form>!');
-      }
-
-      massInputFormSubmitHandler = makeSubmitHandler();
-
-      // setup submit buttons inside this massinput so browser
-      // uses correct submit button for form submission.
-      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);
-
-      return {
-        name: MASS_INPUT_UTIL_NAME,
-        element: element,
-        destroy: function() {
-          reset();
-        },
-      };
-    }
-
-    function makeSubmitHandler() {
-      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) {
-        var activeElement;
-
-        // check if event occured from either a mass input add/delete button or
-        // from inside one of massinput's inputs (i.e. a child is focused/active)
-        activeElement = element.querySelector(':focus, :active');
-
-        if (!activeElement) {
-          return false;
-        }
-
-        // 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('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS);
-        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(submitButton, enctype);
-
-        if (requestFn && requestBody) {
-          var headers = {'Mass-Input-Shortcircuit': massInputId};
-
-          if (enctype !== 'multipart/form-data')
-            headers['Content-Type'] = enctype;
-
-          requestFn({
-            url: url,
-            headers: headers,
-            body: requestBody,
-            accept: HttpClient.ACCEPT.TEXT_HTML,
-          }).then(function(response) {
-            return HtmlHelpers.parseResponse(response);
-          }).then(function(response) {
-              processResponse(response.element);
-              if (isAddCell) {
-                reFocusAddCell();
-              }
-            });
-        }
-      };
-    }
-
-    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));
-    }
-
-    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(responseElement) {
-      element.innerHTML = "";
-      element.appendChild(responseElement);
-
-      reset();
-
-      if (UtilRegistry) {
-        UtilRegistry.setupAll(element);
-      }
-    }
-
-    function serializeForm(submitButton, enctype) {
-      var formData = new FormData(massInputForm);
-
-      // manually add name and value of submit button to formData
-      formData.append(submitButton.name, submitButton.value);
-
-      if (enctype === 'application/x-www-form-urlencoded') {
-        return new URLSearchParams(formData);
-      } else if (enctype === 'multipart/form-data') {
-        return formData;
-      } else {
-        throw new Error('Unsupported form enctype: ' + enctype);
-      }
-    }
-
-    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) {
-        // Clearing of add-inputs is done in the backend
-        addCellInput.focus();
-      }
-    }
-
-    function reset() {
-      element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
-      massInputForm.removeEventListener('submit', massInputFormSubmitHandler)
-      massInputForm.removeEventListener('keypress', keypressHandler);
-
-      var buttons = getMassInputSubmitButtons();
-      buttons.forEach(function(button) {
-        resetSubmitButton(button);
-      });
-    }
-
-    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/static/js/utils/modal.js b/static/js/utils/modal.js
deleted file mode 100644
index 6710c0854..000000000
--- a/static/js/utils/modal.js
+++ /dev/null
@@ -1,212 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   *
-   * 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 MODAL_HEADERS = {
-    'Is-Modal': 'True',
-  };
-
-  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';
-
-  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 modalsWrapper;
-    var modalOverlay;
-    var modalUrl;
-
-    function _init() {
-      if (!element) {
-        throw new Error('Modal utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(MODAL_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      ensureModalWrapper();
-
-      // param modalTrigger
-      if (!element.dataset.modalTrigger) {
-        throw new Error('Modal utility cannot be setup without a trigger element!');
-      } else {
-        setupTrigger();
-      }
-
-      // param modalCloseable
-      if (element.dataset.modalCloseable !== undefined) {
-        setupCloser();
-      }
-
-      // 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 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('#')) {
-        triggerSelector = '#' + triggerSelector;
-      }
-      var triggerElement = document.querySelector(triggerSelector);
-
-      if (!triggerElement) {
-        throw new Error('Trigger element for Modal not found: "' + triggerSelector + '"');
-      }
-
-      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);
-      modalOverlay.addEventListener('click', onCloseClicked, false);
-    }
-
-    function onTriggerClicked(event) {
-      event.preventDefault();
-      open();
-    }
-
-    function onCloseClicked(event) {
-      event.preventDefault();
-      close();
-    }
-
-    function onKeyUp(event) {
-      if (event.key === 'Escape') {
-        close();
-      }
-    }
-
-    function open() {
-      element.classList.add(MODAL_OPEN_CLASS);
-      modalOverlay.classList.add(MODAL_OVERLAY_OPEN_CLASS);
-      modalsWrapper.classList.add(MODALS_WRAPPER_OPEN_CLASS);
-      modalsWrapper.appendChild(element);
-
-      if (modalUrl) {
-        fillModal(modalUrl);
-      }
-
-      document.addEventListener('keyup', onKeyUp);
-    }
-
-    function close() {
-      modalOverlay.classList.remove(MODAL_OVERLAY_OPEN_CLASS);
-      element.classList.remove(MODAL_OPEN_CLASS);
-      modalsWrapper.classList.remove(MODALS_WRAPPER_OPEN_CLASS);
-
-      document.removeEventListener('keyup', onKeyUp);
-    };
-
-    function fillModal(url) {
-      if (!HttpClient) {
-        throw new Error('HttpClient not found! Can\'t fetch modal content from ' + url);
-      }
-
-      HttpClient.get({
-        url: url,
-        headers: MODAL_HEADERS,
-        accept: HttpClient.ACCEPT.TEXT_HTML,
-      }).then(function(response) {
-        return HtmlHelpers.parseResponse(response);
-      }).then(function(response) {
-        processResponse(response.element);
-      });
-    }
-
-    function processResponse(responseElement) {
-      var modalContent = document.createElement('div');
-      modalContent.classList.add(MODAL_CONTENT_CLASS);
-
-      var contentBody = responseElement.querySelector('.' + MAIN_CONTENT_CLASS);
-
-      if (contentBody) {
-        modalContent.innerHTML = contentBody.innerHTML;
-      }
-
-      var previousModalContent = element.querySelector('.' + MODAL_CONTENT_CLASS);
-      if (previousModalContent) {
-        previousModalContent.remove();
-      }
-
-      element.insertBefore(modalContent, null);
-
-      // setup any newly arrived utils
-      UtilRegistry.setupAll(element);
-    }
-
-    return _init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: MODAL_UTIL_NAME,
-      selector: MODAL_UTIL_SELECTOR,
-      setup: modalUtil
-    });
-  }
-})();
diff --git a/static/js/utils/showHide.js b/static/js/utils/showHide.js
deleted file mode 100644
index e2b25e200..000000000
--- a/static/js/utils/showHide.js
+++ /dev/null
@@ -1,114 +0,0 @@
-(function() {
-  'use strict';
-
-  var SHOW_HIDE_UTIL_NAME = 'showHide';
-  var SHOW_HIDE_UTIL_SELECTOR = '[uw-show-hide]';
-
-  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>Click me
-   *   <div>This will be toggled
-   *   <div>This will be toggled as well
-   */
-  var showHideUtil = function(element) {
-
-    var showHideId;
-
-    function init() {
-      if (!element) {
-        throw new Error('ShowHide utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(SHOW_HIDE_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // 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 addClickListener() {
-      element.addEventListener('click', function clickListener() {
-        var newState = element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
-
-        if (showHideId) {
-          setLocalStorage(showHideId, newState);
-        }
-      });
-    }
-
-    function setLocalStorage(id, state) {
-      var lsData = getLocalStorage();
-      lsData[id] = state;
-      window.localStorage.setItem(SHOW_HIDE_LOCAL_STORAGE_KEY, JSON.stringify(lsData));
-    }
-
-    function getLocalStorage() {
-      return JSON.parse(window.localStorage.getItem(SHOW_HIDE_LOCAL_STORAGE_KEY)) || {};
-    }
-
-    return init();
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: SHOW_HIDE_UTIL_NAME,
-      selector: SHOW_HIDE_UTIL_SELECTOR,
-      setup: showHideUtil
-    });
-  }
-
-})();
diff --git a/static/js/utils/tabber.js b/static/js/utils/tabber.js
deleted file mode 100644
index 38fb43578..000000000
--- a/static/js/utils/tabber.js
+++ /dev/null
@@ -1,90 +0,0 @@
-(function($) {
-
-  document.addEventListener('DOMContentLoaded', function() {
-    'use strict';
-
-    // define plugin
-    $.fn.tabgroup = function() {
-
-      var $this = $(this);
-      var $openers = $('<div class="tab-group-openers"></div>');
-      $this.prepend($openers);
-
-      var openedByDefault = $this.data('tab-open') || 0;
-      var tabs = [];
-      var currentTab = {};
-
-      $this.find('.tab').each(function(i, t) {
-        var tab = $(t);
-        tab.data('tab-index', i);
-        var tabName = tab.data('tab-name') || 'Tab '+i;
-        var tabFile = tab.data('tab-file') || false;
-        var $opener = makeOpener(tabName, i);
-        $openers.append($opener);
-        if (tab.find('.tab-title')) {
-          tab.find('.tab-title').remove();
-        }
-        tab.hide();
-        var loaded = false;
-        tabs.push({index: i, name: tabName, file: tabFile, dom: tab, opener: $opener, loaded: false});
-      });
-
-      $this.on('click', 'a[href^="#"]', function(event) {
-        var $target = $(event.currentTarget);
-        var tab = getTabByName($target.attr('href').replace('#', ''));
-        if ( tab ) {
-          showTab(tab.index);
-        }
-        event.preventDefault();
-      });
-
-      function getTabByName(name) {
-        var it = -1;
-        $.each(tabs, function(i, t) {
-          if ( t.name.toLowerCase() === name.toLowerCase() ) {
-            it = i;
-          }
-        });
-        if ( it >= 0 ) {
-          return tabs[it];
-        } else {
-          return false;
-        }
-      }
-
-      function makeOpener(tabName, i) {
-        return $('<span class="tab-opener">'+tabName+'</span>').
-                on('click', function() {
-                  showTab(i);
-                });
-      }
-
-      function showTab(i) {
-        tabs.forEach(function(t) {
-          t.dom.hide();
-          t.opener.removeClass('tab-visible');
-        });
-        currentTab = tabs[i];
-        if ( !currentTab.loaded && currentTab.file ){
-          $.get(currentTab.file, function(res) {
-            currentTab.dom.html(res);
-            currentTab.loaded = true;
-          });
-        }
-        currentTab.opener.addClass('tab-visible');
-        currentTab.dom.show();
-      }
-
-      showTab(openedByDefault);
-      currentTab = tabs[openedByDefault];
-
-    };
-
-    // apply plugin to all available tab-groups if on wide screen
-    if (window.innerWidth > 768) {
-      $('.tab-group').each(function(i, t) {
-        $(t).tabgroup();
-      });
-    }
-  });
-})($);
diff --git a/static/js/vendor/flatpickr.js b/static/js/vendor/flatpickr.js
deleted file mode 100644
index 226f63df3..000000000
--- a/static/js/vendor/flatpickr.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* flatpickr v4.4.4,, @license MIT */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.flatpickr=t()}(this,function(){"use strict";var Z=function(e){return("0"+e).slice(-2)},Q=function(e){return!0===e?1:0};function X(n,a,i){var o;return void 0===i&&(i=!1),function(){var e=this,t=arguments;null!==o&&clearTimeout(o),o=window.setTimeout(function(){o=null,i||n.apply(e,t)},a),i&&!o&&n.apply(e,t)}}var ee=function(e){return e instanceof Array?e:[e]},e=function(){},te=function(e,t,n){return n.months[t?"shorthand":"longhand"][e]},D={D:e,F:function(e,t,n){e.setMonth(n.months.longhand.indexOf(t))},G:function(e,t){e.setHours(parseFloat(t))},H:function(e,t){e.setHours(parseFloat(t))},J:function(e,t){e.setDate(parseFloat(t))},K:function(e,t,n){e.setHours(e.getHours()%12+12*Q(new RegExp(n.amPM[1],"i").test(t)))},M:function(e,t,n){e.setMonth(n.months.shorthand.indexOf(t))},S:function(e,t){e.setSeconds(parseFloat(t))},U:function(e,t){return new Date(1e3*parseFloat(t))},W:function(e,t){var n=parseInt(t);return new Date(e.getFullYear(),0,2+7*(n-1),0,0,0,0)},Y:function(e,t){e.setFullYear(parseFloat(t))},Z:function(e,t){return new Date(t)},d:function(e,t){e.setDate(parseFloat(t))},h:function(e,t){e.setHours(parseFloat(t))},i:function(e,t){e.setMinutes(parseFloat(t))},j:function(e,t){e.setDate(parseFloat(t))},l:e,m:function(e,t){e.setMonth(parseFloat(t)-1)},n:function(e,t){e.setMonth(parseFloat(t)-1)},s:function(e,t){e.setSeconds(parseFloat(t))},w:e,y:function(e,t){e.setFullYear(2e3+parseFloat(t))}},ne={D:"(\\w+)",F:"(\\w+)",G:"(\\d\\d|\\d)",H:"(\\d\\d|\\d)",J:"(\\d\\d|\\d)\\w+",K:"",M:"(\\w+)",S:"(\\d\\d|\\d)",U:"(.+)",W:"(\\d\\d|\\d)",Y:"(\\d{4})",Z:"(.+)",d:"(\\d\\d|\\d)",h:"(\\d\\d|\\d)",i:"(\\d\\d|\\d)",j:"(\\d\\d|\\d)",l:"(\\w+)",m:"(\\d\\d|\\d)",n:"(\\d\\d|\\d)",s:"(\\d\\d|\\d)",w:"(\\d\\d|\\d)",y:"(\\d{2})"},c={Z:function(e){return e.toISOString()},D:function(e,t,n){return t.weekdays.shorthand[c.w(e,t,n)]},F:function(e,t,n){return te(c.n(e,t,n)-1,!1,t)},G:function(e,t,n){return Z(c.h(e,t,n))},H:function(e){return Z(e.getHours())},J:function(e,t){return void 0!==t.ordinal?e.getDate()+t.ordinal(e.getDate()):e.getDate()},K:function(e,t){return t.amPM[Q(11<e.getHours())]},M:function(e,t){return te(e.getMonth(),!0,t)},S:function(e){return Z(e.getSeconds())},U:function(e){return e.getTime()/1e3},W:function(e,t,n){return n.getWeek(e)},Y:function(e){return e.getFullYear()},d:function(e){return Z(e.getDate())},h:function(e){return e.getHours()%12?e.getHours()%12:12},i:function(e){return Z(e.getMinutes())},j:function(e){return e.getDate()},l:function(e,t){return t.weekdays.longhand[e.getDay()]},m:function(e){return Z(e.getMonth()+1)},n:function(e){return e.getMonth()+1},s:function(e){return e.getSeconds()},w:function(e){return e.getDay()},y:function(e){return String(e.getFullYear()).substring(2)}},ae={weekdays:{shorthand:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],longhand:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]},months:{shorthand:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],longhand:["January","February","March","April","May","June","July","August","September","October","November","December"]},daysInMonth:[31,28,31,30,31,30,31,31,30,31,30,31],firstDayOfWeek:0,ordinal:function(e){var t=e%100;if(3<t&&t<21)return"th";switch(t%10){case 1:return"st";case 2:return"nd";case 3:return"rd";default:return"th"}},rangeSeparator:" to ",weekAbbreviation:"Wk",scrollTitle:"Scroll to increment",toggleTitle:"Click to toggle",amPM:["AM","PM"],yearAriaLabel:"Year"},ie=function(e){var t=e.config,o=void 0===t?b:t,n=e.l10n,r=void 0===n?ae:n;return function(a,e,t){if(void 0!==o.formatDate)return o.formatDate(a,e);var i=t||r;return e.split("").map(function(e,t,n){return c[e]&&"\\"!==n[t-1]?c[e](a,i,o):"\\"!==e?e:""}).join("")}},oe=function(e){var t=e.config,h=void 0===t?b:t,n=e.l10n,v=void 0===n?ae:n;return function(e,t,n){if(0===e||e){var a,i=e;if(e instanceof Date)a=new Date(e.getTime());else if("string"!=typeof e&&void 0!==e.toFixed)a=new Date(e);else if("string"==typeof e){var o=t||(h||b).dateFormat,r=String(e).trim();if("today"===r)a=new Date,n=!0;else if(/Z$/.test(r)||/GMT$/.test(r))a=new Date(e);else if(h&&h.parseDate)a=h.parseDate(e,o);else{a=h&&h.noCalendar?new Date((new Date).setHours(0,0,0,0)):new Date((new Date).getFullYear(),0,1,0,0,0,0);for(var c,l=[],d=0,s=0,u="";d<o.length;d++){var f=o[d],m="\\"===f,g="\\"===o[d-1]||m;if(ne[f]&&!g){u+=ne[f];var p=new RegExp(u).exec(e);p&&(c=!0)&&l["Y"!==f?"push":"unshift"]({fn:D[f],val:p[++s]})}else m||(u+=".");l.forEach(function(e){var t=e.fn,n=e.val;return a=t(a,n,v)||a})}a=c?a:void 0}}if(a instanceof Date)return!0===n&&a.setHours(0,0,0,0),a;h.errorHandler(new Error("Invalid date provided: "+i))}}};function re(e,t,n){return void 0===n&&(n=!0),!1!==n?new Date(e.getTime()).setHours(0,0,0,0)-new Date(t.getTime()).setHours(0,0,0,0):e.getTime()-t.getTime()}var ce=function(e,t,n){return e>Math.min(t,n)&&e<Math.max(t,n)},le={DAY:864e5},b={_disable:[],_enable:[],allowInput:!1,altFormat:"F j, Y",altInput:!1,altInputClass:"form-control input",animate:"object"==typeof window&&-1===window.navigator.userAgent.indexOf("MSIE"),ariaDateFormat:"F j, Y",clickOpens:!0,closeOnSelect:!0,conjunction:", ",dateFormat:"Y-m-d",defaultHour:12,defaultMinute:0,defaultSeconds:0,disable:[],disableMobile:!1,enable:[],enableSeconds:!1,enableTime:!1,errorHandler:function(e){return"undefined"!=typeof console&&console.warn(e)},getWeek:function(e){var t=new Date(e.getTime());t.setHours(0,0,0,0),t.setDate(t.getDate()+3-(t.getDay()+6)%7);var n=new Date(t.getFullYear(),0,4);return 1+Math.round(((t.getTime()-n.getTime())/864e5-3+(n.getDay()+6)%7)/7)},hourIncrement:1,ignoredFocusElements:[],inline:!1,locale:"default",minuteIncrement:5,mode:"single",nextArrow:"<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M13.207 8.472l-7.854 7.854-0.707-0.707 7.146-7.146-7.146-7.148 0.707-0.707 7.854 7.854z' /></svg>",noCalendar:!1,now:new Date,onChange:[],onClose:[],onDayCreate:[],onDestroy:[],onKeyDown:[],onMonthChange:[],onOpen:[],onParseConfig:[],onReady:[],onValueUpdate:[],onYearChange:[],onPreCalendarPosition:[],plugins:[],position:"auto",positionElement:void 0,prevArrow:"<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M5.207 8.471l7.146 7.147-0.707 0.707-7.853-7.854 7.854-7.853 0.707 0.707-7.147 7.146z' /></svg>",shorthandCurrentMonth:!1,showMonths:1,static:!1,time_24hr:!1,weekNumbers:!1,wrap:!1};function de(e,t,n){if(!0===n)return e.classList.add(t);e.classList.remove(t)}function se(e,t,n){var a=window.document.createElement(e);return t=t||"",n=n||"",a.className=t,void 0!==n&&(a.textContent=n),a}function ue(e){for(;e.firstChild;)e.removeChild(e.firstChild)}function fe(e,t){var n=se("div","numInputWrapper"),a=se("input","numInput "+e),i=se("span","arrowUp"),o=se("span","arrowDown");if(a.type="text",a.pattern="\\d*",void 0!==t)for(var r in t)a.setAttribute(r,t[r]);return n.appendChild(a),n.appendChild(i),n.appendChild(o),n}"function"!=typeof Object.assign&&(Object.assign=function(n){if(!n)throw TypeError("Cannot convert undefined or null to object");for(var e=arguments.length,t=new Array(1<e?e-1:0),a=1;a<e;a++)t[a-1]=arguments[a];for(var i=function(t){t&&Object.keys(t).forEach(function(e){return n[e]=t[e]})},o=0;o<t.length;o++){i(t[o])}return n});var me=300;function r(s,u){var D={config:Object.assign({},ge.defaultConfig),l10n:ae};function f(e){return e.bind(D)}function t(){if(void 0!==D.daysContainer){D.calendarContainer.style.visibility="hidden",D.calendarContainer.style.display="block";var e=(D.days.offsetWidth+1)*D.config.showMonths;D.daysContainer.style.width=e+"px",D.calendarContainer.style.width=e+"px",void 0!==D.weekWrapper&&(D.calendarContainer.style.width=e+D.weekWrapper.offsetWidth+"px"),D.calendarContainer.style.removeProperty("visibility"),D.calendarContainer.style.removeProperty("display")}}function d(e){0!==D.selectedDates.length&&(!function(e){e.preventDefault();var t="keydown"===e.type,n=e.target;void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[Q(D.amPM.textContent===D.l10n.amPM[0])]);var a=parseFloat(n.getAttribute("data-min")),i=parseFloat(n.getAttribute("data-max")),o=parseFloat(n.getAttribute("data-step")),r=parseInt(n.value,10),c=e.delta||(t?38===e.which?1:-1:0),l=r+o*c;if(void 0!==n.value&&2===n.value.length){var d=n===D.hourElement,s=n===D.minuteElement;l<a?(l=i+l+Q(!d)+(Q(d)&&Q(!D.amPM)),s&&h(void 0,-1,D.hourElement)):i<l&&(l=n===D.hourElement?l-i-Q(!D.amPM):a,s&&h(void 0,1,D.hourElement)),D.amPM&&d&&(1===o?l+r===23:Math.abs(l-r)>o)&&(D.amPM.textContent=D.l10n.amPM[Q(D.amPM.textContent===D.l10n.amPM[0])]),n.value=Z(l)}}(e),"input"!==e.type?(m(),G()):setTimeout(function(){m(),G()},me))}function m(){if(void 0!==D.hourElement&&void 0!==D.minuteElement){var e,t,n=(parseInt(D.hourElement.value.slice(-2),10)||0)%24,a=(parseInt(D.minuteElement.value,10)||0)%60,i=void 0!==D.secondElement?(parseInt(D.secondElement.value,10)||0)%60:0;void 0!==D.amPM&&(e=n,t=D.amPM.textContent,n=e%12+12*Q(t===D.l10n.amPM[1]));var o=void 0!==D.config.minTime||D.config.minDate&&D.minDateHasTime&&D.latestSelectedDateObj&&0===re(D.latestSelectedDateObj,D.config.minDate,!0);if(void 0!==D.config.maxTime||D.config.maxDate&&D.maxDateHasTime&&D.latestSelectedDateObj&&0===re(D.latestSelectedDateObj,D.config.maxDate,!0)){var r=void 0!==D.config.maxTime?D.config.maxTime:D.config.maxDate;(n=Math.min(n,r.getHours()))===r.getHours()&&(a=Math.min(a,r.getMinutes())),a===r.getMinutes()&&(i=Math.min(i,r.getSeconds()))}if(o){var c=void 0!==D.config.minTime?D.config.minTime:D.config.minDate;(n=Math.max(n,c.getHours()))===c.getHours()&&(a=Math.max(a,c.getMinutes())),a===c.getMinutes()&&(i=Math.max(i,c.getSeconds()))}l(n,a,i)}}function g(e){var t=e||D.latestSelectedDateObj;t&&l(t.getHours(),t.getMinutes(),t.getSeconds())}function l(e,t,n){void 0!==D.latestSelectedDateObj&&D.latestSelectedDateObj.setHours(e%24,t,n||0,0),D.hourElement&&D.minuteElement&&!D.isMobile&&(D.hourElement.value=Z(D.config.time_24hr?e:(12+e)%12+12*Q(e%12==0)),D.minuteElement.value=Z(t),void 0!==D.amPM&&(D.amPM.textContent=D.l10n.amPM[Q(12<=e)]),void 0!==D.secondElement&&(D.secondElement.value=Z(n)))}function n(e){var t=parseInt(e.target.value)+(e.delta||0);4!==t.toString().length&&"Enter"!==e.key||(e.target.blur(),/[^\d]/.test(t.toString())||S(t))}function o(t,n,a,i){return n instanceof Array?n.forEach(function(e){return o(t,e,a,i)}):t instanceof Array?t.forEach(function(e){return o(e,n,a,i)}):(t.addEventListener(n,a,i),void D._handlers.push({element:t,event:n,handler:a}))}function a(t){return function(e){1===e.which&&t(e)}}function p(){U("onChange")}function i(e){var t=void 0!==e?D.parseDate(e):D.latestSelectedDateObj||(D.config.minDate&&D.config.minDate>D.now?D.config.minDate:D.config.maxDate&&D.config.maxDate<D.now?D.config.maxDate:D.now);try{void 0!==t&&(D.currentYear=t.getFullYear(),D.currentMonth=t.getMonth())}catch(e){e.message="Invalid date supplied: "+t,D.config.errorHandler(e)}D.redraw()}function r(e){~e.target.className.indexOf("arrow")&&h(e,e.target.classList.contains("arrowUp")?1:-1)}function h(e,t,n){var a=e&&e.target,i=n||a&&a.parentNode&&a.parentNode.firstChild,o=q("increment");o.delta=t,i&&i.dispatchEvent(o)}function v(e,t,n,a){var i,o=P(t,!0),r=se("span","flatpickr-day "+e,t.getDate().toString());return r.dateObj=t,r.$i=a,r.setAttribute("aria-label",D.formatDate(t,D.config.ariaDateFormat)),-1===e.indexOf("hidden")&&0===re(t,D.now)&&((D.todayDateElem=r).classList.add("today"),r.setAttribute("aria-current","date")),o?(r.tabIndex=-1,$(t)&&(r.classList.add("selected"),D.selectedDateElem=r,"range"===D.config.mode&&(de(r,"startRange",D.selectedDates[0]&&0===re(t,D.selectedDates[0],!0)),de(r,"endRange",D.selectedDates[1]&&0===re(t,D.selectedDates[1],!0)),"nextMonthDay"===e&&r.classList.add("inRange")))):r.classList.add("disabled"),"range"===D.config.mode&&(i=t,!("range"!==D.config.mode||D.selectedDates.length<2)&&0<=re(i,D.selectedDates[0])&&re(i,D.selectedDates[1])<=0&&!$(t)&&r.classList.add("inRange")),D.weekNumbers&&1===D.config.showMonths&&"prevMonthDay"!==e&&n%7==1&&D.weekNumbers.insertAdjacentHTML("beforeend","<span class='flatpickr-day'>"+D.config.getWeek(t)+"</span>"),U("onDayCreate",r),r}function b(e){e.focus(),"range"===D.config.mode&&A(e)}function w(e){for(var t=0<e?0:D.config.showMonths-1,n=0<e?D.config.showMonths:-1,a=t;a!=n;a+=e)for(var i=D.daysContainer.children[a],o=0<e?0:i.children.length-1,r=0<e?i.children.length:-1,c=o;c!=r;c+=e){var l=i.children[c];if(-1===l.className.indexOf("hidden")&&P(l.dateObj))return l}}function M(e,t){var n=_(document.activeElement),a=void 0!==e?e:n?document.activeElement:void 0!==D.selectedDateElem&&_(D.selectedDateElem)?D.selectedDateElem:void 0!==D.todayDateElem&&_(D.todayDateElem)?D.todayDateElem:w(0<t?1:-1);return void 0===a?D._input.focus():n?void function(e,t){for(var n=-1===e.className.indexOf("Month")?e.dateObj.getMonth():D.currentMonth,a=0<t?D.config.showMonths:-1,i=0<t?1:-1,o=n-D.currentMonth;o!=a;o+=i)for(var r=D.daysContainer.children[o],c=n-D.currentMonth===o?e.$i+t:t<0?r.children.length-1:0,l=r.children.length,d=c;0<=d&&d<l&&d!=(0<t?l:-1);d+=i){var s=r.children[d];if(-1===s.className.indexOf("hidden")&&P(s.dateObj)&&Math.abs(e.$i-d)>=Math.abs(t))return b(s)}D.changeMonth(i),M(w(i),0)}(a,t):b(a)}function c(e,t){for(var n=(new Date(e,t,1).getDay()-D.l10n.firstDayOfWeek+7)%7,a=D.utils.getDaysInMonth((t-1+12)%12),i=D.utils.getDaysInMonth(t),o=window.document.createDocumentFragment(),r=1<D.config.showMonths,c=r?"prevMonthDay hidden":"prevMonthDay",l=r?"nextMonthDay hidden":"nextMonthDay",d=a+1-n,s=0;d<=a;d++,s++)o.appendChild(v(c,new Date(e,t-1,d),d,s));for(d=1;d<=i;d++,s++)o.appendChild(v("",new Date(e,t,d),d,s));for(var u=i+1;u<=42-n&&(1===D.config.showMonths||s%7!=0);u++,s++)o.appendChild(v(l,new Date(e,t+1,u%i),u,s));var f=se("div","dayContainer");return f.appendChild(o),f}function C(){if(void 0!==D.daysContainer){ue(D.daysContainer),D.weekNumbers&&ue(D.weekNumbers);for(var e=document.createDocumentFragment(),t=0;t<D.config.showMonths;t++){var n=new Date(D.currentYear,D.currentMonth,1);n.setMonth(D.currentMonth+t),e.appendChild(c(n.getFullYear(),n.getMonth()))}D.daysContainer.appendChild(e),D.days=D.daysContainer.firstChild}}function y(){var e=se("div","flatpickr-month"),t=window.document.createDocumentFragment(),n=se("span","cur-month");n.title=D.l10n.scrollTitle;var a=fe("cur-year",{tabindex:"-1"}),i=a.childNodes[0];i.title=D.l10n.scrollTitle,i.setAttribute("aria-label",D.l10n.yearAriaLabel),D.config.minDate&&i.setAttribute("data-min",D.config.minDate.getFullYear().toString()),D.config.maxDate&&(i.setAttribute("data-max",D.config.maxDate.getFullYear().toString()),i.disabled=!!D.config.minDate&&D.config.minDate.getFullYear()===D.config.maxDate.getFullYear());var o=se("div","flatpickr-current-month");return o.appendChild(n),o.appendChild(a),t.appendChild(o),e.appendChild(t),{container:e,yearElement:i,monthElement:n}}function x(){ue(D.monthNav),D.monthNav.appendChild(D.prevMonthNav);for(var e=D.config.showMonths;e--;){var t=y();D.yearElements.push(t.yearElement),D.monthElements.push(t.monthElement),D.monthNav.appendChild(t.container)}D.monthNav.appendChild(D.nextMonthNav)}function E(){D.weekdayContainer?ue(D.weekdayContainer):D.weekdayContainer=se("div","flatpickr-weekdays");for(var e=D.config.showMonths;e--;){var t=se("div","flatpickr-weekdaycontainer");D.weekdayContainer.appendChild(t)}return T(),D.weekdayContainer}function T(){var e=D.l10n.firstDayOfWeek,t=D.l10n.weekdays.shorthand.concat();0<e&&e<t.length&&(t=t.splice(e,t.length).concat(t.splice(0,e)));for(var n=D.config.showMonths;n--;)D.weekdayContainer.children[n].innerHTML="\n      <span class=flatpickr-weekday>\n        "+t.join("</span><span class=flatpickr-weekday>")+"\n      </span>\n      "}function k(e,t){void 0===t&&(t=!0);var n=t?e:e-D.currentMonth;n<0&&!0===D._hidePrevMonthArrow||0<n&&!0===D._hideNextMonthArrow||(D.currentMonth+=n,(D.currentMonth<0||11<D.currentMonth)&&(D.currentYear+=11<D.currentMonth?1:-1,D.currentMonth=(D.currentMonth+12)%12,U("onYearChange")),C(),U("onMonthChange"),z())}function I(e){return!(!D.config.appendTo||!D.config.appendTo.contains(e))||D.calendarContainer.contains(e)}function O(t){if(D.isOpen&&!D.config.inline){var e=I(t.target),n=t.target===D.input||t.target===D.altInput||D.element.contains(t.target)||t.path&&t.path.indexOf&&(~t.path.indexOf(D.input)||~t.path.indexOf(D.altInput)),a="blur"===t.type?n&&t.relatedTarget&&!I(t.relatedTarget):!n&&!e,i=!D.config.ignoredFocusElements.some(function(e){return e.contains(t.target)});a&&i&&(D.close(),"range"===D.config.mode&&1===D.selectedDates.length&&(D.clear(!1),D.redraw()))}}function S(e){if(!(!e||D.config.minDate&&e<D.config.minDate.getFullYear()||D.config.maxDate&&e>D.config.maxDate.getFullYear())){var t=e,n=D.currentYear!==t;D.currentYear=t||D.currentYear,D.config.maxDate&&D.currentYear===D.config.maxDate.getFullYear()?D.currentMonth=Math.min(D.config.maxDate.getMonth(),D.currentMonth):D.config.minDate&&D.currentYear===D.config.minDate.getFullYear()&&(D.currentMonth=Math.max(D.config.minDate.getMonth(),D.currentMonth)),n&&(D.redraw(),U("onYearChange"))}}function P(e,t){void 0===t&&(t=!0);var n=D.parseDate(e,void 0,t);if(D.config.minDate&&n&&re(n,D.config.minDate,void 0!==t?t:!D.minDateHasTime)<0||D.config.maxDate&&n&&0<re(n,D.config.maxDate,void 0!==t?t:!D.maxDateHasTime))return!1;if(0===D.config.enable.length&&0===D.config.disable.length)return!0;if(void 0===n)return!1;for(var a,i=0<D.config.enable.length,o=i?D.config.enable:D.config.disable,r=0;r<o.length;r++){if("function"==typeof(a=o[r])&&a(n))return i;if(a instanceof Date&&void 0!==n&&a.getTime()===n.getTime())return i;if("string"==typeof a&&void 0!==n){var c=D.parseDate(a,void 0,!0);return c&&c.getTime()===n.getTime()?i:!i}if("object"==typeof a&&void 0!==n&&a.from&&a.to&&n.getTime()>=a.from.getTime()&&n.getTime()<=a.to.getTime())return i}return!i}function _(e){return void 0!==D.daysContainer&&(-1===e.className.indexOf("hidden")&&D.daysContainer.contains(e))}function F(e){e.stopPropagation();var t=e.target===D._input,n=I(e.target),a=D.config.allowInput,i=D.isOpen&&(!a||!t),o=D.config.inline&&t&&!a;if(13===e.keyCode&&t){if(a)return D.setDate(D._input.value,!0,e.target===D.altInput?D.config.altFormat:D.config.dateFormat),e.target.blur();D.open()}else if(n||i||o){var r=!!D.timeContainer&&D.timeContainer.contains(e.target);switch(e.keyCode){case 13:r?G():R(e);break;case 27:e.preventDefault(),W();break;case 8:case 46:t&&!D.config.allowInput&&(e.preventDefault(),D.clear());break;case 37:case 39:if(r)D.hourElement&&D.hourElement.focus();else if(e.preventDefault(),void 0!==D.daysContainer&&!1===D.config.allowInput){var c=39===e.keyCode?1:-1;e.ctrlKey?(k(c),M(w(1),0)):M(void 0,c)}break;case 38:case 40:e.preventDefault();var l=40===e.keyCode?1:-1;D.daysContainer?e.ctrlKey?(S(D.currentYear-l),M(w(1),0)):r||M(void 0,7*l):D.config.enableTime&&(!r&&D.hourElement&&D.hourElement.focus(),d(e),D._debouncedChange());break;case 9:e.target===D.hourElement?(e.preventDefault(),D.minuteElement.select()):e.target===D.minuteElement&&(D.secondElement||D.amPM)?(e.preventDefault(),void 0!==D.secondElement?D.secondElement.focus():void 0!==D.amPM&&D.amPM.focus()):e.target===D.secondElement&&D.amPM&&(e.preventDefault(),D.amPM.focus())}switch(e.key){case D.l10n.amPM[0].charAt(0):case D.l10n.amPM[0].charAt(0).toLowerCase():void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[0],m(),G());break;case D.l10n.amPM[1].charAt(0):case D.l10n.amPM[1].charAt(0).toLowerCase():void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[1],m(),G())}U("onKeyDown",e)}}function A(o){if(1===D.selectedDates.length&&o.classList.contains("flatpickr-day")&&!o.classList.contains("disabled")){for(var r=o.dateObj.getTime(),c=D.parseDate(D.selectedDates[0],void 0,!0).getTime(),e=Math.min(r,D.selectedDates[0].getTime()),t=Math.max(r,D.selectedDates[0].getTime()),n=D.daysContainer.children,a=n[0].children[0].dateObj.getTime(),i=n[n.length-1].lastChild.dateObj.getTime(),l=!1,d=0,s=0,u=a;u<i;u+=le.DAY)P(new Date(u),!0)||(l=l||e<u&&u<t,u<c&&(!d||d<u)?d=u:c<u&&(!s||u<s)&&(s=u));for(var f=0;f<D.config.showMonths;f++)for(var m=D.daysContainer.children[f],g=D.daysContainer.children[f-1],p=function(e,t){var n=m.children[e],a=n.dateObj.getTime(),i=0<d&&a<d||0<s&&s<a;return i?(n.classList.add("notAllowed"),["inRange","startRange","endRange"].forEach(function(e){n.classList.remove(e)}),"continue"):l&&!i?"continue":(["startRange","inRange","endRange","notAllowed"].forEach(function(e){n.classList.remove(e)}),o.classList.add(r<D.selectedDates[0].getTime()?"startRange":"endRange"),void(!m.contains(o)&&0<f&&g&&g.lastChild.dateObj.getTime()>=a||(c<r&&a===c?n.classList.add("startRange"):r<c&&a===c&&n.classList.add("endRange"),d<=a&&(0===s||a<=s)&&ce(a,c,r)&&n.classList.add("inRange"))))},h=0,v=m.children.length;h<v;h++)p(h)}}function N(){!D.isOpen||D.config.static||D.config.inline||H()}function j(a){return function(e){var t=D.config["_"+a+"Date"]=D.parseDate(e,D.config.dateFormat),n=D.config["_"+("min"===a?"max":"min")+"Date"];void 0!==t&&(D["min"===a?"minDateHasTime":"maxDateHasTime"]=0<t.getHours()||0<t.getMinutes()||0<t.getSeconds()),D.selectedDates&&(D.selectedDates=D.selectedDates.filter(function(e){return P(e)}),D.selectedDates.length||"min"!==a||g(t),G()),D.daysContainer&&(L(),void 0!==t?D.currentYearElement[a]=t.getFullYear().toString():D.currentYearElement.removeAttribute(a),D.currentYearElement.disabled=!!n&&void 0!==t&&n.getFullYear()===t.getFullYear())}}function Y(){"object"!=typeof D.config.locale&&void 0===ge.l10ns[D.config.locale]&&D.config.errorHandler(new Error("flatpickr: invalid locale "+D.config.locale)),D.l10n=Object.assign({},ge.l10ns.default,"object"==typeof D.config.locale?D.config.locale:"default"!==D.config.locale?ge.l10ns[D.config.locale]:void 0),ne.K="("+D.l10n.amPM[0]+"|"+D.l10n.amPM[1]+"|"+D.l10n.amPM[0].toLowerCase()+"|"+D.l10n.amPM[1].toLowerCase()+")",D.formatDate=ie(D)}function H(e){if(void 0!==D.calendarContainer){U("onPreCalendarPosition");var t=e||D._positionElement,n=Array.prototype.reduce.call(D.calendarContainer.children,function(e,t){return e+t.offsetHeight},0),a=D.calendarContainer.offsetWidth,i=D.config.position,o=t.getBoundingClientRect(),r=window.innerHeight-o.bottom,c="above"===i||"below"!==i&&r<n&&o.top>n,l=window.pageYOffset+o.top+(c?-n-2:t.offsetHeight+2);if(de(D.calendarContainer,"arrowTop",!c),de(D.calendarContainer,"arrowBottom",c),!D.config.inline){var d=window.pageXOffset+o.left,s=window.document.body.offsetWidth-o.right,u=d+a>window.document.body.offsetWidth;de(D.calendarContainer,"rightMost",u),D.config.static||(D.calendarContainer.style.top=l+"px",u?(D.calendarContainer.style.left="auto",D.calendarContainer.style.right=s+"px"):(D.calendarContainer.style.left=d+"px",D.calendarContainer.style.right="auto"))}}}function L(){D.config.noCalendar||D.isMobile||(z(),C())}function W(){D._input.focus(),-1!==window.navigator.userAgent.indexOf("MSIE")||void 0!==navigator.msMaxTouchPoints?setTimeout(D.close,0):D.close()}function R(e){e.preventDefault(),e.stopPropagation();var t=function e(t,n){return n(t)?t:t.parentNode?e(t.parentNode,n):void 0}(e.target,function(e){return e.classList&&e.classList.contains("flatpickr-day")&&!e.classList.contains("disabled")&&!e.classList.contains("notAllowed")});if(void 0!==t){var n=t,a=D.latestSelectedDateObj=new Date(n.dateObj.getTime()),i=(a.getMonth()<D.currentMonth||a.getMonth()>D.currentMonth+D.config.showMonths-1)&&"range"!==D.config.mode;if(D.selectedDateElem=n,"single"===D.config.mode)D.selectedDates=[a];else if("multiple"===D.config.mode){var o=$(a);o?D.selectedDates.splice(parseInt(o),1):D.selectedDates.push(a)}else"range"===D.config.mode&&(2===D.selectedDates.length&&D.clear(!1),D.selectedDates.push(a),0!==re(a,D.selectedDates[0],!0)&&D.selectedDates.sort(function(e,t){return e.getTime()-t.getTime()}));if(m(),i){var r=D.currentYear!==a.getFullYear();D.currentYear=a.getFullYear(),D.currentMonth=a.getMonth(),r&&U("onYearChange"),U("onMonthChange")}if(z(),C(),D.config.minDate&&D.minDateHasTime&&D.config.enableTime&&0===re(a,D.config.minDate)&&g(D.config.minDate),G(),D.config.enableTime&&setTimeout(function(){return D.showTimeInput=!0},50),"range"===D.config.mode&&(1===D.selectedDates.length?A(n):z()),i||"range"===D.config.mode||1!==D.config.showMonths?D.selectedDateElem&&D.selectedDateElem.focus():b(n),void 0!==D.hourElement&&setTimeout(function(){return void 0!==D.hourElement&&D.hourElement.select()},451),D.config.closeOnSelect){var c="single"===D.config.mode&&!D.config.enableTime,l="range"===D.config.mode&&2===D.selectedDates.length&&!D.config.enableTime;(c||l)&&W()}p()}}D.parseDate=oe({config:D.config,l10n:D.l10n}),D._handlers=[],D._bind=o,D._setHoursFromDate=g,D.changeMonth=k,D.changeYear=S,D.clear=function(e){void 0===e&&(e=!0);D.input.value="",void 0!==D.altInput&&(D.altInput.value="");void 0!==D.mobileInput&&(D.mobileInput.value="");D.selectedDates=[],D.latestSelectedDateObj=void 0,!(D.showTimeInput=!1)===D.config.enableTime&&(void 0!==D.config.minDate?g(D.config.minDate):l(D.config.defaultHour,D.config.defaultMinute,D.config.defaultSeconds));D.redraw(),e&&U("onChange")},D.close=function(){D.isOpen=!1,D.isMobile||(D.calendarContainer.classList.remove("open"),D._input.classList.remove("active"));U("onClose")},D._createElement=se,D.destroy=function(){void 0!==D.config&&U("onDestroy");for(var e=D._handlers.length;e--;){var t=D._handlers[e];t.element.removeEventListener(t.event,t.handler)}D._handlers=[],D.mobileInput?(D.mobileInput.parentNode&&D.mobileInput.parentNode.removeChild(D.mobileInput),D.mobileInput=void 0):D.calendarContainer&&D.calendarContainer.parentNode&&D.calendarContainer.parentNode.removeChild(D.calendarContainer);D.altInput&&(D.input.type="text",D.altInput.parentNode&&D.altInput.parentNode.removeChild(D.altInput),delete D.altInput);D.input&&(D.input.type=D.input._type,D.input.classList.remove("flatpickr-input"),D.input.removeAttribute("readonly"),D.input.value="");["_showTimeInput","latestSelectedDateObj","_hideNextMonthArrow","_hidePrevMonthArrow","__hideNextMonthArrow","__hidePrevMonthArrow","isMobile","isOpen","selectedDateElem","minDateHasTime","maxDateHasTime","days","daysContainer","_input","_positionElement","innerContainer","rContainer","monthNav","todayDateElem","calendarContainer","weekdayContainer","prevMonthNav","nextMonthNav","currentMonthElement","currentYearElement","navigationCurrentMonth","selectedDateElem","config"].forEach(function(e){try{delete D[e]}catch(e){}})},D.isEnabled=P,D.jumpToDate=i,D.open=function(e,t){void 0===t&&(t=D._input);if(!0===D.isMobile)return e&&(e.preventDefault(),e.target&&e.target.blur()),setTimeout(function(){void 0!==D.mobileInput&&D.mobileInput.click()},0),void U("onOpen");if(D._input.disabled||D.config.inline)return;var n=D.isOpen;D.isOpen=!0,n||(D.calendarContainer.classList.add("open"),D._input.classList.add("active"),U("onOpen"),H(t));!0===D.config.enableTime&&!0===D.config.noCalendar&&(0===D.selectedDates.length&&(D.setDate(void 0!==D.config.minDate?new Date(D.config.minDate.getTime()):(new Date).setHours(D.config.defaultHour,D.config.defaultMinute,D.config.defaultSeconds,0),!1),m(),G()),setTimeout(function(){return D.hourElement.select()},50))},D.redraw=L,D.set=function(e,t){null!==e&&"object"==typeof e?Object.assign(D.config,e):(D.config[e]=t,void 0!==J[e]&&J[e].forEach(function(e){return e()}));D.redraw(),i()},D.setDate=function(e,t,n){void 0===t&&(t=!1);void 0===n&&(n=D.config.dateFormat);if(0!==e&&!e)return D.clear(t);K(e,n),D.showTimeInput=0<D.selectedDates.length,D.latestSelectedDateObj=D.selectedDates[0],D.redraw(),i(),g(),G(t),t&&U("onChange")},D.toggle=function(){if(D.isOpen)return D.close();D.open()};var J={locale:[Y,T],showMonths:[x,t,E]};function K(e,t){var n=[];if(e instanceof Array)n=e.map(function(e){return D.parseDate(e,t)});else if(e instanceof Date||"number"==typeof e)n=[D.parseDate(e,t)];else if("string"==typeof e)switch(D.config.mode){case"single":n=[D.parseDate(e,t)];break;case"multiple":n=e.split(D.config.conjunction).map(function(e){return D.parseDate(e,t)});break;case"range":n=e.split(D.l10n.rangeSeparator).map(function(e){return D.parseDate(e,t)})}else D.config.errorHandler(new Error("Invalid date supplied: "+JSON.stringify(e)));D.selectedDates=n.filter(function(e){return e instanceof Date&&P(e,!1)}),"range"===D.config.mode&&D.selectedDates.sort(function(e,t){return e.getTime()-t.getTime()})}function B(e){return e.map(function(e){return"string"==typeof e||"number"==typeof e||e instanceof Date?D.parseDate(e,void 0,!0):e&&"object"==typeof e&&e.from&&e.to?{from:D.parseDate(e.from,void 0),to:D.parseDate(e.to,void 0)}:e}).filter(function(e){return e})}function U(e,t){var n=D.config[e];if(void 0!==n&&0<n.length)for(var a=0;n[a]&&a<n.length;a++)n[a](D.selectedDates,D.input.value,D,t);"onChange"===e&&(D.input.dispatchEvent(q("change")),D.input.dispatchEvent(q("input")))}function q(e){var t=document.createEvent("Event");return t.initEvent(e,!0,!0),t}function $(e){for(var t=0;t<D.selectedDates.length;t++)if(0===re(D.selectedDates[t],e))return""+t;return!1}function z(){D.config.noCalendar||D.isMobile||!D.monthNav||(D.yearElements.forEach(function(e,t){var n=new Date(D.currentYear,D.currentMonth,1);n.setMonth(D.currentMonth+t),D.monthElements[t].textContent=te(n.getMonth(),D.config.shorthandCurrentMonth,D.l10n)+" ",e.value=n.getFullYear().toString()}),D._hidePrevMonthArrow=void 0!==D.config.minDate&&(D.currentYear===D.config.minDate.getFullYear()?D.currentMonth<=D.config.minDate.getMonth():D.currentYear<D.config.minDate.getFullYear()),D._hideNextMonthArrow=void 0!==D.config.maxDate&&(D.currentYear===D.config.maxDate.getFullYear()?D.currentMonth+1>D.config.maxDate.getMonth():D.currentYear>D.config.maxDate.getFullYear()))}function G(e){if(void 0===e&&(e=!0),0===D.selectedDates.length)return D.clear(e);void 0!==D.mobileInput&&D.mobileFormatStr&&(D.mobileInput.value=void 0!==D.latestSelectedDateObj?D.formatDate(D.latestSelectedDateObj,D.mobileFormatStr):"");var t="range"!==D.config.mode?D.config.conjunction:D.l10n.rangeSeparator;D.input.value=D.selectedDates.map(function(e){return D.formatDate(e,D.config.dateFormat)}).join(t),void 0!==D.altInput&&(D.altInput.value=D.selectedDates.map(function(e){return D.formatDate(e,D.config.altFormat)}).join(t)),!1!==e&&U("onValueUpdate")}function V(e){var t=D.prevMonthNav.contains(e.target),n=D.nextMonthNav.contains(e.target);t||n?k(t?-1:1):0<=D.yearElements.indexOf(e.target)?(e.preventDefault(),e.target.select()):e.target.classList.contains("arrowUp")?D.changeYear(D.currentYear+1):e.target.classList.contains("arrowDown")&&D.changeYear(D.currentYear-1)}return function(){D.element=D.input=s,D.isOpen=!1,function(){var e=["wrap","weekNumbers","allowInput","clickOpens","time_24hr","enableTime","noCalendar","altInput","shorthandCurrentMonth","inline","static","enableSeconds","disableMobile"],t=["onChange","onClose","onDayCreate","onDestroy","onKeyDown","onMonthChange","onOpen","onParseConfig","onReady","onValueUpdate","onYearChange","onPreCalendarPosition"],n=Object.assign({},u,JSON.parse(JSON.stringify(s.dataset||{}))),a={};D.config.parseDate=n.parseDate,D.config.formatDate=n.formatDate,Object.defineProperty(D.config,"enable",{get:function(){return D.config._enable},set:function(e){D.config._enable=B(e)}}),Object.defineProperty(D.config,"disable",{get:function(){return D.config._disable},set:function(e){D.config._disable=B(e)}}),!n.dateFormat&&n.enableTime&&(a.dateFormat=n.noCalendar?"H:i"+(n.enableSeconds?":S":""):ge.defaultConfig.dateFormat+" H:i"+(n.enableSeconds?":S":"")),n.altInput&&n.enableTime&&!n.altFormat&&(a.altFormat=n.noCalendar?"h:i"+(n.enableSeconds?":S K":" K"):ge.defaultConfig.altFormat+" h:i"+(n.enableSeconds?":S":"")+" K"),Object.defineProperty(D.config,"minDate",{get:function(){return D.config._minDate},set:j("min")}),Object.defineProperty(D.config,"maxDate",{get:function(){return D.config._maxDate},set:j("max")});var i=function(t){return function(e){D.config["min"===t?"_minTime":"_maxTime"]=D.parseDate(e,"H:i")}};Object.defineProperty(D.config,"minTime",{get:function(){return D.config._minTime},set:i("min")}),Object.defineProperty(D.config,"maxTime",{get:function(){return D.config._maxTime},set:i("max")}),Object.assign(D.config,a,n);for(var o=0;o<e.length;o++)D.config[e[o]]=!0===D.config[e[o]]||"true"===D.config[e[o]];for(var r=t.length;r--;)void 0!==D.config[t[r]]&&(D.config[t[r]]=ee(D.config[t[r]]||[]).map(f));"time"===D.config.mode&&(D.config.noCalendar=!0,D.config.enableTime=!0);for(var c=0;c<D.config.plugins.length;c++){var l=D.config.plugins[c](D)||{};for(var d in l)~t.indexOf(d)?D.config[d]=ee(l[d]).map(f).concat(D.config[d]):void 0===n[d]&&(D.config[d]=l[d])}D.isMobile=!D.config.disableMobile&&!D.config.inline&&"single"===D.config.mode&&!D.config.disable.length&&!D.config.enable.length&&!D.config.weekNumbers&&/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),U("onParseConfig")}(),Y(),function(){if(D.input=D.config.wrap?s.querySelector("[data-input]"):s,!D.input)return D.config.errorHandler(new Error("Invalid input element specified"));D.input._type=D.input.type,D.input.type="text",D.input.classList.add("flatpickr-input"),D._input=D.input,D.config.altInput&&(D.altInput=se(D.input.nodeName,D.input.className+" "+D.config.altInputClass),D._input=D.altInput,D.altInput.placeholder=D.input.placeholder,D.altInput.disabled=D.input.disabled,D.altInput.required=D.input.required,D.altInput.tabIndex=D.input.tabIndex,D.altInput.type="text",D.input.type="hidden",!D.config.static&&D.input.parentNode&&D.input.parentNode.insertBefore(D.altInput,D.input.nextSibling)),D.config.allowInput||D._input.setAttribute("readonly","readonly"),D._positionElement=D.config.positionElement||D._input}(),function(){D.selectedDates=[],D.now=D.parseDate(D.config.now)||new Date;var e=D.config.defaultDate||D.input.value;e&&K(e,D.config.dateFormat);var t=0<D.selectedDates.length?D.selectedDates[0]:D.config.minDate&&D.config.minDate.getTime()>D.now.getTime()?D.config.minDate:D.config.maxDate&&D.config.maxDate.getTime()<D.now.getTime()?D.config.maxDate:D.now;D.currentYear=t.getFullYear(),D.currentMonth=t.getMonth(),0<D.selectedDates.length&&(D.latestSelectedDateObj=D.selectedDates[0]),void 0!==D.config.minTime&&(D.config.minTime=D.parseDate(D.config.minTime,"H:i")),void 0!==D.config.maxTime&&(D.config.maxTime=D.parseDate(D.config.maxTime,"H:i")),D.minDateHasTime=!!D.config.minDate&&(0<D.config.minDate.getHours()||0<D.config.minDate.getMinutes()||0<D.config.minDate.getSeconds()),D.maxDateHasTime=!!D.config.maxDate&&(0<D.config.maxDate.getHours()||0<D.config.maxDate.getMinutes()||0<D.config.maxDate.getSeconds()),Object.defineProperty(D,"showTimeInput",{get:function(){return D._showTimeInput},set:function(e){D._showTimeInput=e,D.calendarContainer&&de(D.calendarContainer,"showTimeInput",e),D.isOpen&&H()}})}(),D.utils={getDaysInMonth:function(e,t){return void 0===e&&(e=D.currentMonth),void 0===t&&(t=D.currentYear),1===e&&(t%4==0&&t%100!=0||t%400==0)?29:D.l10n.daysInMonth[e]}},D.isMobile||function(){var e=window.document.createDocumentFragment();if(D.calendarContainer=se("div","flatpickr-calendar"),D.calendarContainer.tabIndex=-1,!D.config.noCalendar){if(e.appendChild((D.monthNav=se("div","flatpickr-months"),D.yearElements=[],D.monthElements=[],D.prevMonthNav=se("span","flatpickr-prev-month"),D.prevMonthNav.innerHTML=D.config.prevArrow,D.nextMonthNav=se("span","flatpickr-next-month"),D.nextMonthNav.innerHTML=D.config.nextArrow,x(),Object.defineProperty(D,"_hidePrevMonthArrow",{get:function(){return D.__hidePrevMonthArrow},set:function(e){D.__hidePrevMonthArrow!==e&&(de(D.prevMonthNav,"disabled",e),D.__hidePrevMonthArrow=e)}}),Object.defineProperty(D,"_hideNextMonthArrow",{get:function(){return D.__hideNextMonthArrow},set:function(e){D.__hideNextMonthArrow!==e&&(de(D.nextMonthNav,"disabled",e),D.__hideNextMonthArrow=e)}}),D.currentYearElement=D.yearElements[0],z(),D.monthNav)),D.innerContainer=se("div","flatpickr-innerContainer"),D.config.weekNumbers){var t=function(){D.calendarContainer.classList.add("hasWeeks");var e=se("div","flatpickr-weekwrapper");e.appendChild(se("span","flatpickr-weekday",D.l10n.weekAbbreviation));var t=se("div","flatpickr-weeks");return e.appendChild(t),{weekWrapper:e,weekNumbers:t}}(),n=t.weekWrapper,a=t.weekNumbers;D.innerContainer.appendChild(n),D.weekNumbers=a,D.weekWrapper=n}D.rContainer=se("div","flatpickr-rContainer"),D.rContainer.appendChild(E()),D.daysContainer||(D.daysContainer=se("div","flatpickr-days"),D.daysContainer.tabIndex=-1),C(),D.rContainer.appendChild(D.daysContainer),D.innerContainer.appendChild(D.rContainer),e.appendChild(D.innerContainer)}D.config.enableTime&&e.appendChild(function(){D.calendarContainer.classList.add("hasTime"),D.config.noCalendar&&D.calendarContainer.classList.add("noCalendar"),D.timeContainer=se("div","flatpickr-time"),D.timeContainer.tabIndex=-1;var e=se("span","flatpickr-time-separator",":"),t=fe("flatpickr-hour");D.hourElement=t.childNodes[0];var n=fe("flatpickr-minute");if(D.minuteElement=n.childNodes[0],D.hourElement.tabIndex=D.minuteElement.tabIndex=-1,D.hourElement.value=Z(D.latestSelectedDateObj?D.latestSelectedDateObj.getHours():D.config.time_24hr?D.config.defaultHour:function(e){switch(e%24){case 0:case 12:return 12;default:return e%12}}(D.config.defaultHour)),D.minuteElement.value=Z(D.latestSelectedDateObj?D.latestSelectedDateObj.getMinutes():D.config.defaultMinute),D.hourElement.setAttribute("data-step",D.config.hourIncrement.toString()),D.minuteElement.setAttribute("data-step",D.config.minuteIncrement.toString()),D.hourElement.setAttribute("data-min",D.config.time_24hr?"0":"1"),D.hourElement.setAttribute("data-max",D.config.time_24hr?"23":"12"),D.minuteElement.setAttribute("data-min","0"),D.minuteElement.setAttribute("data-max","59"),D.timeContainer.appendChild(t),D.timeContainer.appendChild(e),D.timeContainer.appendChild(n),D.config.time_24hr&&D.timeContainer.classList.add("time24hr"),D.config.enableSeconds){D.timeContainer.classList.add("hasSeconds");var a=fe("flatpickr-second");D.secondElement=a.childNodes[0],D.secondElement.value=Z(D.latestSelectedDateObj?D.latestSelectedDateObj.getSeconds():D.config.defaultSeconds),D.secondElement.setAttribute("data-step",D.minuteElement.getAttribute("data-step")),D.secondElement.setAttribute("data-min",D.minuteElement.getAttribute("data-min")),D.secondElement.setAttribute("data-max",D.minuteElement.getAttribute("data-max")),D.timeContainer.appendChild(se("span","flatpickr-time-separator",":")),D.timeContainer.appendChild(a)}return D.config.time_24hr||(D.amPM=se("span","flatpickr-am-pm",D.l10n.amPM[Q(11<(D.latestSelectedDateObj?D.hourElement.value:D.config.defaultHour))]),D.amPM.title=D.l10n.toggleTitle,D.amPM.tabIndex=-1,D.timeContainer.appendChild(D.amPM)),D.timeContainer}()),de(D.calendarContainer,"rangeMode","range"===D.config.mode),de(D.calendarContainer,"animate",!0===D.config.animate),de(D.calendarContainer,"multiMonth",1<D.config.showMonths),D.calendarContainer.appendChild(e);var i=void 0!==D.config.appendTo&&void 0!==D.config.appendTo.nodeType;if((D.config.inline||D.config.static)&&(D.calendarContainer.classList.add(D.config.inline?"inline":"static"),D.config.inline&&(!i&&D.element.parentNode?D.element.parentNode.insertBefore(D.calendarContainer,D._input.nextSibling):void 0!==D.config.appendTo&&D.config.appendTo.appendChild(D.calendarContainer)),D.config.static)){var o=se("div","flatpickr-wrapper");D.element.parentNode&&D.element.parentNode.insertBefore(o,D.element),o.appendChild(D.element),D.altInput&&o.appendChild(D.altInput),o.appendChild(D.calendarContainer)}D.config.static||D.config.inline||(void 0!==D.config.appendTo?D.config.appendTo:window.document.body).appendChild(D.calendarContainer)}(),function(){if(D.config.wrap&&["open","close","toggle","clear"].forEach(function(t){Array.prototype.forEach.call(D.element.querySelectorAll("[data-"+t+"]"),function(e){return o(e,"click",D[t])})}),D.isMobile)return function(){var e=D.config.enableTime?D.config.noCalendar?"time":"datetime-local":"date";D.mobileInput=se("input",D.input.className+" flatpickr-mobile"),D.mobileInput.step=D.input.getAttribute("step")||"any",D.mobileInput.tabIndex=1,D.mobileInput.type=e,D.mobileInput.disabled=D.input.disabled,D.mobileInput.required=D.input.required,D.mobileInput.placeholder=D.input.placeholder,D.mobileFormatStr="datetime-local"===e?"Y-m-d\\TH:i:S":"date"===e?"Y-m-d":"H:i:S",0<D.selectedDates.length&&(D.mobileInput.defaultValue=D.mobileInput.value=D.formatDate(D.selectedDates[0],D.mobileFormatStr)),D.config.minDate&&(D.mobileInput.min=D.formatDate(D.config.minDate,"Y-m-d")),D.config.maxDate&&(D.mobileInput.max=D.formatDate(D.config.maxDate,"Y-m-d")),D.input.type="hidden",void 0!==D.altInput&&(D.altInput.type="hidden");try{D.input.parentNode&&D.input.parentNode.insertBefore(D.mobileInput,D.input.nextSibling)}catch(e){}o(D.mobileInput,"change",function(e){D.setDate(e.target.value,!1,D.mobileFormatStr),U("onChange"),U("onClose")})}();var e=X(N,50);D._debouncedChange=X(p,me),D.daysContainer&&!/iPhone|iPad|iPod/i.test(navigator.userAgent)&&o(D.daysContainer,"mouseover",function(e){"range"===D.config.mode&&A(e.target)}),o(window.document.body,"keydown",F),D.config.static||o(D._input,"keydown",F),D.config.inline||D.config.static||o(window,"resize",e),void 0!==window.ontouchstart&&o(window.document,"touchstart",O),o(window.document,"mousedown",a(O)),o(window.document,"focus",O,{capture:!0}),!0===D.config.clickOpens&&(o(D._input,"focus",D.open),o(D._input,"mousedown",a(D.open))),void 0!==D.daysContainer&&(o(D.monthNav,"mousedown",a(V)),o(D.monthNav,["keyup","increment"],n),o(D.daysContainer,"mousedown",a(R))),void 0!==D.timeContainer&&void 0!==D.minuteElement&&void 0!==D.hourElement&&(o(D.timeContainer,["input","increment"],d),o(D.timeContainer,"mousedown",a(r)),o(D.timeContainer,["input","increment"],D._debouncedChange,{passive:!0}),o([D.hourElement,D.minuteElement],["focus","click"],function(e){return e.target.select()}),void 0!==D.secondElement&&o(D.secondElement,"focus",function(){return D.secondElement&&D.secondElement.select()}),void 0!==D.amPM&&o(D.amPM,"mousedown",a(function(e){d(e),p()})))}(),(D.selectedDates.length||D.config.noCalendar)&&(D.config.enableTime&&g(D.config.noCalendar?D.latestSelectedDateObj||D.config.minDate:void 0),G(!1)),t(),D.showTimeInput=0<D.selectedDates.length||D.config.noCalendar;var e=/^((?!chrome|android).)*safari/i.test(navigator.userAgent);!D.isMobile&&e&&H(),U("onReady")}(),D}function n(e,t){for(var n=Array.prototype.slice.call(e),a=[],i=0;i<n.length;i++){var o=n[i];try{if(null!==o.getAttribute("data-fp-omit"))continue;void 0!==o._flatpickr&&(o._flatpickr.destroy(),o._flatpickr=void 0),o._flatpickr=r(o,t||{}),a.push(o._flatpickr)}catch(e){console.error(e)}}return 1===a.length?a[0]:a}"undefined"!=typeof HTMLElement&&(HTMLCollection.prototype.flatpickr=NodeList.prototype.flatpickr=function(e){return n(this,e)},HTMLElement.prototype.flatpickr=function(e){return n([this],e)});var ge=function(e,t){return e instanceof NodeList?n(e,t):n("string"==typeof e?window.document.querySelectorAll(e):[e],t)};return ge.defaultConfig=b,ge.l10ns={en:Object.assign({},ae),default:Object.assign({},ae)},ge.localize=function(e){ge.l10ns.default=Object.assign({},ge.l10ns.default,e)},ge.setDefaults=function(e){ge.defaultConfig=Object.assign({},ge.defaultConfig,e)},ge.parseDate=oe({}),ge.formatDate=ie({}),ge.compareDates=re,"undefined"!=typeof jQuery&&(jQuery.fn.flatpickr=function(e){return n(this,e)}),Date.prototype.fp_incr=function(e){return new Date(this.getFullYear(),this.getMonth(),this.getDate()+("string"==typeof e?parseInt(e,10):e))},ge});
diff --git a/static/js/vendor/zepto.js b/static/js/vendor/zepto.js
deleted file mode 100644
index 18b3ada79..000000000
--- a/static/js/vendor/zepto.js
+++ /dev/null
@@ -1,1650 +0,0 @@
-/* Zepto v1.2.0 - zepto event ajax form ie - zeptojs.com/license */
-(function(global, factory) {
-  if (typeof define === 'function' && define.amd)
-    define(function() { return factory(global) })
-  else
-    factory(global)
-}(this, function(window) {
-  var Zepto = (function() {
-  var undefined, key, $, classList, emptyArray = [], concat = emptyArray.concat, filter = emptyArray.filter, slice = emptyArray.slice,
-    document = window.document,
-    elementDisplay = {}, classCache = {},
-    cssNumber = { 'column-count': 1, 'columns': 1, 'font-weight': 1, 'line-height': 1,'opacity': 1, 'z-index': 1, 'zoom': 1 },
-    fragmentRE = /^\s*<(\w+|!)[^>]*>/,
-    singleTagRE = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-    tagExpanderRE = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
-    rootNodeRE = /^(?:body|html)$/i,
-    capitalRE = /([A-Z])/g,
-
-    // special attributes that should be get/set via method calls
-    methodAttributes = ['val', 'css', 'html', 'text', 'data', 'width', 'height', 'offset'],
-
-    adjacencyOperators = [ 'after', 'prepend', 'before', 'append' ],
-    table = document.createElement('table'),
-    tableRow = document.createElement('tr'),
-    containers = {
-      'tr': document.createElement('tbody'),
-      'tbody': table, 'thead': table, 'tfoot': table,
-      'td': tableRow, 'th': tableRow,
-      '*': document.createElement('div')
-    },
-    readyRE = /complete|loaded|interactive/,
-    simpleSelectorRE = /^[\w-]*$/,
-    class2type = {},
-    toString = class2type.toString,
-    zepto = {},
-    camelize, uniq,
-    tempParent = document.createElement('div'),
-    propMap = {
-      'tabindex': 'tabIndex',
-      'readonly': 'readOnly',
-      'for': 'htmlFor',
-      'class': 'className',
-      'maxlength': 'maxLength',
-      'cellspacing': 'cellSpacing',
-      'cellpadding': 'cellPadding',
-      'rowspan': 'rowSpan',
-      'colspan': 'colSpan',
-      'usemap': 'useMap',
-      'frameborder': 'frameBorder',
-      'contenteditable': 'contentEditable'
-    },
-    isArray = Array.isArray ||
-      function(object){ return object instanceof Array }
-
-  zepto.matches = function(element, selector) {
-    if (!selector || !element || element.nodeType !== 1) return false
-    var matchesSelector = element.matches || element.webkitMatchesSelector ||
-                          element.mozMatchesSelector || element.oMatchesSelector ||
-                          element.matchesSelector
-    if (matchesSelector) return matchesSelector.call(element, selector)
-    // fall back to performing a selector:
-    var match, parent = element.parentNode, temp = !parent
-    if (temp) (parent = tempParent).appendChild(element)
-    match = ~zepto.qsa(parent, selector).indexOf(element)
-    temp && tempParent.removeChild(element)
-    return match
-  }
-
-  function type(obj) {
-    return obj == null ? String(obj) :
-      class2type[toString.call(obj)] || "object"
-  }
-
-  function isFunction(value) { return type(value) == "function" }
-  function isWindow(obj)     { return obj != null && obj == obj.window }
-  function isDocument(obj)   { return obj != null && obj.nodeType == obj.DOCUMENT_NODE }
-  function isObject(obj)     { return type(obj) == "object" }
-  function isPlainObject(obj) {
-    return isObject(obj) && !isWindow(obj) && Object.getPrototypeOf(obj) == Object.prototype
-  }
-
-  function likeArray(obj) {
-    var length = !!obj && 'length' in obj && obj.length,
-      type = $.type(obj)
-
-    return 'function' != type && !isWindow(obj) && (
-      'array' == type || length === 0 ||
-        (typeof length == 'number' && length > 0 && (length - 1) in obj)
-    )
-  }
-
-  function compact(array) { return filter.call(array, function(item){ return item != null }) }
-  function flatten(array) { return array.length > 0 ? $.fn.concat.apply([], array) : array }
-  camelize = function(str){ return str.replace(/-+(.)?/g, function(match, chr){ return chr ? chr.toUpperCase() : '' }) }
-  function dasherize(str) {
-    return str.replace(/::/g, '/')
-           .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
-           .replace(/([a-z\d])([A-Z])/g, '$1_$2')
-           .replace(/_/g, '-')
-           .toLowerCase()
-  }
-  uniq = function(array){ return filter.call(array, function(item, idx){ return array.indexOf(item) == idx }) }
-
-  function classRE(name) {
-    return name in classCache ?
-      classCache[name] : (classCache[name] = new RegExp('(^|\\s)' + name + '(\\s|$)'))
-  }
-
-  function maybeAddPx(name, value) {
-    return (typeof value == "number" && !cssNumber[dasherize(name)]) ? value + "px" : value
-  }
-
-  function defaultDisplay(nodeName) {
-    var element, display
-    if (!elementDisplay[nodeName]) {
-      element = document.createElement(nodeName)
-      document.body.appendChild(element)
-      display = getComputedStyle(element, '').getPropertyValue("display")
-      element.parentNode.removeChild(element)
-      display == "none" && (display = "block")
-      elementDisplay[nodeName] = display
-    }
-    return elementDisplay[nodeName]
-  }
-
-  function children(element) {
-    return 'children' in element ?
-      slice.call(element.children) :
-      $.map(element.childNodes, function(node){ if (node.nodeType == 1) return node })
-  }
-
-  function Z(dom, selector) {
-    var i, len = dom ? dom.length : 0
-    for (i = 0; i < len; i++) this[i] = dom[i]
-    this.length = len
-    this.selector = selector || ''
-  }
-
-  // `$.zepto.fragment` takes a html string and an optional tag name
-  // to generate DOM nodes from the given html string.
-  // The generated DOM nodes are returned as an array.
-  // This function can be overridden in plugins for example to make
-  // it compatible with browsers that don't support the DOM fully.
-  zepto.fragment = function(html, name, properties) {
-    var dom, nodes, container
-
-    // A special case optimization for a single tag
-    if (singleTagRE.test(html)) dom = $(document.createElement(RegExp.$1))
-
-    if (!dom) {
-      if (html.replace) html = html.replace(tagExpanderRE, "<$1></$2>")
-      if (name === undefined) name = fragmentRE.test(html) && RegExp.$1
-      if (!(name in containers)) name = '*'
-
-      container = containers[name]
-      container.innerHTML = '' + html
-      dom = $.each(slice.call(container.childNodes), function(){
-        container.removeChild(this)
-      })
-    }
-
-    if (isPlainObject(properties)) {
-      nodes = $(dom)
-      $.each(properties, function(key, value) {
-        if (methodAttributes.indexOf(key) > -1) nodes[key](value)
-        else nodes.attr(key, value)
-      })
-    }
-
-    return dom
-  }
-
-  // `$.zepto.Z` swaps out the prototype of the given `dom` array
-  // of nodes with `$.fn` and thus supplying all the Zepto functions
-  // to the array. This method can be overridden in plugins.
-  zepto.Z = function(dom, selector) {
-    return new Z(dom, selector)
-  }
-
-  // `$.zepto.isZ` should return `true` if the given object is a Zepto
-  // collection. This method can be overridden in plugins.
-  zepto.isZ = function(object) {
-    return object instanceof zepto.Z
-  }
-
-  // `$.zepto.init` is Zepto's counterpart to jQuery's `$.fn.init` and
-  // takes a CSS selector and an optional context (and handles various
-  // special cases).
-  // This method can be overridden in plugins.
-  zepto.init = function(selector, context) {
-    var dom
-    // If nothing given, return an empty Zepto collection
-    if (!selector) return zepto.Z()
-    // Optimize for string selectors
-    else if (typeof selector == 'string') {
-      selector = selector.trim()
-      // If it's a html fragment, create nodes from it
-      // Note: In both Chrome 21 and Firefox 15, DOM error 12
-      // is thrown if the fragment doesn't begin with <
-      if (selector[0] == '<' && fragmentRE.test(selector))
-        dom = zepto.fragment(selector, RegExp.$1, context), selector = null
-      // If there's a context, create a collection on that context first, and select
-      // nodes from there
-      else if (context !== undefined) return $(context).find(selector)
-      // If it's a CSS selector, use it to select nodes.
-      else dom = zepto.qsa(document, selector)
-    }
-    // If a function is given, call it when the DOM is ready
-    else if (isFunction(selector)) return $(document).ready(selector)
-    // If a Zepto collection is given, just return it
-    else if (zepto.isZ(selector)) return selector
-    else {
-      // normalize array if an array of nodes is given
-      if (isArray(selector)) dom = compact(selector)
-      // Wrap DOM nodes.
-      else if (isObject(selector))
-        dom = [selector], selector = null
-      // If it's a html fragment, create nodes from it
-      else if (fragmentRE.test(selector))
-        dom = zepto.fragment(selector.trim(), RegExp.$1, context), selector = null
-      // If there's a context, create a collection on that context first, and select
-      // nodes from there
-      else if (context !== undefined) return $(context).find(selector)
-      // And last but no least, if it's a CSS selector, use it to select nodes.
-      else dom = zepto.qsa(document, selector)
-    }
-    // create a new Zepto collection from the nodes found
-    return zepto.Z(dom, selector)
-  }
-
-  // `$` will be the base `Zepto` object. When calling this
-  // function just call `$.zepto.init, which makes the implementation
-  // details of selecting nodes and creating Zepto collections
-  // patchable in plugins.
-  $ = function(selector, context){
-    return zepto.init(selector, context)
-  }
-
-  function extend(target, source, deep) {
-    for (key in source)
-      if (deep && (isPlainObject(source[key]) || isArray(source[key]))) {
-        if (isPlainObject(source[key]) && !isPlainObject(target[key]))
-          target[key] = {}
-        if (isArray(source[key]) && !isArray(target[key]))
-          target[key] = []
-        extend(target[key], source[key], deep)
-      }
-      else if (source[key] !== undefined) target[key] = source[key]
-  }
-
-  // Copy all but undefined properties from one or more
-  // objects to the `target` object.
-  $.extend = function(target){
-    var deep, args = slice.call(arguments, 1)
-    if (typeof target == 'boolean') {
-      deep = target
-      target = args.shift()
-    }
-    args.forEach(function(arg){ extend(target, arg, deep) })
-    return target
-  }
-
-  // `$.zepto.qsa` is Zepto's CSS selector implementation which
-  // uses `document.querySelectorAll` and optimizes for some special cases, like `#id`.
-  // This method can be overridden in plugins.
-  zepto.qsa = function(element, selector){
-    var found,
-        maybeID = selector[0] == '#',
-        maybeClass = !maybeID && selector[0] == '.',
-        nameOnly = maybeID || maybeClass ? selector.slice(1) : selector, // Ensure that a 1 char tag name still gets checked
-        isSimple = simpleSelectorRE.test(nameOnly)
-    return (element.getElementById && isSimple && maybeID) ? // Safari DocumentFragment doesn't have getElementById
-      ( (found = element.getElementById(nameOnly)) ? [found] : [] ) :
-      (element.nodeType !== 1 && element.nodeType !== 9 && element.nodeType !== 11) ? [] :
-      slice.call(
-        isSimple && !maybeID && element.getElementsByClassName ? // DocumentFragment doesn't have getElementsByClassName/TagName
-          maybeClass ? element.getElementsByClassName(nameOnly) : // If it's simple, it could be a class
-          element.getElementsByTagName(selector) : // Or a tag
-          element.querySelectorAll(selector) // Or it's not simple, and we need to query all
-      )
-  }
-
-  function filtered(nodes, selector) {
-    return selector == null ? $(nodes) : $(nodes).filter(selector)
-  }
-
-  $.contains = document.documentElement.contains ?
-    function(parent, node) {
-      return parent !== node && parent.contains(node)
-    } :
-    function(parent, node) {
-      while (node && (node = node.parentNode))
-        if (node === parent) return true
-      return false
-    }
-
-  function funcArg(context, arg, idx, payload) {
-    return isFunction(arg) ? arg.call(context, idx, payload) : arg
-  }
-
-  function setAttribute(node, name, value) {
-    value == null ? node.removeAttribute(name) : node.setAttribute(name, value)
-  }
-
-  // access className property while respecting SVGAnimatedString
-  function className(node, value){
-    var klass = node.className || '',
-        svg   = klass && klass.baseVal !== undefined
-
-    if (value === undefined) return svg ? klass.baseVal : klass
-    svg ? (klass.baseVal = value) : (node.className = value)
-  }
-
-  // "true"  => true
-  // "false" => false
-  // "null"  => null
-  // "42"    => 42
-  // "42.5"  => 42.5
-  // "08"    => "08"
-  // JSON    => parse if valid
-  // String  => self
-  function deserializeValue(value) {
-    try {
-      return value ?
-        value == "true" ||
-        ( value == "false" ? false :
-          value == "null" ? null :
-          +value + "" == value ? +value :
-          /^[\[\{]/.test(value) ? $.parseJSON(value) :
-          value )
-        : value
-    } catch(e) {
-      return value
-    }
-  }
-
-  $.type = type
-  $.isFunction = isFunction
-  $.isWindow = isWindow
-  $.isArray = isArray
-  $.isPlainObject = isPlainObject
-
-  $.isEmptyObject = function(obj) {
-    var name
-    for (name in obj) return false
-    return true
-  }
-
-  $.isNumeric = function(val) {
-    var num = Number(val), type = typeof val
-    return val != null && type != 'boolean' &&
-      (type != 'string' || val.length) &&
-      !isNaN(num) && isFinite(num) || false
-  }
-
-  $.inArray = function(elem, array, i){
-    return emptyArray.indexOf.call(array, elem, i)
-  }
-
-  $.camelCase = camelize
-  $.trim = function(str) {
-    return str == null ? "" : String.prototype.trim.call(str)
-  }
-
-  // plugin compatibility
-  $.uuid = 0
-  $.support = { }
-  $.expr = { }
-  $.noop = function() {}
-
-  $.map = function(elements, callback){
-    var value, values = [], i, key
-    if (likeArray(elements))
-      for (i = 0; i < elements.length; i++) {
-        value = callback(elements[i], i)
-        if (value != null) values.push(value)
-      }
-    else
-      for (key in elements) {
-        value = callback(elements[key], key)
-        if (value != null) values.push(value)
-      }
-    return flatten(values)
-  }
-
-  $.each = function(elements, callback){
-    var i, key
-    if (likeArray(elements)) {
-      for (i = 0; i < elements.length; i++)
-        if (callback.call(elements[i], i, elements[i]) === false) return elements
-    } else {
-      for (key in elements)
-        if (callback.call(elements[key], key, elements[key]) === false) return elements
-    }
-
-    return elements
-  }
-
-  $.grep = function(elements, callback){
-    return filter.call(elements, callback)
-  }
-
-  if (window.JSON) $.parseJSON = JSON.parse
-
-  // Populate the class2type map
-  $.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-    class2type[ "[object " + name + "]" ] = name.toLowerCase()
-  })
-
-  // Define methods that will be available on all
-  // Zepto collections
-  $.fn = {
-    constructor: zepto.Z,
-    length: 0,
-
-    // Because a collection acts like an array
-    // copy over these useful array functions.
-    forEach: emptyArray.forEach,
-    reduce: emptyArray.reduce,
-    push: emptyArray.push,
-    sort: emptyArray.sort,
-    splice: emptyArray.splice,
-    indexOf: emptyArray.indexOf,
-    concat: function(){
-      var i, value, args = []
-      for (i = 0; i < arguments.length; i++) {
-        value = arguments[i]
-        args[i] = zepto.isZ(value) ? value.toArray() : value
-      }
-      return concat.apply(zepto.isZ(this) ? this.toArray() : this, args)
-    },
-
-    // `map` and `slice` in the jQuery API work differently
-    // from their array counterparts
-    map: function(fn){
-      return $($.map(this, function(el, i){ return fn.call(el, i, el) }))
-    },
-    slice: function(){
-      return $(slice.apply(this, arguments))
-    },
-
-    ready: function(callback){
-      // need to check if document.body exists for IE as that browser reports
-      // document ready when it hasn't yet created the body element
-      if (readyRE.test(document.readyState) && document.body) callback($)
-      else document.addEventListener('DOMContentLoaded', function(){ callback($) }, false)
-      return this
-    },
-    get: function(idx){
-      return idx === undefined ? slice.call(this) : this[idx >= 0 ? idx : idx + this.length]
-    },
-    toArray: function(){ return this.get() },
-    size: function(){
-      return this.length
-    },
-    remove: function(){
-      return this.each(function(){
-        if (this.parentNode != null)
-          this.parentNode.removeChild(this)
-      })
-    },
-    each: function(callback){
-      emptyArray.every.call(this, function(el, idx){
-        return callback.call(el, idx, el) !== false
-      })
-      return this
-    },
-    filter: function(selector){
-      if (isFunction(selector)) return this.not(this.not(selector))
-      return $(filter.call(this, function(element){
-        return zepto.matches(element, selector)
-      }))
-    },
-    add: function(selector,context){
-      return $(uniq(this.concat($(selector,context))))
-    },
-    is: function(selector){
-      return this.length > 0 && zepto.matches(this[0], selector)
-    },
-    not: function(selector){
-      var nodes=[]
-      if (isFunction(selector) && selector.call !== undefined)
-        this.each(function(idx){
-          if (!selector.call(this,idx)) nodes.push(this)
-        })
-      else {
-        var excludes = typeof selector == 'string' ? this.filter(selector) :
-          (likeArray(selector) && isFunction(selector.item)) ? slice.call(selector) : $(selector)
-        this.forEach(function(el){
-          if (excludes.indexOf(el) < 0) nodes.push(el)
-        })
-      }
-      return $(nodes)
-    },
-    has: function(selector){
-      return this.filter(function(){
-        return isObject(selector) ?
-          $.contains(this, selector) :
-          $(this).find(selector).size()
-      })
-    },
-    eq: function(idx){
-      return idx === -1 ? this.slice(idx) : this.slice(idx, + idx + 1)
-    },
-    first: function(){
-      var el = this[0]
-      return el && !isObject(el) ? el : $(el)
-    },
-    last: function(){
-      var el = this[this.length - 1]
-      return el && !isObject(el) ? el : $(el)
-    },
-    find: function(selector){
-      var result, $this = this
-      if (!selector) result = $()
-      else if (typeof selector == 'object')
-        result = $(selector).filter(function(){
-          var node = this
-          return emptyArray.some.call($this, function(parent){
-            return $.contains(parent, node)
-          })
-        })
-      else if (this.length == 1) result = $(zepto.qsa(this[0], selector))
-      else result = this.map(function(){ return zepto.qsa(this, selector) })
-      return result
-    },
-    closest: function(selector, context){
-      var nodes = [], collection = typeof selector == 'object' && $(selector)
-      this.each(function(_, node){
-        while (node && !(collection ? collection.indexOf(node) >= 0 : zepto.matches(node, selector)))
-          node = node !== context && !isDocument(node) && node.parentNode
-        if (node && nodes.indexOf(node) < 0) nodes.push(node)
-      })
-      return $(nodes)
-    },
-    parents: function(selector){
-      var ancestors = [], nodes = this
-      while (nodes.length > 0)
-        nodes = $.map(nodes, function(node){
-          if ((node = node.parentNode) && !isDocument(node) && ancestors.indexOf(node) < 0) {
-            ancestors.push(node)
-            return node
-          }
-        })
-      return filtered(ancestors, selector)
-    },
-    parent: function(selector){
-      return filtered(uniq(this.pluck('parentNode')), selector)
-    },
-    children: function(selector){
-      return filtered(this.map(function(){ return children(this) }), selector)
-    },
-    contents: function() {
-      return this.map(function() { return this.contentDocument || slice.call(this.childNodes) })
-    },
-    siblings: function(selector){
-      return filtered(this.map(function(i, el){
-        return filter.call(children(el.parentNode), function(child){ return child!==el })
-      }), selector)
-    },
-    empty: function(){
-      return this.each(function(){ this.innerHTML = '' })
-    },
-    // `pluck` is borrowed from Prototype.js
-    pluck: function(property){
-      return $.map(this, function(el){ return el[property] })
-    },
-    show: function(){
-      return this.each(function(){
-        this.style.display == "none" && (this.style.display = '')
-        if (getComputedStyle(this, '').getPropertyValue("display") == "none")
-          this.style.display = defaultDisplay(this.nodeName)
-      })
-    },
-    replaceWith: function(newContent){
-      return this.before(newContent).remove()
-    },
-    wrap: function(structure){
-      var func = isFunction(structure)
-      if (this[0] && !func)
-        var dom   = $(structure).get(0),
-            clone = dom.parentNode || this.length > 1
-
-      return this.each(function(index){
-        $(this).wrapAll(
-          func ? structure.call(this, index) :
-            clone ? dom.cloneNode(true) : dom
-        )
-      })
-    },
-    wrapAll: function(structure){
-      if (this[0]) {
-        $(this[0]).before(structure = $(structure))
-        var children
-        // drill down to the inmost element
-        while ((children = structure.children()).length) structure = children.first()
-        $(structure).append(this)
-      }
-      return this
-    },
-    wrapInner: function(structure){
-      var func = isFunction(structure)
-      return this.each(function(index){
-        var self = $(this), contents = self.contents(),
-            dom  = func ? structure.call(this, index) : structure
-        contents.length ? contents.wrapAll(dom) : self.append(dom)
-      })
-    },
-    unwrap: function(){
-      this.parent().each(function(){
-        $(this).replaceWith($(this).children())
-      })
-      return this
-    },
-    clone: function(){
-      return this.map(function(){ return this.cloneNode(true) })
-    },
-    hide: function(){
-      return this.css("display", "none")
-    },
-    toggle: function(setting){
-      return this.each(function(){
-        var el = $(this)
-        ;(setting === undefined ? el.css("display") == "none" : setting) ? el.show() : el.hide()
-      })
-    },
-    prev: function(selector){ return $(this.pluck('previousElementSibling')).filter(selector || '*') },
-    next: function(selector){ return $(this.pluck('nextElementSibling')).filter(selector || '*') },
-    html: function(html){
-      return 0 in arguments ?
-        this.each(function(idx){
-          var originHtml = this.innerHTML
-          $(this).empty().append( funcArg(this, html, idx, originHtml) )
-        }) :
-        (0 in this ? this[0].innerHTML : null)
-    },
-    text: function(text){
-      return 0 in arguments ?
-        this.each(function(idx){
-          var newText = funcArg(this, text, idx, this.textContent)
-          this.textContent = newText == null ? '' : ''+newText
-        }) :
-        (0 in this ? this.pluck('textContent').join("") : null)
-    },
-    attr: function(name, value){
-      var result
-      return (typeof name == 'string' && !(1 in arguments)) ?
-        (0 in this && this[0].nodeType == 1 && (result = this[0].getAttribute(name)) != null ? result : undefined) :
-        this.each(function(idx){
-          if (this.nodeType !== 1) return
-          if (isObject(name)) for (key in name) setAttribute(this, key, name[key])
-          else setAttribute(this, name, funcArg(this, value, idx, this.getAttribute(name)))
-        })
-    },
-    removeAttr: function(name){
-      return this.each(function(){ this.nodeType === 1 && name.split(' ').forEach(function(attribute){
-        setAttribute(this, attribute)
-      }, this)})
-    },
-    prop: function(name, value){
-      name = propMap[name] || name
-      return (1 in arguments) ?
-        this.each(function(idx){
-          this[name] = funcArg(this, value, idx, this[name])
-        }) :
-        (this[0] && this[0][name])
-    },
-    removeProp: function(name){
-      name = propMap[name] || name
-      return this.each(function(){ delete this[name] })
-    },
-    data: function(name, value){
-      var attrName = 'data-' + name.replace(capitalRE, '-$1').toLowerCase()
-
-      var data = (1 in arguments) ?
-        this.attr(attrName, value) :
-        this.attr(attrName)
-
-      return data !== null ? deserializeValue(data) : undefined
-    },
-    val: function(value){
-      if (0 in arguments) {
-        if (value == null) value = ""
-        return this.each(function(idx){
-          this.value = funcArg(this, value, idx, this.value)
-        })
-      } else {
-        return this[0] && (this[0].multiple ?
-           $(this[0]).find('option').filter(function(){ return this.selected }).pluck('value') :
-           this[0].value)
-      }
-    },
-    offset: function(coordinates){
-      if (coordinates) return this.each(function(index){
-        var $this = $(this),
-            coords = funcArg(this, coordinates, index, $this.offset()),
-            parentOffset = $this.offsetParent().offset(),
-            props = {
-              top:  coords.top  - parentOffset.top,
-              left: coords.left - parentOffset.left
-            }
-
-        if ($this.css('position') == 'static') props['position'] = 'relative'
-        $this.css(props)
-      })
-      if (!this.length) return null
-      if (document.documentElement !== this[0] && !$.contains(document.documentElement, this[0]))
-        return {top: 0, left: 0}
-      var obj = this[0].getBoundingClientRect()
-      return {
-        left: obj.left + window.pageXOffset,
-        top: obj.top + window.pageYOffset,
-        width: Math.round(obj.width),
-        height: Math.round(obj.height)
-      }
-    },
-    css: function(property, value){
-      if (arguments.length < 2) {
-        var element = this[0]
-        if (typeof property == 'string') {
-          if (!element) return
-          return element.style[camelize(property)] || getComputedStyle(element, '').getPropertyValue(property)
-        } else if (isArray(property)) {
-          if (!element) return
-          var props = {}
-          var computedStyle = getComputedStyle(element, '')
-          $.each(property, function(_, prop){
-            props[prop] = (element.style[camelize(prop)] || computedStyle.getPropertyValue(prop))
-          })
-          return props
-        }
-      }
-
-      var css = ''
-      if (type(property) == 'string') {
-        if (!value && value !== 0)
-          this.each(function(){ this.style.removeProperty(dasherize(property)) })
-        else
-          css = dasherize(property) + ":" + maybeAddPx(property, value)
-      } else {
-        for (key in property)
-          if (!property[key] && property[key] !== 0)
-            this.each(function(){ this.style.removeProperty(dasherize(key)) })
-          else
-            css += dasherize(key) + ':' + maybeAddPx(key, property[key]) + ';'
-      }
-
-      return this.each(function(){ this.style.cssText += ';' + css })
-    },
-    index: function(element){
-      return element ? this.indexOf($(element)[0]) : this.parent().children().indexOf(this[0])
-    },
-    hasClass: function(name){
-      if (!name) return false
-      return emptyArray.some.call(this, function(el){
-        return this.test(className(el))
-      }, classRE(name))
-    },
-    addClass: function(name){
-      if (!name) return this
-      return this.each(function(idx){
-        if (!('className' in this)) return
-        classList = []
-        var cls = className(this), newName = funcArg(this, name, idx, cls)
-        newName.split(/\s+/g).forEach(function(klass){
-          if (!$(this).hasClass(klass)) classList.push(klass)
-        }, this)
-        classList.length && className(this, cls + (cls ? " " : "") + classList.join(" "))
-      })
-    },
-    removeClass: function(name){
-      return this.each(function(idx){
-        if (!('className' in this)) return
-        if (name === undefined) return className(this, '')
-        classList = className(this)
-        funcArg(this, name, idx, classList).split(/\s+/g).forEach(function(klass){
-          classList = classList.replace(classRE(klass), " ")
-        })
-        className(this, classList.trim())
-      })
-    },
-    toggleClass: function(name, when){
-      if (!name) return this
-      return this.each(function(idx){
-        var $this = $(this), names = funcArg(this, name, idx, className(this))
-        names.split(/\s+/g).forEach(function(klass){
-          (when === undefined ? !$this.hasClass(klass) : when) ?
-            $this.addClass(klass) : $this.removeClass(klass)
-        })
-      })
-    },
-    scrollTop: function(value){
-      if (!this.length) return
-      var hasScrollTop = 'scrollTop' in this[0]
-      if (value === undefined) return hasScrollTop ? this[0].scrollTop : this[0].pageYOffset
-      return this.each(hasScrollTop ?
-        function(){ this.scrollTop = value } :
-        function(){ this.scrollTo(this.scrollX, value) })
-    },
-    scrollLeft: function(value){
-      if (!this.length) return
-      var hasScrollLeft = 'scrollLeft' in this[0]
-      if (value === undefined) return hasScrollLeft ? this[0].scrollLeft : this[0].pageXOffset
-      return this.each(hasScrollLeft ?
-        function(){ this.scrollLeft = value } :
-        function(){ this.scrollTo(value, this.scrollY) })
-    },
-    position: function() {
-      if (!this.length) return
-
-      var elem = this[0],
-        // Get *real* offsetParent
-        offsetParent = this.offsetParent(),
-        // Get correct offsets
-        offset       = this.offset(),
-        parentOffset = rootNodeRE.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset()
-
-      // Subtract element margins
-      // note: when an element has margin: auto the offsetLeft and marginLeft
-      // are the same in Safari causing offset.left to incorrectly be 0
-      offset.top  -= parseFloat( $(elem).css('margin-top') ) || 0
-      offset.left -= parseFloat( $(elem).css('margin-left') ) || 0
-
-      // Add offsetParent borders
-      parentOffset.top  += parseFloat( $(offsetParent[0]).css('border-top-width') ) || 0
-      parentOffset.left += parseFloat( $(offsetParent[0]).css('border-left-width') ) || 0
-
-      // Subtract the two offsets
-      return {
-        top:  offset.top  - parentOffset.top,
-        left: offset.left - parentOffset.left
-      }
-    },
-    offsetParent: function() {
-      return this.map(function(){
-        var parent = this.offsetParent || document.body
-        while (parent && !rootNodeRE.test(parent.nodeName) && $(parent).css("position") == "static")
-          parent = parent.offsetParent
-        return parent
-      })
-    }
-  }
-
-  // for now
-  $.fn.detach = $.fn.remove
-
-  // Generate the `width` and `height` functions
-  ;['width', 'height'].forEach(function(dimension){
-    var dimensionProperty =
-      dimension.replace(/./, function(m){ return m[0].toUpperCase() })
-
-    $.fn[dimension] = function(value){
-      var offset, el = this[0]
-      if (value === undefined) return isWindow(el) ? el['inner' + dimensionProperty] :
-        isDocument(el) ? el.documentElement['scroll' + dimensionProperty] :
-        (offset = this.offset()) && offset[dimension]
-      else return this.each(function(idx){
-        el = $(this)
-        el.css(dimension, funcArg(this, value, idx, el[dimension]()))
-      })
-    }
-  })
-
-  function traverseNode(node, fun) {
-    fun(node)
-    for (var i = 0, len = node.childNodes.length; i < len; i++)
-      traverseNode(node.childNodes[i], fun)
-  }
-
-  // Generate the `after`, `prepend`, `before`, `append`,
-  // `insertAfter`, `insertBefore`, `appendTo`, and `prependTo` methods.
-  adjacencyOperators.forEach(function(operator, operatorIndex) {
-    var inside = operatorIndex % 2 //=> prepend, append
-
-    $.fn[operator] = function(){
-      // arguments can be nodes, arrays of nodes, Zepto objects and HTML strings
-      var argType, nodes = $.map(arguments, function(arg) {
-            var arr = []
-            argType = type(arg)
-            if (argType == "array") {
-              arg.forEach(function(el) {
-                if (el.nodeType !== undefined) return arr.push(el)
-                else if ($.zepto.isZ(el)) return arr = arr.concat(el.get())
-                arr = arr.concat(zepto.fragment(el))
-              })
-              return arr
-            }
-            return argType == "object" || arg == null ?
-              arg : zepto.fragment(arg)
-          }),
-          parent, copyByClone = this.length > 1
-      if (nodes.length < 1) return this
-
-      return this.each(function(_, target){
-        parent = inside ? target : target.parentNode
-
-        // convert all methods to a "before" operation
-        target = operatorIndex == 0 ? target.nextSibling :
-                 operatorIndex == 1 ? target.firstChild :
-                 operatorIndex == 2 ? target :
-                 null
-
-        var parentInDocument = $.contains(document.documentElement, parent)
-
-        nodes.forEach(function(node){
-          if (copyByClone) node = node.cloneNode(true)
-          else if (!parent) return $(node).remove()
-
-          parent.insertBefore(node, target)
-          if (parentInDocument) traverseNode(node, function(el){
-            if (el.nodeName != null && el.nodeName.toUpperCase() === 'SCRIPT' &&
-               (!el.type || el.type === 'text/javascript') && !el.src){
-              var target = el.ownerDocument ? el.ownerDocument.defaultView : window
-              target['eval'].call(target, el.innerHTML)
-            }
-          })
-        })
-      })
-    }
-
-    // after    => insertAfter
-    // prepend  => prependTo
-    // before   => insertBefore
-    // append   => appendTo
-    $.fn[inside ? operator+'To' : 'insert'+(operatorIndex ? 'Before' : 'After')] = function(html){
-      $(html)[operator](this)
-      return this
-    }
-  })
-
-  zepto.Z.prototype = Z.prototype = $.fn
-
-  // Export internal API functions in the `$.zepto` namespace
-  zepto.uniq = uniq
-  zepto.deserializeValue = deserializeValue
-  $.zepto = zepto
-
-  return $
-})()
-
-window.Zepto = Zepto
-window.$ === undefined && (window.$ = Zepto)
-
-;(function($){
-  var _zid = 1, undefined,
-      slice = Array.prototype.slice,
-      isFunction = $.isFunction,
-      isString = function(obj){ return typeof obj == 'string' },
-      handlers = {},
-      specialEvents={},
-      focusinSupported = 'onfocusin' in window,
-      focus = { focus: 'focusin', blur: 'focusout' },
-      hover = { mouseenter: 'mouseover', mouseleave: 'mouseout' }
-
-  specialEvents.click = specialEvents.mousedown = specialEvents.mouseup = specialEvents.mousemove = 'MouseEvents'
-
-  function zid(element) {
-    return element._zid || (element._zid = _zid++)
-  }
-  function findHandlers(element, event, fn, selector) {
-    event = parse(event)
-    if (event.ns) var matcher = matcherFor(event.ns)
-    return (handlers[zid(element)] || []).filter(function(handler) {
-      return handler
-        && (!event.e  || handler.e == event.e)
-        && (!event.ns || matcher.test(handler.ns))
-        && (!fn       || zid(handler.fn) === zid(fn))
-        && (!selector || handler.sel == selector)
-    })
-  }
-  function parse(event) {
-    var parts = ('' + event).split('.')
-    return {e: parts[0], ns: parts.slice(1).sort().join(' ')}
-  }
-  function matcherFor(ns) {
-    return new RegExp('(?:^| )' + ns.replace(' ', ' .* ?') + '(?: |$)')
-  }
-
-  function eventCapture(handler, captureSetting) {
-    return handler.del &&
-      (!focusinSupported && (handler.e in focus)) ||
-      !!captureSetting
-  }
-
-  function realEvent(type) {
-    return hover[type] || (focusinSupported && focus[type]) || type
-  }
-
-  function add(element, events, fn, data, selector, delegator, capture){
-    var id = zid(element), set = (handlers[id] || (handlers[id] = []))
-    events.split(/\s/).forEach(function(event){
-      if (event == 'ready') return $(document).ready(fn)
-      var handler   = parse(event)
-      handler.fn    = fn
-      handler.sel   = selector
-      // emulate mouseenter, mouseleave
-      if (handler.e in hover) fn = function(e){
-        var related = e.relatedTarget
-        if (!related || (related !== this && !$.contains(this, related)))
-          return handler.fn.apply(this, arguments)
-      }
-      handler.del   = delegator
-      var callback  = delegator || fn
-      handler.proxy = function(e){
-        e = compatible(e)
-        if (e.isImmediatePropagationStopped()) return
-        e.data = data
-        var result = callback.apply(element, e._args == undefined ? [e] : [e].concat(e._args))
-        if (result === false) e.preventDefault(), e.stopPropagation()
-        return result
-      }
-      handler.i = set.length
-      set.push(handler)
-      if ('addEventListener' in element)
-        element.addEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture))
-    })
-  }
-  function remove(element, events, fn, selector, capture){
-    var id = zid(element)
-    ;(events || '').split(/\s/).forEach(function(event){
-      findHandlers(element, event, fn, selector).forEach(function(handler){
-        delete handlers[id][handler.i]
-      if ('removeEventListener' in element)
-        element.removeEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture))
-      })
-    })
-  }
-
-  $.event = { add: add, remove: remove }
-
-  $.proxy = function(fn, context) {
-    var args = (2 in arguments) && slice.call(arguments, 2)
-    if (isFunction(fn)) {
-      var proxyFn = function(){ return fn.apply(context, args ? args.concat(slice.call(arguments)) : arguments) }
-      proxyFn._zid = zid(fn)
-      return proxyFn
-    } else if (isString(context)) {
-      if (args) {
-        args.unshift(fn[context], fn)
-        return $.proxy.apply(null, args)
-      } else {
-        return $.proxy(fn[context], fn)
-      }
-    } else {
-      throw new TypeError("expected function")
-    }
-  }
-
-  $.fn.bind = function(event, data, callback){
-    return this.on(event, data, callback)
-  }
-  $.fn.unbind = function(event, callback){
-    return this.off(event, callback)
-  }
-  $.fn.one = function(event, selector, data, callback){
-    return this.on(event, selector, data, callback, 1)
-  }
-
-  var returnTrue = function(){return true},
-      returnFalse = function(){return false},
-      ignoreProperties = /^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/,
-      eventMethods = {
-        preventDefault: 'isDefaultPrevented',
-        stopImmediatePropagation: 'isImmediatePropagationStopped',
-        stopPropagation: 'isPropagationStopped'
-      }
-
-  function compatible(event, source) {
-    if (source || !event.isDefaultPrevented) {
-      source || (source = event)
-
-      $.each(eventMethods, function(name, predicate) {
-        var sourceMethod = source[name]
-        event[name] = function(){
-          this[predicate] = returnTrue
-          return sourceMethod && sourceMethod.apply(source, arguments)
-        }
-        event[predicate] = returnFalse
-      })
-
-      event.timeStamp || (event.timeStamp = Date.now())
-
-      if (source.defaultPrevented !== undefined ? source.defaultPrevented :
-          'returnValue' in source ? source.returnValue === false :
-          source.getPreventDefault && source.getPreventDefault())
-        event.isDefaultPrevented = returnTrue
-    }
-    return event
-  }
-
-  function createProxy(event) {
-    var key, proxy = { originalEvent: event }
-    for (key in event)
-      if (!ignoreProperties.test(key) && event[key] !== undefined) proxy[key] = event[key]
-
-    return compatible(proxy, event)
-  }
-
-  $.fn.delegate = function(selector, event, callback){
-    return this.on(event, selector, callback)
-  }
-  $.fn.undelegate = function(selector, event, callback){
-    return this.off(event, selector, callback)
-  }
-
-  $.fn.live = function(event, callback){
-    $(document.body).delegate(this.selector, event, callback)
-    return this
-  }
-  $.fn.die = function(event, callback){
-    $(document.body).undelegate(this.selector, event, callback)
-    return this
-  }
-
-  $.fn.on = function(event, selector, data, callback, one){
-    var autoRemove, delegator, $this = this
-    if (event && !isString(event)) {
-      $.each(event, function(type, fn){
-        $this.on(type, selector, data, fn, one)
-      })
-      return $this
-    }
-
-    if (!isString(selector) && !isFunction(callback) && callback !== false)
-      callback = data, data = selector, selector = undefined
-    if (callback === undefined || data === false)
-      callback = data, data = undefined
-
-    if (callback === false) callback = returnFalse
-
-    return $this.each(function(_, element){
-      if (one) autoRemove = function(e){
-        remove(element, e.type, callback)
-        return callback.apply(this, arguments)
-      }
-
-      if (selector) delegator = function(e){
-        var evt, match = $(e.target).closest(selector, element).get(0)
-        if (match && match !== element) {
-          evt = $.extend(createProxy(e), {currentTarget: match, liveFired: element})
-          return (autoRemove || callback).apply(match, [evt].concat(slice.call(arguments, 1)))
-        }
-      }
-
-      add(element, event, callback, data, selector, delegator || autoRemove)
-    })
-  }
-  $.fn.off = function(event, selector, callback){
-    var $this = this
-    if (event && !isString(event)) {
-      $.each(event, function(type, fn){
-        $this.off(type, selector, fn)
-      })
-      return $this
-    }
-
-    if (!isString(selector) && !isFunction(callback) && callback !== false)
-      callback = selector, selector = undefined
-
-    if (callback === false) callback = returnFalse
-
-    return $this.each(function(){
-      remove(this, event, callback, selector)
-    })
-  }
-
-  $.fn.trigger = function(event, args){
-    event = (isString(event) || $.isPlainObject(event)) ? $.Event(event) : compatible(event)
-    event._args = args
-    return this.each(function(){
-      // handle focus(), blur() by calling them directly
-      if (event.type in focus && typeof this[event.type] == "function") this[event.type]()
-      // items in the collection might not be DOM elements
-      else if ('dispatchEvent' in this) this.dispatchEvent(event)
-      else $(this).triggerHandler(event, args)
-    })
-  }
-
-  // triggers event handlers on current element just as if an event occurred,
-  // doesn't trigger an actual event, doesn't bubble
-  $.fn.triggerHandler = function(event, args){
-    var e, result
-    this.each(function(i, element){
-      e = createProxy(isString(event) ? $.Event(event) : event)
-      e._args = args
-      e.target = element
-      $.each(findHandlers(element, event.type || event), function(i, handler){
-        result = handler.proxy(e)
-        if (e.isImmediatePropagationStopped()) return false
-      })
-    })
-    return result
-  }
-
-  // shortcut methods for `.bind(event, fn)` for each event type
-  ;('focusin focusout focus blur load resize scroll unload click dblclick '+
-  'mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave '+
-  'change select keydown keypress keyup error').split(' ').forEach(function(event) {
-    $.fn[event] = function(callback) {
-      return (0 in arguments) ?
-        this.bind(event, callback) :
-        this.trigger(event)
-    }
-  })
-
-  $.Event = function(type, props) {
-    if (!isString(type)) props = type, type = props.type
-    var event = document.createEvent(specialEvents[type] || 'Events'), bubbles = true
-    if (props) for (var name in props) (name == 'bubbles') ? (bubbles = !!props[name]) : (event[name] = props[name])
-    event.initEvent(type, bubbles, true)
-    return compatible(event)
-  }
-
-})(Zepto)
-
-;(function($){
-  var jsonpID = +new Date(),
-      document = window.document,
-      key,
-      name,
-      rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-      scriptTypeRE = /^(?:text|application)\/javascript/i,
-      xmlTypeRE = /^(?:text|application)\/xml/i,
-      jsonType = 'application/json',
-      htmlType = 'text/html',
-      blankRE = /^\s*$/,
-      originAnchor = document.createElement('a')
-
-  originAnchor.href = window.location.href
-
-  // trigger a custom event and return false if it was cancelled
-  function triggerAndReturn(context, eventName, data) {
-    var event = $.Event(eventName)
-    $(context).trigger(event, data)
-    return !event.isDefaultPrevented()
-  }
-
-  // trigger an Ajax "global" event
-  function triggerGlobal(settings, context, eventName, data) {
-    if (settings.global) return triggerAndReturn(context || document, eventName, data)
-  }
-
-  // Number of active Ajax requests
-  $.active = 0
-
-  function ajaxStart(settings) {
-    if (settings.global && $.active++ === 0) triggerGlobal(settings, null, 'ajaxStart')
-  }
-  function ajaxStop(settings) {
-    if (settings.global && !(--$.active)) triggerGlobal(settings, null, 'ajaxStop')
-  }
-
-  // triggers an extra global event "ajaxBeforeSend" that's like "ajaxSend" but cancelable
-  function ajaxBeforeSend(xhr, settings) {
-    var context = settings.context
-    if (settings.beforeSend.call(context, xhr, settings) === false ||
-        triggerGlobal(settings, context, 'ajaxBeforeSend', [xhr, settings]) === false)
-      return false
-
-    triggerGlobal(settings, context, 'ajaxSend', [xhr, settings])
-  }
-  function ajaxSuccess(data, xhr, settings, deferred) {
-    var context = settings.context, status = 'success'
-    settings.success.call(context, data, status, xhr)
-    if (deferred) deferred.resolveWith(context, [data, status, xhr])
-    triggerGlobal(settings, context, 'ajaxSuccess', [xhr, settings, data])
-    ajaxComplete(status, xhr, settings)
-  }
-  // type: "timeout", "error", "abort", "parsererror"
-  function ajaxError(error, type, xhr, settings, deferred) {
-    var context = settings.context
-    settings.error.call(context, xhr, type, error)
-    if (deferred) deferred.rejectWith(context, [xhr, type, error])
-    triggerGlobal(settings, context, 'ajaxError', [xhr, settings, error || type])
-    ajaxComplete(type, xhr, settings)
-  }
-  // status: "success", "notmodified", "error", "timeout", "abort", "parsererror"
-  function ajaxComplete(status, xhr, settings) {
-    var context = settings.context
-    settings.complete.call(context, xhr, status)
-    triggerGlobal(settings, context, 'ajaxComplete', [xhr, settings])
-    ajaxStop(settings)
-  }
-
-  function ajaxDataFilter(data, type, settings) {
-    if (settings.dataFilter == empty) return data
-    var context = settings.context
-    return settings.dataFilter.call(context, data, type)
-  }
-
-  // Empty function, used as default callback
-  function empty() {}
-
-  $.ajaxJSONP = function(options, deferred){
-    if (!('type' in options)) return $.ajax(options)
-
-    var _callbackName = options.jsonpCallback,
-      callbackName = ($.isFunction(_callbackName) ?
-        _callbackName() : _callbackName) || ('Zepto' + (jsonpID++)),
-      script = document.createElement('script'),
-      originalCallback = window[callbackName],
-      responseData,
-      abort = function(errorType) {
-        $(script).triggerHandler('error', errorType || 'abort')
-      },
-      xhr = { abort: abort }, abortTimeout
-
-    if (deferred) deferred.promise(xhr)
-
-    $(script).on('load error', function(e, errorType){
-      clearTimeout(abortTimeout)
-      $(script).off().remove()
-
-      if (e.type == 'error' || !responseData) {
-        ajaxError(null, errorType || 'error', xhr, options, deferred)
-      } else {
-        ajaxSuccess(responseData[0], xhr, options, deferred)
-      }
-
-      window[callbackName] = originalCallback
-      if (responseData && $.isFunction(originalCallback))
-        originalCallback(responseData[0])
-
-      originalCallback = responseData = undefined
-    })
-
-    if (ajaxBeforeSend(xhr, options) === false) {
-      abort('abort')
-      return xhr
-    }
-
-    window[callbackName] = function(){
-      responseData = arguments
-    }
-
-    script.src = options.url.replace(/\?(.+)=\?/, '?$1=' + callbackName)
-    document.head.appendChild(script)
-
-    if (options.timeout > 0) abortTimeout = setTimeout(function(){
-      abort('timeout')
-    }, options.timeout)
-
-    return xhr
-  }
-
-  $.ajaxSettings = {
-    // Default type of request
-    type: 'GET',
-    // Callback that is executed before request
-    beforeSend: empty,
-    // Callback that is executed if the request succeeds
-    success: empty,
-    // Callback that is executed the the server drops error
-    error: empty,
-    // Callback that is executed on request complete (both: error and success)
-    complete: empty,
-    // The context for the callbacks
-    context: null,
-    // Whether to trigger "global" Ajax events
-    global: true,
-    // Transport
-    xhr: function () {
-      return new window.XMLHttpRequest()
-    },
-    // MIME types mapping
-    // IIS returns Javascript as "application/x-javascript"
-    accepts: {
-      script: 'text/javascript, application/javascript, application/x-javascript',
-      json:   jsonType,
-      xml:    'application/xml, text/xml',
-      html:   htmlType,
-      text:   'text/plain'
-    },
-    // Whether the request is to another domain
-    crossDomain: false,
-    // Default timeout
-    timeout: 0,
-    // Whether data should be serialized to string
-    processData: true,
-    // Whether the browser should be allowed to cache GET responses
-    cache: true,
-    //Used to handle the raw response data of XMLHttpRequest.
-    //This is a pre-filtering function to sanitize the response.
-    //The sanitized response should be returned
-    dataFilter: empty
-  }
-
-  function mimeToDataType(mime) {
-    if (mime) mime = mime.split(';', 2)[0]
-    return mime && ( mime == htmlType ? 'html' :
-      mime == jsonType ? 'json' :
-      scriptTypeRE.test(mime) ? 'script' :
-      xmlTypeRE.test(mime) && 'xml' ) || 'text'
-  }
-
-  function appendQuery(url, query) {
-    if (query == '') return url
-    return (url + '&' + query).replace(/[&?]{1,2}/, '?')
-  }
-
-  // serialize payload and append it to the URL for GET requests
-  function serializeData(options) {
-    if (options.processData && options.data && $.type(options.data) != "string")
-      options.data = $.param(options.data, options.traditional)
-    if (options.data && (!options.type || options.type.toUpperCase() == 'GET' || 'jsonp' == options.dataType))
-      options.url = appendQuery(options.url, options.data), options.data = undefined
-  }
-
-  $.ajax = function(options){
-    var settings = $.extend({}, options || {}),
-        deferred = $.Deferred && $.Deferred(),
-        urlAnchor, hashIndex
-    for (key in $.ajaxSettings) if (settings[key] === undefined) settings[key] = $.ajaxSettings[key]
-
-    ajaxStart(settings)
-
-    if (!settings.crossDomain) {
-      urlAnchor = document.createElement('a')
-      urlAnchor.href = settings.url
-      // cleans up URL for .href (IE only), see https://github.com/madrobby/zepto/pull/1049
-      urlAnchor.href = urlAnchor.href
-      settings.crossDomain = (originAnchor.protocol + '//' + originAnchor.host) !== (urlAnchor.protocol + '//' + urlAnchor.host)
-    }
-
-    if (!settings.url) settings.url = window.location.toString()
-    if ((hashIndex = settings.url.indexOf('#')) > -1) settings.url = settings.url.slice(0, hashIndex)
-    serializeData(settings)
-
-    var dataType = settings.dataType, hasPlaceholder = /\?.+=\?/.test(settings.url)
-    if (hasPlaceholder) dataType = 'jsonp'
-
-    if (settings.cache === false || (
-         (!options || options.cache !== true) &&
-         ('script' == dataType || 'jsonp' == dataType)
-        ))
-      settings.url = appendQuery(settings.url, '_=' + Date.now())
-
-    if ('jsonp' == dataType) {
-      if (!hasPlaceholder)
-        settings.url = appendQuery(settings.url,
-          settings.jsonp ? (settings.jsonp + '=?') : settings.jsonp === false ? '' : 'callback=?')
-      return $.ajaxJSONP(settings, deferred)
-    }
-
-    var mime = settings.accepts[dataType],
-        headers = { },
-        setHeader = function(name, value) { headers[name.toLowerCase()] = [name, value] },
-        protocol = /^([\w-]+:)\/\//.test(settings.url) ? RegExp.$1 : window.location.protocol,
-        xhr = settings.xhr(),
-        nativeSetHeader = xhr.setRequestHeader,
-        abortTimeout
-
-    if (deferred) deferred.promise(xhr)
-
-    if (!settings.crossDomain) setHeader('X-Requested-With', 'XMLHttpRequest')
-    setHeader('Accept', mime || '*/*')
-    if (mime = settings.mimeType || mime) {
-      if (mime.indexOf(',') > -1) mime = mime.split(',', 2)[0]
-      xhr.overrideMimeType && xhr.overrideMimeType(mime)
-    }
-    if (settings.contentType || (settings.contentType !== false && settings.data && settings.type.toUpperCase() != 'GET'))
-      setHeader('Content-Type', settings.contentType || 'application/x-www-form-urlencoded')
-
-    if (settings.headers) for (name in settings.headers) setHeader(name, settings.headers[name])
-    xhr.setRequestHeader = setHeader
-
-    xhr.onreadystatechange = function(){
-      if (xhr.readyState == 4) {
-        xhr.onreadystatechange = empty
-        clearTimeout(abortTimeout)
-        var result, error = false
-        if ((xhr.status >= 200 && xhr.status < 300) || xhr.status == 304 || (xhr.status == 0 && protocol == 'file:')) {
-          dataType = dataType || mimeToDataType(settings.mimeType || xhr.getResponseHeader('content-type'))
-
-          if (xhr.responseType == 'arraybuffer' || xhr.responseType == 'blob')
-            result = xhr.response
-          else {
-            result = xhr.responseText
-
-            try {
-              // http://perfectionkills.com/global-eval-what-are-the-options/
-              // sanitize response accordingly if data filter callback provided
-              result = ajaxDataFilter(result, dataType, settings)
-              if (dataType == 'script')    (1,eval)(result)
-              else if (dataType == 'xml')  result = xhr.responseXML
-              else if (dataType == 'json') result = blankRE.test(result) ? null : $.parseJSON(result)
-            } catch (e) { error = e }
-
-            if (error) return ajaxError(error, 'parsererror', xhr, settings, deferred)
-          }
-
-          ajaxSuccess(result, xhr, settings, deferred)
-        } else {
-          ajaxError(xhr.statusText || null, xhr.status ? 'error' : 'abort', xhr, settings, deferred)
-        }
-      }
-    }
-
-    if (ajaxBeforeSend(xhr, settings) === false) {
-      xhr.abort()
-      ajaxError(null, 'abort', xhr, settings, deferred)
-      return xhr
-    }
-
-    var async = 'async' in settings ? settings.async : true
-    xhr.open(settings.type, settings.url, async, settings.username, settings.password)
-
-    if (settings.xhrFields) for (name in settings.xhrFields) xhr[name] = settings.xhrFields[name]
-
-    for (name in headers) nativeSetHeader.apply(xhr, headers[name])
-
-    if (settings.timeout > 0) abortTimeout = setTimeout(function(){
-        xhr.onreadystatechange = empty
-        xhr.abort()
-        ajaxError(null, 'timeout', xhr, settings, deferred)
-      }, settings.timeout)
-
-    // avoid sending empty string (#319)
-    xhr.send(settings.data ? settings.data : null)
-    return xhr
-  }
-
-  // handle optional data/success arguments
-  function parseArguments(url, data, success, dataType) {
-    if ($.isFunction(data)) dataType = success, success = data, data = undefined
-    if (!$.isFunction(success)) dataType = success, success = undefined
-    return {
-      url: url
-    , data: data
-    , success: success
-    , dataType: dataType
-    }
-  }
-
-  $.get = function(/* url, data, success, dataType */){
-    return $.ajax(parseArguments.apply(null, arguments))
-  }
-
-  $.post = function(/* url, data, success, dataType */){
-    var options = parseArguments.apply(null, arguments)
-    options.type = 'POST'
-    return $.ajax(options)
-  }
-
-  $.getJSON = function(/* url, data, success */){
-    var options = parseArguments.apply(null, arguments)
-    options.dataType = 'json'
-    return $.ajax(options)
-  }
-
-  $.fn.load = function(url, data, success){
-    if (!this.length) return this
-    var self = this, parts = url.split(/\s/), selector,
-        options = parseArguments(url, data, success),
-        callback = options.success
-    if (parts.length > 1) options.url = parts[0], selector = parts[1]
-    options.success = function(response){
-      self.html(selector ?
-        $('<div>').html(response.replace(rscript, "")).find(selector)
-        : response)
-      callback && callback.apply(self, arguments)
-    }
-    $.ajax(options)
-    return this
-  }
-
-  var escape = encodeURIComponent
-
-  function serialize(params, obj, traditional, scope){
-    var type, array = $.isArray(obj), hash = $.isPlainObject(obj)
-    $.each(obj, function(key, value) {
-      type = $.type(value)
-      if (scope) key = traditional ? scope :
-        scope + '[' + (hash || type == 'object' || type == 'array' ? key : '') + ']'
-      // handle data in serializeArray() format
-      if (!scope && array) params.add(value.name, value.value)
-      // recurse into nested objects
-      else if (type == "array" || (!traditional && type == "object"))
-        serialize(params, value, traditional, key)
-      else params.add(key, value)
-    })
-  }
-
-  $.param = function(obj, traditional){
-    var params = []
-    params.add = function(key, value) {
-      if ($.isFunction(value)) value = value()
-      if (value == null) value = ""
-      this.push(escape(key) + '=' + escape(value))
-    }
-    serialize(params, obj, traditional)
-    return params.join('&').replace(/%20/g, '+')
-  }
-})(Zepto)
-
-;(function($){
-  $.fn.serializeArray = function() {
-    var name, type, result = [],
-      add = function(value) {
-        if (value.forEach) return value.forEach(add)
-        result.push({ name: name, value: value })
-      }
-    if (this[0]) $.each(this[0].elements, function(_, field){
-      type = field.type, name = field.name
-      if (name && field.nodeName.toLowerCase() != 'fieldset' &&
-        !field.disabled && type != 'submit' && type != 'reset' && type != 'button' && type != 'file' &&
-        ((type != 'radio' && type != 'checkbox') || field.checked))
-          add($(field).val())
-    })
-    return result
-  }
-
-  $.fn.serialize = function(){
-    var result = []
-    this.serializeArray().forEach(function(elm){
-      result.push(encodeURIComponent(elm.name) + '=' + encodeURIComponent(elm.value))
-    })
-    return result.join('&')
-  }
-
-  $.fn.submit = function(callback) {
-    if (0 in arguments) this.bind('submit', callback)
-    else if (this.length) {
-      var event = $.Event('submit')
-      this.eq(0).trigger(event)
-      if (!event.isDefaultPrevented()) this.get(0).submit()
-    }
-    return this
-  }
-
-})(Zepto)
-
-;(function(){
-  // getComputedStyle shouldn't freak out when called
-  // without a valid element as argument
-  try {
-    getComputedStyle(undefined)
-  } catch(e) {
-    var nativeGetComputedStyle = getComputedStyle
-    window.getComputedStyle = function(element, pseudoElement){
-      try {
-        return nativeGetComputedStyle(element, pseudoElement)
-      } catch(e) {
-        return null
-      }
-    }
-  }
-})()
-  return Zepto
-}))

From fb5be3995ef01eb9c0828947bc0387f3d6ec7840 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:13:12 +0200
Subject: [PATCH 383/519] update gitignore

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

diff --git a/.gitignore b/.gitignore
index fb55045ce..553ebdac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 dist*
-static/js/
+static/bundles/
 static/tmp/
 static/combined/
 frontend/node_modules/

From 4ee48ca268340d98cddb7c880141db6a781a8ca7 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:13:45 +0200
Subject: [PATCH 384/519] move js and css to frontend folder

---
 frontend/polyfills/fetch.js                   | 466 +++++++++++
 frontend/polyfills/main.js                    |   2 +
 frontend/polyfills/url-search-params.js       | 348 ++++++++
 frontend/src/main.js                          |  43 +
 .../src/services/html-helpers/html-helpers.js |  41 +
 .../src/services/http-client/http-client.js   |  41 +
 frontend/src/services/i18n/i18n.js            |  32 +
 .../services/util-registry/util-registry.js   | 122 +++
 frontend/src/utils/alerts/alerts.js           | 206 +++++
 frontend/src/utils/alerts/alerts.scss         | 210 +++++
 frontend/src/utils/asidenav/asidenav.js       | 105 +++
 frontend/src/utils/asidenav/asidenav.scss     | 364 +++++++++
 frontend/src/utils/async-form/async-form.js   | 117 +++
 frontend/src/utils/async-form/async-form.scss |  78 ++
 .../utils/async-table/async-table-filter.scss |   5 +
 frontend/src/utils/async-table/async-table.js | 413 ++++++++++
 .../src/utils/async-table/async-table.scss    |   5 +
 frontend/src/utils/check-all/check-all.js     | 141 ++++
 frontend/src/utils/form/form.js               | 599 ++++++++++++++
 frontend/src/utils/form/form.scss             |  45 ++
 frontend/src/utils/inputs/checkbox.scss       |  82 ++
 frontend/src/utils/inputs/inputs.js           | 194 +++++
 frontend/src/utils/inputs/inputs.scss         | 239 ++++++
 frontend/src/utils/inputs/radio.scss          |  72 ++
 frontend/src/utils/mass-input/mass-input.js   | 218 ++++++
 frontend/src/utils/modal/modal.js             | 203 +++++
 frontend/src/utils/modal/modal.scss           | 115 +++
 frontend/src/utils/show-hide/show-hide.js     | 109 +++
 frontend/src/utils/show-hide/show-hide.scss   |  54 ++
 frontend/src/utils/tabber/tabber.js           |  92 +++
 frontend/src/utils/tabber/tabber.scss         |  39 +
 frontend/src/utils/tooltips/tooltips.js       |   7 +
 frontend/src/utils/tooltips/tooltips.scss     |  88 +++
 frontend/src/utils/utils.js                   |  38 +
 frontend/vendor/flatpickr.css                 | 740 ++++++++++++++++++
 frontend/vendor/flatpickr.js                  |   2 +
 frontend/vendor/fontawesome.css               |   5 +
 frontend/vendor/main.js                       |   5 +
 frontend/vendor/zepto.js                      |   2 +
 static/fonts/fonts.css                        | 129 +++
 40 files changed, 5816 insertions(+)
 create mode 100644 frontend/polyfills/fetch.js
 create mode 100644 frontend/polyfills/main.js
 create mode 100644 frontend/polyfills/url-search-params.js
 create mode 100644 frontend/src/main.js
 create mode 100644 frontend/src/services/html-helpers/html-helpers.js
 create mode 100644 frontend/src/services/http-client/http-client.js
 create mode 100644 frontend/src/services/i18n/i18n.js
 create mode 100644 frontend/src/services/util-registry/util-registry.js
 create mode 100644 frontend/src/utils/alerts/alerts.js
 create mode 100644 frontend/src/utils/alerts/alerts.scss
 create mode 100644 frontend/src/utils/asidenav/asidenav.js
 create mode 100644 frontend/src/utils/asidenav/asidenav.scss
 create mode 100644 frontend/src/utils/async-form/async-form.js
 create mode 100644 frontend/src/utils/async-form/async-form.scss
 create mode 100644 frontend/src/utils/async-table/async-table-filter.scss
 create mode 100644 frontend/src/utils/async-table/async-table.js
 create mode 100644 frontend/src/utils/async-table/async-table.scss
 create mode 100644 frontend/src/utils/check-all/check-all.js
 create mode 100644 frontend/src/utils/form/form.js
 create mode 100644 frontend/src/utils/form/form.scss
 create mode 100644 frontend/src/utils/inputs/checkbox.scss
 create mode 100644 frontend/src/utils/inputs/inputs.js
 create mode 100644 frontend/src/utils/inputs/inputs.scss
 create mode 100644 frontend/src/utils/inputs/radio.scss
 create mode 100644 frontend/src/utils/mass-input/mass-input.js
 create mode 100644 frontend/src/utils/modal/modal.js
 create mode 100644 frontend/src/utils/modal/modal.scss
 create mode 100644 frontend/src/utils/show-hide/show-hide.js
 create mode 100644 frontend/src/utils/show-hide/show-hide.scss
 create mode 100644 frontend/src/utils/tabber/tabber.js
 create mode 100644 frontend/src/utils/tabber/tabber.scss
 create mode 100644 frontend/src/utils/tooltips/tooltips.js
 create mode 100644 frontend/src/utils/tooltips/tooltips.scss
 create mode 100644 frontend/src/utils/utils.js
 create mode 100644 frontend/vendor/flatpickr.css
 create mode 100644 frontend/vendor/flatpickr.js
 create mode 100644 frontend/vendor/fontawesome.css
 create mode 100644 frontend/vendor/main.js
 create mode 100644 frontend/vendor/zepto.js
 create mode 100644 static/fonts/fonts.css

diff --git a/frontend/polyfills/fetch.js b/frontend/polyfills/fetch.js
new file mode 100644
index 000000000..ac9a4fd87
--- /dev/null
+++ b/frontend/polyfills/fetch.js
@@ -0,0 +1,466 @@
+(function(self) {
+  'use strict';
+
+  if (self.fetch) {
+    return
+  }
+
+  var support = {
+    searchParams: 'URLSearchParams' in self,
+    iterable: 'Symbol' in self && 'iterator' in Symbol,
+    blob: 'FileReader' in self && 'Blob' in self && (function() {
+      try {
+        new Blob()
+        return true
+      } catch(e) {
+        return false
+      }
+    })(),
+    formData: 'FormData' in self,
+    arrayBuffer: 'ArrayBuffer' in self
+  }
+
+  if (support.arrayBuffer) {
+    var viewClasses = [
+      '[object Int8Array]',
+      '[object Uint8Array]',
+      '[object Uint8ClampedArray]',
+      '[object Int16Array]',
+      '[object Uint16Array]',
+      '[object Int32Array]',
+      '[object Uint32Array]',
+      '[object Float32Array]',
+      '[object Float64Array]'
+    ]
+
+    var isDataView = function(obj) {
+      return obj && DataView.prototype.isPrototypeOf(obj)
+    }
+
+    var isArrayBufferView = ArrayBuffer.isView || function(obj) {
+      return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1
+    }
+  }
+
+  function normalizeName(name) {
+    if (typeof name !== 'string') {
+      name = String(name)
+    }
+    if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) {
+      throw new TypeError('Invalid character in header field name')
+    }
+    return name.toLowerCase()
+  }
+
+  function normalizeValue(value) {
+    if (typeof value !== 'string') {
+      value = String(value)
+    }
+    return value
+  }
+
+  // Build a destructive iterator for the value list
+  function iteratorFor(items) {
+    var iterator = {
+      next: function() {
+        var value = items.shift()
+        return {done: value === undefined, value: value}
+      }
+    }
+
+    if (support.iterable) {
+      iterator[Symbol.iterator] = function() {
+        return iterator
+      }
+    }
+
+    return iterator
+  }
+
+  function Headers(headers) {
+    this.map = {}
+
+    if (headers instanceof Headers) {
+      headers.forEach(function(value, name) {
+        this.append(name, value)
+      }, this)
+    } else if (Array.isArray(headers)) {
+      headers.forEach(function(header) {
+        this.append(header[0], header[1])
+      }, this)
+    } else if (headers) {
+      Object.getOwnPropertyNames(headers).forEach(function(name) {
+        this.append(name, headers[name])
+      }, this)
+    }
+  }
+
+  Headers.prototype.append = function(name, value) {
+    name = normalizeName(name)
+    value = normalizeValue(value)
+    var oldValue = this.map[name]
+    this.map[name] = oldValue ? oldValue+','+value : value
+  }
+
+  Headers.prototype['delete'] = function(name) {
+    delete this.map[normalizeName(name)]
+  }
+
+  Headers.prototype.get = function(name) {
+    name = normalizeName(name)
+    return this.has(name) ? this.map[name] : null
+  }
+
+  Headers.prototype.has = function(name) {
+    return this.map.hasOwnProperty(normalizeName(name))
+  }
+
+  Headers.prototype.set = function(name, value) {
+    this.map[normalizeName(name)] = normalizeValue(value)
+  }
+
+  Headers.prototype.forEach = function(callback, thisArg) {
+    for (var name in this.map) {
+      if (this.map.hasOwnProperty(name)) {
+        callback.call(thisArg, this.map[name], name, this)
+      }
+    }
+  }
+
+  Headers.prototype.keys = function() {
+    var items = []
+    this.forEach(function(value, name) { items.push(name) })
+    return iteratorFor(items)
+  }
+
+  Headers.prototype.values = function() {
+    var items = []
+    this.forEach(function(value) { items.push(value) })
+    return iteratorFor(items)
+  }
+
+  Headers.prototype.entries = function() {
+    var items = []
+    this.forEach(function(value, name) { items.push([name, value]) })
+    return iteratorFor(items)
+  }
+
+  if (support.iterable) {
+    Headers.prototype[Symbol.iterator] = Headers.prototype.entries
+  }
+
+  function consumed(body) {
+    if (body.bodyUsed) {
+      return Promise.reject(new TypeError('Already read'))
+    }
+    body.bodyUsed = true
+  }
+
+  function fileReaderReady(reader) {
+    return new Promise(function(resolve, reject) {
+      reader.onload = function() {
+        resolve(reader.result)
+      }
+      reader.onerror = function() {
+        reject(reader.error)
+      }
+    })
+  }
+
+  function readBlobAsArrayBuffer(blob) {
+    var reader = new FileReader()
+    var promise = fileReaderReady(reader)
+    reader.readAsArrayBuffer(blob)
+    return promise
+  }
+
+  function readBlobAsText(blob) {
+    var reader = new FileReader()
+    var promise = fileReaderReady(reader)
+    reader.readAsText(blob)
+    return promise
+  }
+
+  function readArrayBufferAsText(buf) {
+    var view = new Uint8Array(buf)
+    var chars = new Array(view.length)
+
+    for (var i = 0; i < view.length; i++) {
+      chars[i] = String.fromCharCode(view[i])
+    }
+    return chars.join('')
+  }
+
+  function bufferClone(buf) {
+    if (buf.slice) {
+      return buf.slice(0)
+    } else {
+      var view = new Uint8Array(buf.byteLength)
+      view.set(new Uint8Array(buf))
+      return view.buffer
+    }
+  }
+
+  function Body() {
+    this.bodyUsed = false
+
+    this._initBody = function(body) {
+      this._bodyInit = body
+      if (!body) {
+        this._bodyText = ''
+      } else if (typeof body === 'string') {
+        this._bodyText = body
+      } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
+        this._bodyBlob = body
+      } else if (support.formData && FormData.prototype.isPrototypeOf(body)) {
+        this._bodyFormData = body
+      } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
+        this._bodyText = body.toString()
+      } else if (support.arrayBuffer && support.blob && isDataView(body)) {
+        this._bodyArrayBuffer = bufferClone(body.buffer)
+        // IE 10-11 can't handle a DataView body.
+        this._bodyInit = new Blob([this._bodyArrayBuffer])
+      } else if (support.arrayBuffer && (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))) {
+        this._bodyArrayBuffer = bufferClone(body)
+      } else {
+        throw new Error('unsupported BodyInit type')
+      }
+
+      if (!this.headers.get('content-type')) {
+        if (typeof body === 'string') {
+          this.headers.set('content-type', 'text/plain;charset=UTF-8')
+        } else if (this._bodyBlob && this._bodyBlob.type) {
+          this.headers.set('content-type', this._bodyBlob.type)
+        } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
+          this.headers.set('content-type', 'application/x-www-form-urlencoded;charset=UTF-8')
+        }
+      }
+    }
+
+    if (support.blob) {
+      this.blob = function() {
+        var rejected = consumed(this)
+        if (rejected) {
+          return rejected
+        }
+
+        if (this._bodyBlob) {
+          return Promise.resolve(this._bodyBlob)
+        } else if (this._bodyArrayBuffer) {
+          return Promise.resolve(new Blob([this._bodyArrayBuffer]))
+        } else if (this._bodyFormData) {
+          throw new Error('could not read FormData body as blob')
+        } else {
+          return Promise.resolve(new Blob([this._bodyText]))
+        }
+      }
+
+      this.arrayBuffer = function() {
+        if (this._bodyArrayBuffer) {
+          return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
+        } else {
+          return this.blob().then(readBlobAsArrayBuffer)
+        }
+      }
+    }
+
+    this.text = function() {
+      var rejected = consumed(this)
+      if (rejected) {
+        return rejected
+      }
+
+      if (this._bodyBlob) {
+        return readBlobAsText(this._bodyBlob)
+      } else if (this._bodyArrayBuffer) {
+        return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer))
+      } else if (this._bodyFormData) {
+        throw new Error('could not read FormData body as text')
+      } else {
+        return Promise.resolve(this._bodyText)
+      }
+    }
+
+    if (support.formData) {
+      this.formData = function() {
+        return this.text().then(decode)
+      }
+    }
+
+    this.json = function() {
+      return this.text().then(JSON.parse)
+    }
+
+    return this
+  }
+
+  // HTTP methods whose capitalization should be normalized
+  var methods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT']
+
+  function normalizeMethod(method) {
+    var upcased = method.toUpperCase()
+    return (methods.indexOf(upcased) > -1) ? upcased : method
+  }
+
+  function Request(input, options) {
+    options = options || {}
+    var body = options.body
+
+    if (input instanceof Request) {
+      if (input.bodyUsed) {
+        throw new TypeError('Already read')
+      }
+      this.url = input.url
+      this.credentials = input.credentials
+      if (!options.headers) {
+        this.headers = new Headers(input.headers)
+      }
+      this.method = input.method
+      this.mode = input.mode
+      if (!body && input._bodyInit != null) {
+        body = input._bodyInit
+        input.bodyUsed = true
+      }
+    } else {
+      this.url = String(input)
+    }
+
+    this.credentials = options.credentials || this.credentials || 'omit'
+    if (options.headers || !this.headers) {
+      this.headers = new Headers(options.headers)
+    }
+    this.method = normalizeMethod(options.method || this.method || 'GET')
+    this.mode = options.mode || this.mode || null
+    this.referrer = null
+
+    if ((this.method === 'GET' || this.method === 'HEAD') && body) {
+      throw new TypeError('Body not allowed for GET or HEAD requests')
+    }
+    this._initBody(body)
+  }
+
+  Request.prototype.clone = function() {
+    return new Request(this, { body: this._bodyInit })
+  }
+
+  function decode(body) {
+    var form = new FormData()
+    body.trim().split('&').forEach(function(bytes) {
+      if (bytes) {
+        var split = bytes.split('=')
+        var name = split.shift().replace(/\+/g, ' ')
+        var value = split.join('=').replace(/\+/g, ' ')
+        form.append(decodeURIComponent(name), decodeURIComponent(value))
+      }
+    })
+    return form
+  }
+
+  function parseHeaders(rawHeaders) {
+    var headers = new Headers()
+    // Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
+    // https://tools.ietf.org/html/rfc7230#section-3.2
+    var preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ')
+    preProcessedHeaders.split(/\r?\n/).forEach(function(line) {
+      var parts = line.split(':')
+      var key = parts.shift().trim()
+      if (key) {
+        var value = parts.join(':').trim()
+        headers.append(key, value)
+      }
+    })
+    return headers
+  }
+
+  Body.call(Request.prototype)
+
+  function Response(bodyInit, options) {
+    if (!options) {
+      options = {}
+    }
+
+    this.type = 'default'
+    this.status = options.status === undefined ? 200 : options.status
+    this.ok = this.status >= 200 && this.status < 300
+    this.statusText = 'statusText' in options ? options.statusText : 'OK'
+    this.headers = new Headers(options.headers)
+    this.url = options.url || ''
+    this._initBody(bodyInit)
+  }
+
+  Body.call(Response.prototype)
+
+  Response.prototype.clone = function() {
+    return new Response(this._bodyInit, {
+      status: this.status,
+      statusText: this.statusText,
+      headers: new Headers(this.headers),
+      url: this.url
+    })
+  }
+
+  Response.error = function() {
+    var response = new Response(null, {status: 0, statusText: ''})
+    response.type = 'error'
+    return response
+  }
+
+  var redirectStatuses = [301, 302, 303, 307, 308]
+
+  Response.redirect = function(url, status) {
+    if (redirectStatuses.indexOf(status) === -1) {
+      throw new RangeError('Invalid status code')
+    }
+
+    return new Response(null, {status: status, headers: {location: url}})
+  }
+
+  self.Headers = Headers
+  self.Request = Request
+  self.Response = Response
+
+  self.fetch = function(input, init) {
+    return new Promise(function(resolve, reject) {
+      var request = new Request(input, init)
+      var xhr = new XMLHttpRequest()
+
+      xhr.onload = function() {
+        var options = {
+          status: xhr.status,
+          statusText: xhr.statusText,
+          headers: parseHeaders(xhr.getAllResponseHeaders() || '')
+        }
+        options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL')
+        var body = 'response' in xhr ? xhr.response : xhr.responseText
+        resolve(new Response(body, options))
+      }
+
+      xhr.onerror = function() {
+        reject(new TypeError('Network request failed'))
+      }
+
+      xhr.ontimeout = function() {
+        reject(new TypeError('Network request failed'))
+      }
+
+      xhr.open(request.method, request.url, true)
+
+      if (request.credentials === 'include') {
+        xhr.withCredentials = true
+      } else if (request.credentials === 'omit') {
+        xhr.withCredentials = false
+      }
+
+      if ('responseType' in xhr && support.blob) {
+        xhr.responseType = 'blob'
+      }
+
+      request.headers.forEach(function(value, name) {
+        xhr.setRequestHeader(name, value)
+      })
+
+      xhr.send(typeof request._bodyInit === 'undefined' ? null : request._bodyInit)
+    })
+  }
+  self.fetch.polyfill = true
+})(typeof self !== 'undefined' ? self : this);
\ No newline at end of file
diff --git a/frontend/polyfills/main.js b/frontend/polyfills/main.js
new file mode 100644
index 000000000..7e4c554ea
--- /dev/null
+++ b/frontend/polyfills/main.js
@@ -0,0 +1,2 @@
+import './fetch';
+import './url-search-params';
diff --git a/frontend/polyfills/url-search-params.js b/frontend/polyfills/url-search-params.js
new file mode 100644
index 000000000..e38c12021
--- /dev/null
+++ b/frontend/polyfills/url-search-params.js
@@ -0,0 +1,348 @@
+(function(global) {
+  /**
+   * Polyfill URLSearchParams
+   *
+   * Inspired from : https://github.com/WebReflection/url-search-params/blob/master/src/url-search-params.js
+   */
+
+  var checkIfIteratorIsSupported = function() {
+    try {
+      return !!Symbol.iterator;
+    } catch(error) {
+      return false;
+    }
+  };
+
+
+  var iteratorSupported = checkIfIteratorIsSupported();
+
+  var createIterator = function(items) {
+    var iterator = {
+      next: function() {
+        var value = items.shift();
+        return { done: value === void 0, value: value };
+      }
+    };
+
+    if(iteratorSupported) {
+      iterator[Symbol.iterator] = function() {
+        return iterator;
+      };
+    }
+
+    return iterator;
+  };
+
+  /**
+   * Search param name and values should be encoded according to https://url.spec.whatwg.org/#urlencoded-serializing
+   * encodeURIComponent() produces the same result except encoding spaces as `%20` instead of `+`.
+   */
+  var serializeParam = function(value) {
+    return encodeURIComponent(value).replace(/%20/g, '+');
+  };
+
+  var deserializeParam = function(value) {
+    return decodeURIComponent(value).replace(/\+/g, ' ');
+  };
+
+  var polyfillURLSearchParams= function() {
+
+    var URLSearchParams = function(searchString) {
+      Object.defineProperty(this, '_entries', { value: {} });
+
+      if(typeof searchString === 'string') {
+        if(searchString !== '') {
+          searchString = searchString.replace(/^\?/, '');
+          var attributes = searchString.split('&');
+          var attribute;
+          for(var i = 0; i < attributes.length; i++) {
+            attribute = attributes[i].split('=');
+            this.append(
+              deserializeParam(attribute[0]),
+              (attribute.length > 1) ? deserializeParam(attribute[1]) : ''
+            );
+          }
+        }
+      } else if(searchString instanceof URLSearchParams) {
+        var _this = this;
+        searchString.forEach(function(value, name) {
+          _this.append(value, name);
+        });
+      }
+    };
+
+    var proto = URLSearchParams.prototype;
+
+    proto.append = function(name, value) {
+      if(name in this._entries) {
+        this._entries[name].push(value.toString());
+      } else {
+        this._entries[name] = [value.toString()];
+      }
+    };
+
+    proto.delete = function(name) {
+      delete this._entries[name];
+    };
+
+    proto.get = function(name) {
+      return (name in this._entries) ? this._entries[name][0] : null;
+    };
+
+    proto.getAll = function(name) {
+      return (name in this._entries) ? this._entries[name].slice(0) : [];
+    };
+
+    proto.has = function(name) {
+      return (name in this._entries);
+    };
+
+    proto.set = function(name, value) {
+      this._entries[name] = [value.toString()];
+    };
+
+    proto.forEach = function(callback, thisArg) {
+      var entries;
+      for(var name in this._entries) {
+        if(this._entries.hasOwnProperty(name)) {
+          entries = this._entries[name];
+          for(var i = 0; i < entries.length; i++) {
+            callback.call(thisArg, entries[i], name, this);
+          }
+        }
+      }
+    };
+
+    proto.keys = function() {
+      var items = [];
+      this.forEach(function(value, name) { items.push(name); });
+      return createIterator(items);
+    };
+
+    proto.values = function() {
+      var items = [];
+      this.forEach(function(value) { items.push(value); });
+      return createIterator(items);
+    };
+
+    proto.entries = function() {
+      var items = [];
+      this.forEach(function(value, name) { items.push([name, value]); });
+      return createIterator(items);
+    };
+
+    if(iteratorSupported) {
+      proto[Symbol.iterator] = proto.entries;
+    }
+
+    proto.toString = function() {
+      var searchString = '';
+      this.forEach(function(value, name) {
+        if(searchString.length > 0) searchString+= '&';
+        searchString += serializeParam(name) + '=' + serializeParam(value);
+      });
+      return searchString;
+    };
+
+    global.URLSearchParams = URLSearchParams;
+  };
+
+  if(!('URLSearchParams' in global) || (new URLSearchParams('?a=1').toString() !== 'a=1')) {
+    polyfillURLSearchParams();
+  }
+
+  // HTMLAnchorElement
+
+})(
+  (typeof global !== 'undefined') ? global
+    : ((typeof window !== 'undefined') ? window
+    : ((typeof self !== 'undefined') ? self : this))
+);
+
+(function(global) {
+  /**
+   * Polyfill URL
+   *
+   * Inspired from : https://github.com/arv/DOM-URL-Polyfill/blob/master/src/url.js
+   */
+
+  var checkIfURLIsSupported = function() {
+    try {
+      var u = new URL('b', 'http://a');
+      u.pathname = 'c%20d';
+      return (u.href === 'http://a/c%20d') && u.searchParams;
+    } catch(e) {
+      return false;
+    }
+  };
+
+
+  var polyfillURL = function() {
+    var _URL = global.URL;
+
+    var URL = function(url, base) {
+      if(typeof url !== 'string') url = String(url);
+
+      var doc = document.implementation.createHTMLDocument('');
+      window.doc = doc;
+      if(base) {
+        var baseElement = doc.createElement('base');
+        baseElement.href = base;
+        doc.head.appendChild(baseElement);
+      }
+
+      var anchorElement = doc.createElement('a');
+      anchorElement.href = url;
+      doc.body.appendChild(anchorElement);
+      anchorElement.href = anchorElement.href; // force href to refresh
+
+      if(anchorElement.protocol === ':' || !/:/.test(anchorElement.href)) {
+        throw new TypeError('Invalid URL');
+      }
+
+      Object.defineProperty(this, '_anchorElement', {
+        value: anchorElement
+      });
+    };
+
+    var proto = URL.prototype;
+
+    var linkURLWithAnchorAttribute = function(attributeName) {
+      Object.defineProperty(proto, attributeName, {
+        get: function() {
+          return this._anchorElement[attributeName];
+        },
+        set: function(value) {
+          this._anchorElement[attributeName] = value;
+        },
+        enumerable: true
+      });
+    };
+
+    ['hash', 'host', 'hostname', 'port', 'protocol', 'search']
+    .forEach(function(attributeName) {
+      linkURLWithAnchorAttribute(attributeName);
+    });
+
+    Object.defineProperties(proto, {
+
+      'toString': {
+        get: function() {
+          var _this = this;
+          return function() {
+            return _this.href;
+          };
+        }
+      },
+
+      'href' : {
+        get: function() {
+          return this._anchorElement.href.replace(/\?$/,'');
+        },
+        set: function(value) {
+          this._anchorElement.href = value;
+        },
+        enumerable: true
+      },
+
+      'pathname' : {
+        get: function() {
+          return this._anchorElement.pathname.replace(/(^\/?)/,'/');
+        },
+        set: function(value) {
+          this._anchorElement.pathname = value;
+        },
+        enumerable: true
+      },
+
+      'origin': {
+        get: function() {
+          // get expected port from protocol
+          var expectedPort = {'http:': 80, 'https:': 443, 'ftp:': 21}[this._anchorElement.protocol];
+          // add port to origin if, expected port is different than actual port
+          // and it is not empty f.e http://foo:8080
+          // 8080 != 80 && 8080 != ''
+          var addPortToOrigin = this._anchorElement.port != expectedPort &&
+            this._anchorElement.port !== ''
+
+          return this._anchorElement.protocol +
+            '//' +
+            this._anchorElement.hostname +
+            (addPortToOrigin ? (':' + this._anchorElement.port) : '');
+        },
+        enumerable: true
+      },
+
+      'password': { // TODO
+        get: function() {
+          return '';
+        },
+        set: function(value) {
+        },
+        enumerable: true
+      },
+
+      'username': { // TODO
+        get: function() {
+          return '';
+        },
+        set: function(value) {
+        },
+        enumerable: true
+      },
+
+      'searchParams': {
+        get: function() {
+          var searchParams = new URLSearchParams(this.search);
+          var _this = this;
+          ['append', 'delete', 'set'].forEach(function(methodName) {
+            var method = searchParams[methodName];
+            searchParams[methodName] = function() {
+              method.apply(searchParams, arguments);
+              _this.search = searchParams.toString();
+            };
+          });
+          return searchParams;
+        },
+        enumerable: true
+      }
+    });
+
+    URL.createObjectURL = function(blob) {
+      return _URL.createObjectURL.apply(_URL, arguments);
+    };
+
+    URL.revokeObjectURL = function(url) {
+      return _URL.revokeObjectURL.apply(_URL, arguments);
+    };
+
+    global.URL = URL;
+
+  };
+
+  if(!checkIfURLIsSupported()) {
+    polyfillURL();
+  }
+
+  if((global.location !== void 0) && !('origin' in global.location)) {
+    var getOrigin = function() {
+      return global.location.protocol + '//' + global.location.hostname + (global.location.port ? (':' + global.location.port) : '');
+    };
+
+    try {
+      Object.defineProperty(global.location, 'origin', {
+        get: getOrigin,
+        enumerable: true
+      });
+    } catch(e) {
+      setInterval(function() {
+        global.location.origin = getOrigin();
+      }, 100);
+    }
+  }
+
+})(
+  (typeof global !== 'undefined') ? global
+    : ((typeof window !== 'undefined') ? window
+    : ((typeof self !== 'undefined') ? self : this))
+);
diff --git a/frontend/src/main.js b/frontend/src/main.js
new file mode 100644
index 000000000..91ebb8e24
--- /dev/null
+++ b/frontend/src/main.js
@@ -0,0 +1,43 @@
+import { HttpClient } from './services/http-client/http-client';
+import { HtmlHelpers } from './services/html-helpers/html-helpers';
+import { I18n } from './services/i18n/i18n';
+import { UtilRegistry } from './services/util-registry/util-registry';
+
+// import utils
+import Utils from './utils/utils';
+
+class App {
+  httpClient = new HttpClient();
+  htmlHelpers = new HtmlHelpers();
+  i18n = new I18n();
+  utilRegistry = new UtilRegistry();
+
+  constructor() {
+    this.utilRegistry.setApp(this);
+
+    Utils.forEach(util => {
+      this.utilRegistry.register(util);
+    });
+  }
+}
+
+export const app = new App();
+
+// attach the app to window to be able to get a hold of the
+// app instance from the shakespearean templates
+window.App = app;
+
+// dont know where to put this currently...
+// interceptor to throw an error if an http response does not match the expected content-type
+// function contentTypeInterceptor(response, options) {
+//   if (!options || !options.headers.get('Accept')) {
+//     return;
+//   }
+
+//   const contentType = response.headers.get("content-type");
+//   if (!contentType.match(options.accept)) {
+//     throw new Error('Server returned with "' + contentType + '" when "' + options.accept + '" was expected');
+//   }
+// }
+
+// window.HttpClient.addResponseInterceptor(contentTypeInterceptor);
diff --git a/frontend/src/services/html-helpers/html-helpers.js b/frontend/src/services/html-helpers/html-helpers.js
new file mode 100644
index 000000000..7956a569c
--- /dev/null
+++ b/frontend/src/services/html-helpers/html-helpers.js
@@ -0,0 +1,41 @@
+export class HtmlHelpers {
+
+  // `parseResponse` takes a raw HttpClient response and an options object.
+  // Returns an object with `element` being an contextual fragment of the
+  // HTML in the response and `ifPrefix` being the prefix that was used to
+  // "unique-ify" the ids of the received HTML.
+  // Original Response IDs can optionally be kept by adding `keepIds: true`
+  // to the `options` object.
+  parseResponse(response, options = {}) {
+    return response.text()
+      .then(
+        (responseText) => {
+          const docFrag = document.createRange().createContextualFragment(responseText);
+          let idPrefix;
+          if (!options.keepIds) {
+            idPrefix = this._getIdPrefix();
+            this._prefixIds(docFrag, idPrefix);
+          }
+          return Promise.resolve({ idPrefix, element: docFrag });
+        },
+        Promise.reject,
+      ).catch(console.error);
+  }
+
+  _prefixIds(element, idPrefix) {
+    const idAttrs = ['id', 'for', 'data-conditional-input', 'data-modal-trigger'];
+
+    idAttrs.forEach((attr) => {
+      Array.from(element.querySelectorAll('[' + attr + ']')).forEach((input) => {
+        const value = idPrefix + input.getAttribute(attr);
+        input.setAttribute(attr, value);
+      });
+    });
+  }
+
+  _getIdPrefix() {
+    // leading 'r'(andom) to overcome the fact that IDs
+    // starting with a numeric value are not valid in CSS
+    return 'r' + Math.floor(Math.random() * 100000) + '__';
+  }
+}
diff --git a/frontend/src/services/http-client/http-client.js b/frontend/src/services/http-client/http-client.js
new file mode 100644
index 000000000..6ba2341f0
--- /dev/null
+++ b/frontend/src/services/http-client/http-client.js
@@ -0,0 +1,41 @@
+export class HttpClient {
+
+  static ACCEPT = {
+    TEXT_HTML: 'text/html',
+    JSON: 'application/json',
+  };
+
+  _responseInterceptors = [];
+
+  addResponseInterceptor(interceptor) {
+    if (typeof interceptor === 'function') {
+      this._responseInterceptors.push(interceptor);
+    }
+  }
+
+  get(args) {
+    args.method = 'GET';
+    return this._fetch(args);
+  }
+
+  post(args) {
+    args.method = 'POST';
+    return this._fetch(args);
+  }
+
+  _fetch(options) {
+    const requestOptions = {
+      credentials: 'same-origin',
+      ...options,
+    };
+
+    return fetch(options.url, requestOptions)
+      .then(
+        (response) => {
+          this._responseInterceptors.forEach((interceptor) => interceptor(response, options));
+          return Promise.resolve(response);
+        },
+        Promise.reject,
+      ).catch(console.error);
+  }
+}
diff --git a/frontend/src/services/i18n/i18n.js b/frontend/src/services/i18n/i18n.js
new file mode 100644
index 000000000..7061f6ba6
--- /dev/null
+++ b/frontend/src/services/i18n/i18n.js
@@ -0,0 +1,32 @@
+  /**
+   * 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.
+   *
+   */
+
+export class I18n {
+
+  translations = {};
+
+  add(id, translation) {
+    this.translations[id] = translation;
+  }
+
+  addMany(manyTranslations) {
+    Object.keys(manyTranslations).forEach((key) => this.add(key, manyTranslations[key]));
+  }
+
+  get(id) {
+    if (!this.translations[id]) {
+      throw new Error('I18N Error: Translation missing for »' + id + '«!');
+    }
+    return this.translations[id];
+  }
+}
diff --git a/frontend/src/services/util-registry/util-registry.js b/frontend/src/services/util-registry/util-registry.js
new file mode 100644
index 000000000..001bb1e6b
--- /dev/null
+++ b/frontend/src/services/util-registry/util-registry.js
@@ -0,0 +1,122 @@
+const DEBUG_MODE = /localhost/.test(window.location.href) && 0;
+
+export class UtilRegistry {
+
+  _registeredUtils = [];
+  _activeUtilInstances = [];
+  _appInstance;
+
+  constructor() {
+    document.addEventListener('DOMContentLoaded', () => this.setupAll());
+  }
+
+  /**
+   * 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
+   */
+  register(util) {
+    if (DEBUG_MODE > 2) {
+      console.log('registering util "' + util.name + '"');
+      console.log({ util });
+    }
+    this._registeredUtils.push(util);
+  }
+
+  deregister(name, destroy) {
+    const utilIndex = this._findUtilIndex(name);
+
+    if (utilIndex >= 0) {
+      if (destroy === true) {
+        this._destroyUtilInstances(name);
+      }
+
+      this._registeredUtils.splice(utilIndex, 1);
+    }
+  }
+
+  setApp(appInstance) {
+    this.appInstance = appInstance;
+  }
+
+  setupAll = (scope) => {
+    if (DEBUG_MODE > 1) {
+      console.info('registered js utilities:');
+      console.table(this._registeredUtils);
+    }
+
+    this._registeredUtils.forEach((util) => this.setup(util, scope));
+  }
+
+  setup(util, scope = document.body) {
+    if (DEBUG_MODE > 2) {
+      console.log('setting up util', { util });
+    }
+
+    if (util && typeof util.setup === 'function') {
+      const elements = this._findUtilElements(util, scope);
+
+      elements.forEach((element) => {
+        let utilInstance = null;
+
+        try {
+          utilInstance = util.setup(element, this.appInstance);
+        } catch(err) {
+          if (DEBUG_MODE > 0) {
+            console.warn('Error while trying to initialize a utility!', { util , element, err });
+          }
+        }
+
+        if (utilInstance) {
+          if (DEBUG_MODE > 2) {
+            console.info('Got utility instance for utility "' + util.name + '"', { utilInstance });
+          }
+
+          this._activeUtilInstances.push(utilInstance);
+        }
+      });
+    }
+  }
+
+  find(name) {
+    return this._registeredUtils.find((util) => util.name === name);
+  }
+
+  _findUtilElements(util, scope) {
+    if (scope && scope.matches(util.selector)) {
+      return [scope];
+    }
+    return Array.from(scope.querySelectorAll(util.selector));
+  }
+
+  _findUtilIndex(name) {
+    return this._registeredUtils.findIndex((util) => util.name === name);
+  }
+
+  _destroyUtilInstances(name) {
+    this._activeUtilInstances
+      .map((util, index) => ({
+        util: util,
+        index: index,
+      }))
+      .filter((activeUtil) => activeUtil.util.name === name)
+      .forEach((activeUtil) => {
+        // destroy util instance
+        activeUtil.util.destroy();
+        delete this._activeUtilInstances[activeUtil.index];
+      });
+
+    // get rid of now empty array slots
+    this._activeUtilInstances = this._activeUtilInstances.filter((util) => !!util);
+  }
+}
diff --git a/frontend/src/utils/alerts/alerts.js b/frontend/src/utils/alerts/alerts.js
new file mode 100644
index 000000000..3e49080bc
--- /dev/null
+++ b/frontend/src/utils/alerts/alerts.js
@@ -0,0 +1,206 @@
+import './alerts.scss';
+
+/**
+ *
+ * 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_UTIL_NAME = 'alerts';
+var ALERTS_UTIL_SELECTOR = '[uw-alerts]';
+
+var ALERTS_INITIALIZED_CLASS = 'alerts--initialized';
+var ALERTS_ELEVATED_CLASS = 'alerts--elevated';
+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_ICON_CLASS = 'alert__icon';
+var ALERT_CONTENT_CLASS = 'alert__content';
+var ALERT_INVISIBLE_CLASS = 'alert--invisible';
+var ALERT_AUTO_HIDE_DELAY = 10;
+var ALERT_AUTOCLOSING_MATCHER = '.alert-info, .alert-success';
+
+var alertsUtil = function(element, app) {
+  var togglerCheckRequested = false;
+  var togglerElement;
+  var alertElements;
+
+  function init() {
+    if (!element) {
+      throw new Error('Alerts util has to be called with an element!');
+    }
+
+    if (element.classList.contains(ALERTS_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    togglerElement = element.querySelector('.' + ALERTS_TOGGLER_CLASS);
+    alertElements = gatherAlertElements();
+
+    initToggler();
+    initAlerts();
+
+    // register http client interceptor to filter out Alerts Header
+    setupHttpInterceptor();
+
+    // 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() {
+    togglerElement.addEventListener('click', function() {
+      alertElements.forEach(function(alertEl) {
+        toggleAlert(alertEl, true);
+      });
+      togglerElement.classList.remove(ALERTS_TOGGLER_VISIBLE_CLASS);
+    });
+  }
+
+  function initAlerts() {
+    alertElements.forEach(initAlert);
+  }
+
+  function initAlert(alertElement) {
+    var autoHideDelay = ALERT_AUTO_HIDE_DELAY;
+    if (alertElement.dataset.decay) {
+      autoHideDelay = parseInt(alertElement.dataset.decay, 10);
+    }
+
+    var closeEl = alertElement.querySelector('.' + ALERT_CLOSER_CLASS);
+    closeEl.addEventListener('click', function() {
+      toggleAlert(alertElement);
+    });
+
+    if (autoHideDelay > 0 && alertElement.matches(ALERT_AUTOCLOSING_MATCHER)) {
+      window.setTimeout(function() {
+        toggleAlert(alertElement);
+      }, autoHideDelay * 1000);
+    }
+  }
+
+  function toggleAlert(alertEl, visible) {
+    alertEl.classList.toggle(ALERT_INVISIBLE_CLASS, !visible);
+    checkToggler();
+  }
+
+  function checkToggler() {
+    if (togglerCheckRequested) {
+      return;
+    }
+
+    var alertsHidden = alertElements.reduce(function(acc, alert) {
+      return acc && alert.classList.contains(ALERT_INVISIBLE_CLASS);
+    }, true);
+
+    window.setTimeout(function() {
+      togglerElement.classList.toggle(ALERTS_TOGGLER_VISIBLE_CLASS, alertsHidden);
+      togglerCheckRequested = false;
+    }, ALERTS_TOGGLER_APPEAR_DELAY);
+  }
+
+  function setupHttpInterceptor() {
+    app.httpClient.addResponseInterceptor(responseInterceptor.bind(this));
+  }
+
+  function elevateAlerts() {
+    element.classList.add(ALERTS_ELEVATED_CLASS);
+  }
+
+  function responseInterceptor(response) {
+    var alerts;
+    for (var header of response.headers) {
+      if (header[0] === 'alerts') {
+        var decodedHeader = decodeURIComponent(header[1]);
+        alerts = JSON.parse(decodedHeader);
+        break;
+      }
+    }
+
+    if (alerts) {
+      alerts.forEach(function(alert) {
+        var alertElement = createAlertElement(alert.status, alert.content);
+        element.appendChild(alertElement);
+        alertElements.push(alertElement);
+        initAlert(alertElement);
+      });
+
+      elevateAlerts();
+    }
+  }
+
+  function createAlertElement(type, content) {
+    var alertElement = document.createElement('div');
+    alertElement.classList.add(ALERT_CLASS, 'alert-' + type);
+
+    var alertCloser = document.createElement('div');
+    alertCloser.classList.add(ALERT_CLOSER_CLASS);
+
+    var alertIcon = document.createElement('div');
+    alertIcon.classList.add(ALERT_ICON_CLASS);
+
+    var alertContent = document.createElement('div');
+    alertContent.classList.add(ALERT_CONTENT_CLASS);
+    alertContent.innerHTML = content;
+
+    alertElement.appendChild(alertCloser);
+    alertElement.appendChild(alertIcon);
+    alertElement.appendChild(alertContent);
+
+    return alertElement;
+  }
+
+  return init();
+};
+
+export default {
+  name: ALERTS_UTIL_NAME,
+  selector: ALERTS_UTIL_SELECTOR,
+  setup: alertsUtil,
+};
diff --git a/frontend/src/utils/alerts/alerts.scss b/frontend/src/utils/alerts/alerts.scss
new file mode 100644
index 000000000..cd0492f11
--- /dev/null
+++ b/frontend/src/utils/alerts/alerts.scss
@@ -0,0 +1,210 @@
+.alerts {
+  position: fixed;
+  bottom: 0;
+  right: 5%;
+  z-index: 20;
+  text-align: right;
+  display: flex;
+  flex-direction: column;
+}
+
+.alerts__toggler {
+  width: 40px;
+  height: 40px;
+  position: absolute;
+  top: 400px;
+  left: 50%;
+  transform: translateX(-50%);
+  cursor: pointer;
+
+  &::before {
+    content: '\f077';
+    position: absolute;
+    font-family: "Font Awesome 5 Free";
+    left: 50%;
+    top: 0;
+    height: 30px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 30px;
+    color: var(--color-grey);
+    font-size: 30px;
+    transform: translateX(-50%);
+  }
+}
+
+.alerts--elevated {
+  z-index: 1000;
+}
+
+.alerts__toggler--visible {
+  top: -40px;
+  opacity: 1;
+  transition: top     .5s cubic-bezier(0.73, 1.25, 0.61, 1),
+              opacity .5s cubic-bezier(0.73, 1.25, 0.61, 1);
+}
+
+@media (max-width: 425px) {
+
+  .alerts {
+    left: 5%;
+  }
+}
+
+.alert {
+  position: relative;
+  display: block;
+  background-color: var(--color-lightblack);
+  font-size: 1rem;
+  color: var(--color-lightwhite);
+  z-index: 0;
+  padding: 0 50px;
+  padding-right: 60px;
+  animation: slide-in-alert .2s ease-out forwards;
+  margin-bottom: 10px;
+  transition: margin-bottom .2s ease-out;
+}
+
+.alert a {
+  color: var(--color-lightwhite);
+}
+
+@keyframes slide-in-alert {
+  from {
+    transform: translateY(120%);
+  }
+  to {
+    transform: translateY(0);
+  }
+}
+
+@keyframes slide-out-alert {
+  from {
+    transform: translateY(0);
+    max-height: 200px;
+  }
+  to {
+    transform: translateY(250%);
+    opacity: 0;
+    max-height: 0;
+    overflow: hidden;
+  }
+}
+
+@media (min-width: 425px) {
+
+  .alert {
+    max-width: 400px;
+  }
+}
+
+.alert--invisible {
+  animation: slide-out-alert .2s ease-out forwards;
+  margin-bottom: 0;
+}
+
+.alert__content {
+  padding: 8px 0;
+  min-height: 40px;
+  position: relative;
+  display: flex;
+  font-weight: 600;
+  align-items: center;
+  text-align: left;
+}
+
+.alert__icon {
+  text-align: right;
+  position: absolute;
+  left: 0px;
+  top: 0;
+  width: 50px;
+  height: 100%;
+  z-index: 40;
+
+  &::before {
+    content: '\f05a';
+    position: absolute;
+    font-family: "Font Awesome 5 Free";
+    font-size: 24px;
+    top: 50%;
+    left: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transform: translate(-50%, -50%);
+    border-radius: 50%;
+    width: 30px;
+    height: 30px;
+  }
+}
+
+.alert__closer {
+  cursor: pointer;
+  text-align: right;
+  position: absolute;
+  right: 0px;
+  top: 0;
+  width: 60px;
+  height: 100%;
+  transition: all .3s ease;
+  z-index: 40;
+
+  &:hover {
+    transform: scale(1.05, 1.05);
+
+    &::before {
+      box-shadow: 0 0 4px white;
+      background-color: rgba(255, 255, 255, 0.1);
+      color: white;
+    }
+  }
+
+  &::before {
+    content: '\f00d';
+    position: absolute;
+    font-family: "Font Awesome 5 Free";
+    top: 50%;
+    left: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transform: translate(-50%, -50%);
+    border-radius: 50%;
+    width: 30px;
+    height: 30px;
+    transition: all .15s ease;
+  }
+}
+
+@media (max-width: 768px) {
+
+  .alert__closer {
+    width: 40px;
+  }
+}
+
+.alert-success {
+  background-color: var(--color-success);
+
+  .alert__icon::before {
+    content: '\f058';
+  }
+}
+
+.alert-warning {
+  background-color: var(--color-warning);
+
+  .alert__icon::before {
+    content: '\f06a';
+  }
+}
+
+.alert-error {
+  background-color: var(--color-error);
+
+  .alert__icon::before {
+    content: '\f071';
+  }
+}
diff --git a/frontend/src/utils/asidenav/asidenav.js b/frontend/src/utils/asidenav/asidenav.js
new file mode 100644
index 000000000..c5ba552c9
--- /dev/null
+++ b/frontend/src/utils/asidenav/asidenav.js
@@ -0,0 +1,105 @@
+import './asidenav.scss';
+
+/**
+ *
+ * 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';
+
+var asidenavUtil = function(element) {
+
+  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);
+      element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
+      event.preventDefault();
+    }, true);
+  }
+
+  function initAsidenavSubmenus() {
+    var asidenavLinksWithSubmenus = Array.from(element.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
+      .map(function(listItem) {
+        var submenu = listItem.querySelector('.' + ASIDENAV_SUBMENU_CLASS);
+        return { listItem, submenu };
+      }).filter(function(union) {
+        return union.submenu !== null;
+      });
+
+    asidenavLinksWithSubmenus.forEach(function(union) {
+      union.listItem.addEventListener('mouseover', createMouseoverHandler(union));
+    });
+  }
+
+  function createMouseoverHandler(union) {
+    return function mouseoverHanlder() {
+      var rectListItem = union.listItem.getBoundingClientRect();
+      var rectSubMenu = union.submenu.getBoundingClientRect();
+
+      union.submenu.style.left = (rectListItem.left + rectListItem.width) + 'px';
+      if (window.innerHeight - rectListItem.top < rectSubMenu.height) {
+        union.submenu.style.top = (rectListItem.top + rectListItem.height - rectSubMenu.height) + 'px';
+      } else {
+        union.submenu.style.top = rectListItem.top + 'px';
+      }
+
+    };
+  }
+
+  return init();
+};
+
+export default {
+  name: ASIDENAV_UTIL_NAME,
+  selector: ASIDENAV_UTIL_SELECTOR,
+  setup: asidenavUtil,
+};
diff --git a/frontend/src/utils/asidenav/asidenav.scss b/frontend/src/utils/asidenav/asidenav.scss
new file mode 100644
index 000000000..e7ab3b50d
--- /dev/null
+++ b/frontend/src/utils/asidenav/asidenav.scss
@@ -0,0 +1,364 @@
+.main__aside {
+  position: fixed;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+  z-index: 1;
+  top: 0;
+  left: 0;
+  width: var(--asidenav-width-lg, 20%);
+  height: 100%;
+  flex: 0 0 0;
+  flex-basis: var(--asidenav-width-lg, 20%);
+  transition: all .2s ease-out;
+
+  &::before {
+    position: absolute;
+    z-index: -1;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background-color: var(--color-dark);
+    opacity: 0.05;
+  }
+
+  &::after {
+    content: '';
+    position: absolute;
+    z-index: -2;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background-color: var(--color-grey-light);
+  }
+}
+
+@media (max-width: 425px) {
+
+  .main__aside {
+    position: fixed;
+    top: var(--header-height-collapsed);
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: 100% !important;
+    width: 100%;
+    z-index: 5;
+    overflow: hidden;
+    transform: translateX(-110%);
+    transition: transform .2s ease-out;
+
+    &.main__aside--expanded {
+      transform: translateX(0%);
+    }
+
+    .asidenav__box-title {
+      font-size: 18px;
+      padding-left: 10px;
+    }
+  }
+}
+
+@media (min-width: 1200px) {
+  .main__aside {
+    width: var(--asidenav-width-xl, 250px)
+  }
+}
+
+.asidenav {
+  color: var(--color-font);
+  min-height: calc(100% - var(--header-height));
+  height: 400px;
+  overflow-y: auto;
+  overflow-x: hidden;
+
+  &::-webkit-scrollbar {
+    width: 0;
+  }
+}
+
+.asidenav__box {
+  transition: opacity .2s ease;
+
+  + .asidenav__box {
+    margin-top: 10px;
+  }
+}
+
+.asidenav__box-title {
+  padding: 7px 13px;
+  margin-top: 30px;
+  background-color: transparent;
+  transition: all .2s ease;
+  padding: 10px 13px;
+  margin: 0;
+  border-bottom: 1px solid var(--color-grey);
+}
+
+/* LOGO */
+
+.asidenav__logo {
+  height: var(--header-height);
+  display: flex;
+  align-items: center;
+}
+
+@media (max-width: 768px) {
+
+  .asidenav__logo {
+    display: none;
+  }
+}
+
+.asidenav__logo-link {
+  flex: 1;
+  top: 10px;
+  left: 20px;
+  height: 80px;
+  padding: 0 20px;
+  display: flex;
+  flex-basis: var(--asidenav-width-xl, 250px);
+  font-size: 16px;
+  align-items: center;
+  color: var(--color-dark);
+  transform-origin: left;
+
+  &:hover {
+    color: var(--color-primary);
+  }
+}
+
+.asidenav__logo-lmu {
+  width: 80px;
+  height: 100%;
+}
+
+.asidenav__logo-uni2work {
+  display: flex;
+  align-items: flex-end;
+  min-width: 70px;
+  margin-left: 12px;
+  text-transform: uppercase;
+  width: 100%;
+  height: 100%;
+  padding: 2px 4px;
+  border: 1px solid currentColor;
+  letter-spacing: 2px;
+  background-color: white;
+  transition: background-color .3s ease;
+}
+
+@media (max-width: 1199px) {
+
+  .asidenav__logo-link {
+    flex-basis: var(--asidenav-width-lg, 20%);
+    font-size: 16px;
+  }
+
+  .asidenav__logo-lmu {
+    display: none;
+  }
+
+  .asidenav__logo-uni2work {
+    margin-left: 0;
+  }
+}
+
+/* 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 {
+  color: var(--color-font);
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+
+  &:not(.asidenav__list-item--active):hover {
+    background-color: var(--color-lightwhite);
+
+    > .asidenav__link-wrapper {
+      color: var(--color-font);
+    }
+  }
+
+  &:hover {
+
+    .asidenav__link-shorthand {
+      transform: scale(1.05, 1.0);
+      transform-origin: right;
+      text-shadow: none;
+    }
+
+    .asidenav__nested-list-wrapper {
+      display: block;
+    }
+  }
+}
+
+/* small list-item-padding for medium to large screens */
+@media (min-width: 769px) {
+
+  .asidenav__list-item {
+    padding-left: 10px;
+  }
+}
+
+.asidenav__list-item--active {
+  background-color: var(--color-lightwhite);
+
+  .asidenav__link-wrapper {
+    color: var(--color-link);
+  }
+
+  .asidenav__link-shorthand {
+    transform: scale(1.05, 1.0);
+    transform-origin: right;
+    text-shadow: none;
+  }
+}
+
+.asidenav__link-wrapper {
+  position: relative;
+  display: flex;
+  flex: 1;
+  align-items: center;
+  padding: 8px 3px;
+  justify-content: flex-start;
+  color: var(--color-font);
+  width: 100%;
+  z-index: 1;
+}
+
+.asidenav__link-shorthand {
+  display: none;
+}
+
+.asidenav__link-label {
+  line-height: 1;
+}
+
+/* hover sub-menus */
+.asidenav__nested-list-wrapper {
+  position: absolute;
+  z-index: 10;
+  display: none;
+  color: var(--color-font);
+  background-color: var(--color-grey-light);
+  box-shadow: 1px 1px 1px 0px var(--color-grey);
+}
+
+.asidenav__nested-list {
+  min-width: 200px;
+}
+
+@media (max-width: 425px) {
+
+  .asidenav__nested-list {
+    display: none;
+  }
+}
+
+.asidenav__nested-list-item {
+  position: relative;
+
+  &:hover {
+    background-color: var(--color-lightwhite);
+  }
+
+  .asidenav__link-wrapper {
+    padding-left: 13px;
+    padding-right: 13px;
+    transition: all .2s ease;
+    color: var(--color-font);
+  }
+}
+
+/* TABLET */
+@media (min-width: 426px) and (max-width: 768px) {
+
+  .main__aside {
+    width: var(--asidenav-width-md, 50px);
+    flex-basis: var(--asidenav-width-md, 50px);
+    overflow: hidden;
+    min-height: calc(100% - var(--header-height-collapsed));
+    top: var(--header-height-collapsed);
+
+    .asidenav__box-title {
+      width: var(--asidenav-width-md, 50px);
+      font-size: 18px;
+      text-align: center;
+      padding: 10px 1px;
+      word-break: break-all;
+      background-color: var(--color-dark);
+      color: var(--color-lightwhite);
+
+      &:hover {
+        background-color: var(--color-dark);
+      }
+    }
+
+    .asidenav__link-shorthand {
+      display: flex;
+      position: static;
+      height: 50px;
+      width: var(--asidenav-width-md, 50px);
+      text-align: center;
+      opacity: 1;
+      font-size: 15px;
+      line-height: 1em;
+      margin-right: 13px;
+      flex-shrink: 0;
+      padding: 1px;
+      outline: 1px solid white;
+      word-break: break-all;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .asidenav__list-item {
+      padding-left: 0;
+
+      + .asidenav__list-item {
+        margin: 0;
+      }
+    }
+
+    .asidenav__link-wrapper {
+      color: var(--color-font);
+      padding: 0;
+    }
+
+    .asidenav__nested-list,
+    .asidenav__link-label {
+      display: none;
+    }
+
+    .asidenav__list-item--active {
+
+      .asidenav__link-wrapper {
+        background-color: var(--color-lightwhite);
+      }
+    }
+  }
+}
diff --git a/frontend/src/utils/async-form/async-form.js b/frontend/src/utils/async-form/async-form.js
new file mode 100644
index 000000000..5af38c7e9
--- /dev/null
+++ b/frontend/src/utils/async-form/async-form.js
@@ -0,0 +1,117 @@
+import './async-form.scss';
+
+/**
+ *
+ * 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='...'>
+ *     ...
+ *
+ * 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';
+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 MODAL_SELECTOR = '.modal';
+var MODAL_HEADER_KEY = 'Is-Modal';
+var MODAL_HEADER_VALUE = 'True';
+
+var asyncFormUtil = function(element, app) {
+
+  var lastRequestTimestamp = 0;
+
+  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 = 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, element);
+      element.remove();
+    }, delay);
+  }
+
+  function makeResponseElement(content, status) {
+    var responseElement = document.createElement('div');
+    status = status || 'info';
+    responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS);
+    responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS + '--' + status);
+    responseElement.innerHTML = content;
+    return responseElement;
+  }
+
+  function submitHandler(event) {
+    event.preventDefault();
+
+    element.classList.add(ASYNC_FORM_LOADING_CLASS);
+    lastRequestTimestamp = Date.now();
+
+    var url = element.getAttribute('action');
+    var headers = { };
+    var body = new FormData(element);
+
+    var isModal = element.closest(MODAL_SELECTOR);
+    if (isModal) {
+      headers[MODAL_HEADER_KEY] = MODAL_HEADER_VALUE;
+    }
+
+    app.httpClient.post({
+      url: url,
+      headers: headers,
+      body: body,
+    }).then(function(response) {
+      return response.json();
+    }).then(function(response) {
+      processResponse(response[0]);
+    }).catch(function() {
+      var failureMessage = app.i18n.get('asyncFormFailure');
+      processResponse({ content: failureMessage });
+
+      element.classList.remove(ASYNC_FORM_LOADING_CLASS);
+    });
+  }
+
+  return init();
+};
+
+export default {
+  name: ASYNC_FORM_UTIL_NAME,
+  selector: ASYNC_FORM_UTIL_SELECTOR,
+  setup: asyncFormUtil,
+};
diff --git a/frontend/src/utils/async-form/async-form.scss b/frontend/src/utils/async-form/async-form.scss
new file mode 100644
index 000000000..bd5a97a41
--- /dev/null
+++ b/frontend/src/utils/async-form/async-form.scss
@@ -0,0 +1,78 @@
+.async-form__response {
+  margin: 20px 0;
+  position: relative;
+  width: 100%;
+  font-size: 18px;
+  text-align: center;
+  padding-top: 60px;
+}
+
+.async-form__response::before,
+.async-form__response::after {
+  position: absolute;
+  top: 0px;
+  left: 50%;
+  display: block;
+}
+
+.async-form__response--success::before {
+  content: '';
+  width: 17px;
+  height: 28px;
+  border: solid #069e04;
+  border-width: 0 5px 5px 0;
+  transform: translateX(-50%) rotate(45deg);
+}
+
+.async-form__response--info::before {
+  content: '';
+  width: 5px;
+  height: 30px;
+  top: 10px;
+  background-color: #777;
+  transform: translateX(-50%);
+}
+.async-form__response--info::after {
+  content: '';
+  width: 5px;
+  height: 5px;
+  background-color: #777;
+  transform: translateX(-50%);
+}
+
+.async-form__response--warning::before {
+  content: '';
+  width: 5px;
+  height: 30px;
+  background-color: rgb(255, 187, 0);
+  transform: translateX(-50%);
+}
+.async-form__response--warning::after {
+  content: '';
+  width: 5px;
+  height: 5px;
+  top: 35px;
+  background-color: rgb(255, 187, 0);
+  transform: translateX(-50%);
+}
+
+.async-form__response--error::before {
+  content: '';
+  width: 5px;
+  height: 40px;
+  background-color: #940d0d;
+  transform: translateX(-50%) rotate(-45deg);
+}
+.async-form__response--error::after {
+  content: '';
+  width: 5px;
+  height: 40px;
+  background-color: #940d0d;
+  transform: translateX(-50%) rotate(45deg);
+}
+
+.async-form--loading {
+  opacity: 0.1;
+  transition: opacity 800ms ease-out;
+  pointer-events: none;
+}
diff --git a/frontend/src/utils/async-table/async-table-filter.scss b/frontend/src/utils/async-table/async-table-filter.scss
new file mode 100644
index 000000000..794240f3f
--- /dev/null
+++ b/frontend/src/utils/async-table/async-table-filter.scss
@@ -0,0 +1,5 @@
+.async-table-filter--loading {
+  opacity: 0.7;
+  pointer-events: none;
+  transition: opacity 400ms ease-out;
+}
diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
new file mode 100644
index 000000000..c9508c7d6
--- /dev/null
+++ b/frontend/src/utils/async-table/async-table.js
@@ -0,0 +1,413 @@
+import { HttpClient } from '../../services/http-client/http-client';
+import './async-table.scss';
+import './async-table-filter.scss';
+
+/**
+ *
+ * Async Table Utility
+ *  makes table filters, sorting and pagination behave asynchronously via AJAX calls
+ *
+ * Attribute: uw-async-table
+ *
+ * Example usage:
+*   (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 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, app) {
+  var asyncTableHeader;
+  var asyncTableId;
+
+  var ths = [];
+  var pageLinks = [];
+  var pagesizeForm;
+  var scrollTable;
+  var cssIdPrefix = '';
+
+  var tableFilterInputs = {
+    search: [],
+    input: [],
+    change: [],
+    select: [],
+  };
+
+  function init() {
+    if (!element) {
+      throw new Error('Async Table utility cannot be setup without an element!');
+    }
+
+    if (element.classList.contains(ASYNC_TABLE_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // param asyncTableDbHeader
+    if (element.dataset.asyncTableDbHeader !== undefined) {
+      asyncTableHeader = element.dataset.asyncTableDbHeader;
+    }
+
+    var rawTableId = element.querySelector('table').id;
+    cssIdPrefix = findCssIdPrefix(rawTableId);
+    asyncTableId = rawTableId.replace(cssIdPrefix, '');
+
+    // find scrolltable wrapper
+    scrollTable = element.querySelector(ASYNC_TABLE_SCROLLTABLE_SELECTOR);
+    if (!scrollTable) {
+      throw new Error('Async Table cannot be set up without a scrolltable element!');
+    }
+
+    setupSortableHeaders();
+    setupPagination();
+    setupPageSizeSelect();
+    setupTableFilter();
+
+    processLocalStorage();
+
+    // clear currentTableUrl from previous requests
+    setLocalStorageParameter('currentTableUrl', null);
+
+    // mark initialized
+    element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
+
+    return {
+      name: ASYNC_TABLE_UTIL_NAME,
+      element: element,
+      destroy: function() {},
+    };
+  }
+
+  function setupSortableHeaders() {
+    ths = Array.from(scrollTable.querySelectorAll('th.sortable')).map(function(th) {
+      return { element: th };
+    });
+
+    ths.forEach(function(th) {
+      th.clickHandler = function(event) {
+        setLocalStorageParameter('horizPos', (scrollTable || {}).scrollLeft);
+        linkClickHandler(event);
+      };
+      th.element.addEventListener('click', th.clickHandler);
+    });
+  }
+
+  function setupPagination() {
+    var pagination = element.querySelector('#' + cssIdPrefix + 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);
+          }
+          linkClickHandler(event);
+        };
+        link.element.addEventListener('click', link.clickHandler);
+      });
+    }
+  }
+
+  function setupPageSizeSelect() {
+    // pagesize form
+    pagesizeForm = element.querySelector('#' + cssIdPrefix + asyncTableId + '-pagesize-form');
+
+    if (pagesizeForm) {
+      var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
+      pagesizeSelect.addEventListener('change', changePagesizeHandler);
+    }
+  }
+
+  function setupTableFilter() {
+    var tableFilterForm = element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
+
+    if (tableFilterForm) {
+      gatherTableFilterInputs(tableFilterForm);
+      addTableFilterEventListeners(tableFilterForm);
+    }
+  }
+
+  function gatherTableFilterInputs(tableFilterForm) {
+    Array.from(tableFilterForm.querySelectorAll('input[type="search"]')).forEach(function(input) {
+      tableFilterInputs.search.push(input);
+    });
+
+    Array.from(tableFilterForm.querySelectorAll('input[type="text"]')).forEach(function(input) {
+      tableFilterInputs.input.push(input);
+    });
+
+    Array.from(tableFilterForm.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
+      tableFilterInputs.change.push(input);
+    });
+
+    Array.from(tableFilterForm.querySelectorAll('select')).forEach(function(input) {
+      tableFilterInputs.select.push(input);
+    });
+  }
+
+  function addTableFilterEventListeners(tableFilterForm) {
+    tableFilterInputs.search.forEach(function(input) {
+      var debouncedInput = debounce(function() {
+        if (input.value.length === 0 || input.value.length > 2) {
+          updateFromTableFilter(tableFilterForm);
+        }
+      }, 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(tableFilterForm);
+        }
+      }, INPUT_DEBOUNCE);
+      input.addEventListener('input', debouncedInput);
+    });
+
+    tableFilterInputs.change.forEach(function(input) {
+      input.addEventListener('change', function() {
+        updateFromTableFilter(tableFilterForm);
+      });
+    });
+
+    tableFilterInputs.select.forEach(function(input) {
+      input.addEventListener('change', function() {
+        updateFromTableFilter(tableFilterForm);
+      });
+    });
+
+    tableFilterForm.addEventListener('submit', function(event) {
+      event.preventDefault();
+      updateFromTableFilter(tableFilterForm);
+    });
+  }
+
+  function updateFromTableFilter(tableFilterForm) {
+    var url = serializeTableFilterToURL();
+    var callback = null;
+
+    var focusedInput = tableFilterForm.querySelector(':focus, :active');
+    // focus previously focused input
+    if (focusedInput && focusedInput.selectionStart !== null) {
+      var selectionStart = focusedInput.selectionStart;
+      // remove the following part of the id to get rid of the random
+      // (yet somewhat structured) prefix we got from nudging.
+      var prefix = findCssIdPrefix(focusedInput.id);
+      var focusId = focusedInput.id.replace(prefix, '');
+      callback = function(wrapper) {
+        var idPrefix = getLocalStorageParameter('cssIdPrefix');
+        var toBeFocused = wrapper.querySelector('#' + idPrefix + focusId);
+        if (toBeFocused) {
+          toBeFocused.focus();
+          toBeFocused.selectionStart = selectionStart;
+        }
+      };
+    }
+    updateTableFrom(url, callback);
+  }
+
+  function serializeTableFilterToURL() {
+    var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
+
+    var formIdElement = element.querySelector(ASYNC_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 processLocalStorage() {
+    var scrollTo = getLocalStorageParameter('scrollTo');
+    if (scrollTo && scrollTable) {
+      window.scrollTo(scrollTo);
+    }
+    setLocalStorageParameter('scrollTo', null);
+
+    var horizPos = getLocalStorageParameter('horizPos');
+    if (horizPos && scrollTable) {
+      scrollTable.scrollLeft = horizPos;
+    }
+    setLocalStorageParameter('horizPos', null);
+  }
+
+  function removeListeners() {
+    ths.forEach(function(th) {
+      th.element.removeEventListener('click', th.clickHandler);
+    });
+
+    pageLinks.forEach(function(link) {
+      link.element.removeEventListener('click', link.clickHandler);
+    });
+
+    if (pagesizeForm) {
+      var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
+      pagesizeSelect.removeEventListener('change', changePagesizeHandler);
+    }
+  }
+
+  function linkClickHandler(event) {
+    event.preventDefault();
+    var url = getClickDestination(event.target);
+    if (!url.match(/^http/)) {
+      url = window.location.origin + window.location.pathname + url;
+    }
+    updateTableFrom(url);
+  }
+
+  function getClickDestination(el) {
+    if (!el.matches('a') && !el.querySelector('a')) {
+      return '';
+    }
+    return el.getAttribute('href') || el.querySelector('a').getAttribute('href');
+  }
+
+  function changePagesizeHandler(event) {
+    var pagesizeParamKey = asyncTableId + '-pagesize';
+    var pageParamKey = asyncTableId + '-page';
+    var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
+    url.searchParams.set(pagesizeParamKey, event.target.value);
+    url.searchParams.set(pageParamKey, 0);
+    updateTableFrom(url.href);
+  }
+
+  // fetches new sorted element from url with params and replaces contents of current element
+  function updateTableFrom(url, callback) {
+    element.classList.add(ASYNC_TABLE_LOADING_CLASS);
+
+    var headers = {
+      'Accept': HttpClient.ACCEPT.TEXT_HTML,
+      [asyncTableHeader]: asyncTableId,
+    };
+
+    app.httpClient.get({
+      url: url,
+      headers: headers,
+    }).then(function(response) {
+      return app.htmlHelpers.parseResponse(response);
+    }).then(function(response) {
+      setLocalStorageParameter('currentTableUrl', url.href);
+      // reset table
+      removeListeners();
+      element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
+      // update table with new
+      updateWrapperContents(response);
+
+      app.utilRegistry.setupAll(element);
+
+      if (callback && typeof callback === 'function') {
+        setLocalStorageParameter('cssIdPrefix', response.idPrefix);
+        callback(element);
+        setLocalStorageParameter('cssIdPrefix', '');
+      }
+    }).catch(function(err) {
+      console.error(err);
+    }).finally(function() {
+      element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
+    });
+  }
+
+  function updateWrapperContents(response) {
+    var newPage = document.createElement('div');
+    newPage.appendChild(response.element);
+    var newWrapperContents = newPage.querySelector('#' + response.idPrefix + element.id);
+    element.innerHTML = newWrapperContents.innerHTML;
+  }
+
+  return init();
+};
+
+
+// returns any random nudged prefix found in the given id
+function findCssIdPrefix(id) {
+  var matcher = /r\d*?__/;
+  var maybePrefix = id.match(matcher);
+  if (maybePrefix && maybePrefix[0]) {
+    return maybePrefix[0];
+  }
+  return '';
+}
+
+function setLocalStorageParameter(key, value) {
+  var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
+  if (value !== null) {
+    currentLSState[key] = value;
+  } else {
+    delete currentLSState[key];
+  }
+  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);
+  };
+}
+
+export default {
+  name: ASYNC_TABLE_UTIL_NAME,
+  selector: ASYNC_TABLE_UTIL_SELECTOR,
+  setup: asyncTableUtil,
+};
diff --git a/frontend/src/utils/async-table/async-table.scss b/frontend/src/utils/async-table/async-table.scss
new file mode 100644
index 000000000..9766daa84
--- /dev/null
+++ b/frontend/src/utils/async-table/async-table.scss
@@ -0,0 +1,5 @@
+.async-table--loading {
+  opacity: 0.7;
+  pointer-events: none;
+  transition: opacity 400ms ease-out;
+}
diff --git a/frontend/src/utils/check-all/check-all.js b/frontend/src/utils/check-all/check-all.js
new file mode 100644
index 000000000..bc88f8904
--- /dev/null
+++ b/frontend/src/utils/check-all/check-all.js
@@ -0,0 +1,141 @@
+/**
+ *
+ * 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"]';
+
+var CHECK_ALL_INITIALIZED_CLASS = 'check-all--initialized';
+
+var checkAllUtil = function(element, app) {
+  var columns = [];
+  var checkboxColumn = [];
+  var checkAllCheckbox = null;
+
+  function init() {
+    if (!element) {
+      throw new Error('Check All utility cannot be setup without an element!');
+    }
+
+    if (element.classList.contains(CHECK_ALL_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    gatherColumns();
+    setupCheckAllCheckbox();
+
+    // mark initialized
+    element.classList.add(CHECK_ALL_INITIALIZED_CLASS);
+
+    return {
+      name: CHECK_ALL_UTIL_NAME,
+      element: element,
+      destroy: function() {},
+    };
+  }
+
+  function getCheckboxId() {
+    return 'check-all-checkbox-' + Math.floor(Math.random() * 100000);
+  }
+
+  function gatherColumns() {
+    var rows = Array.from(element.querySelectorAll('tr'));
+    var cols = [];
+    rows.forEach(function(tr) {
+      var cells = Array.from(tr.querySelectorAll('td'));
+      cells.forEach(function(cell, cellIndex) {
+        if (!cols[cellIndex]) {
+          cols[cellIndex] = [];
+        }
+        cols[cellIndex].push(cell);
+      });
+    });
+    columns = cols;
+  }
+
+  function findCheckboxColumn(columns) {
+    var checkboxColumnId = null;
+    columns.forEach(function(col, i) {
+      if (isCheckboxColumn(col)) {
+        checkboxColumnId = i;
+      }
+    });
+    return checkboxColumnId;
+  }
+
+  function isCheckboxColumn(col) {
+    var onlyCheckboxes = true;
+    col.forEach(function(cell) {
+      if (onlyCheckboxes && !cell.querySelector(CHECKBOX_SELECTOR)) {
+        onlyCheckboxes = false;
+      }
+    });
+    return onlyCheckboxes;
+  }
+
+  function setupCheckAllCheckbox() {
+    var checkboxColumnId = findCheckboxColumn(columns);
+    if (checkboxColumnId === null) {
+      return;
+    }
+
+    checkboxColumn = columns[checkboxColumnId];
+    var firstRow = element.querySelector('tr');
+    var th = Array.from(firstRow.querySelectorAll('th, td'))[checkboxColumnId];
+    checkAllCheckbox = document.createElement('input');
+    checkAllCheckbox.setAttribute('type', 'checkbox');
+    checkAllCheckbox.setAttribute('id', getCheckboxId());
+    th.insertBefore(checkAllCheckbox, th.firstChild);
+
+    // manually set up new checkbox
+    app.utilRegistry.setup(app.utilRegistry.find('checkbox'), th);
+
+    checkAllCheckbox.addEventListener('input', onCheckAllCheckboxInput);
+    setupCheckboxListeners();
+  }
+
+  function onCheckAllCheckboxInput() {
+    toggleAll(checkAllCheckbox.checked);
+  }
+
+  function setupCheckboxListeners() {
+    checkboxColumn
+      .map(function(cell) {
+        return cell.querySelector(CHECKBOX_SELECTOR);
+      })
+      .forEach(function(checkbox) {
+        checkbox.addEventListener('input', updateCheckAllCheckboxState);
+      });
+  }
+
+  function updateCheckAllCheckboxState() {
+    var allChecked = checkboxColumn.every(function(cell) {
+      return cell.querySelector(CHECKBOX_SELECTOR).checked;
+    });
+    checkAllCheckbox.checked = allChecked;
+  }
+
+  function toggleAll(checked) {
+    checkboxColumn.forEach(function(cell) {
+      cell.querySelector(CHECKBOX_SELECTOR).checked = checked;
+    });
+  }
+
+  return init();
+};
+
+export default {
+  name: CHECK_ALL_UTIL_NAME,
+  selector: CHECK_ALL_UTIL_SELECTOR,
+  setup: checkAllUtil,
+};
diff --git a/frontend/src/utils/form/form.js b/frontend/src/utils/form/form.js
new file mode 100644
index 000000000..30fa5bef3
--- /dev/null
+++ b/frontend/src/utils/form/form.js
@@ -0,0 +1,599 @@
+import './form.scss';
+
+/**
+ *
+ * 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: [none]
+ *  (automatically setup on all form tags)
+ *
+ * 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>
+ */
+
+var REACTIVE_SUBMIT_BUTTON_UTIL_NAME = 'reactiveSubmitButton';
+// var REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR = 'form';
+
+var REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS = 'reactive-submit-button--initialized';
+
+/* eslint-disable-next-line */
+var reactiveSubmitButtonUtil = 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)) {
+      return false;
+    }
+
+    // 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 || !submitButtons.length) {
+      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() {},
+    };
+  }
+
+  function setupInputs() {
+    requiredInputs.forEach(function(el) {
+      var checkbox = el.getAttribute('type') === 'checkbox';
+      var eventType = checkbox ? 'change' : 'input';
+      el.addEventListener(eventType, function() {
+        updateButtonState();
+      });
+    });
+  }
+
+  function updateButtonState() {
+    if (inputsValid()) {
+      submitButton.removeAttribute('disabled');
+    } else {
+      submitButton.setAttribute('disabled', 'true');
+    }
+  }
+
+  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();
+};
+
+// 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
+// eport const reactiveSubmitButton = {
+//   name: REACTIVE_SUBMIT_BUTTON_UTIL_NAME,
+//   selector: REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR,
+//   setup: reactiveSubmitButtonUtil,
+// };
+
+/**
+ *
+ * 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
+ *    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>
+ * ## 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>
+ * ## 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';
+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 INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled])';
+
+var interactiveFieldsetUtil = function(element) {
+  var conditionalInput;
+  var conditionalValue;
+  var target;
+  var childInputs;
+
+  function init() {
+    if (!element) {
+      throw new Error('Interactive Fieldset utility cannot be setup without an element!');
+    }
+
+    if (element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // 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.');
+    }
+
+    // param conditionalValue
+    if (!element.dataset.conditionalValue && !isCheckbox()) {
+      throw new Error('Interactive Fieldset needs a conditional value!');
+    }
+    conditionalValue = element.dataset.conditionalValue;
+
+    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));
+
+    // add event listener
+    var observer = new MutationObserver(() => updateVisibility());
+    observer.observe(conditionalInput, { attributes: true, attributeFilter: ['disabled'] });
+    conditionalInput.addEventListener('input', updateVisibility);
+
+    // initial visibility update
+    updateVisibility();
+
+    // mark as initialized
+    element.classList.add(INTERACTIVE_FIELDSET_INITIALIZED_CLASS);
+
+    return {
+      name: INTERACTIVE_FIELDSET_UTIL_NAME,
+      element: element,
+      destroy: function() {},
+    };
+  }
+
+  function updateVisibility() {
+    var active = matchesConditionalValue() && !conditionalInput.disabled;
+
+    target.classList.toggle('hidden', !active);
+
+    childInputs.forEach(function(el) {
+      el.disabled = !active;
+      if (el._flatpickr) {
+        el._flatpickr.altInput.disabled = !active;
+      }
+    });
+  }
+
+  function matchesConditionalValue() {
+    if (isCheckbox()) {
+      return conditionalInput.checked === true;
+    }
+
+    return conditionalInput.value === conditionalValue;
+  }
+
+  function isCheckbox() {
+    return conditionalInput.getAttribute('type') === 'checkbox';
+  }
+
+  return init();
+};
+
+export const interactiveFieldset = {
+  name: INTERACTIVE_FIELDSET_UTIL_NAME,
+  selector: INTERACTIVE_FIELDSET_UTIL_SELECTOR,
+  setup: interactiveFieldsetUtil,
+};
+
+/**
+ *
+ * Navigate Away Prompt Utility
+ *  This utility asks the user if (s)he really wants to navigate away
+ *  from a page containing a form if (s)he already touched an input.
+ *  Form-Submits will not trigger the prompt.
+ *  Utility will ignore forms that contain auto submit elements (buttons, inputs).
+ *
+ * Attribute: [none]
+ *  (automatically setup on all form tags that dont automatically submit, see AutoSubmitButtonUtil)
+ *
+ * Example usage:
+ *  (any page with a form)
+ */
+
+var NAVIGATE_AWAY_PROMPT_UTIL_NAME = 'navigateAwayPrompt';
+var NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR = 'form';
+
+var NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS = 'navigate-away-prompt--initialized';
+
+var navigateAwayPromptUtil = function(element) {
+  var touched = false;
+  var unloadDueToSubmit = false;
+
+  function init() {
+    if (!element) {
+      throw new Error('Navigate Away Prompt utility needs to be passed an element!');
+    }
+
+    if (element.classList.contains(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // ignore forms that get submitted automatically
+    if (element.querySelector(AUTO_SUBMIT_BUTTON_UTIL_SELECTOR) || element.querySelector(AUTO_SUBMIT_INPUT_UTIL_SELECTOR)) {
+      return false;
+    }
+
+    window.addEventListener('beforeunload', beforeUnloadHandler);
+
+    element.addEventListener('submit', function() {
+      unloadDueToSubmit = true;
+    });
+    element.addEventListener('change', function() {
+      touched = true;
+      unloadDueToSubmit = false;
+    });
+
+    // mark initialized
+    element.classList.add(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS);
+
+    return {
+      name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
+      element: element,
+      destroy: function() {
+        window.removeEventListener('beforeunload', beforeUnloadHandler);
+      },
+    };
+  }
+
+  function beforeUnloadHandler(event) {
+    // allow the event to happen if the form was not touched by the
+    // user or the unload event was initiated by a form submit
+    if (!touched || unloadDueToSubmit) {
+      return false;
+    }
+
+    // cancel the unload event. This is the standard to force the prompt to appear.
+    event.preventDefault();
+    // for all non standard compliant browsers we return a truthy value to activate the prompt.
+    return true;
+  }
+
+  return init();
+};
+
+export const navigateAwayPrompt = {
+  name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
+  selector: NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR,
+  setup: navigateAwayPromptUtil,
+};
+
+/**
+ *
+ * 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
+ */
+
+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!');
+  }
+
+  if (element.classList.contains(AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
+    return false;
+  }
+
+  // hide and mark initialized
+  element.classList.add(AUTO_SUBMIT_BUTTON_HIDDEN_CLASS, AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS);
+
+  return {
+    name: AUTO_SUBMIT_BUTTON_UTIL_NAME,
+    element: element,
+    destroy: function() {},
+  };
+};
+
+export const autoSubmitButton = {
+  name: AUTO_SUBMIT_BUTTON_UTIL_NAME,
+  selector: AUTO_SUBMIT_BUTTON_UTIL_SELECTOR,
+  setup: autoSubmitButtonUtil,
+};
+
+/**
+ *
+ * Auto Submit Input Utility
+ *  Programmatically submits forms when a certain input changes value
+ *
+ * Attribute: uw-auto-submit-input
+ *
+ * Example usage:
+ *  <input type="text" uw-auto-submit-input />
+ */
+
+var AUTO_SUBMIT_INPUT_UTIL_NAME = 'autoSubmitInput';
+var AUTO_SUBMIT_INPUT_UTIL_SELECTOR = '[uw-auto-submit-input]';
+
+var AUTO_SUBMIT_INPUT_INITIALIZED_CLASS = 'auto-submit-input--initialized';
+
+var autoSubmitInputUtil = function(element) {
+  var form;
+  var debouncedHandler;
+
+  function autoSubmit() {
+    form.submit();
+  }
+
+  function init() {
+    if (!element) {
+      throw new Error('Auto Submit Input utility needs to be passed an element!');
+    }
+
+    if (element.classList.contains(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    form = element.form;
+    if (!form) {
+      throw new Error('Could not determine associated form for auto submit input');
+    }
+
+    debouncedHandler = debounce(autoSubmit, 500);
+
+    element.addEventListener('input', debouncedHandler);
+
+    element.classList.add(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS);
+
+    return {
+      name: AUTO_SUBMIT_INPUT_UTIL_NAME,
+      element: element,
+      destroy: function() {
+        element.removeEventListener('input', debouncedHandler);
+      },
+    };
+  }
+
+  return init();
+};
+
+export const autoSubmitInput = {
+  name: AUTO_SUBMIT_INPUT_UTIL_NAME,
+  selector: AUTO_SUBMIT_INPUT_UTIL_SELECTOR,
+  setup: autoSubmitInputUtil,
+};
+
+/**
+ *
+ * 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)
+ */
+
+var FORM_ERROR_REMOVER_UTIL_NAME = 'formErrorRemover';
+var FORM_ERROR_REMOVER_UTIL_SELECTOR = 'form';
+
+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!');
+    }
+
+    if (element.classList.contains(FORM_ERROR_REMOVER_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // find form groups
+    formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
+
+    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 {
+      name: FORM_ERROR_REMOVER_UTIL_NAME,
+      element: element,
+      destroy: function() {},
+    };
+  }
+
+  return init();
+};
+
+export const formErrorRemover = {
+  name: FORM_ERROR_REMOVER_UTIL_NAME,
+  selector: FORM_ERROR_REMOVER_UTIL_SELECTOR,
+  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_INITIALIZED_CLASS = 'datepicker--initialized';
+
+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!');
+    }
+
+    if (element.classList.contains(DATEPICKER_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    var flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute("type")];
+
+    if (!flatpickrConfig) {
+      throw new Error('Datepicker utility called on unsupported element!');
+    }
+
+    flatpickrInstance = flatpickr(element, flatpickrConfig);
+
+    // mark initialized
+    element.classList.add(DATEPICKER_INITIALIZED_CLASS);
+
+    return {
+      name: DATEPICKER_UTIL_NAME,
+      element: element,
+      destroy: function() { flatpickrInstance.destroy(); },
+    };
+  }
+
+  return init();
+};
+
+export const datepicker = {
+  name: DATEPICKER_UTIL_NAME,
+  selector: DATEPICKER_UTIL_SELECTOR,
+  setup: datepickerUtil,
+};
+
+// 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);
+  };
+}
diff --git a/frontend/src/utils/form/form.scss b/frontend/src/utils/form/form.scss
new file mode 100644
index 000000000..6612beeb1
--- /dev/null
+++ b/frontend/src/utils/form/form.scss
@@ -0,0 +1,45 @@
+fieldset {
+  border: 0;
+  margin: 0;
+  padding: 0;
+
+  legend {
+    display: none;
+  }
+}
+
+@media (min-width: 769px) {
+  .form-group__input {
+    grid-column: 2;
+  }
+}
+
+[uw-auto-submit-button][type="submit"] {
+  animation: fade-in 500ms ease-in-out backwards;
+  animation-delay: 500ms;
+}
+
+@keyframes fade-in {
+  from {
+    opacity: 0;
+  }
+}
+
+.hidden {
+  visibility: hidden !important;
+  height: 0 !important;
+  width: 0 !important;
+  opacity: 0 !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  min-width: 0 !important;
+}
+
+.select--pagesize {
+  width: 5em;
+  min-width: 75px;
+}
+
+.label-pagesize {
+  margin-right: 13px;
+}
diff --git a/frontend/src/utils/inputs/checkbox.scss b/frontend/src/utils/inputs/checkbox.scss
new file mode 100644
index 000000000..6db7f97e3
--- /dev/null
+++ b/frontend/src/utils/inputs/checkbox.scss
@@ -0,0 +1,82 @@
+
+/* CUSTOM CHECKBOXES */
+/* Completely replaces legacy checkbox */
+.checkbox {
+  position: relative;
+  display: inline-block;
+
+  [type="checkbox"] {
+    position: fixed;
+    top: -1px;
+    left: -1px;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+  }
+
+  label {
+    display: block;
+    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);
+    border-radius: 4px;
+    color: white;
+    cursor: pointer;
+  }
+
+  label::before,
+  label::after {
+    position: absolute;
+    display: block;
+    top: 12px;
+    left: 8px;
+    height: 2px;
+    width: 8px;
+    background-color: var(--color-font);
+  }
+
+  :checked + label {
+    background-color: var(--color-primary);
+  }
+
+  [type="checkbox"]:focus + label {
+    border-color: #3273dc;
+    box-shadow: 0 0 0 0.125em rgba(50,115,220,.25);
+    outline: 0;
+  }
+
+  :checked + label::before,
+  :checked + label::after {
+    content: '';
+  }
+
+  :checked + label::before {
+    background-color: white;
+    transform: rotate(45deg);
+    left: 2px;
+    top: 11px;
+  }
+
+  :checked + label::after {
+    background-color: white;
+    transform: rotate(-45deg);
+    top: 9px;
+    width: 12px;
+    left: 7px;
+  }
+
+  [disabled] + label {
+    pointer-events: none;
+    border: none;
+    opacity: 0.6;
+    filter: grayscale(1);
+  }
+}
+
+/* special treatment for checkboxes in table headers */
+th .checkbox {
+  margin-right: 7px;
+  vertical-align: bottom;
+}
diff --git a/frontend/src/utils/inputs/inputs.js b/frontend/src/utils/inputs/inputs.js
new file mode 100644
index 000000000..53d0ebb9a
--- /dev/null
+++ b/frontend/src/utils/inputs/inputs.js
@@ -0,0 +1,194 @@
+import './checkbox.scss';
+import './radio.scss';
+import './inputs.scss';
+
+/**
+ *
+ * FileInput Utility
+ *  wraps native file input
+ *
+ * Attribute: uw-file-input
+ *  (element must be an input of type='file')
+ *
+ * Example usage:
+ * <input type='file' uw-file-input>
+ *
+ * Internationalization:
+ *  This utility expects the following translations to be available:
+ *    »filesSelected«: label of multi-input button after selection
+ *      example: "Dateien ausgewählt" (will be prepended by number of selected files)
+ *    »selectFile«: label of single-input button before selection
+ *      example: "Datei auswählen"
+ *    »selectFiles«: label of multi-input button before selection
+ *      example: "Datei(en) auswählen"
+ *
+ */
+
+var FILE_INPUT_UTIL_NAME = 'fileInput';
+var FILE_INPUT_UTIL_SELECTOR = 'input[type="file"][uw-file-input]';
+
+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 fileInputUtil = function(element, app) {
+  var isMultiFileInput = false;
+  var fileList;
+  var label;
+
+  function init() {
+    if (!element) {
+      throw new Error('FileInput utility cannot be setup without an element!');
+    }
+
+    if (element.classList.contains(FILE_INPUT_INITIALIZED_CLASS)) {
+      throw new Error('FileInput utility already initialized!');
+    }
+
+    // check if is multi-file input
+    isMultiFileInput = element.hasAttribute('multiple');
+    if (isMultiFileInput) {
+      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_INPUT_CLASS);
+    element.classList.add(FILE_INPUT_INITIALIZED_CLASS);
+
+    return {
+      name: FILE_INPUT_UTIL_NAME,
+      element: element,
+      destroy: function() {},
+    };
+  }
+
+  function renderFileList() {
+    if (!fileList) {
+      return;
+    }
+
+    var files = element.files;
+    fileList.innerHTML = '';
+    Array.from(files).forEach(function(file) {
+      var fileDisplayEl = document.createElement('li');
+      fileDisplayEl.innerHTML = file.name;
+      fileList.appendChild(fileDisplayEl);
+    });
+  }
+
+  function createFileList() {
+    var list = document.createElement('ol');
+    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 {
+      element.parentElement.appendChild(list);
+    }
+    return list;
+  }
+
+  function createFileLabel() {
+    var label = document.createElement('label');
+    label.classList.add(FILE_INPUT_LABEL_CLASS);
+    label.setAttribute('for', element.id);
+    element.parentElement.insertBefore(label, element);
+    return label;
+  }
+
+  function updateLabel() {
+    var files = element.files;
+    if (files && files.length) {
+      label.innerText = isMultiFileInput ? files.length + ' ' + app.i18n.get('filesSelected') : files[0].name;
+    } else {
+      label.innerText = isMultiFileInput ? app.i18n.get('selectFiles') : app.i18n.get('selectFile');
+    }
+  }
+
+  return init();
+};
+
+export const fileInput = {
+  name: FILE_INPUT_UTIL_NAME,
+  selector: FILE_INPUT_UTIL_SELECTOR,
+  setup: fileInputUtil,
+};
+
+/**
+ *
+ * Checkbox Utility
+ *  wraps native checkbox
+ *
+ * Attribute: (none)
+ *  (element must be an input of type="checkbox")
+ *
+ * Example usage:
+ * <input type="checkbox">
+ *
+ */
+
+var CHECKBOX_UTIL_NAME = 'checkbox';
+var CHECKBOX_UTIL_SELECTOR = 'input[type="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!');
+      return false;
+    }
+
+    if (element.parentElement.classList.contains(CHECKBOX_CLASS)) {
+      // throw new Error('Checkbox element\'s wrapper already has class "' + CHECKBOX_CLASS + '"!');
+      return false;
+    }
+
+    var siblingEl = element.nextSibling;
+    var parentEl = element.parentElement;
+
+    var wrapperEl = document.createElement('div');
+    wrapperEl.classList.add(CHECKBOX_CLASS);
+
+    var labelEl = document.createElement('label');
+    labelEl.setAttribute('for', element.id);
+
+    wrapperEl.appendChild(element);
+    wrapperEl.appendChild(labelEl);
+
+    parentEl.insertBefore(wrapperEl, siblingEl);
+
+    element.classList.add(CHECKBOX_INITIALIZED_CLASS);
+
+    return {
+      name: CHECKBOX_UTIL_NAME,
+      element: element,
+      destroy: function() {},
+    };
+  }
+
+  return init();
+};
+
+export const checkbox = {
+  name: CHECKBOX_UTIL_NAME,
+  selector: CHECKBOX_UTIL_SELECTOR,
+  setup: checkboxUtil,
+};
diff --git a/frontend/src/utils/inputs/inputs.scss b/frontend/src/utils/inputs/inputs.scss
new file mode 100644
index 000000000..3290094d0
--- /dev/null
+++ b/frontend/src/utils/inputs/inputs.scss
@@ -0,0 +1,239 @@
+/* GENERAL STYLES FOR FORMS */
+
+/* FORM GROUPS */
+.form-group {
+  position: relative;
+  display: flex;
+  display: grid;
+  grid-template-columns: 1fr 3fr;
+  grid-gap: 5px;
+  justify-content: flex-start;
+  align-items: flex-start;
+  padding: 4px 0;
+  border-left: 2px solid transparent;
+
+  + .form-group {
+    margin-top: 7px;
+  }
+
+  + .form-section-title {
+    margin-top: 40px;
+  }
+}
+
+.form-section-title {
+  color: var(--color-fontsec);
+}
+
+.form-group-label {
+  font-weight: 600;
+  padding-top: 6px;
+}
+
+.form-group-label__hint {
+  margin-top: 7px;
+  color: var(--color-fontsec);
+  font-size: 0.9rem;
+}
+
+.form-group--required {
+  .form-group-label__caption::after {
+    content: ' *';
+    color: var(--color-error);
+  }
+}
+
+.form-group--optional {
+  .form-group-label__caption::after {
+    content: '';
+  }
+}
+
+.form-group--submit .form-group__input {
+  grid-column: 2;
+}
+
+@media (max-width: 768px) {
+  .form-group--submit .form-group__input {
+    grid-column: 1;
+  }
+}
+
+.form-group--has-error {
+  background-color: rgba(255, 0, 0, 0.1);
+
+  input, textarea {
+    border-color: var(--color-error) !important;
+  }
+
+  .form-error {
+    display: block;
+  }
+}
+
+.form-error {
+  display: none;
+}
+
+@media (max-width: 768px) {
+  .form-group {
+    grid-template-columns: 1fr;
+    align-items: baseline;
+    margin-top: 17px;
+    flex-direction: column;
+  }
+}
+
+/* TEXT INPUTS */
+input[type="text"],
+input[type="search"],
+input[type="password"],
+input[type="url"],
+input[type="number"],
+input[type="email"],
+input[type*="date"],
+input[type*="time"],
+select {
+  /* from bulma.css */
+  color: #363636;
+  border-color: #dbdbdb;
+  background-color: #f3f3f3;
+  box-shadow: inset 0 1px 2px 1px rgba(50,50,50,.05);
+
+  width: 100%;
+  max-width: 600px;
+  align-items: center;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  font-size: 1rem;
+  font-family: var(--font-base);
+  line-height: 1.5;
+  padding: 4px 13px;
+}
+
+input[type="number"] {
+  width: 100px;
+}
+
+input[type*="date"],
+input[type*="time"],
+.flatpickr-input[type="text"] {
+  width: 50%;
+  width: 250px;
+}
+
+/* BUTTON STYLE SEE default-layout.lucius */
+
+/* TEXTAREAS */
+textarea {
+  width: 100%;
+  height: 170px;
+  max-width: 600px;
+  line-height: 1.5;
+  color: #363636;
+  background-color: #f3f3f3;
+  padding: 4px 13px;
+  font-size: 1rem;
+  font-family: var(--font-base);
+  -webkit-appearance: none;
+  appearance: none;
+  border: 1px solid #dbdbdb;
+  border-radius: 2px;
+  box-shadow: inset 0 1px 2px 1px rgba(50,50,50,.05);
+  vertical-align: top;
+}
+
+/* SHARED STATE RELATED STYLES */
+
+input,
+select,
+textarea {
+  &:focus {
+    border-color: #3273dc;
+    box-shadow: 0 0 0 0.125em rgba(50,115,220,.25);
+    outline: 0;
+  }
+
+  &[disabled] {
+    background-color: #f3f3f3;
+    color: #7a7a7a;
+    box-shadow: none;
+    border-color: #dbdbdb;
+  }
+
+  &[readonly] {
+    background-color: #f5f5f5;
+    border-color: #dbdbdb;
+  }
+}
+
+/* OPTIONS */
+
+select {
+  -webkit-appearance: menulist;
+}
+
+select,
+option {
+  font-size: 1rem;
+  line-height: 1.5;
+  padding: 4px 13px;
+  border: 1px solid #dbdbdb;
+  border-radius: 2px;
+  outline: 0;
+  color: #363636;
+  min-width: 250px;
+  width: auto;
+  background-color: #f3f3f3;
+  box-shadow: inset 0 1px 2px 1px rgba(50,50,50,.05);
+}
+
+@media (max-width: 425px) {
+
+  select, option {
+    width: 100%;
+  }
+}
+
+/* FILE INPUT */
+.file-input {
+  display: none;
+}
+
+.file-input__label {
+  cursor: pointer;
+  display: inline-block;
+  background-color: var(--color-primary);
+  color: white;
+  padding: 10px 17px;
+  border-radius: 3px;
+}
+
+.file-input__info {
+  font-size: .9rem;
+  font-style: italic;
+  margin: 10px 0;
+  color: var(--color-fontsec);
+}
+
+.file-input__list {
+  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;
+
+  .checkbox {
+    margin-left: 12px;
+  }
+}
diff --git a/frontend/src/utils/inputs/radio.scss b/frontend/src/utils/inputs/radio.scss
new file mode 100644
index 000000000..1b26ae1ae
--- /dev/null
+++ b/frontend/src/utils/inputs/radio.scss
@@ -0,0 +1,72 @@
+/* CUSTOM RADIO BOXES */
+/* Completely replaces native radiobox */
+
+.radio-group {
+  display: flex;
+}
+
+.radio {
+  position: relative;
+  display: inline-block;
+
+  [type="radio"] {
+    position: fixed;
+    top: -1px;
+    left: -1px;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+  }
+
+  label {
+    display: block;
+    height: 34px;
+    min-width: 42px;
+    line-height: 34px;
+    text-align: center;
+    padding: 0 13px;
+    background-color: #f3f3f3;
+    box-shadow: inset 2px 1px 2px 1px rgba(50, 50, 50, 0.05);
+    color: var(--color-font);
+    cursor: pointer;
+  }
+
+  :checked + label {
+    background-color: var(--color-primary);
+    color: var(--color-lightwhite);
+    box-shadow: inset -2px -1px 2px 1px rgba(255, 255, 255, 0.15);
+  }
+
+  :focus + label {
+    border-color: #3273dc;
+    box-shadow: 0 0 0.125em 0 rgba(50,115,220,0.8);
+    outline: 0;
+  }
+
+  [disabled] + label {
+    pointer-events: none;
+    border: none;
+    opacity: 0.6;
+    filter: grayscale(1);
+  }
+}
+
+.radio:first-child {
+  label {
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+  }
+}
+
+.radio:last-child {
+  label {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+  }
+}
+
+@media (max-width: 768px) {
+  .radio + .radio {
+    margin-left: 10px;
+  }
+}
diff --git a/frontend/src/utils/mass-input/mass-input.js b/frontend/src/utils/mass-input/mass-input.js
new file mode 100644
index 000000000..33e33d30f
--- /dev/null
+++ b/frontend/src/utils/mass-input/mass-input.js
@@ -0,0 +1,218 @@
+/**
+ *
+ * Mass Input Utility
+ *  allows form shapes to be manipulated asynchronously:
+ *  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
+ *
+ * Example usage:
+ *  <form method="POST" action="...">
+ *   <input type="text">
+ *   <div uw-mass-input>
+ *     <input type="text">
+ *     <button type="submit">
+ */
+
+var MASS_INPUT_UTIL_NAME = 'massInput';
+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_SUBMIT_BUTTON_CLASS = 'massinput__submit-button';
+var MASS_INPUT_INITIALIZED_CLASS = 'mass-input--initialized';
+
+var massInputUtil = function(element, app) {
+  var massInputId;
+  var massInputFormSubmitHandler;
+  var massInputForm;
+
+  function init() {
+    if (!element) {
+      throw new Error('Mass Input utility cannot be setup without an element!');
+    }
+
+    if (element.classList.contains(MASS_INPUT_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    massInputId = element.dataset.massInputIdent || '_';
+    massInputForm = element.closest('form');
+
+    if (!massInputForm) {
+      throw new Error('Mass Input utility cannot be setup without being wrapped in a <form>!');
+    }
+
+    massInputFormSubmitHandler = makeSubmitHandler();
+
+    // setup submit buttons inside this massinput so browser
+    // uses correct submit button for form submission.
+    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);
+
+    return {
+      name: MASS_INPUT_UTIL_NAME,
+      element: element,
+      destroy: function() {
+        reset();
+      },
+    };
+  }
+
+  function makeSubmitHandler() {
+    var method = massInputForm.getAttribute('method') || 'POST';
+    var url = massInputForm.getAttribute('action') || window.location.href;
+    var enctype = massInputForm.getAttribute('enctype') || 'application/json';
+
+    var requestFn;
+    if (app.httpClient[method.toLowerCase()]) {
+      requestFn = app.httpClient[method.toLowerCase()].bind(app.httpClient);
+    }
+
+    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. a child is focused/active)
+      activeElement = element.querySelector(':focus, :active');
+
+      if (!activeElement) {
+        return false;
+      }
+
+      // 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('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS);
+      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(submitButton, enctype);
+
+      if (requestFn && requestBody) {
+        var headers = {'Mass-Input-Shortcircuit': massInputId};
+
+        if (enctype !== 'multipart/form-data')
+          headers['Content-Type'] = enctype;
+
+        requestFn({
+          url: url,
+          headers: headers,
+          body: requestBody,
+        }).then(function(response) {
+          return app.htmlHelpers.parseResponse(response);
+        }).then(function(response) {
+            processResponse(response.element);
+            if (isAddCell) {
+              reFocusAddCell();
+            }
+          });
+      }
+    };
+  }
+
+  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));
+  }
+
+  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(responseElement) {
+    element.innerHTML = "";
+    element.appendChild(responseElement);
+
+    reset();
+
+    app.utilRegistry.setupAll(element);
+  }
+
+  function serializeForm(submitButton, enctype) {
+    var formData = new FormData(massInputForm);
+
+    // manually add name and value of submit button to formData
+    formData.append(submitButton.name, submitButton.value);
+
+    if (enctype === 'application/x-www-form-urlencoded') {
+      return new URLSearchParams(formData);
+    } else if (enctype === 'multipart/form-data') {
+      return formData;
+    } else {
+      throw new Error('Unsupported form enctype: ' + enctype);
+    }
+  }
+
+  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) {
+      // Clearing of add-inputs is done in the backend
+      addCellInput.focus();
+    }
+  }
+
+  function reset() {
+    element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
+    massInputForm.removeEventListener('submit', massInputFormSubmitHandler);
+    massInputForm.removeEventListener('keypress', keypressHandler);
+
+    var buttons = getMassInputSubmitButtons();
+    buttons.forEach(function(button) {
+      resetSubmitButton(button);
+    });
+  }
+
+  return init();
+};
+
+export default {
+  name: MASS_INPUT_UTIL_NAME,
+  selector: MASS_INPUT_UTIL_SELECTOR,
+  setup: massInputUtil,
+};
diff --git a/frontend/src/utils/modal/modal.js b/frontend/src/utils/modal/modal.js
new file mode 100644
index 000000000..431199a8f
--- /dev/null
+++ b/frontend/src/utils/modal/modal.js
@@ -0,0 +1,203 @@
+import './modal.scss';
+
+/**
+ *
+ * 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 MODAL_HEADERS = {
+  'Is-Modal': 'True',
+};
+
+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';
+
+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, app) {
+
+  var modalsWrapper;
+  var modalOverlay;
+  var modalUrl;
+
+  function _init() {
+    if (!element) {
+      throw new Error('Modal utility cannot be setup without an element!');
+    }
+
+    if (element.classList.contains(MODAL_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    ensureModalWrapper();
+
+    // param modalTrigger
+    if (!element.dataset.modalTrigger) {
+      throw new Error('Modal utility cannot be setup without a trigger element!');
+    } else {
+      setupTrigger();
+    }
+
+    // param modalCloseable
+    if (element.dataset.modalCloseable !== undefined) {
+      setupCloser();
+    }
+
+    // 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 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('#')) {
+      triggerSelector = '#' + triggerSelector;
+    }
+    var triggerElement = document.querySelector(triggerSelector);
+
+    if (!triggerElement) {
+      throw new Error('Trigger element for Modal not found: "' + triggerSelector + '"');
+    }
+
+    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);
+    modalOverlay.addEventListener('click', onCloseClicked, false);
+  }
+
+  function onTriggerClicked(event) {
+    event.preventDefault();
+    open();
+  }
+
+  function onCloseClicked(event) {
+    event.preventDefault();
+    close();
+  }
+
+  function onKeyUp(event) {
+    if (event.key === 'Escape') {
+      close();
+    }
+  }
+
+  function open() {
+    element.classList.add(MODAL_OPEN_CLASS);
+    modalOverlay.classList.add(MODAL_OVERLAY_OPEN_CLASS);
+    modalsWrapper.classList.add(MODALS_WRAPPER_OPEN_CLASS);
+    modalsWrapper.appendChild(element);
+
+    if (modalUrl) {
+      fillModal(modalUrl);
+    }
+
+    document.addEventListener('keyup', onKeyUp);
+  }
+
+  function close() {
+    modalOverlay.classList.remove(MODAL_OVERLAY_OPEN_CLASS);
+    element.classList.remove(MODAL_OPEN_CLASS);
+    modalsWrapper.classList.remove(MODALS_WRAPPER_OPEN_CLASS);
+
+    document.removeEventListener('keyup', onKeyUp);
+  };
+
+  function fillModal(url) {
+    app.httpClient.get({
+      url: url,
+      headers: MODAL_HEADERS,
+    }).then(function(response) {
+      return app.htmlHelpers.parseResponse(response);
+    }).then(function(response) {
+      processResponse(response.element);
+    });
+  }
+
+  function processResponse(responseElement) {
+    var modalContent = document.createElement('div');
+    modalContent.classList.add(MODAL_CONTENT_CLASS);
+
+    var contentBody = responseElement.querySelector('.' + MAIN_CONTENT_CLASS);
+
+    if (contentBody) {
+      modalContent.innerHTML = contentBody.innerHTML;
+    }
+
+    var previousModalContent = element.querySelector('.' + MODAL_CONTENT_CLASS);
+    if (previousModalContent) {
+      previousModalContent.remove();
+    }
+
+    element.insertBefore(modalContent, null);
+
+    // setup any newly arrived utils
+    app.utilRegistry.setupAll(element);
+  }
+
+  return _init();
+};
+
+export default {
+  name: MODAL_UTIL_NAME,
+  selector: MODAL_UTIL_SELECTOR,
+  setup: modalUtil,
+};
diff --git a/frontend/src/utils/modal/modal.scss b/frontend/src/utils/modal/modal.scss
new file mode 100644
index 000000000..2cecac941
--- /dev/null
+++ b/frontend/src/utils/modal/modal.scss
@@ -0,0 +1,115 @@
+.modals-wrapper {
+  position: fixed;
+  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 40px;
+  overflow: auto;
+  overscroll-behavior: contain;
+  pointer-events: none;
+  opacity: 0;
+
+  &.modal--open {
+    display: flex;
+    opacity: 1;
+    pointer-events: auto;
+    z-index: 200;
+    transition:
+      opacity .2s .1s ease-in-out,
+      transform .3s ease-in-out;
+  }
+}
+
+@media (max-width: 1024px) {
+  .modal {
+    min-width: 80vw;
+  }
+}
+@media (max-width: 768px) {
+  .modal {
+    min-width: 90vw;
+  }
+}
+@media (max-width: 425px) {
+  .modal {
+    min-width: calc(100vw - 20px);
+  }
+}
+
+.modal__overlay {
+  position: fixed;
+  left: 0;
+  top: 0;
+  height: 100%;
+  width: 100%;
+  background-color: transparent;
+  z-index: -1;
+  transition: all .2s ease;
+  display: none;
+
+  &.modal__overlay--open {
+    display: block;
+    z-index: 199;
+    opacity: 1;
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+}
+
+.modal__trigger {
+  cursor: pointer;
+}
+
+.modal__trigger-label {
+  font-style: italic;
+  text-decoration: underline;
+}
+
+.modal__closer {
+  position: absolute;
+  top: 20px;
+  right: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 30px;
+  height: 30px;
+  background-color: var(--color-darker);
+  border-radius: 2px;
+  cursor: pointer;
+  z-index: 20;
+
+  &::before {
+    content: '\f00d';
+    font-family: 'Font Awesome 5 Free';
+    color: white;
+  }
+}
+
+.modal__content {
+  margin: 20px 0;
+  width: 100%;
+}
diff --git a/frontend/src/utils/show-hide/show-hide.js b/frontend/src/utils/show-hide/show-hide.js
new file mode 100644
index 000000000..1566aa940
--- /dev/null
+++ b/frontend/src/utils/show-hide/show-hide.js
@@ -0,0 +1,109 @@
+import './show-hide.scss';
+
+var SHOW_HIDE_UTIL_NAME = 'showHide';
+var SHOW_HIDE_UTIL_SELECTOR = '[uw-show-hide]';
+
+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>Click me
+ *   <div>This will be toggled
+ *   <div>This will be toggled as well
+ */
+var showHideUtil = function(element) {
+
+  var showHideId;
+
+  function init() {
+    if (!element) {
+      throw new Error('ShowHide utility cannot be setup without an element!');
+    }
+
+    if (element.classList.contains(SHOW_HIDE_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // 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 addClickListener() {
+    element.addEventListener('click', function clickListener() {
+      var newState = element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
+
+      if (showHideId) {
+        setLocalStorage(showHideId, newState);
+      }
+    });
+  }
+
+  function setLocalStorage(id, state) {
+    var lsData = getLocalStorage();
+    lsData[id] = state;
+    window.localStorage.setItem(SHOW_HIDE_LOCAL_STORAGE_KEY, JSON.stringify(lsData));
+  }
+
+  function getLocalStorage() {
+    return JSON.parse(window.localStorage.getItem(SHOW_HIDE_LOCAL_STORAGE_KEY)) || {};
+  }
+
+  return init();
+};
+
+export default {
+  name: SHOW_HIDE_UTIL_NAME,
+  selector: SHOW_HIDE_UTIL_SELECTOR,
+  setup: showHideUtil,
+};
diff --git a/frontend/src/utils/show-hide/show-hide.scss b/frontend/src/utils/show-hide/show-hide.scss
new file mode 100644
index 000000000..04143d0ae
--- /dev/null
+++ b/frontend/src/utils/show-hide/show-hide.scss
@@ -0,0 +1,54 @@
+$show-hide-toggle-size: 6px;
+
+.show-hide__toggle {
+
+  position: relative;
+  cursor: pointer;
+
+  &:hover {
+    background-color: var(--color-grey-lighter);
+    cursor: pointer;
+  }
+}
+
+.show-hide__toggle::before {
+  content: '';
+  position: absolute;
+  width: $show-hide-toggle-size;
+  height: $show-hide-toggle-size;
+  left: -15px;
+  top: 50%;
+  color: var(--color-primary);
+  border-right: 2px solid currentColor;
+  border-top: 2px solid currentColor;
+  transition: transform .2s ease;
+  transform: translateY(-50%) rotate(-45deg);
+
+  @media (max-width: 768px) {
+    left: auto;
+    right: 20px;
+    color: var(--color-font);
+  }
+}
+
+.show-hide__toggle--right::before {
+  left: auto;
+  right: 20px;
+  color: var(--color-font);
+}
+
+.show-hide--collapsed {
+
+  .show-hide__toggle::before {
+    transform: translateY(-50%) rotate(135deg);
+  }
+
+  :not(.show-hide__toggle) {
+    display: block;
+    height: 0;
+    margin: 0;
+    padding: 0;
+    max-height: 0;
+    overflow-y: hidden;
+  }
+}
diff --git a/frontend/src/utils/tabber/tabber.js b/frontend/src/utils/tabber/tabber.js
new file mode 100644
index 000000000..c44caa44b
--- /dev/null
+++ b/frontend/src/utils/tabber/tabber.js
@@ -0,0 +1,92 @@
+import './tabber.scss';
+
+(function($) {
+
+  document.addEventListener('DOMContentLoaded', function() {
+    'use strict';
+
+    // define plugin
+    $.fn.tabgroup = function() {
+
+      var $this = $(this);
+      var $openers = $('<div class="tab-group-openers"></div>');
+      $this.prepend($openers);
+
+      var openedByDefault = $this.data('tab-open') || 0;
+      var tabs = [];
+      var currentTab = {};
+
+      $this.find('.tab').each(function(i, t) {
+        var tab = $(t);
+        tab.data('tab-index', i);
+        var tabName = tab.data('tab-name') || 'Tab '+i;
+        var tabFile = tab.data('tab-file') || false;
+        var $opener = makeOpener(tabName, i);
+        $openers.append($opener);
+        if (tab.find('.tab-title')) {
+          tab.find('.tab-title').remove();
+        }
+        tab.hide();
+        var loaded = false;
+        tabs.push({index: i, name: tabName, file: tabFile, dom: tab, opener: $opener, loaded: loaded });
+      });
+
+      $this.on('click', 'a[href^="#"]', function(event) {
+        var $target = $(event.currentTarget);
+        var tab = getTabByName($target.attr('href').replace('#', ''));
+        if ( tab ) {
+          showTab(tab.index);
+        }
+        event.preventDefault();
+      });
+
+      function getTabByName(name) {
+        var it = -1;
+        $.each(tabs, function(i, t) {
+          if ( t.name.toLowerCase() === name.toLowerCase() ) {
+            it = i;
+          }
+        });
+        if ( it >= 0 ) {
+          return tabs[it];
+        } else {
+          return false;
+        }
+      }
+
+      function makeOpener(tabName, i) {
+        return $('<span class="tab-opener">'+tabName+'</span>').
+                on('click', function() {
+                  showTab(i);
+                });
+      }
+
+      function showTab(i) {
+        tabs.forEach(function(t) {
+          t.dom.hide();
+          t.opener.removeClass('tab-visible');
+        });
+        currentTab = tabs[i];
+        if ( !currentTab.loaded && currentTab.file ){
+          $.get(currentTab.file, function(res) {
+            currentTab.dom.html(res);
+            currentTab.loaded = true;
+          });
+        }
+        currentTab.opener.addClass('tab-visible');
+        currentTab.dom.show();
+      }
+
+      showTab(openedByDefault);
+      currentTab = tabs[openedByDefault];
+
+    };
+
+    // apply plugin to all available tab-groups if on wide screen
+    if (window.innerWidth > 768) {
+      $('.tab-group').each(function(i, t) {
+        $(t).tabgroup();
+      });
+    }
+  });
+})($);
diff --git a/frontend/src/utils/tabber/tabber.scss b/frontend/src/utils/tabber/tabber.scss
new file mode 100644
index 000000000..d135a5f27
--- /dev/null
+++ b/frontend/src/utils/tabber/tabber.scss
@@ -0,0 +1,39 @@
+.tab-group {
+  border-top: 2px solid #dcdcdc;
+  padding-top: 30px;
+}
+
+.tab-group-openers {
+  display: flex;
+  justify-content: stretch;
+  line-height: 40px;
+  font-size: 14px;
+  margin-bottom: 40px;
+}
+
+.tab-opener {
+  display: inline-block;
+  flex: 1;
+  text-align: center;
+  padding: 0 13px;
+  margin: 0 2px;
+  background-color: var(--color-dark);
+  color: white;
+  font-size: 16px;
+  text-transform: uppercase;
+  font-weight: 600;
+  transition: all .1s ease;
+  border-bottom: 5px solid rgba(100, 100, 100, 0.2);
+}
+.tab-opener:not(.tab-visible):hover {
+  cursor: pointer;
+  background-color: transparent;
+  color: rgb(52, 48, 58);
+  border-bottom-color: grey;
+}
+
+.tab-opener.tab-visible {
+  background-color: transparent;
+  color: rgb(52, 48, 58);
+  border-bottom-color: var(--color-primary);
+}
diff --git a/frontend/src/utils/tooltips/tooltips.js b/frontend/src/utils/tooltips/tooltips.js
new file mode 100644
index 000000000..1bf275e43
--- /dev/null
+++ b/frontend/src/utils/tooltips/tooltips.js
@@ -0,0 +1,7 @@
+import './tooltips.scss';
+
+export default {
+  name: 'tooltips',
+  selector: '[not-something-that-would-be-found]',
+  setup: () => {},
+};
diff --git a/frontend/src/utils/tooltips/tooltips.scss b/frontend/src/utils/tooltips/tooltips.scss
new file mode 100644
index 000000000..ed6b5fd5d
--- /dev/null
+++ b/frontend/src/utils/tooltips/tooltips.scss
@@ -0,0 +1,88 @@
+.tooltip {
+  position: relative;
+  display: inline-block;
+  height: 1.5rem;
+  vertical-align: -0.375rem;
+
+  &:hover .tooltip__content {
+    display: inline-block;
+  }
+}
+
+.tooltip__handle {
+  background-color: var(--color-dark);
+  border-radius: 50%;
+  height: 1.5rem;
+  width: 1.5rem;
+  line-height: 1.5rem;
+  font-size: 1.2rem;
+  color: white;
+  display: inline-block;
+  text-align: center;
+  margin: 0 10px;
+  cursor: default;
+  position: relative;
+
+  &::before {
+    content: '\f128';
+    position: absolute;
+    top: 0;
+    left: 0;
+    font-family: "Font Awesome 5 Free";
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    font-size: 15px;
+  }
+
+  &.tooltip__handle--danger::before {
+    content: '\f12a';
+  }
+
+  &.tooltip__handle--danger {
+      background-color: var(--color-warning);
+  }
+
+  &:hover {
+    background-color: var(--color-light);
+  }
+}
+
+.tooltip__content {
+  position: absolute;
+  display: none;
+  top: -10px;
+  transform: translateY(-100%);
+  right: 3px;
+  width: 275px;
+  z-index: 10;
+  background-color: #fafafa;
+  border-radius: 4px;
+  padding: 13px 17px;
+  box-shadow: 0 0 20px 4px rgba(0, 0, 0, 0.1);
+
+  &::after {
+    content: '';
+    width: 16px;
+    height: 16px;
+    background-color: #fafafa;
+    transform: rotate(45deg);
+    position: absolute;
+    right: 10px;
+    bottom: -8px;
+  }
+}
+
+@media (max-width: 768px) {
+
+  .tooltip {
+    display: block;
+    margin-top: 10px;
+
+    .tooltip__content {
+      left: 3px;
+      right: 3px;
+      width: auto;
+    }
+  }
+}
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
new file mode 100644
index 000000000..b3f73084e
--- /dev/null
+++ b/frontend/src/utils/utils.js
@@ -0,0 +1,38 @@
+import alerts from './alerts/alerts';
+import asidenav from './asidenav/asidenav';
+import asyncForm from './async-form/async-form';
+import asyncTable from './async-table/async-table';
+import checkAll from './check-all/check-all';
+import massInput from './mass-input/mass-input';
+import { fileInput, checkbox } from './inputs/inputs';
+import modal from './modal/modal';
+import showHide from './show-hide/show-hide';
+import {
+  interactiveFieldset,
+  navigateAwayPrompt,
+  autoSubmitButton,
+  autoSubmitInput,
+  formErrorRemover,
+  datepicker,
+} from './form/form';
+import tooltips from './tooltips/tooltips';
+
+export default [
+  alerts,
+  asidenav,
+  asyncForm,
+  asyncTable,
+  checkAll,
+  massInput,
+  fileInput,
+  checkbox,
+  modal,
+  showHide,
+  interactiveFieldset,
+  navigateAwayPrompt,
+  autoSubmitButton,
+  autoSubmitInput,
+  formErrorRemover,
+  datepicker,
+  tooltips,
+];
diff --git a/frontend/vendor/flatpickr.css b/frontend/vendor/flatpickr.css
new file mode 100644
index 000000000..2e9c517e9
--- /dev/null
+++ b/frontend/vendor/flatpickr.css
@@ -0,0 +1,740 @@
+.flatpickr-calendar {
+  background: transparent;
+  opacity: 0;
+  display: none;
+  text-align: center;
+  visibility: hidden;
+  padding: 0;
+  -webkit-animation: none;
+          animation: none;
+  direction: ltr;
+  border: 0;
+  font-size: 14px;
+  line-height: 24px;
+  border-radius: 5px;
+  position: absolute;
+  width: 307.875px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  -ms-touch-action: manipulation;
+      touch-action: manipulation;
+  background: #fff;
+  -webkit-box-shadow: 1px 0 0 #e6e6e6, -1px 0 0 #e6e6e6, 0 1px 0 #e6e6e6, 0 -1px 0 #e6e6e6, 0 3px 13px rgba(0,0,0,0.08);
+          box-shadow: 1px 0 0 #e6e6e6, -1px 0 0 #e6e6e6, 0 1px 0 #e6e6e6, 0 -1px 0 #e6e6e6, 0 3px 13px rgba(0,0,0,0.08);
+}
+.flatpickr-calendar.open,
+.flatpickr-calendar.inline {
+  opacity: 1;
+  max-height: 640px;
+  visibility: visible;
+}
+.flatpickr-calendar.open {
+  display: inline-block;
+  z-index: 99999;
+}
+.flatpickr-calendar.animate.open {
+  -webkit-animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
+          animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
+}
+.flatpickr-calendar.inline {
+  display: block;
+  position: relative;
+  top: 2px;
+}
+.flatpickr-calendar.static {
+  position: absolute;
+  top: calc(100% + 2px);
+}
+.flatpickr-calendar.static.open {
+  z-index: 999;
+  display: block;
+}
+.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7) {
+  -webkit-box-shadow: none !important;
+          box-shadow: none !important;
+}
+.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1) {
+  -webkit-box-shadow: -2px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+          box-shadow: -2px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+}
+.flatpickr-calendar .hasWeeks .dayContainer,
+.flatpickr-calendar .hasTime .dayContainer {
+  border-bottom: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.flatpickr-calendar .hasWeeks .dayContainer {
+  border-left: 0;
+}
+.flatpickr-calendar.showTimeInput.hasTime .flatpickr-time {
+  height: 40px;
+  border-top: 1px solid #e6e6e6;
+}
+.flatpickr-calendar.noCalendar.hasTime .flatpickr-time {
+  height: auto;
+}
+.flatpickr-calendar:before,
+.flatpickr-calendar:after {
+  position: absolute;
+  display: block;
+  pointer-events: none;
+  border: solid transparent;
+  content: '';
+  height: 0;
+  width: 0;
+  left: 22px;
+}
+.flatpickr-calendar.rightMost:before,
+.flatpickr-calendar.rightMost:after {
+  left: auto;
+  right: 22px;
+}
+.flatpickr-calendar:before {
+  border-width: 5px;
+  margin: 0 -5px;
+}
+.flatpickr-calendar:after {
+  border-width: 4px;
+  margin: 0 -4px;
+}
+.flatpickr-calendar.arrowTop:before,
+.flatpickr-calendar.arrowTop:after {
+  bottom: 100%;
+}
+.flatpickr-calendar.arrowTop:before {
+  border-bottom-color: #e6e6e6;
+}
+.flatpickr-calendar.arrowTop:after {
+  border-bottom-color: #fff;
+}
+.flatpickr-calendar.arrowBottom:before,
+.flatpickr-calendar.arrowBottom:after {
+  top: 100%;
+}
+.flatpickr-calendar.arrowBottom:before {
+  border-top-color: #e6e6e6;
+}
+.flatpickr-calendar.arrowBottom:after {
+  border-top-color: #fff;
+}
+.flatpickr-calendar:focus {
+  outline: 0;
+}
+.flatpickr-wrapper {
+  position: relative;
+  display: inline-block;
+}
+.flatpickr-months {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+.flatpickr-months .flatpickr-month {
+  background: transparent;
+  color: rgba(0,0,0,0.9);
+  fill: rgba(0,0,0,0.9);
+  height: 28px;
+  line-height: 1;
+  text-align: center;
+  position: relative;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+  overflow: hidden;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+}
+.flatpickr-months .flatpickr-prev-month,
+.flatpickr-months .flatpickr-next-month {
+  text-decoration: none;
+  cursor: pointer;
+  position: absolute;
+  top: 0px;
+  line-height: 16px;
+  height: 28px;
+  padding: 10px;
+  z-index: 3;
+}
+.flatpickr-months .flatpickr-prev-month.disabled,
+.flatpickr-months .flatpickr-next-month.disabled {
+  display: none;
+}
+.flatpickr-months .flatpickr-prev-month i,
+.flatpickr-months .flatpickr-next-month i {
+  position: relative;
+}
+.flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,
+.flatpickr-months .flatpickr-next-month.flatpickr-prev-month {
+/*
+      /*rtl:begin:ignore*/
+/*
+      */
+  left: 0;
+/*
+      /*rtl:end:ignore*/
+/*
+      */
+}
+/*
+      /*rtl:begin:ignore*/
+/*
+      /*rtl:end:ignore*/
+.flatpickr-months .flatpickr-prev-month.flatpickr-next-month,
+.flatpickr-months .flatpickr-next-month.flatpickr-next-month {
+/*
+      /*rtl:begin:ignore*/
+/*
+      */
+  right: 0;
+/*
+      /*rtl:end:ignore*/
+/*
+      */
+}
+/*
+      /*rtl:begin:ignore*/
+/*
+      /*rtl:end:ignore*/
+.flatpickr-months .flatpickr-prev-month:hover,
+.flatpickr-months .flatpickr-next-month:hover {
+  color: #959ea9;
+}
+.flatpickr-months .flatpickr-prev-month:hover svg,
+.flatpickr-months .flatpickr-next-month:hover svg {
+  fill: #f64747;
+}
+.flatpickr-months .flatpickr-prev-month svg,
+.flatpickr-months .flatpickr-next-month svg {
+  width: 14px;
+  height: 14px;
+}
+.flatpickr-months .flatpickr-prev-month svg path,
+.flatpickr-months .flatpickr-next-month svg path {
+  -webkit-transition: fill 0.1s;
+  transition: fill 0.1s;
+  fill: inherit;
+}
+.numInputWrapper {
+  position: relative;
+  height: auto;
+}
+.numInputWrapper input,
+.numInputWrapper span {
+  display: inline-block;
+}
+.numInputWrapper input {
+  width: 100%;
+  min-width: auto !important;
+}
+.numInputWrapper input::-ms-clear {
+  display: none;
+}
+.numInputWrapper span {
+  position: absolute;
+  right: 0;
+  width: 14px;
+  padding: 0 4px 0 2px;
+  height: 50%;
+  line-height: 50%;
+  opacity: 0;
+  cursor: pointer;
+  border: 1px solid rgba(57,57,57,0.15);
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+.numInputWrapper span:hover {
+  background: rgba(0,0,0,0.1);
+}
+.numInputWrapper span:active {
+  background: rgba(0,0,0,0.2);
+}
+.numInputWrapper span:after {
+  display: block;
+  content: "";
+  position: absolute;
+}
+.numInputWrapper span.arrowUp {
+  top: 0;
+  border-bottom: 0;
+}
+.numInputWrapper span.arrowUp:after {
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-bottom: 4px solid rgba(57,57,57,0.6);
+  top: 26%;
+}
+.numInputWrapper span.arrowDown {
+  top: 50%;
+}
+.numInputWrapper span.arrowDown:after {
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid rgba(57,57,57,0.6);
+  top: 40%;
+}
+.numInputWrapper span svg {
+  width: inherit;
+  height: auto;
+}
+.numInputWrapper span svg path {
+  fill: rgba(0,0,0,0.5);
+}
+.numInputWrapper:hover {
+  background: rgba(0,0,0,0.05);
+}
+.numInputWrapper:hover span {
+  opacity: 1;
+}
+.flatpickr-current-month {
+  font-size: 135%;
+  line-height: inherit;
+  font-weight: 300;
+  color: inherit;
+  position: absolute;
+  width: 75%;
+  left: 12.5%;
+  padding: 6.16px 0 0 0;
+  line-height: 1;
+  height: 28px;
+  display: inline-block;
+  text-align: center;
+  -webkit-transform: translate3d(0px, 0px, 0px);
+          transform: translate3d(0px, 0px, 0px);
+}
+.flatpickr-current-month span.cur-month {
+  font-family: inherit;
+  font-weight: 700;
+  color: inherit;
+  display: inline-block;
+  margin-left: 0.5ch;
+  padding: 0;
+}
+.flatpickr-current-month span.cur-month:hover {
+  background: rgba(0,0,0,0.05);
+}
+.flatpickr-current-month .numInputWrapper {
+  width: 6ch;
+  width: 7ch\0;
+  display: inline-block;
+}
+.flatpickr-current-month .numInputWrapper span.arrowUp:after {
+  border-bottom-color: rgba(0,0,0,0.9);
+}
+.flatpickr-current-month .numInputWrapper span.arrowDown:after {
+  border-top-color: rgba(0,0,0,0.9);
+}
+.flatpickr-current-month input.cur-year {
+  background: transparent;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  color: inherit;
+  cursor: text;
+  padding: 0 0 0 0.5ch;
+  margin: 0;
+  display: inline-block;
+  font-size: inherit;
+  font-family: inherit;
+  font-weight: 300;
+  line-height: inherit;
+  height: auto;
+  border: 0;
+  border-radius: 0;
+  vertical-align: initial;
+}
+.flatpickr-current-month input.cur-year:focus {
+  outline: 0;
+}
+.flatpickr-current-month input.cur-year[disabled],
+.flatpickr-current-month input.cur-year[disabled]:hover {
+  font-size: 100%;
+  color: rgba(0,0,0,0.5);
+  background: transparent;
+  pointer-events: none;
+}
+.flatpickr-weekdays {
+  background: transparent;
+  text-align: center;
+  overflow: hidden;
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  height: 28px;
+}
+.flatpickr-weekdays .flatpickr-weekdaycontainer {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+}
+span.flatpickr-weekday {
+  cursor: default;
+  font-size: 90%;
+  background: transparent;
+  color: rgba(0,0,0,0.54);
+  line-height: 1;
+  margin: 0;
+  text-align: center;
+  display: block;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  font-weight: bolder;
+}
+.dayContainer,
+.flatpickr-weeks {
+  padding: 1px 0 0 0;
+}
+.flatpickr-days {
+  position: relative;
+  overflow: hidden;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: start;
+  -webkit-align-items: flex-start;
+      -ms-flex-align: start;
+          align-items: flex-start;
+  width: 307.875px;
+}
+.flatpickr-days:focus {
+  outline: 0;
+}
+.dayContainer {
+  padding: 0;
+  outline: 0;
+  text-align: left;
+  width: 307.875px;
+  min-width: 307.875px;
+  max-width: 307.875px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  display: inline-block;
+  display: -ms-flexbox;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-flex-wrap: wrap;
+          flex-wrap: wrap;
+  -ms-flex-wrap: wrap;
+  -ms-flex-pack: justify;
+  -webkit-justify-content: space-around;
+          justify-content: space-around;
+  -webkit-transform: translate3d(0px, 0px, 0px);
+          transform: translate3d(0px, 0px, 0px);
+  opacity: 1;
+}
+.dayContainer + .dayContainer {
+  -webkit-box-shadow: -1px 0 0 #e6e6e6;
+          box-shadow: -1px 0 0 #e6e6e6;
+}
+.flatpickr-day {
+  background: none;
+  border: 1px solid transparent;
+  border-radius: 150px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  color: #393939;
+  cursor: pointer;
+  font-weight: 400;
+  width: 14.2857143%;
+  -webkit-flex-basis: 14.2857143%;
+      -ms-flex-preferred-size: 14.2857143%;
+          flex-basis: 14.2857143%;
+  max-width: 39px;
+  height: 39px;
+  line-height: 39px;
+  margin: 0;
+  display: inline-block;
+  position: relative;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  text-align: center;
+}
+.flatpickr-day.inRange,
+.flatpickr-day.prevMonthDay.inRange,
+.flatpickr-day.nextMonthDay.inRange,
+.flatpickr-day.today.inRange,
+.flatpickr-day.prevMonthDay.today.inRange,
+.flatpickr-day.nextMonthDay.today.inRange,
+.flatpickr-day:hover,
+.flatpickr-day.prevMonthDay:hover,
+.flatpickr-day.nextMonthDay:hover,
+.flatpickr-day:focus,
+.flatpickr-day.prevMonthDay:focus,
+.flatpickr-day.nextMonthDay:focus {
+  cursor: pointer;
+  outline: 0;
+  background: #e6e6e6;
+  border-color: #e6e6e6;
+}
+.flatpickr-day.today {
+  border-color: #959ea9;
+}
+.flatpickr-day.today:hover,
+.flatpickr-day.today:focus {
+  border-color: #959ea9;
+  background: #959ea9;
+  color: #fff;
+}
+.flatpickr-day.selected,
+.flatpickr-day.startRange,
+.flatpickr-day.endRange,
+.flatpickr-day.selected.inRange,
+.flatpickr-day.startRange.inRange,
+.flatpickr-day.endRange.inRange,
+.flatpickr-day.selected:focus,
+.flatpickr-day.startRange:focus,
+.flatpickr-day.endRange:focus,
+.flatpickr-day.selected:hover,
+.flatpickr-day.startRange:hover,
+.flatpickr-day.endRange:hover,
+.flatpickr-day.selected.prevMonthDay,
+.flatpickr-day.startRange.prevMonthDay,
+.flatpickr-day.endRange.prevMonthDay,
+.flatpickr-day.selected.nextMonthDay,
+.flatpickr-day.startRange.nextMonthDay,
+.flatpickr-day.endRange.nextMonthDay {
+  background: #569ff7;
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  color: #fff;
+  border-color: #569ff7;
+}
+.flatpickr-day.selected.startRange,
+.flatpickr-day.startRange.startRange,
+.flatpickr-day.endRange.startRange {
+  border-radius: 50px 0 0 50px;
+}
+.flatpickr-day.selected.endRange,
+.flatpickr-day.startRange.endRange,
+.flatpickr-day.endRange.endRange {
+  border-radius: 0 50px 50px 0;
+}
+.flatpickr-day.selected.startRange + .endRange,
+.flatpickr-day.startRange.startRange + .endRange,
+.flatpickr-day.endRange.startRange + .endRange {
+  -webkit-box-shadow: -10px 0 0 #569ff7;
+          box-shadow: -10px 0 0 #569ff7;
+}
+.flatpickr-day.selected.startRange.endRange,
+.flatpickr-day.startRange.startRange.endRange,
+.flatpickr-day.endRange.startRange.endRange {
+  border-radius: 50px;
+}
+.flatpickr-day.inRange {
+  border-radius: 0;
+  -webkit-box-shadow: -5px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+          box-shadow: -5px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+}
+.flatpickr-day.disabled,
+.flatpickr-day.disabled:hover,
+.flatpickr-day.prevMonthDay,
+.flatpickr-day.nextMonthDay,
+.flatpickr-day.notAllowed,
+.flatpickr-day.notAllowed.prevMonthDay,
+.flatpickr-day.notAllowed.nextMonthDay {
+  color: rgba(57,57,57,0.3);
+  background: transparent;
+  border-color: transparent;
+  cursor: default;
+}
+.flatpickr-day.disabled,
+.flatpickr-day.disabled:hover {
+  cursor: not-allowed;
+  color: rgba(57,57,57,0.1);
+}
+.flatpickr-day.week.selected {
+  border-radius: 0;
+  -webkit-box-shadow: -5px 0 0 #569ff7, 5px 0 0 #569ff7;
+          box-shadow: -5px 0 0 #569ff7, 5px 0 0 #569ff7;
+}
+.flatpickr-day.hidden {
+  visibility: hidden;
+}
+.rangeMode .flatpickr-day {
+  margin-top: 1px;
+}
+.flatpickr-weekwrapper {
+  display: inline-block;
+  float: left;
+}
+.flatpickr-weekwrapper .flatpickr-weeks {
+  padding: 0 12px;
+  -webkit-box-shadow: 1px 0 0 #e6e6e6;
+          box-shadow: 1px 0 0 #e6e6e6;
+}
+.flatpickr-weekwrapper .flatpickr-weekday {
+  float: none;
+  width: 100%;
+  line-height: 28px;
+}
+.flatpickr-weekwrapper span.flatpickr-day,
+.flatpickr-weekwrapper span.flatpickr-day:hover {
+  display: block;
+  width: 100%;
+  max-width: none;
+  color: rgba(57,57,57,0.3);
+  background: transparent;
+  cursor: default;
+  border: none;
+}
+.flatpickr-innerContainer {
+  display: block;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  overflow: hidden;
+}
+.flatpickr-rContainer {
+  display: inline-block;
+  padding: 0;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+.flatpickr-time {
+  text-align: center;
+  outline: 0;
+  display: block;
+  height: 0;
+  line-height: 40px;
+  max-height: 40px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  overflow: hidden;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+.flatpickr-time:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+.flatpickr-time .numInputWrapper {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  width: 40%;
+  height: 40px;
+  float: left;
+}
+.flatpickr-time .numInputWrapper span.arrowUp:after {
+  border-bottom-color: #393939;
+}
+.flatpickr-time .numInputWrapper span.arrowDown:after {
+  border-top-color: #393939;
+}
+.flatpickr-time.hasSeconds .numInputWrapper {
+  width: 26%;
+}
+.flatpickr-time.time24hr .numInputWrapper {
+  width: 49%;
+}
+.flatpickr-time input {
+  background: transparent;
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  border: 0;
+  border-radius: 0;
+  text-align: center;
+  margin: 0;
+  padding: 0;
+  height: inherit;
+  line-height: inherit;
+  cursor: pointer;
+  color: #393939;
+  font-size: 14px;
+  position: relative;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+.flatpickr-time input.flatpickr-hour {
+  font-weight: bold;
+}
+.flatpickr-time input.flatpickr-minute,
+.flatpickr-time input.flatpickr-second {
+  font-weight: 400;
+}
+.flatpickr-time input:focus {
+  outline: 0;
+  border: 0;
+}
+.flatpickr-time .flatpickr-time-separator,
+.flatpickr-time .flatpickr-am-pm {
+  height: inherit;
+  display: inline-block;
+  float: left;
+  line-height: inherit;
+  color: #393939;
+  font-weight: bold;
+  width: 2%;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+  -webkit-align-self: center;
+      -ms-flex-item-align: center;
+          align-self: center;
+}
+.flatpickr-time .flatpickr-am-pm {
+  outline: 0;
+  width: 18%;
+  cursor: pointer;
+  text-align: center;
+  font-weight: 400;
+}
+.flatpickr-time .flatpickr-am-pm:hover,
+.flatpickr-time .flatpickr-am-pm:focus {
+  background: #f0f0f0;
+}
+.flatpickr-input[readonly] {
+  cursor: pointer;
+  min-width: auto;
+}
+@-webkit-keyframes fpFadeInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -20px, 0);
+            transform: translate3d(0, -20px, 0);
+  }
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+            transform: translate3d(0, 0, 0);
+  }
+}
+@keyframes fpFadeInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -20px, 0);
+            transform: translate3d(0, -20px, 0);
+  }
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+            transform: translate3d(0, 0, 0);
+  }
+}
diff --git a/frontend/vendor/flatpickr.js b/frontend/vendor/flatpickr.js
new file mode 100644
index 000000000..226f63df3
--- /dev/null
+++ b/frontend/vendor/flatpickr.js
@@ -0,0 +1,2 @@
+/* flatpickr v4.4.4,, @license MIT */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.flatpickr=t()}(this,function(){"use strict";var Z=function(e){return("0"+e).slice(-2)},Q=function(e){return!0===e?1:0};function X(n,a,i){var o;return void 0===i&&(i=!1),function(){var e=this,t=arguments;null!==o&&clearTimeout(o),o=window.setTimeout(function(){o=null,i||n.apply(e,t)},a),i&&!o&&n.apply(e,t)}}var ee=function(e){return e instanceof Array?e:[e]},e=function(){},te=function(e,t,n){return n.months[t?"shorthand":"longhand"][e]},D={D:e,F:function(e,t,n){e.setMonth(n.months.longhand.indexOf(t))},G:function(e,t){e.setHours(parseFloat(t))},H:function(e,t){e.setHours(parseFloat(t))},J:function(e,t){e.setDate(parseFloat(t))},K:function(e,t,n){e.setHours(e.getHours()%12+12*Q(new RegExp(n.amPM[1],"i").test(t)))},M:function(e,t,n){e.setMonth(n.months.shorthand.indexOf(t))},S:function(e,t){e.setSeconds(parseFloat(t))},U:function(e,t){return new Date(1e3*parseFloat(t))},W:function(e,t){var n=parseInt(t);return new Date(e.getFullYear(),0,2+7*(n-1),0,0,0,0)},Y:function(e,t){e.setFullYear(parseFloat(t))},Z:function(e,t){return new Date(t)},d:function(e,t){e.setDate(parseFloat(t))},h:function(e,t){e.setHours(parseFloat(t))},i:function(e,t){e.setMinutes(parseFloat(t))},j:function(e,t){e.setDate(parseFloat(t))},l:e,m:function(e,t){e.setMonth(parseFloat(t)-1)},n:function(e,t){e.setMonth(parseFloat(t)-1)},s:function(e,t){e.setSeconds(parseFloat(t))},w:e,y:function(e,t){e.setFullYear(2e3+parseFloat(t))}},ne={D:"(\\w+)",F:"(\\w+)",G:"(\\d\\d|\\d)",H:"(\\d\\d|\\d)",J:"(\\d\\d|\\d)\\w+",K:"",M:"(\\w+)",S:"(\\d\\d|\\d)",U:"(.+)",W:"(\\d\\d|\\d)",Y:"(\\d{4})",Z:"(.+)",d:"(\\d\\d|\\d)",h:"(\\d\\d|\\d)",i:"(\\d\\d|\\d)",j:"(\\d\\d|\\d)",l:"(\\w+)",m:"(\\d\\d|\\d)",n:"(\\d\\d|\\d)",s:"(\\d\\d|\\d)",w:"(\\d\\d|\\d)",y:"(\\d{2})"},c={Z:function(e){return e.toISOString()},D:function(e,t,n){return t.weekdays.shorthand[c.w(e,t,n)]},F:function(e,t,n){return te(c.n(e,t,n)-1,!1,t)},G:function(e,t,n){return Z(c.h(e,t,n))},H:function(e){return Z(e.getHours())},J:function(e,t){return void 0!==t.ordinal?e.getDate()+t.ordinal(e.getDate()):e.getDate()},K:function(e,t){return t.amPM[Q(11<e.getHours())]},M:function(e,t){return te(e.getMonth(),!0,t)},S:function(e){return Z(e.getSeconds())},U:function(e){return e.getTime()/1e3},W:function(e,t,n){return n.getWeek(e)},Y:function(e){return e.getFullYear()},d:function(e){return Z(e.getDate())},h:function(e){return e.getHours()%12?e.getHours()%12:12},i:function(e){return Z(e.getMinutes())},j:function(e){return e.getDate()},l:function(e,t){return t.weekdays.longhand[e.getDay()]},m:function(e){return Z(e.getMonth()+1)},n:function(e){return e.getMonth()+1},s:function(e){return e.getSeconds()},w:function(e){return e.getDay()},y:function(e){return String(e.getFullYear()).substring(2)}},ae={weekdays:{shorthand:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],longhand:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]},months:{shorthand:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],longhand:["January","February","March","April","May","June","July","August","September","October","November","December"]},daysInMonth:[31,28,31,30,31,30,31,31,30,31,30,31],firstDayOfWeek:0,ordinal:function(e){var t=e%100;if(3<t&&t<21)return"th";switch(t%10){case 1:return"st";case 2:return"nd";case 3:return"rd";default:return"th"}},rangeSeparator:" to ",weekAbbreviation:"Wk",scrollTitle:"Scroll to increment",toggleTitle:"Click to toggle",amPM:["AM","PM"],yearAriaLabel:"Year"},ie=function(e){var t=e.config,o=void 0===t?b:t,n=e.l10n,r=void 0===n?ae:n;return function(a,e,t){if(void 0!==o.formatDate)return o.formatDate(a,e);var i=t||r;return e.split("").map(function(e,t,n){return c[e]&&"\\"!==n[t-1]?c[e](a,i,o):"\\"!==e?e:""}).join("")}},oe=function(e){var t=e.config,h=void 0===t?b:t,n=e.l10n,v=void 0===n?ae:n;return function(e,t,n){if(0===e||e){var a,i=e;if(e instanceof Date)a=new Date(e.getTime());else if("string"!=typeof e&&void 0!==e.toFixed)a=new Date(e);else if("string"==typeof e){var o=t||(h||b).dateFormat,r=String(e).trim();if("today"===r)a=new Date,n=!0;else if(/Z$/.test(r)||/GMT$/.test(r))a=new Date(e);else if(h&&h.parseDate)a=h.parseDate(e,o);else{a=h&&h.noCalendar?new Date((new Date).setHours(0,0,0,0)):new Date((new Date).getFullYear(),0,1,0,0,0,0);for(var c,l=[],d=0,s=0,u="";d<o.length;d++){var f=o[d],m="\\"===f,g="\\"===o[d-1]||m;if(ne[f]&&!g){u+=ne[f];var p=new RegExp(u).exec(e);p&&(c=!0)&&l["Y"!==f?"push":"unshift"]({fn:D[f],val:p[++s]})}else m||(u+=".");l.forEach(function(e){var t=e.fn,n=e.val;return a=t(a,n,v)||a})}a=c?a:void 0}}if(a instanceof Date)return!0===n&&a.setHours(0,0,0,0),a;h.errorHandler(new Error("Invalid date provided: "+i))}}};function re(e,t,n){return void 0===n&&(n=!0),!1!==n?new Date(e.getTime()).setHours(0,0,0,0)-new Date(t.getTime()).setHours(0,0,0,0):e.getTime()-t.getTime()}var ce=function(e,t,n){return e>Math.min(t,n)&&e<Math.max(t,n)},le={DAY:864e5},b={_disable:[],_enable:[],allowInput:!1,altFormat:"F j, Y",altInput:!1,altInputClass:"form-control input",animate:"object"==typeof window&&-1===window.navigator.userAgent.indexOf("MSIE"),ariaDateFormat:"F j, Y",clickOpens:!0,closeOnSelect:!0,conjunction:", ",dateFormat:"Y-m-d",defaultHour:12,defaultMinute:0,defaultSeconds:0,disable:[],disableMobile:!1,enable:[],enableSeconds:!1,enableTime:!1,errorHandler:function(e){return"undefined"!=typeof console&&console.warn(e)},getWeek:function(e){var t=new Date(e.getTime());t.setHours(0,0,0,0),t.setDate(t.getDate()+3-(t.getDay()+6)%7);var n=new Date(t.getFullYear(),0,4);return 1+Math.round(((t.getTime()-n.getTime())/864e5-3+(n.getDay()+6)%7)/7)},hourIncrement:1,ignoredFocusElements:[],inline:!1,locale:"default",minuteIncrement:5,mode:"single",nextArrow:"<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M13.207 8.472l-7.854 7.854-0.707-0.707 7.146-7.146-7.146-7.148 0.707-0.707 7.854 7.854z' /></svg>",noCalendar:!1,now:new Date,onChange:[],onClose:[],onDayCreate:[],onDestroy:[],onKeyDown:[],onMonthChange:[],onOpen:[],onParseConfig:[],onReady:[],onValueUpdate:[],onYearChange:[],onPreCalendarPosition:[],plugins:[],position:"auto",positionElement:void 0,prevArrow:"<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M5.207 8.471l7.146 7.147-0.707 0.707-7.853-7.854 7.854-7.853 0.707 0.707-7.147 7.146z' /></svg>",shorthandCurrentMonth:!1,showMonths:1,static:!1,time_24hr:!1,weekNumbers:!1,wrap:!1};function de(e,t,n){if(!0===n)return e.classList.add(t);e.classList.remove(t)}function se(e,t,n){var a=window.document.createElement(e);return t=t||"",n=n||"",a.className=t,void 0!==n&&(a.textContent=n),a}function ue(e){for(;e.firstChild;)e.removeChild(e.firstChild)}function fe(e,t){var n=se("div","numInputWrapper"),a=se("input","numInput "+e),i=se("span","arrowUp"),o=se("span","arrowDown");if(a.type="text",a.pattern="\\d*",void 0!==t)for(var r in t)a.setAttribute(r,t[r]);return n.appendChild(a),n.appendChild(i),n.appendChild(o),n}"function"!=typeof Object.assign&&(Object.assign=function(n){if(!n)throw TypeError("Cannot convert undefined or null to object");for(var e=arguments.length,t=new Array(1<e?e-1:0),a=1;a<e;a++)t[a-1]=arguments[a];for(var i=function(t){t&&Object.keys(t).forEach(function(e){return n[e]=t[e]})},o=0;o<t.length;o++){i(t[o])}return n});var me=300;function r(s,u){var D={config:Object.assign({},ge.defaultConfig),l10n:ae};function f(e){return e.bind(D)}function t(){if(void 0!==D.daysContainer){D.calendarContainer.style.visibility="hidden",D.calendarContainer.style.display="block";var e=(D.days.offsetWidth+1)*D.config.showMonths;D.daysContainer.style.width=e+"px",D.calendarContainer.style.width=e+"px",void 0!==D.weekWrapper&&(D.calendarContainer.style.width=e+D.weekWrapper.offsetWidth+"px"),D.calendarContainer.style.removeProperty("visibility"),D.calendarContainer.style.removeProperty("display")}}function d(e){0!==D.selectedDates.length&&(!function(e){e.preventDefault();var t="keydown"===e.type,n=e.target;void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[Q(D.amPM.textContent===D.l10n.amPM[0])]);var a=parseFloat(n.getAttribute("data-min")),i=parseFloat(n.getAttribute("data-max")),o=parseFloat(n.getAttribute("data-step")),r=parseInt(n.value,10),c=e.delta||(t?38===e.which?1:-1:0),l=r+o*c;if(void 0!==n.value&&2===n.value.length){var d=n===D.hourElement,s=n===D.minuteElement;l<a?(l=i+l+Q(!d)+(Q(d)&&Q(!D.amPM)),s&&h(void 0,-1,D.hourElement)):i<l&&(l=n===D.hourElement?l-i-Q(!D.amPM):a,s&&h(void 0,1,D.hourElement)),D.amPM&&d&&(1===o?l+r===23:Math.abs(l-r)>o)&&(D.amPM.textContent=D.l10n.amPM[Q(D.amPM.textContent===D.l10n.amPM[0])]),n.value=Z(l)}}(e),"input"!==e.type?(m(),G()):setTimeout(function(){m(),G()},me))}function m(){if(void 0!==D.hourElement&&void 0!==D.minuteElement){var e,t,n=(parseInt(D.hourElement.value.slice(-2),10)||0)%24,a=(parseInt(D.minuteElement.value,10)||0)%60,i=void 0!==D.secondElement?(parseInt(D.secondElement.value,10)||0)%60:0;void 0!==D.amPM&&(e=n,t=D.amPM.textContent,n=e%12+12*Q(t===D.l10n.amPM[1]));var o=void 0!==D.config.minTime||D.config.minDate&&D.minDateHasTime&&D.latestSelectedDateObj&&0===re(D.latestSelectedDateObj,D.config.minDate,!0);if(void 0!==D.config.maxTime||D.config.maxDate&&D.maxDateHasTime&&D.latestSelectedDateObj&&0===re(D.latestSelectedDateObj,D.config.maxDate,!0)){var r=void 0!==D.config.maxTime?D.config.maxTime:D.config.maxDate;(n=Math.min(n,r.getHours()))===r.getHours()&&(a=Math.min(a,r.getMinutes())),a===r.getMinutes()&&(i=Math.min(i,r.getSeconds()))}if(o){var c=void 0!==D.config.minTime?D.config.minTime:D.config.minDate;(n=Math.max(n,c.getHours()))===c.getHours()&&(a=Math.max(a,c.getMinutes())),a===c.getMinutes()&&(i=Math.max(i,c.getSeconds()))}l(n,a,i)}}function g(e){var t=e||D.latestSelectedDateObj;t&&l(t.getHours(),t.getMinutes(),t.getSeconds())}function l(e,t,n){void 0!==D.latestSelectedDateObj&&D.latestSelectedDateObj.setHours(e%24,t,n||0,0),D.hourElement&&D.minuteElement&&!D.isMobile&&(D.hourElement.value=Z(D.config.time_24hr?e:(12+e)%12+12*Q(e%12==0)),D.minuteElement.value=Z(t),void 0!==D.amPM&&(D.amPM.textContent=D.l10n.amPM[Q(12<=e)]),void 0!==D.secondElement&&(D.secondElement.value=Z(n)))}function n(e){var t=parseInt(e.target.value)+(e.delta||0);4!==t.toString().length&&"Enter"!==e.key||(e.target.blur(),/[^\d]/.test(t.toString())||S(t))}function o(t,n,a,i){return n instanceof Array?n.forEach(function(e){return o(t,e,a,i)}):t instanceof Array?t.forEach(function(e){return o(e,n,a,i)}):(t.addEventListener(n,a,i),void D._handlers.push({element:t,event:n,handler:a}))}function a(t){return function(e){1===e.which&&t(e)}}function p(){U("onChange")}function i(e){var t=void 0!==e?D.parseDate(e):D.latestSelectedDateObj||(D.config.minDate&&D.config.minDate>D.now?D.config.minDate:D.config.maxDate&&D.config.maxDate<D.now?D.config.maxDate:D.now);try{void 0!==t&&(D.currentYear=t.getFullYear(),D.currentMonth=t.getMonth())}catch(e){e.message="Invalid date supplied: "+t,D.config.errorHandler(e)}D.redraw()}function r(e){~e.target.className.indexOf("arrow")&&h(e,e.target.classList.contains("arrowUp")?1:-1)}function h(e,t,n){var a=e&&e.target,i=n||a&&a.parentNode&&a.parentNode.firstChild,o=q("increment");o.delta=t,i&&i.dispatchEvent(o)}function v(e,t,n,a){var i,o=P(t,!0),r=se("span","flatpickr-day "+e,t.getDate().toString());return r.dateObj=t,r.$i=a,r.setAttribute("aria-label",D.formatDate(t,D.config.ariaDateFormat)),-1===e.indexOf("hidden")&&0===re(t,D.now)&&((D.todayDateElem=r).classList.add("today"),r.setAttribute("aria-current","date")),o?(r.tabIndex=-1,$(t)&&(r.classList.add("selected"),D.selectedDateElem=r,"range"===D.config.mode&&(de(r,"startRange",D.selectedDates[0]&&0===re(t,D.selectedDates[0],!0)),de(r,"endRange",D.selectedDates[1]&&0===re(t,D.selectedDates[1],!0)),"nextMonthDay"===e&&r.classList.add("inRange")))):r.classList.add("disabled"),"range"===D.config.mode&&(i=t,!("range"!==D.config.mode||D.selectedDates.length<2)&&0<=re(i,D.selectedDates[0])&&re(i,D.selectedDates[1])<=0&&!$(t)&&r.classList.add("inRange")),D.weekNumbers&&1===D.config.showMonths&&"prevMonthDay"!==e&&n%7==1&&D.weekNumbers.insertAdjacentHTML("beforeend","<span class='flatpickr-day'>"+D.config.getWeek(t)+"</span>"),U("onDayCreate",r),r}function b(e){e.focus(),"range"===D.config.mode&&A(e)}function w(e){for(var t=0<e?0:D.config.showMonths-1,n=0<e?D.config.showMonths:-1,a=t;a!=n;a+=e)for(var i=D.daysContainer.children[a],o=0<e?0:i.children.length-1,r=0<e?i.children.length:-1,c=o;c!=r;c+=e){var l=i.children[c];if(-1===l.className.indexOf("hidden")&&P(l.dateObj))return l}}function M(e,t){var n=_(document.activeElement),a=void 0!==e?e:n?document.activeElement:void 0!==D.selectedDateElem&&_(D.selectedDateElem)?D.selectedDateElem:void 0!==D.todayDateElem&&_(D.todayDateElem)?D.todayDateElem:w(0<t?1:-1);return void 0===a?D._input.focus():n?void function(e,t){for(var n=-1===e.className.indexOf("Month")?e.dateObj.getMonth():D.currentMonth,a=0<t?D.config.showMonths:-1,i=0<t?1:-1,o=n-D.currentMonth;o!=a;o+=i)for(var r=D.daysContainer.children[o],c=n-D.currentMonth===o?e.$i+t:t<0?r.children.length-1:0,l=r.children.length,d=c;0<=d&&d<l&&d!=(0<t?l:-1);d+=i){var s=r.children[d];if(-1===s.className.indexOf("hidden")&&P(s.dateObj)&&Math.abs(e.$i-d)>=Math.abs(t))return b(s)}D.changeMonth(i),M(w(i),0)}(a,t):b(a)}function c(e,t){for(var n=(new Date(e,t,1).getDay()-D.l10n.firstDayOfWeek+7)%7,a=D.utils.getDaysInMonth((t-1+12)%12),i=D.utils.getDaysInMonth(t),o=window.document.createDocumentFragment(),r=1<D.config.showMonths,c=r?"prevMonthDay hidden":"prevMonthDay",l=r?"nextMonthDay hidden":"nextMonthDay",d=a+1-n,s=0;d<=a;d++,s++)o.appendChild(v(c,new Date(e,t-1,d),d,s));for(d=1;d<=i;d++,s++)o.appendChild(v("",new Date(e,t,d),d,s));for(var u=i+1;u<=42-n&&(1===D.config.showMonths||s%7!=0);u++,s++)o.appendChild(v(l,new Date(e,t+1,u%i),u,s));var f=se("div","dayContainer");return f.appendChild(o),f}function C(){if(void 0!==D.daysContainer){ue(D.daysContainer),D.weekNumbers&&ue(D.weekNumbers);for(var e=document.createDocumentFragment(),t=0;t<D.config.showMonths;t++){var n=new Date(D.currentYear,D.currentMonth,1);n.setMonth(D.currentMonth+t),e.appendChild(c(n.getFullYear(),n.getMonth()))}D.daysContainer.appendChild(e),D.days=D.daysContainer.firstChild}}function y(){var e=se("div","flatpickr-month"),t=window.document.createDocumentFragment(),n=se("span","cur-month");n.title=D.l10n.scrollTitle;var a=fe("cur-year",{tabindex:"-1"}),i=a.childNodes[0];i.title=D.l10n.scrollTitle,i.setAttribute("aria-label",D.l10n.yearAriaLabel),D.config.minDate&&i.setAttribute("data-min",D.config.minDate.getFullYear().toString()),D.config.maxDate&&(i.setAttribute("data-max",D.config.maxDate.getFullYear().toString()),i.disabled=!!D.config.minDate&&D.config.minDate.getFullYear()===D.config.maxDate.getFullYear());var o=se("div","flatpickr-current-month");return o.appendChild(n),o.appendChild(a),t.appendChild(o),e.appendChild(t),{container:e,yearElement:i,monthElement:n}}function x(){ue(D.monthNav),D.monthNav.appendChild(D.prevMonthNav);for(var e=D.config.showMonths;e--;){var t=y();D.yearElements.push(t.yearElement),D.monthElements.push(t.monthElement),D.monthNav.appendChild(t.container)}D.monthNav.appendChild(D.nextMonthNav)}function E(){D.weekdayContainer?ue(D.weekdayContainer):D.weekdayContainer=se("div","flatpickr-weekdays");for(var e=D.config.showMonths;e--;){var t=se("div","flatpickr-weekdaycontainer");D.weekdayContainer.appendChild(t)}return T(),D.weekdayContainer}function T(){var e=D.l10n.firstDayOfWeek,t=D.l10n.weekdays.shorthand.concat();0<e&&e<t.length&&(t=t.splice(e,t.length).concat(t.splice(0,e)));for(var n=D.config.showMonths;n--;)D.weekdayContainer.children[n].innerHTML="\n      <span class=flatpickr-weekday>\n        "+t.join("</span><span class=flatpickr-weekday>")+"\n      </span>\n      "}function k(e,t){void 0===t&&(t=!0);var n=t?e:e-D.currentMonth;n<0&&!0===D._hidePrevMonthArrow||0<n&&!0===D._hideNextMonthArrow||(D.currentMonth+=n,(D.currentMonth<0||11<D.currentMonth)&&(D.currentYear+=11<D.currentMonth?1:-1,D.currentMonth=(D.currentMonth+12)%12,U("onYearChange")),C(),U("onMonthChange"),z())}function I(e){return!(!D.config.appendTo||!D.config.appendTo.contains(e))||D.calendarContainer.contains(e)}function O(t){if(D.isOpen&&!D.config.inline){var e=I(t.target),n=t.target===D.input||t.target===D.altInput||D.element.contains(t.target)||t.path&&t.path.indexOf&&(~t.path.indexOf(D.input)||~t.path.indexOf(D.altInput)),a="blur"===t.type?n&&t.relatedTarget&&!I(t.relatedTarget):!n&&!e,i=!D.config.ignoredFocusElements.some(function(e){return e.contains(t.target)});a&&i&&(D.close(),"range"===D.config.mode&&1===D.selectedDates.length&&(D.clear(!1),D.redraw()))}}function S(e){if(!(!e||D.config.minDate&&e<D.config.minDate.getFullYear()||D.config.maxDate&&e>D.config.maxDate.getFullYear())){var t=e,n=D.currentYear!==t;D.currentYear=t||D.currentYear,D.config.maxDate&&D.currentYear===D.config.maxDate.getFullYear()?D.currentMonth=Math.min(D.config.maxDate.getMonth(),D.currentMonth):D.config.minDate&&D.currentYear===D.config.minDate.getFullYear()&&(D.currentMonth=Math.max(D.config.minDate.getMonth(),D.currentMonth)),n&&(D.redraw(),U("onYearChange"))}}function P(e,t){void 0===t&&(t=!0);var n=D.parseDate(e,void 0,t);if(D.config.minDate&&n&&re(n,D.config.minDate,void 0!==t?t:!D.minDateHasTime)<0||D.config.maxDate&&n&&0<re(n,D.config.maxDate,void 0!==t?t:!D.maxDateHasTime))return!1;if(0===D.config.enable.length&&0===D.config.disable.length)return!0;if(void 0===n)return!1;for(var a,i=0<D.config.enable.length,o=i?D.config.enable:D.config.disable,r=0;r<o.length;r++){if("function"==typeof(a=o[r])&&a(n))return i;if(a instanceof Date&&void 0!==n&&a.getTime()===n.getTime())return i;if("string"==typeof a&&void 0!==n){var c=D.parseDate(a,void 0,!0);return c&&c.getTime()===n.getTime()?i:!i}if("object"==typeof a&&void 0!==n&&a.from&&a.to&&n.getTime()>=a.from.getTime()&&n.getTime()<=a.to.getTime())return i}return!i}function _(e){return void 0!==D.daysContainer&&(-1===e.className.indexOf("hidden")&&D.daysContainer.contains(e))}function F(e){e.stopPropagation();var t=e.target===D._input,n=I(e.target),a=D.config.allowInput,i=D.isOpen&&(!a||!t),o=D.config.inline&&t&&!a;if(13===e.keyCode&&t){if(a)return D.setDate(D._input.value,!0,e.target===D.altInput?D.config.altFormat:D.config.dateFormat),e.target.blur();D.open()}else if(n||i||o){var r=!!D.timeContainer&&D.timeContainer.contains(e.target);switch(e.keyCode){case 13:r?G():R(e);break;case 27:e.preventDefault(),W();break;case 8:case 46:t&&!D.config.allowInput&&(e.preventDefault(),D.clear());break;case 37:case 39:if(r)D.hourElement&&D.hourElement.focus();else if(e.preventDefault(),void 0!==D.daysContainer&&!1===D.config.allowInput){var c=39===e.keyCode?1:-1;e.ctrlKey?(k(c),M(w(1),0)):M(void 0,c)}break;case 38:case 40:e.preventDefault();var l=40===e.keyCode?1:-1;D.daysContainer?e.ctrlKey?(S(D.currentYear-l),M(w(1),0)):r||M(void 0,7*l):D.config.enableTime&&(!r&&D.hourElement&&D.hourElement.focus(),d(e),D._debouncedChange());break;case 9:e.target===D.hourElement?(e.preventDefault(),D.minuteElement.select()):e.target===D.minuteElement&&(D.secondElement||D.amPM)?(e.preventDefault(),void 0!==D.secondElement?D.secondElement.focus():void 0!==D.amPM&&D.amPM.focus()):e.target===D.secondElement&&D.amPM&&(e.preventDefault(),D.amPM.focus())}switch(e.key){case D.l10n.amPM[0].charAt(0):case D.l10n.amPM[0].charAt(0).toLowerCase():void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[0],m(),G());break;case D.l10n.amPM[1].charAt(0):case D.l10n.amPM[1].charAt(0).toLowerCase():void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[1],m(),G())}U("onKeyDown",e)}}function A(o){if(1===D.selectedDates.length&&o.classList.contains("flatpickr-day")&&!o.classList.contains("disabled")){for(var r=o.dateObj.getTime(),c=D.parseDate(D.selectedDates[0],void 0,!0).getTime(),e=Math.min(r,D.selectedDates[0].getTime()),t=Math.max(r,D.selectedDates[0].getTime()),n=D.daysContainer.children,a=n[0].children[0].dateObj.getTime(),i=n[n.length-1].lastChild.dateObj.getTime(),l=!1,d=0,s=0,u=a;u<i;u+=le.DAY)P(new Date(u),!0)||(l=l||e<u&&u<t,u<c&&(!d||d<u)?d=u:c<u&&(!s||u<s)&&(s=u));for(var f=0;f<D.config.showMonths;f++)for(var m=D.daysContainer.children[f],g=D.daysContainer.children[f-1],p=function(e,t){var n=m.children[e],a=n.dateObj.getTime(),i=0<d&&a<d||0<s&&s<a;return i?(n.classList.add("notAllowed"),["inRange","startRange","endRange"].forEach(function(e){n.classList.remove(e)}),"continue"):l&&!i?"continue":(["startRange","inRange","endRange","notAllowed"].forEach(function(e){n.classList.remove(e)}),o.classList.add(r<D.selectedDates[0].getTime()?"startRange":"endRange"),void(!m.contains(o)&&0<f&&g&&g.lastChild.dateObj.getTime()>=a||(c<r&&a===c?n.classList.add("startRange"):r<c&&a===c&&n.classList.add("endRange"),d<=a&&(0===s||a<=s)&&ce(a,c,r)&&n.classList.add("inRange"))))},h=0,v=m.children.length;h<v;h++)p(h)}}function N(){!D.isOpen||D.config.static||D.config.inline||H()}function j(a){return function(e){var t=D.config["_"+a+"Date"]=D.parseDate(e,D.config.dateFormat),n=D.config["_"+("min"===a?"max":"min")+"Date"];void 0!==t&&(D["min"===a?"minDateHasTime":"maxDateHasTime"]=0<t.getHours()||0<t.getMinutes()||0<t.getSeconds()),D.selectedDates&&(D.selectedDates=D.selectedDates.filter(function(e){return P(e)}),D.selectedDates.length||"min"!==a||g(t),G()),D.daysContainer&&(L(),void 0!==t?D.currentYearElement[a]=t.getFullYear().toString():D.currentYearElement.removeAttribute(a),D.currentYearElement.disabled=!!n&&void 0!==t&&n.getFullYear()===t.getFullYear())}}function Y(){"object"!=typeof D.config.locale&&void 0===ge.l10ns[D.config.locale]&&D.config.errorHandler(new Error("flatpickr: invalid locale "+D.config.locale)),D.l10n=Object.assign({},ge.l10ns.default,"object"==typeof D.config.locale?D.config.locale:"default"!==D.config.locale?ge.l10ns[D.config.locale]:void 0),ne.K="("+D.l10n.amPM[0]+"|"+D.l10n.amPM[1]+"|"+D.l10n.amPM[0].toLowerCase()+"|"+D.l10n.amPM[1].toLowerCase()+")",D.formatDate=ie(D)}function H(e){if(void 0!==D.calendarContainer){U("onPreCalendarPosition");var t=e||D._positionElement,n=Array.prototype.reduce.call(D.calendarContainer.children,function(e,t){return e+t.offsetHeight},0),a=D.calendarContainer.offsetWidth,i=D.config.position,o=t.getBoundingClientRect(),r=window.innerHeight-o.bottom,c="above"===i||"below"!==i&&r<n&&o.top>n,l=window.pageYOffset+o.top+(c?-n-2:t.offsetHeight+2);if(de(D.calendarContainer,"arrowTop",!c),de(D.calendarContainer,"arrowBottom",c),!D.config.inline){var d=window.pageXOffset+o.left,s=window.document.body.offsetWidth-o.right,u=d+a>window.document.body.offsetWidth;de(D.calendarContainer,"rightMost",u),D.config.static||(D.calendarContainer.style.top=l+"px",u?(D.calendarContainer.style.left="auto",D.calendarContainer.style.right=s+"px"):(D.calendarContainer.style.left=d+"px",D.calendarContainer.style.right="auto"))}}}function L(){D.config.noCalendar||D.isMobile||(z(),C())}function W(){D._input.focus(),-1!==window.navigator.userAgent.indexOf("MSIE")||void 0!==navigator.msMaxTouchPoints?setTimeout(D.close,0):D.close()}function R(e){e.preventDefault(),e.stopPropagation();var t=function e(t,n){return n(t)?t:t.parentNode?e(t.parentNode,n):void 0}(e.target,function(e){return e.classList&&e.classList.contains("flatpickr-day")&&!e.classList.contains("disabled")&&!e.classList.contains("notAllowed")});if(void 0!==t){var n=t,a=D.latestSelectedDateObj=new Date(n.dateObj.getTime()),i=(a.getMonth()<D.currentMonth||a.getMonth()>D.currentMonth+D.config.showMonths-1)&&"range"!==D.config.mode;if(D.selectedDateElem=n,"single"===D.config.mode)D.selectedDates=[a];else if("multiple"===D.config.mode){var o=$(a);o?D.selectedDates.splice(parseInt(o),1):D.selectedDates.push(a)}else"range"===D.config.mode&&(2===D.selectedDates.length&&D.clear(!1),D.selectedDates.push(a),0!==re(a,D.selectedDates[0],!0)&&D.selectedDates.sort(function(e,t){return e.getTime()-t.getTime()}));if(m(),i){var r=D.currentYear!==a.getFullYear();D.currentYear=a.getFullYear(),D.currentMonth=a.getMonth(),r&&U("onYearChange"),U("onMonthChange")}if(z(),C(),D.config.minDate&&D.minDateHasTime&&D.config.enableTime&&0===re(a,D.config.minDate)&&g(D.config.minDate),G(),D.config.enableTime&&setTimeout(function(){return D.showTimeInput=!0},50),"range"===D.config.mode&&(1===D.selectedDates.length?A(n):z()),i||"range"===D.config.mode||1!==D.config.showMonths?D.selectedDateElem&&D.selectedDateElem.focus():b(n),void 0!==D.hourElement&&setTimeout(function(){return void 0!==D.hourElement&&D.hourElement.select()},451),D.config.closeOnSelect){var c="single"===D.config.mode&&!D.config.enableTime,l="range"===D.config.mode&&2===D.selectedDates.length&&!D.config.enableTime;(c||l)&&W()}p()}}D.parseDate=oe({config:D.config,l10n:D.l10n}),D._handlers=[],D._bind=o,D._setHoursFromDate=g,D.changeMonth=k,D.changeYear=S,D.clear=function(e){void 0===e&&(e=!0);D.input.value="",void 0!==D.altInput&&(D.altInput.value="");void 0!==D.mobileInput&&(D.mobileInput.value="");D.selectedDates=[],D.latestSelectedDateObj=void 0,!(D.showTimeInput=!1)===D.config.enableTime&&(void 0!==D.config.minDate?g(D.config.minDate):l(D.config.defaultHour,D.config.defaultMinute,D.config.defaultSeconds));D.redraw(),e&&U("onChange")},D.close=function(){D.isOpen=!1,D.isMobile||(D.calendarContainer.classList.remove("open"),D._input.classList.remove("active"));U("onClose")},D._createElement=se,D.destroy=function(){void 0!==D.config&&U("onDestroy");for(var e=D._handlers.length;e--;){var t=D._handlers[e];t.element.removeEventListener(t.event,t.handler)}D._handlers=[],D.mobileInput?(D.mobileInput.parentNode&&D.mobileInput.parentNode.removeChild(D.mobileInput),D.mobileInput=void 0):D.calendarContainer&&D.calendarContainer.parentNode&&D.calendarContainer.parentNode.removeChild(D.calendarContainer);D.altInput&&(D.input.type="text",D.altInput.parentNode&&D.altInput.parentNode.removeChild(D.altInput),delete D.altInput);D.input&&(D.input.type=D.input._type,D.input.classList.remove("flatpickr-input"),D.input.removeAttribute("readonly"),D.input.value="");["_showTimeInput","latestSelectedDateObj","_hideNextMonthArrow","_hidePrevMonthArrow","__hideNextMonthArrow","__hidePrevMonthArrow","isMobile","isOpen","selectedDateElem","minDateHasTime","maxDateHasTime","days","daysContainer","_input","_positionElement","innerContainer","rContainer","monthNav","todayDateElem","calendarContainer","weekdayContainer","prevMonthNav","nextMonthNav","currentMonthElement","currentYearElement","navigationCurrentMonth","selectedDateElem","config"].forEach(function(e){try{delete D[e]}catch(e){}})},D.isEnabled=P,D.jumpToDate=i,D.open=function(e,t){void 0===t&&(t=D._input);if(!0===D.isMobile)return e&&(e.preventDefault(),e.target&&e.target.blur()),setTimeout(function(){void 0!==D.mobileInput&&D.mobileInput.click()},0),void U("onOpen");if(D._input.disabled||D.config.inline)return;var n=D.isOpen;D.isOpen=!0,n||(D.calendarContainer.classList.add("open"),D._input.classList.add("active"),U("onOpen"),H(t));!0===D.config.enableTime&&!0===D.config.noCalendar&&(0===D.selectedDates.length&&(D.setDate(void 0!==D.config.minDate?new Date(D.config.minDate.getTime()):(new Date).setHours(D.config.defaultHour,D.config.defaultMinute,D.config.defaultSeconds,0),!1),m(),G()),setTimeout(function(){return D.hourElement.select()},50))},D.redraw=L,D.set=function(e,t){null!==e&&"object"==typeof e?Object.assign(D.config,e):(D.config[e]=t,void 0!==J[e]&&J[e].forEach(function(e){return e()}));D.redraw(),i()},D.setDate=function(e,t,n){void 0===t&&(t=!1);void 0===n&&(n=D.config.dateFormat);if(0!==e&&!e)return D.clear(t);K(e,n),D.showTimeInput=0<D.selectedDates.length,D.latestSelectedDateObj=D.selectedDates[0],D.redraw(),i(),g(),G(t),t&&U("onChange")},D.toggle=function(){if(D.isOpen)return D.close();D.open()};var J={locale:[Y,T],showMonths:[x,t,E]};function K(e,t){var n=[];if(e instanceof Array)n=e.map(function(e){return D.parseDate(e,t)});else if(e instanceof Date||"number"==typeof e)n=[D.parseDate(e,t)];else if("string"==typeof e)switch(D.config.mode){case"single":n=[D.parseDate(e,t)];break;case"multiple":n=e.split(D.config.conjunction).map(function(e){return D.parseDate(e,t)});break;case"range":n=e.split(D.l10n.rangeSeparator).map(function(e){return D.parseDate(e,t)})}else D.config.errorHandler(new Error("Invalid date supplied: "+JSON.stringify(e)));D.selectedDates=n.filter(function(e){return e instanceof Date&&P(e,!1)}),"range"===D.config.mode&&D.selectedDates.sort(function(e,t){return e.getTime()-t.getTime()})}function B(e){return e.map(function(e){return"string"==typeof e||"number"==typeof e||e instanceof Date?D.parseDate(e,void 0,!0):e&&"object"==typeof e&&e.from&&e.to?{from:D.parseDate(e.from,void 0),to:D.parseDate(e.to,void 0)}:e}).filter(function(e){return e})}function U(e,t){var n=D.config[e];if(void 0!==n&&0<n.length)for(var a=0;n[a]&&a<n.length;a++)n[a](D.selectedDates,D.input.value,D,t);"onChange"===e&&(D.input.dispatchEvent(q("change")),D.input.dispatchEvent(q("input")))}function q(e){var t=document.createEvent("Event");return t.initEvent(e,!0,!0),t}function $(e){for(var t=0;t<D.selectedDates.length;t++)if(0===re(D.selectedDates[t],e))return""+t;return!1}function z(){D.config.noCalendar||D.isMobile||!D.monthNav||(D.yearElements.forEach(function(e,t){var n=new Date(D.currentYear,D.currentMonth,1);n.setMonth(D.currentMonth+t),D.monthElements[t].textContent=te(n.getMonth(),D.config.shorthandCurrentMonth,D.l10n)+" ",e.value=n.getFullYear().toString()}),D._hidePrevMonthArrow=void 0!==D.config.minDate&&(D.currentYear===D.config.minDate.getFullYear()?D.currentMonth<=D.config.minDate.getMonth():D.currentYear<D.config.minDate.getFullYear()),D._hideNextMonthArrow=void 0!==D.config.maxDate&&(D.currentYear===D.config.maxDate.getFullYear()?D.currentMonth+1>D.config.maxDate.getMonth():D.currentYear>D.config.maxDate.getFullYear()))}function G(e){if(void 0===e&&(e=!0),0===D.selectedDates.length)return D.clear(e);void 0!==D.mobileInput&&D.mobileFormatStr&&(D.mobileInput.value=void 0!==D.latestSelectedDateObj?D.formatDate(D.latestSelectedDateObj,D.mobileFormatStr):"");var t="range"!==D.config.mode?D.config.conjunction:D.l10n.rangeSeparator;D.input.value=D.selectedDates.map(function(e){return D.formatDate(e,D.config.dateFormat)}).join(t),void 0!==D.altInput&&(D.altInput.value=D.selectedDates.map(function(e){return D.formatDate(e,D.config.altFormat)}).join(t)),!1!==e&&U("onValueUpdate")}function V(e){var t=D.prevMonthNav.contains(e.target),n=D.nextMonthNav.contains(e.target);t||n?k(t?-1:1):0<=D.yearElements.indexOf(e.target)?(e.preventDefault(),e.target.select()):e.target.classList.contains("arrowUp")?D.changeYear(D.currentYear+1):e.target.classList.contains("arrowDown")&&D.changeYear(D.currentYear-1)}return function(){D.element=D.input=s,D.isOpen=!1,function(){var e=["wrap","weekNumbers","allowInput","clickOpens","time_24hr","enableTime","noCalendar","altInput","shorthandCurrentMonth","inline","static","enableSeconds","disableMobile"],t=["onChange","onClose","onDayCreate","onDestroy","onKeyDown","onMonthChange","onOpen","onParseConfig","onReady","onValueUpdate","onYearChange","onPreCalendarPosition"],n=Object.assign({},u,JSON.parse(JSON.stringify(s.dataset||{}))),a={};D.config.parseDate=n.parseDate,D.config.formatDate=n.formatDate,Object.defineProperty(D.config,"enable",{get:function(){return D.config._enable},set:function(e){D.config._enable=B(e)}}),Object.defineProperty(D.config,"disable",{get:function(){return D.config._disable},set:function(e){D.config._disable=B(e)}}),!n.dateFormat&&n.enableTime&&(a.dateFormat=n.noCalendar?"H:i"+(n.enableSeconds?":S":""):ge.defaultConfig.dateFormat+" H:i"+(n.enableSeconds?":S":"")),n.altInput&&n.enableTime&&!n.altFormat&&(a.altFormat=n.noCalendar?"h:i"+(n.enableSeconds?":S K":" K"):ge.defaultConfig.altFormat+" h:i"+(n.enableSeconds?":S":"")+" K"),Object.defineProperty(D.config,"minDate",{get:function(){return D.config._minDate},set:j("min")}),Object.defineProperty(D.config,"maxDate",{get:function(){return D.config._maxDate},set:j("max")});var i=function(t){return function(e){D.config["min"===t?"_minTime":"_maxTime"]=D.parseDate(e,"H:i")}};Object.defineProperty(D.config,"minTime",{get:function(){return D.config._minTime},set:i("min")}),Object.defineProperty(D.config,"maxTime",{get:function(){return D.config._maxTime},set:i("max")}),Object.assign(D.config,a,n);for(var o=0;o<e.length;o++)D.config[e[o]]=!0===D.config[e[o]]||"true"===D.config[e[o]];for(var r=t.length;r--;)void 0!==D.config[t[r]]&&(D.config[t[r]]=ee(D.config[t[r]]||[]).map(f));"time"===D.config.mode&&(D.config.noCalendar=!0,D.config.enableTime=!0);for(var c=0;c<D.config.plugins.length;c++){var l=D.config.plugins[c](D)||{};for(var d in l)~t.indexOf(d)?D.config[d]=ee(l[d]).map(f).concat(D.config[d]):void 0===n[d]&&(D.config[d]=l[d])}D.isMobile=!D.config.disableMobile&&!D.config.inline&&"single"===D.config.mode&&!D.config.disable.length&&!D.config.enable.length&&!D.config.weekNumbers&&/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),U("onParseConfig")}(),Y(),function(){if(D.input=D.config.wrap?s.querySelector("[data-input]"):s,!D.input)return D.config.errorHandler(new Error("Invalid input element specified"));D.input._type=D.input.type,D.input.type="text",D.input.classList.add("flatpickr-input"),D._input=D.input,D.config.altInput&&(D.altInput=se(D.input.nodeName,D.input.className+" "+D.config.altInputClass),D._input=D.altInput,D.altInput.placeholder=D.input.placeholder,D.altInput.disabled=D.input.disabled,D.altInput.required=D.input.required,D.altInput.tabIndex=D.input.tabIndex,D.altInput.type="text",D.input.type="hidden",!D.config.static&&D.input.parentNode&&D.input.parentNode.insertBefore(D.altInput,D.input.nextSibling)),D.config.allowInput||D._input.setAttribute("readonly","readonly"),D._positionElement=D.config.positionElement||D._input}(),function(){D.selectedDates=[],D.now=D.parseDate(D.config.now)||new Date;var e=D.config.defaultDate||D.input.value;e&&K(e,D.config.dateFormat);var t=0<D.selectedDates.length?D.selectedDates[0]:D.config.minDate&&D.config.minDate.getTime()>D.now.getTime()?D.config.minDate:D.config.maxDate&&D.config.maxDate.getTime()<D.now.getTime()?D.config.maxDate:D.now;D.currentYear=t.getFullYear(),D.currentMonth=t.getMonth(),0<D.selectedDates.length&&(D.latestSelectedDateObj=D.selectedDates[0]),void 0!==D.config.minTime&&(D.config.minTime=D.parseDate(D.config.minTime,"H:i")),void 0!==D.config.maxTime&&(D.config.maxTime=D.parseDate(D.config.maxTime,"H:i")),D.minDateHasTime=!!D.config.minDate&&(0<D.config.minDate.getHours()||0<D.config.minDate.getMinutes()||0<D.config.minDate.getSeconds()),D.maxDateHasTime=!!D.config.maxDate&&(0<D.config.maxDate.getHours()||0<D.config.maxDate.getMinutes()||0<D.config.maxDate.getSeconds()),Object.defineProperty(D,"showTimeInput",{get:function(){return D._showTimeInput},set:function(e){D._showTimeInput=e,D.calendarContainer&&de(D.calendarContainer,"showTimeInput",e),D.isOpen&&H()}})}(),D.utils={getDaysInMonth:function(e,t){return void 0===e&&(e=D.currentMonth),void 0===t&&(t=D.currentYear),1===e&&(t%4==0&&t%100!=0||t%400==0)?29:D.l10n.daysInMonth[e]}},D.isMobile||function(){var e=window.document.createDocumentFragment();if(D.calendarContainer=se("div","flatpickr-calendar"),D.calendarContainer.tabIndex=-1,!D.config.noCalendar){if(e.appendChild((D.monthNav=se("div","flatpickr-months"),D.yearElements=[],D.monthElements=[],D.prevMonthNav=se("span","flatpickr-prev-month"),D.prevMonthNav.innerHTML=D.config.prevArrow,D.nextMonthNav=se("span","flatpickr-next-month"),D.nextMonthNav.innerHTML=D.config.nextArrow,x(),Object.defineProperty(D,"_hidePrevMonthArrow",{get:function(){return D.__hidePrevMonthArrow},set:function(e){D.__hidePrevMonthArrow!==e&&(de(D.prevMonthNav,"disabled",e),D.__hidePrevMonthArrow=e)}}),Object.defineProperty(D,"_hideNextMonthArrow",{get:function(){return D.__hideNextMonthArrow},set:function(e){D.__hideNextMonthArrow!==e&&(de(D.nextMonthNav,"disabled",e),D.__hideNextMonthArrow=e)}}),D.currentYearElement=D.yearElements[0],z(),D.monthNav)),D.innerContainer=se("div","flatpickr-innerContainer"),D.config.weekNumbers){var t=function(){D.calendarContainer.classList.add("hasWeeks");var e=se("div","flatpickr-weekwrapper");e.appendChild(se("span","flatpickr-weekday",D.l10n.weekAbbreviation));var t=se("div","flatpickr-weeks");return e.appendChild(t),{weekWrapper:e,weekNumbers:t}}(),n=t.weekWrapper,a=t.weekNumbers;D.innerContainer.appendChild(n),D.weekNumbers=a,D.weekWrapper=n}D.rContainer=se("div","flatpickr-rContainer"),D.rContainer.appendChild(E()),D.daysContainer||(D.daysContainer=se("div","flatpickr-days"),D.daysContainer.tabIndex=-1),C(),D.rContainer.appendChild(D.daysContainer),D.innerContainer.appendChild(D.rContainer),e.appendChild(D.innerContainer)}D.config.enableTime&&e.appendChild(function(){D.calendarContainer.classList.add("hasTime"),D.config.noCalendar&&D.calendarContainer.classList.add("noCalendar"),D.timeContainer=se("div","flatpickr-time"),D.timeContainer.tabIndex=-1;var e=se("span","flatpickr-time-separator",":"),t=fe("flatpickr-hour");D.hourElement=t.childNodes[0];var n=fe("flatpickr-minute");if(D.minuteElement=n.childNodes[0],D.hourElement.tabIndex=D.minuteElement.tabIndex=-1,D.hourElement.value=Z(D.latestSelectedDateObj?D.latestSelectedDateObj.getHours():D.config.time_24hr?D.config.defaultHour:function(e){switch(e%24){case 0:case 12:return 12;default:return e%12}}(D.config.defaultHour)),D.minuteElement.value=Z(D.latestSelectedDateObj?D.latestSelectedDateObj.getMinutes():D.config.defaultMinute),D.hourElement.setAttribute("data-step",D.config.hourIncrement.toString()),D.minuteElement.setAttribute("data-step",D.config.minuteIncrement.toString()),D.hourElement.setAttribute("data-min",D.config.time_24hr?"0":"1"),D.hourElement.setAttribute("data-max",D.config.time_24hr?"23":"12"),D.minuteElement.setAttribute("data-min","0"),D.minuteElement.setAttribute("data-max","59"),D.timeContainer.appendChild(t),D.timeContainer.appendChild(e),D.timeContainer.appendChild(n),D.config.time_24hr&&D.timeContainer.classList.add("time24hr"),D.config.enableSeconds){D.timeContainer.classList.add("hasSeconds");var a=fe("flatpickr-second");D.secondElement=a.childNodes[0],D.secondElement.value=Z(D.latestSelectedDateObj?D.latestSelectedDateObj.getSeconds():D.config.defaultSeconds),D.secondElement.setAttribute("data-step",D.minuteElement.getAttribute("data-step")),D.secondElement.setAttribute("data-min",D.minuteElement.getAttribute("data-min")),D.secondElement.setAttribute("data-max",D.minuteElement.getAttribute("data-max")),D.timeContainer.appendChild(se("span","flatpickr-time-separator",":")),D.timeContainer.appendChild(a)}return D.config.time_24hr||(D.amPM=se("span","flatpickr-am-pm",D.l10n.amPM[Q(11<(D.latestSelectedDateObj?D.hourElement.value:D.config.defaultHour))]),D.amPM.title=D.l10n.toggleTitle,D.amPM.tabIndex=-1,D.timeContainer.appendChild(D.amPM)),D.timeContainer}()),de(D.calendarContainer,"rangeMode","range"===D.config.mode),de(D.calendarContainer,"animate",!0===D.config.animate),de(D.calendarContainer,"multiMonth",1<D.config.showMonths),D.calendarContainer.appendChild(e);var i=void 0!==D.config.appendTo&&void 0!==D.config.appendTo.nodeType;if((D.config.inline||D.config.static)&&(D.calendarContainer.classList.add(D.config.inline?"inline":"static"),D.config.inline&&(!i&&D.element.parentNode?D.element.parentNode.insertBefore(D.calendarContainer,D._input.nextSibling):void 0!==D.config.appendTo&&D.config.appendTo.appendChild(D.calendarContainer)),D.config.static)){var o=se("div","flatpickr-wrapper");D.element.parentNode&&D.element.parentNode.insertBefore(o,D.element),o.appendChild(D.element),D.altInput&&o.appendChild(D.altInput),o.appendChild(D.calendarContainer)}D.config.static||D.config.inline||(void 0!==D.config.appendTo?D.config.appendTo:window.document.body).appendChild(D.calendarContainer)}(),function(){if(D.config.wrap&&["open","close","toggle","clear"].forEach(function(t){Array.prototype.forEach.call(D.element.querySelectorAll("[data-"+t+"]"),function(e){return o(e,"click",D[t])})}),D.isMobile)return function(){var e=D.config.enableTime?D.config.noCalendar?"time":"datetime-local":"date";D.mobileInput=se("input",D.input.className+" flatpickr-mobile"),D.mobileInput.step=D.input.getAttribute("step")||"any",D.mobileInput.tabIndex=1,D.mobileInput.type=e,D.mobileInput.disabled=D.input.disabled,D.mobileInput.required=D.input.required,D.mobileInput.placeholder=D.input.placeholder,D.mobileFormatStr="datetime-local"===e?"Y-m-d\\TH:i:S":"date"===e?"Y-m-d":"H:i:S",0<D.selectedDates.length&&(D.mobileInput.defaultValue=D.mobileInput.value=D.formatDate(D.selectedDates[0],D.mobileFormatStr)),D.config.minDate&&(D.mobileInput.min=D.formatDate(D.config.minDate,"Y-m-d")),D.config.maxDate&&(D.mobileInput.max=D.formatDate(D.config.maxDate,"Y-m-d")),D.input.type="hidden",void 0!==D.altInput&&(D.altInput.type="hidden");try{D.input.parentNode&&D.input.parentNode.insertBefore(D.mobileInput,D.input.nextSibling)}catch(e){}o(D.mobileInput,"change",function(e){D.setDate(e.target.value,!1,D.mobileFormatStr),U("onChange"),U("onClose")})}();var e=X(N,50);D._debouncedChange=X(p,me),D.daysContainer&&!/iPhone|iPad|iPod/i.test(navigator.userAgent)&&o(D.daysContainer,"mouseover",function(e){"range"===D.config.mode&&A(e.target)}),o(window.document.body,"keydown",F),D.config.static||o(D._input,"keydown",F),D.config.inline||D.config.static||o(window,"resize",e),void 0!==window.ontouchstart&&o(window.document,"touchstart",O),o(window.document,"mousedown",a(O)),o(window.document,"focus",O,{capture:!0}),!0===D.config.clickOpens&&(o(D._input,"focus",D.open),o(D._input,"mousedown",a(D.open))),void 0!==D.daysContainer&&(o(D.monthNav,"mousedown",a(V)),o(D.monthNav,["keyup","increment"],n),o(D.daysContainer,"mousedown",a(R))),void 0!==D.timeContainer&&void 0!==D.minuteElement&&void 0!==D.hourElement&&(o(D.timeContainer,["input","increment"],d),o(D.timeContainer,"mousedown",a(r)),o(D.timeContainer,["input","increment"],D._debouncedChange,{passive:!0}),o([D.hourElement,D.minuteElement],["focus","click"],function(e){return e.target.select()}),void 0!==D.secondElement&&o(D.secondElement,"focus",function(){return D.secondElement&&D.secondElement.select()}),void 0!==D.amPM&&o(D.amPM,"mousedown",a(function(e){d(e),p()})))}(),(D.selectedDates.length||D.config.noCalendar)&&(D.config.enableTime&&g(D.config.noCalendar?D.latestSelectedDateObj||D.config.minDate:void 0),G(!1)),t(),D.showTimeInput=0<D.selectedDates.length||D.config.noCalendar;var e=/^((?!chrome|android).)*safari/i.test(navigator.userAgent);!D.isMobile&&e&&H(),U("onReady")}(),D}function n(e,t){for(var n=Array.prototype.slice.call(e),a=[],i=0;i<n.length;i++){var o=n[i];try{if(null!==o.getAttribute("data-fp-omit"))continue;void 0!==o._flatpickr&&(o._flatpickr.destroy(),o._flatpickr=void 0),o._flatpickr=r(o,t||{}),a.push(o._flatpickr)}catch(e){console.error(e)}}return 1===a.length?a[0]:a}"undefined"!=typeof HTMLElement&&(HTMLCollection.prototype.flatpickr=NodeList.prototype.flatpickr=function(e){return n(this,e)},HTMLElement.prototype.flatpickr=function(e){return n([this],e)});var ge=function(e,t){return e instanceof NodeList?n(e,t):n("string"==typeof e?window.document.querySelectorAll(e):[e],t)};return ge.defaultConfig=b,ge.l10ns={en:Object.assign({},ae),default:Object.assign({},ae)},ge.localize=function(e){ge.l10ns.default=Object.assign({},ge.l10ns.default,e)},ge.setDefaults=function(e){ge.defaultConfig=Object.assign({},ge.defaultConfig,e)},ge.parseDate=oe({}),ge.formatDate=ie({}),ge.compareDates=re,"undefined"!=typeof jQuery&&(jQuery.fn.flatpickr=function(e){return n(this,e)}),Date.prototype.fp_incr=function(e){return new Date(this.getFullYear(),this.getMonth(),this.getDate()+("string"==typeof e?parseInt(e,10):e))},ge});
diff --git a/frontend/vendor/fontawesome.css b/frontend/vendor/fontawesome.css
new file mode 100644
index 000000000..68b26ef9b
--- /dev/null
+++ b/frontend/vendor/fontawesome.css
@@ -0,0 +1,5 @@
+/*!
+ * Font Awesome Free 5.1.0 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:a 2s infinite linear}.fa-pulse{animation:a 1s infinite steps(8)}@keyframes a{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-balance-scale:before{content:"\f24e"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bicycle:before{content:"\f206"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blind:before{content:"\f29d"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-open:before{content:"\f518"}.fa-bookmark:before{content:"\f02e"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-certificate:before{content:"\f0a3"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-concierge-bell:before{content:"\f562"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-credit-card:before{content:"\f09d"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-deviantart:before{content:"\f1bd"}.fa-diagnoses:before{content:"\f470"}.fa-dice:before{content:"\f522"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-gift:before{content:"\f06b"}.fa-git:before{content:"\f1d3"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hashtag:before{content:"\f292"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hot-tub:before{content:"\f593"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-houzz:before{content:"\f27c"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-internet-explorer:before{content:"\f26b"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mercury:before{content:"\f223"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-motorcycle:before{content:"\f21c"}.fa-mouse-pointer:before{content:"\f245"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-nintendo-switch:before{content:"\f418"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-old-republic:before{content:"\f510"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-people-carry:before{content:"\f4ce"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-volume:before{content:"\f2a0"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poo:before{content:"\f2fe"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-r-project:before{content:"\f4f7"}.fa-random:before{content:"\f074"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-rendact:before{content:"\f3e4"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-retweet:before{content:"\f079"}.fa-ribbon:before{content:"\f4d6"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-rupee-sign:before{content:"\f156"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-sass:before{content:"\f41e"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-search:before{content:"\f002"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skull:before{content:"\f54c"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowflake:before{content:"\f2dc"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-swatchbook:before{content:"\f5c3"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toolbox:before{content:"\f552"}.fa-tooth:before{content:"\f5c9"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-train:before{content:"\f238"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-moving:before{content:"\f4df"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}
\ No newline at end of file
diff --git a/frontend/vendor/main.js b/frontend/vendor/main.js
new file mode 100644
index 000000000..263a40a71
--- /dev/null
+++ b/frontend/vendor/main.js
@@ -0,0 +1,5 @@
+import './flatpickr';
+import './zepto';
+
+import './fontawesome.css';
+import './flatpickr.css';
diff --git a/frontend/vendor/zepto.js b/frontend/vendor/zepto.js
new file mode 100644
index 000000000..ad43ef113
--- /dev/null
+++ b/frontend/vendor/zepto.js
@@ -0,0 +1,2 @@
+/* Zepto v1.2.0 - zepto event ajax form ie - zeptojs.com/license */
+!function(t,e){"function"==typeof define&&define.amd?define(function(){return e(t)}):e(t)}(this,function(t){var e=function(){function $(t){return null==t?String(t):S[C.call(t)]||"object"}function F(t){return"function"==$(t)}function k(t){return null!=t&&t==t.window}function M(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function R(t){return"object"==$(t)}function Z(t){return R(t)&&!k(t)&&Object.getPrototypeOf(t)==Object.prototype}function z(t){var e=!!t&&"length"in t&&t.length,n=r.type(t);return"function"!=n&&!k(t)&&("array"==n||0===e||"number"==typeof e&&e>0&&e-1 in t)}function q(t){return a.call(t,function(t){return null!=t})}function H(t){return t.length>0?r.fn.concat.apply([],t):t}function I(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function V(t){return t in l?l[t]:l[t]=new RegExp("(^|\\s)"+t+"(\\s|$)")}function _(t,e){return"number"!=typeof e||h[I(t)]?e:e+"px"}function B(t){var e,n;return c[t]||(e=f.createElement(t),f.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),c[t]=n),c[t]}function U(t){return"children"in t?u.call(t.children):r.map(t.childNodes,function(t){return 1==t.nodeType?t:void 0})}function X(t,e){var n,r=t?t.length:0;for(n=0;r>n;n++)this[n]=t[n];this.length=r,this.selector=e||""}function J(t,r,i){for(n in r)i&&(Z(r[n])||L(r[n]))?(Z(r[n])&&!Z(t[n])&&(t[n]={}),L(r[n])&&!L(t[n])&&(t[n]=[]),J(t[n],r[n],i)):r[n]!==e&&(t[n]=r[n])}function W(t,e){return null==e?r(t):r(t).filter(e)}function Y(t,e,n,r){return F(e)?e.call(t,n,r):e}function G(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function K(t,n){var r=t.className||"",i=r&&r.baseVal!==e;return n===e?i?r.baseVal:r:void(i?r.baseVal=n:t.className=n)}function Q(t){try{return t?"true"==t||("false"==t?!1:"null"==t?null:+t+""==t?+t:/^[\[\{]/.test(t)?r.parseJSON(t):t):t}catch(e){return t}}function tt(t,e){e(t);for(var n=0,r=t.childNodes.length;r>n;n++)tt(t.childNodes[n],e)}var e,n,r,i,O,P,o=[],s=o.concat,a=o.filter,u=o.slice,f=t.document,c={},l={},h={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},p=/^\s*<(\w+|!)[^>]*>/,d=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,m=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,g=/^(?:body|html)$/i,v=/([A-Z])/g,y=["val","css","html","text","data","width","height","offset"],x=["after","prepend","before","append"],b=f.createElement("table"),E=f.createElement("tr"),j={tr:f.createElement("tbody"),tbody:b,thead:b,tfoot:b,td:E,th:E,"*":f.createElement("div")},w=/complete|loaded|interactive/,T=/^[\w-]*$/,S={},C=S.toString,N={},A=f.createElement("div"),D={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},L=Array.isArray||function(t){return t instanceof Array};return N.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.matches||t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var r,i=t.parentNode,o=!i;return o&&(i=A).appendChild(t),r=~N.qsa(i,e).indexOf(t),o&&A.removeChild(t),r},O=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},P=function(t){return a.call(t,function(e,n){return t.indexOf(e)==n})},N.fragment=function(t,n,i){var o,s,a;return d.test(t)&&(o=r(f.createElement(RegExp.$1))),o||(t.replace&&(t=t.replace(m,"<$1></$2>")),n===e&&(n=p.test(t)&&RegExp.$1),n in j||(n="*"),a=j[n],a.innerHTML=""+t,o=r.each(u.call(a.childNodes),function(){a.removeChild(this)})),Z(i)&&(s=r(o),r.each(i,function(t,e){y.indexOf(t)>-1?s[t](e):s.attr(t,e)})),o},N.Z=function(t,e){return new X(t,e)},N.isZ=function(t){return t instanceof N.Z},N.init=function(t,n){var i;if(!t)return N.Z();if("string"==typeof t)if(t=t.trim(),"<"==t[0]&&p.test(t))i=N.fragment(t,RegExp.$1,n),t=null;else{if(n!==e)return r(n).find(t);i=N.qsa(f,t)}else{if(F(t))return r(f).ready(t);if(N.isZ(t))return t;if(L(t))i=q(t);else if(R(t))i=[t],t=null;else if(p.test(t))i=N.fragment(t.trim(),RegExp.$1,n),t=null;else{if(n!==e)return r(n).find(t);i=N.qsa(f,t)}}return N.Z(i,t)},r=function(t,e){return N.init(t,e)},r.extend=function(t){var e,n=u.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){J(t,n,e)}),t},N.qsa=function(t,e){var n,r="#"==e[0],i=!r&&"."==e[0],o=r||i?e.slice(1):e,s=T.test(o);return t.getElementById&&s&&r?(n=t.getElementById(o))?[n]:[]:1!==t.nodeType&&9!==t.nodeType&&11!==t.nodeType?[]:u.call(s&&!r&&t.getElementsByClassName?i?t.getElementsByClassName(o):t.getElementsByTagName(e):t.querySelectorAll(e))},r.contains=f.documentElement.contains?function(t,e){return t!==e&&t.contains(e)}:function(t,e){for(;e&&(e=e.parentNode);)if(e===t)return!0;return!1},r.type=$,r.isFunction=F,r.isWindow=k,r.isArray=L,r.isPlainObject=Z,r.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},r.isNumeric=function(t){var e=Number(t),n=typeof t;return null!=t&&"boolean"!=n&&("string"!=n||t.length)&&!isNaN(e)&&isFinite(e)||!1},r.inArray=function(t,e,n){return o.indexOf.call(e,t,n)},r.camelCase=O,r.trim=function(t){return null==t?"":String.prototype.trim.call(t)},r.uuid=0,r.support={},r.expr={},r.noop=function(){},r.map=function(t,e){var n,i,o,r=[];if(z(t))for(i=0;i<t.length;i++)n=e(t[i],i),null!=n&&r.push(n);else for(o in t)n=e(t[o],o),null!=n&&r.push(n);return H(r)},r.each=function(t,e){var n,r;if(z(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(r in t)if(e.call(t[r],r,t[r])===!1)return t;return t},r.grep=function(t,e){return a.call(t,e)},t.JSON&&(r.parseJSON=JSON.parse),r.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){S["[object "+e+"]"]=e.toLowerCase()}),r.fn={constructor:N.Z,length:0,forEach:o.forEach,reduce:o.reduce,push:o.push,sort:o.sort,splice:o.splice,indexOf:o.indexOf,concat:function(){var t,e,n=[];for(t=0;t<arguments.length;t++)e=arguments[t],n[t]=N.isZ(e)?e.toArray():e;return s.apply(N.isZ(this)?this.toArray():this,n)},map:function(t){return r(r.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return r(u.apply(this,arguments))},ready:function(t){return w.test(f.readyState)&&f.body?t(r):f.addEventListener("DOMContentLoaded",function(){t(r)},!1),this},get:function(t){return t===e?u.call(this):this[t>=0?t:t+this.length]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return o.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return F(t)?this.not(this.not(t)):r(a.call(this,function(e){return N.matches(e,t)}))},add:function(t,e){return r(P(this.concat(r(t,e))))},is:function(t){return this.length>0&&N.matches(this[0],t)},not:function(t){var n=[];if(F(t)&&t.call!==e)this.each(function(e){t.call(this,e)||n.push(this)});else{var i="string"==typeof t?this.filter(t):z(t)&&F(t.item)?u.call(t):r(t);this.forEach(function(t){i.indexOf(t)<0&&n.push(t)})}return r(n)},has:function(t){return this.filter(function(){return R(t)?r.contains(this,t):r(this).find(t).size()})},eq:function(t){return-1===t?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!R(t)?t:r(t)},last:function(){var t=this[this.length-1];return t&&!R(t)?t:r(t)},find:function(t){var e,n=this;return e=t?"object"==typeof t?r(t).filter(function(){var t=this;return o.some.call(n,function(e){return r.contains(e,t)})}):1==this.length?r(N.qsa(this[0],t)):this.map(function(){return N.qsa(this,t)}):r()},closest:function(t,e){var n=[],i="object"==typeof t&&r(t);return this.each(function(r,o){for(;o&&!(i?i.indexOf(o)>=0:N.matches(o,t));)o=o!==e&&!M(o)&&o.parentNode;o&&n.indexOf(o)<0&&n.push(o)}),r(n)},parents:function(t){for(var e=[],n=this;n.length>0;)n=r.map(n,function(t){return(t=t.parentNode)&&!M(t)&&e.indexOf(t)<0?(e.push(t),t):void 0});return W(e,t)},parent:function(t){return W(P(this.pluck("parentNode")),t)},children:function(t){return W(this.map(function(){return U(this)}),t)},contents:function(){return this.map(function(){return this.contentDocument||u.call(this.childNodes)})},siblings:function(t){return W(this.map(function(t,e){return a.call(U(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return r.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=B(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var e=F(t);if(this[0]&&!e)var n=r(t).get(0),i=n.parentNode||this.length>1;return this.each(function(o){r(this).wrapAll(e?t.call(this,o):i?n.cloneNode(!0):n)})},wrapAll:function(t){if(this[0]){r(this[0]).before(t=r(t));for(var e;(e=t.children()).length;)t=e.first();r(t).append(this)}return this},wrapInner:function(t){var e=F(t);return this.each(function(n){var i=r(this),o=i.contents(),s=e?t.call(this,n):t;o.length?o.wrapAll(s):i.append(s)})},unwrap:function(){return this.parent().each(function(){r(this).replaceWith(r(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(t){return this.each(function(){var n=r(this);(t===e?"none"==n.css("display"):t)?n.show():n.hide()})},prev:function(t){return r(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return r(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0 in arguments?this.each(function(e){var n=this.innerHTML;r(this).empty().append(Y(this,t,e,n))}):0 in this?this[0].innerHTML:null},text:function(t){return 0 in arguments?this.each(function(e){var n=Y(this,t,e,this.textContent);this.textContent=null==n?"":""+n}):0 in this?this.pluck("textContent").join(""):null},attr:function(t,r){var i;return"string"!=typeof t||1 in arguments?this.each(function(e){if(1===this.nodeType)if(R(t))for(n in t)G(this,n,t[n]);else G(this,t,Y(this,r,e,this.getAttribute(t)))}):0 in this&&1==this[0].nodeType&&null!=(i=this[0].getAttribute(t))?i:e},removeAttr:function(t){return this.each(function(){1===this.nodeType&&t.split(" ").forEach(function(t){G(this,t)},this)})},prop:function(t,e){return t=D[t]||t,1 in arguments?this.each(function(n){this[t]=Y(this,e,n,this[t])}):this[0]&&this[0][t]},removeProp:function(t){return t=D[t]||t,this.each(function(){delete this[t]})},data:function(t,n){var r="data-"+t.replace(v,"-$1").toLowerCase(),i=1 in arguments?this.attr(r,n):this.attr(r);return null!==i?Q(i):e},val:function(t){return 0 in arguments?(null==t&&(t=""),this.each(function(e){this.value=Y(this,t,e,this.value)})):this[0]&&(this[0].multiple?r(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value)},offset:function(e){if(e)return this.each(function(t){var n=r(this),i=Y(this,e,t,n.offset()),o=n.offsetParent().offset(),s={top:i.top-o.top,left:i.left-o.left};"static"==n.css("position")&&(s.position="relative"),n.css(s)});if(!this.length)return null;if(f.documentElement!==this[0]&&!r.contains(f.documentElement,this[0]))return{top:0,left:0};var n=this[0].getBoundingClientRect();return{left:n.left+t.pageXOffset,top:n.top+t.pageYOffset,width:Math.round(n.width),height:Math.round(n.height)}},css:function(t,e){if(arguments.length<2){var i=this[0];if("string"==typeof t){if(!i)return;return i.style[O(t)]||getComputedStyle(i,"").getPropertyValue(t)}if(L(t)){if(!i)return;var o={},s=getComputedStyle(i,"");return r.each(t,function(t,e){o[e]=i.style[O(e)]||s.getPropertyValue(e)}),o}}var a="";if("string"==$(t))e||0===e?a=I(t)+":"+_(t,e):this.each(function(){this.style.removeProperty(I(t))});else for(n in t)t[n]||0===t[n]?a+=I(n)+":"+_(n,t[n])+";":this.each(function(){this.style.removeProperty(I(n))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(r(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return t?o.some.call(this,function(t){return this.test(K(t))},V(t)):!1},addClass:function(t){return t?this.each(function(e){if("className"in this){i=[];var n=K(this),o=Y(this,t,e,n);o.split(/\s+/g).forEach(function(t){r(this).hasClass(t)||i.push(t)},this),i.length&&K(this,n+(n?" ":"")+i.join(" "))}}):this},removeClass:function(t){return this.each(function(n){if("className"in this){if(t===e)return K(this,"");i=K(this),Y(this,t,n,i).split(/\s+/g).forEach(function(t){i=i.replace(V(t)," ")}),K(this,i.trim())}})},toggleClass:function(t,n){return t?this.each(function(i){var o=r(this),s=Y(this,t,i,K(this));s.split(/\s+/g).forEach(function(t){(n===e?!o.hasClass(t):n)?o.addClass(t):o.removeClass(t)})}):this},scrollTop:function(t){if(this.length){var n="scrollTop"in this[0];return t===e?n?this[0].scrollTop:this[0].pageYOffset:this.each(n?function(){this.scrollTop=t}:function(){this.scrollTo(this.scrollX,t)})}},scrollLeft:function(t){if(this.length){var n="scrollLeft"in this[0];return t===e?n?this[0].scrollLeft:this[0].pageXOffset:this.each(n?function(){this.scrollLeft=t}:function(){this.scrollTo(t,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),n=this.offset(),i=g.test(e[0].nodeName)?{top:0,left:0}:e.offset();return n.top-=parseFloat(r(t).css("margin-top"))||0,n.left-=parseFloat(r(t).css("margin-left"))||0,i.top+=parseFloat(r(e[0]).css("border-top-width"))||0,i.left+=parseFloat(r(e[0]).css("border-left-width"))||0,{top:n.top-i.top,left:n.left-i.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||f.body;t&&!g.test(t.nodeName)&&"static"==r(t).css("position");)t=t.offsetParent;return t})}},r.fn.detach=r.fn.remove,["width","height"].forEach(function(t){var n=t.replace(/./,function(t){return t[0].toUpperCase()});r.fn[t]=function(i){var o,s=this[0];return i===e?k(s)?s["inner"+n]:M(s)?s.documentElement["scroll"+n]:(o=this.offset())&&o[t]:this.each(function(e){s=r(this),s.css(t,Y(this,i,e,s[t]()))})}}),x.forEach(function(n,i){var o=i%2;r.fn[n]=function(){var n,a,s=r.map(arguments,function(t){var i=[];return n=$(t),"array"==n?(t.forEach(function(t){return t.nodeType!==e?i.push(t):r.zepto.isZ(t)?i=i.concat(t.get()):void(i=i.concat(N.fragment(t)))}),i):"object"==n||null==t?t:N.fragment(t)}),u=this.length>1;return s.length<1?this:this.each(function(e,n){a=o?n:n.parentNode,n=0==i?n.nextSibling:1==i?n.firstChild:2==i?n:null;var c=r.contains(f.documentElement,a);s.forEach(function(e){if(u)e=e.cloneNode(!0);else if(!a)return r(e).remove();a.insertBefore(e,n),c&&tt(e,function(e){if(!(null==e.nodeName||"SCRIPT"!==e.nodeName.toUpperCase()||e.type&&"text/javascript"!==e.type||e.src)){var n=e.ownerDocument?e.ownerDocument.defaultView:t;n.eval.call(n,e.innerHTML)}})})})},r.fn[o?n+"To":"insert"+(i?"Before":"After")]=function(t){return r(t)[n](this),this}}),N.Z.prototype=X.prototype=r.fn,N.uniq=P,N.deserializeValue=Q,r.zepto=N,r}();return t.Zepto=e,void 0===t.$&&(t.$=e),function(e){function h(t){return t._zid||(t._zid=n++)}function p(t,e,n,r){if(e=d(e),e.ns)var i=m(e.ns);return(a[h(t)]||[]).filter(function(t){return t&&(!e.e||t.e==e.e)&&(!e.ns||i.test(t.ns))&&(!n||h(t.fn)===h(n))&&(!r||t.sel==r)})}function d(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function m(t){return new RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function g(t,e){return t.del&&!f&&t.e in c||!!e}function v(t){return l[t]||f&&c[t]||t}function y(t,n,i,o,s,u,f){var c=h(t),p=a[c]||(a[c]=[]);n.split(/\s/).forEach(function(n){if("ready"==n)return e(document).ready(i);var a=d(n);a.fn=i,a.sel=s,a.e in l&&(i=function(t){var n=t.relatedTarget;return!n||n!==this&&!e.contains(this,n)?a.fn.apply(this,arguments):void 0}),a.del=u;var c=u||i;a.proxy=function(e){if(e=T(e),!e.isImmediatePropagationStopped()){e.data=o;var n=c.apply(t,e._args==r?[e]:[e].concat(e._args));return n===!1&&(e.preventDefault(),e.stopPropagation()),n}},a.i=p.length,p.push(a),"addEventListener"in t&&t.addEventListener(v(a.e),a.proxy,g(a,f))})}function x(t,e,n,r,i){var o=h(t);(e||"").split(/\s/).forEach(function(e){p(t,e,n,r).forEach(function(e){delete a[o][e.i],"removeEventListener"in t&&t.removeEventListener(v(e.e),e.proxy,g(e,i))})})}function T(t,n){return(n||!t.isDefaultPrevented)&&(n||(n=t),e.each(w,function(e,r){var i=n[e];t[e]=function(){return this[r]=b,i&&i.apply(n,arguments)},t[r]=E}),t.timeStamp||(t.timeStamp=Date.now()),(n.defaultPrevented!==r?n.defaultPrevented:"returnValue"in n?n.returnValue===!1:n.getPreventDefault&&n.getPreventDefault())&&(t.isDefaultPrevented=b)),t}function S(t){var e,n={originalEvent:t};for(e in t)j.test(e)||t[e]===r||(n[e]=t[e]);return T(n,t)}var r,n=1,i=Array.prototype.slice,o=e.isFunction,s=function(t){return"string"==typeof t},a={},u={},f="onfocusin"in t,c={focus:"focusin",blur:"focusout"},l={mouseenter:"mouseover",mouseleave:"mouseout"};u.click=u.mousedown=u.mouseup=u.mousemove="MouseEvents",e.event={add:y,remove:x},e.proxy=function(t,n){var r=2 in arguments&&i.call(arguments,2);if(o(t)){var a=function(){return t.apply(n,r?r.concat(i.call(arguments)):arguments)};return a._zid=h(t),a}if(s(n))return r?(r.unshift(t[n],t),e.proxy.apply(null,r)):e.proxy(t[n],t);throw new TypeError("expected function")},e.fn.bind=function(t,e,n){return this.on(t,e,n)},e.fn.unbind=function(t,e){return this.off(t,e)},e.fn.one=function(t,e,n,r){return this.on(t,e,n,r,1)};var b=function(){return!0},E=function(){return!1},j=/^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/,w={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};e.fn.delegate=function(t,e,n){return this.on(e,t,n)},e.fn.undelegate=function(t,e,n){return this.off(e,t,n)},e.fn.live=function(t,n){return e(document.body).delegate(this.selector,t,n),this},e.fn.die=function(t,n){return e(document.body).undelegate(this.selector,t,n),this},e.fn.on=function(t,n,a,u,f){var c,l,h=this;return t&&!s(t)?(e.each(t,function(t,e){h.on(t,n,a,e,f)}),h):(s(n)||o(u)||u===!1||(u=a,a=n,n=r),(u===r||a===!1)&&(u=a,a=r),u===!1&&(u=E),h.each(function(r,o){f&&(c=function(t){return x(o,t.type,u),u.apply(this,arguments)}),n&&(l=function(t){var r,s=e(t.target).closest(n,o).get(0);return s&&s!==o?(r=e.extend(S(t),{currentTarget:s,liveFired:o}),(c||u).apply(s,[r].concat(i.call(arguments,1)))):void 0}),y(o,t,u,a,n,l||c)}))},e.fn.off=function(t,n,i){var a=this;return t&&!s(t)?(e.each(t,function(t,e){a.off(t,n,e)}),a):(s(n)||o(i)||i===!1||(i=n,n=r),i===!1&&(i=E),a.each(function(){x(this,t,i,n)}))},e.fn.trigger=function(t,n){return t=s(t)||e.isPlainObject(t)?e.Event(t):T(t),t._args=n,this.each(function(){t.type in c&&"function"==typeof this[t.type]?this[t.type]():"dispatchEvent"in this?this.dispatchEvent(t):e(this).triggerHandler(t,n)})},e.fn.triggerHandler=function(t,n){var r,i;return this.each(function(o,a){r=S(s(t)?e.Event(t):t),r._args=n,r.target=a,e.each(p(a,t.type||t),function(t,e){return i=e.proxy(r),r.isImmediatePropagationStopped()?!1:void 0})}),i},"focusin focusout focus blur load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(t){e.fn[t]=function(e){return 0 in arguments?this.bind(t,e):this.trigger(t)}}),e.Event=function(t,e){s(t)||(e=t,t=e.type);var n=document.createEvent(u[t]||"Events"),r=!0;if(e)for(var i in e)"bubbles"==i?r=!!e[i]:n[i]=e[i];return n.initEvent(t,r,!0),T(n)}}(e),function(e){function p(t,n,r){var i=e.Event(n);return e(t).trigger(i,r),!i.isDefaultPrevented()}function d(t,e,n,i){return t.global?p(e||r,n,i):void 0}function m(t){t.global&&0===e.active++&&d(t,null,"ajaxStart")}function g(t){t.global&&!--e.active&&d(t,null,"ajaxStop")}function v(t,e){var n=e.context;return e.beforeSend.call(n,t,e)===!1||d(e,n,"ajaxBeforeSend",[t,e])===!1?!1:void d(e,n,"ajaxSend",[t,e])}function y(t,e,n,r){var i=n.context,o="success";n.success.call(i,t,o,e),r&&r.resolveWith(i,[t,o,e]),d(n,i,"ajaxSuccess",[e,n,t]),b(o,e,n)}function x(t,e,n,r,i){var o=r.context;r.error.call(o,n,e,t),i&&i.rejectWith(o,[n,e,t]),d(r,o,"ajaxError",[n,r,t||e]),b(e,n,r)}function b(t,e,n){var r=n.context;n.complete.call(r,e,t),d(n,r,"ajaxComplete",[e,n]),g(n)}function E(t,e,n){if(n.dataFilter==j)return t;var r=n.context;return n.dataFilter.call(r,t,e)}function j(){}function w(t){return t&&(t=t.split(";",2)[0]),t&&(t==c?"html":t==f?"json":a.test(t)?"script":u.test(t)&&"xml")||"text"}function T(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function S(t){t.processData&&t.data&&"string"!=e.type(t.data)&&(t.data=e.param(t.data,t.traditional)),!t.data||t.type&&"GET"!=t.type.toUpperCase()&&"jsonp"!=t.dataType||(t.url=T(t.url,t.data),t.data=void 0)}function C(t,n,r,i){return e.isFunction(n)&&(i=r,r=n,n=void 0),e.isFunction(r)||(i=r,r=void 0),{url:t,data:n,success:r,dataType:i}}function O(t,n,r,i){var o,s=e.isArray(n),a=e.isPlainObject(n);e.each(n,function(n,u){o=e.type(u),i&&(n=r?i:i+"["+(a||"object"==o||"array"==o?n:"")+"]"),!i&&s?t.add(u.name,u.value):"array"==o||!r&&"object"==o?O(t,u,r,n):t.add(n,u)})}var i,o,n=+new Date,r=t.document,s=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,a=/^(?:text|application)\/javascript/i,u=/^(?:text|application)\/xml/i,f="application/json",c="text/html",l=/^\s*$/,h=r.createElement("a");h.href=t.location.href,e.active=0,e.ajaxJSONP=function(i,o){if(!("type"in i))return e.ajax(i);var c,p,s=i.jsonpCallback,a=(e.isFunction(s)?s():s)||"Zepto"+n++,u=r.createElement("script"),f=t[a],l=function(t){e(u).triggerHandler("error",t||"abort")},h={abort:l};return o&&o.promise(h),e(u).on("load error",function(n,r){clearTimeout(p),e(u).off().remove(),"error"!=n.type&&c?y(c[0],h,i,o):x(null,r||"error",h,i,o),t[a]=f,c&&e.isFunction(f)&&f(c[0]),f=c=void 0}),v(h,i)===!1?(l("abort"),h):(t[a]=function(){c=arguments},u.src=i.url.replace(/\?(.+)=\?/,"?$1="+a),r.head.appendChild(u),i.timeout>0&&(p=setTimeout(function(){l("timeout")},i.timeout)),h)},e.ajaxSettings={type:"GET",beforeSend:j,success:j,error:j,complete:j,context:null,global:!0,xhr:function(){return new t.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:f,xml:"application/xml, text/xml",html:c,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0,dataFilter:j},e.ajax=function(n){var u,f,s=e.extend({},n||{}),a=e.Deferred&&e.Deferred();for(i in e.ajaxSettings)void 0===s[i]&&(s[i]=e.ajaxSettings[i]);m(s),s.crossDomain||(u=r.createElement("a"),u.href=s.url,u.href=u.href,s.crossDomain=h.protocol+"//"+h.host!=u.protocol+"//"+u.host),s.url||(s.url=t.location.toString()),(f=s.url.indexOf("#"))>-1&&(s.url=s.url.slice(0,f)),S(s);var c=s.dataType,p=/\?.+=\?/.test(s.url);if(p&&(c="jsonp"),s.cache!==!1&&(n&&n.cache===!0||"script"!=c&&"jsonp"!=c)||(s.url=T(s.url,"_="+Date.now())),"jsonp"==c)return p||(s.url=T(s.url,s.jsonp?s.jsonp+"=?":s.jsonp===!1?"":"callback=?")),e.ajaxJSONP(s,a);var P,d=s.accepts[c],g={},b=function(t,e){g[t.toLowerCase()]=[t,e]},C=/^([\w-]+:)\/\//.test(s.url)?RegExp.$1:t.location.protocol,N=s.xhr(),O=N.setRequestHeader;if(a&&a.promise(N),s.crossDomain||b("X-Requested-With","XMLHttpRequest"),b("Accept",d||"*/*"),(d=s.mimeType||d)&&(d.indexOf(",")>-1&&(d=d.split(",",2)[0]),N.overrideMimeType&&N.overrideMimeType(d)),(s.contentType||s.contentType!==!1&&s.data&&"GET"!=s.type.toUpperCase())&&b("Content-Type",s.contentType||"application/x-www-form-urlencoded"),s.headers)for(o in s.headers)b(o,s.headers[o]);if(N.setRequestHeader=b,N.onreadystatechange=function(){if(4==N.readyState){N.onreadystatechange=j,clearTimeout(P);var t,n=!1;if(N.status>=200&&N.status<300||304==N.status||0==N.status&&"file:"==C){if(c=c||w(s.mimeType||N.getResponseHeader("content-type")),"arraybuffer"==N.responseType||"blob"==N.responseType)t=N.response;else{t=N.responseText;try{t=E(t,c,s),"script"==c?(1,eval)(t):"xml"==c?t=N.responseXML:"json"==c&&(t=l.test(t)?null:e.parseJSON(t))}catch(r){n=r}if(n)return x(n,"parsererror",N,s,a)}y(t,N,s,a)}else x(N.statusText||null,N.status?"error":"abort",N,s,a)}},v(N,s)===!1)return N.abort(),x(null,"abort",N,s,a),N;var A="async"in s?s.async:!0;if(N.open(s.type,s.url,A,s.username,s.password),s.xhrFields)for(o in s.xhrFields)N[o]=s.xhrFields[o];for(o in g)O.apply(N,g[o]);return s.timeout>0&&(P=setTimeout(function(){N.onreadystatechange=j,N.abort(),x(null,"timeout",N,s,a)},s.timeout)),N.send(s.data?s.data:null),N},e.get=function(){return e.ajax(C.apply(null,arguments))},e.post=function(){var t=C.apply(null,arguments);return t.type="POST",e.ajax(t)},e.getJSON=function(){var t=C.apply(null,arguments);return t.dataType="json",e.ajax(t)},e.fn.load=function(t,n,r){if(!this.length)return this;var a,i=this,o=t.split(/\s/),u=C(t,n,r),f=u.success;return o.length>1&&(u.url=o[0],a=o[1]),u.success=function(t){i.html(a?e("<div>").html(t.replace(s,"")).find(a):t),f&&f.apply(i,arguments)},e.ajax(u),this};var N=encodeURIComponent;e.param=function(t,n){var r=[];return r.add=function(t,n){e.isFunction(n)&&(n=n()),null==n&&(n=""),this.push(N(t)+"="+N(n))},O(r,t,n),r.join("&").replace(/%20/g,"+")}}(e),function(t){t.fn.serializeArray=function(){var e,n,r=[],i=function(t){return t.forEach?t.forEach(i):void r.push({name:e,value:t})};return this[0]&&t.each(this[0].elements,function(r,o){n=o.type,e=o.name,e&&"fieldset"!=o.nodeName.toLowerCase()&&!o.disabled&&"submit"!=n&&"reset"!=n&&"button"!=n&&"file"!=n&&("radio"!=n&&"checkbox"!=n||o.checked)&&i(t(o).val())}),r},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(0 in arguments)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(e),function(){try{getComputedStyle(void 0)}catch(e){var n=getComputedStyle;t.getComputedStyle=function(t,e){try{return n(t,e)}catch(r){return null}}}}(),e});
diff --git a/static/fonts/fonts.css b/static/fonts/fonts.css
new file mode 100644
index 000000000..785fe33d3
--- /dev/null
+++ b/static/fonts/fonts.css
@@ -0,0 +1,129 @@
+/*!
+ * Font Awesome Free 5.1.0 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+ @font-face{
+  font-family:"Font Awesome 5 Free";
+  font-style:normal;
+  font-weight:900;
+  src:url(../fonts/fontawesome/fa-solid-900.eot);
+  src:url(../fonts/fontawesome/fa-solid-900.eot?#iefix) format("embedded-opentype"),
+      url(../fonts/fontawesome/fa-solid-900.woff2) format("woff2"),
+      url(../fonts/fontawesome/fa-solid-900.woff) format("woff"),
+      url(../fonts/fontawesome/fa-solid-900.ttf) format("truetype"),
+      url(../fonts/fontawesome/fa-solid-900.svg#fontawesome) format("svg");
+}
+.fa,.fas{
+  font-family:"Font Awesome 5 Free";
+  font-weight:900;
+}
+
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-weight: 300;
+	src:
+		local('Source Sans Pro Light'),
+		local('SourceSansPro-Light'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdu.woff2 */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_300.woff2') format('woff2'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdo.woff */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_300.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdq.eot */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_300.eot?#iefix') format('embedded-opentype'),
+		/* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdp&skey=e2b26fc7e9e1ade8&v=v11#SourceSansPro */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_300.svg#SourceSansPro') format('svg'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdr.ttf */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_300.ttf') format('truetype');
+}
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Source Sans Pro Regular'),
+		local('SourceSansPro-Regular'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_400.woff2') format('woff2'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7j.woff */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7h.eot */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_400.eot?#iefix') format('embedded-opentype'),
+		/* from https://fonts.gstatic.com/l/font?kit=6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7i&skey=1e026b1c27170b9b&v=v11#SourceSansPro */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_400.svg#SourceSansPro') format('svg'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7g.ttf */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_400.ttf') format('truetype');
+}
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-weight: 600;
+	src:
+		local('Source Sans Pro SemiBold'),
+		local('SourceSansPro-SemiBold'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_600.woff2') format('woff2'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdo.woff */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_600.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdq.eot */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_600.eot?#iefix') format('embedded-opentype'),
+		/* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdp&skey=227a890402fab339&v=v11#SourceSansPro */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_600.svg#SourceSansPro') format('svg'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdr.ttf */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_600.ttf') format('truetype');
+}
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-weight: 900;
+	src:
+		local('Source Sans Pro Black'),
+		local('SourceSansPro-Black'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdu.woff2 */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_900.woff2') format('woff2'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdo.woff */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_900.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdq.eot */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_900.eot?#iefix') format('embedded-opentype'),
+		/* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdp&skey=cf4dfcb31d72fb0a&v=v11#SourceSansPro */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_900.svg#SourceSansPro') format('svg'),
+		/* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdr.ttf */
+		url('../fonts/sourcesanspro/Source_Sans_Pro_900.ttf') format('truetype');
+}
+
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 300;
+	src:
+		local('Roboto Light'),
+		local('Roboto-Light'),
+		/* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 */
+		url('../fonts/roboto/Roboto_300.woff2') format('woff2'),
+		/* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc-.woff */
+		url('../fonts/roboto/Roboto_300.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc8.eot */
+		url('../fonts/roboto/Roboto_300.eot?#iefix') format('embedded-opentype'),
+		/* from https://fonts.gstatic.com/l/font?kit=KFOlCnqEu92Fr1MmSU5fBBc_&skey=11ce8ad5f54705ca&v=v18#Roboto */
+		url('../fonts/roboto/Roboto_300.svg#Roboto') format('svg'),
+		/* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc9.ttf */
+		url('../fonts/roboto/Roboto_300.ttf') format('truetype');
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Roboto'),
+		local('Roboto-Regular'),
+		/* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxK.woff2 */
+		url('../fonts/roboto/Roboto_400.woff2') format('woff2'),
+		/* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxM.woff */
+		url('../fonts/roboto/Roboto_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxO.eot */
+		url('../fonts/roboto/Roboto_400.eot?#iefix') format('embedded-opentype'),
+		/* from https://fonts.gstatic.com/l/font?kit=KFOmCnqEu92Fr1Mu4mxN&skey=a0a0114a1dcab3ac&v=v18#Roboto */
+		url('../fonts/roboto/Roboto_400.svg#Roboto') format('svg'),
+		/* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxP.ttf */
+		url('../fonts/roboto/Roboto_400.ttf') format('truetype');
+}

From a942ddec9b42894cd025e8c75ea968752cbcd2a7 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:14:26 +0200
Subject: [PATCH 385/519] adjust default-layout.julius to work with new app

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

diff --git a/templates/default-layout.julius b/templates/default-layout.julius
index a61ccc7e9..d9260db0d 100644
--- a/templates/default-layout.julius
+++ b/templates/default-layout.julius
@@ -1,5 +1,5 @@
-if (I18n) {
-  I18n.addMany(#{frontendI18n});
+if (window.App) {
+  window.App.i18n.addMany(#{frontendI18n});
 } else {
   throw new Error('I18n JavaScript service is missing!');
 }

From 98c5daebcfccf5cd5cafb478a186137ac1f345f7 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:14:52 +0200
Subject: [PATCH 386/519] only import bundled js and css in Foundation.hs

---
 src/Foundation.hs | 47 ++++++++---------------------------------------
 1 file changed, 8 insertions(+), 39 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 8fb2ec86e..412c6cc38 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1322,46 +1322,15 @@ siteLayout' headingOverride widget = do
     frontendI18n = toJSON (mr :: FrontendMessage -> Text)
 
   pc <- widgetToPageContent $ do
-      -- 3rd party
-      addScript $ StaticR js_vendor_flatpickr_js
-      addScript $ StaticR js_vendor_zepto_js
-      addStylesheet $ StaticR css_vendor_flatpickr_css
-      addStylesheet $ StaticR css_vendor_fontawesome_css
       -- fonts
-      addStylesheet $ StaticR css_fonts_css
-      -- polyfills
-      addScript $ StaticR js_polyfills_fetchPolyfill_js
-      addScript $ StaticR js_polyfills_urlPolyfill_js
-      -- JavaScript services
-      addScript $ StaticR js_services_utilRegistry_js
-      addScript $ StaticR js_services_htmlHelpers_js
-      addScript $ StaticR js_services_httpClient_js
-      addScript $ StaticR js_services_i18n_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_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
-      addStylesheet $ StaticR css_utils_alerts_scss
-      addStylesheet $ StaticR css_utils_asidenav_scss
-      addStylesheet $ StaticR css_utils_asyncForm_scss
-      addStylesheet $ StaticR css_utils_asyncTable_scss
-      addStylesheet $ StaticR css_utils_asyncTableFilter_scss
-      addStylesheet $ StaticR css_utils_checkbox_scss
-      addStylesheet $ StaticR css_utils_form_scss
-      addStylesheet $ StaticR css_utils_inputs_scss
-      addStylesheet $ StaticR css_utils_modal_scss
-      addStylesheet $ StaticR css_utils_radio_scss
-      addStylesheet $ StaticR css_utils_showHide_scss
-      addStylesheet $ StaticR css_utils_tabber_scss
-      addStylesheet $ StaticR css_utils_tooltip_scss
+      addStylesheet $ StaticR fonts_fonts_css
+      -- SCSS
+      addStylesheet $ StaticR bundles_css_vendor_css
+      addStylesheet $ StaticR bundles_css_main_css
+      -- JavaScript
+      addScript $ StaticR bundles_js_polyfills_js
+      -- addScript $ StaticR bundles_js_vendor_js
+      addScript $ StaticR bundles_js_main_js
       -- widgets
       $(widgetFile "default-layout")
   withUrlRenderer $(hamletFile "templates/default-layout-wrapper.hamlet")

From 72da3d85e09197cfa2a84a45a41a3ef6270c8154 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:19:27 +0200
Subject: [PATCH 387/519] moved npm, webpack and eslint stuff to root

---
 frontend/.babelrc => .babelrc                   | 0
 frontend/.eslintrc.json => .eslintrc.json       | 0
 .gitignore                                      | 2 +-
 frontend/package-lock.json => package-lock.json | 0
 frontend/package.json => package.json           | 4 ++--
 frontend/postcss.config.js => postcss.config.js | 0
 frontend/webpack.config.js => webpack.config.js | 8 ++++----
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename frontend/.babelrc => .babelrc (100%)
 rename frontend/.eslintrc.json => .eslintrc.json (100%)
 rename frontend/package-lock.json => package-lock.json (100%)
 rename frontend/package.json => package.json (95%)
 rename frontend/postcss.config.js => postcss.config.js (100%)
 rename frontend/webpack.config.js => webpack.config.js (89%)

diff --git a/frontend/.babelrc b/.babelrc
similarity index 100%
rename from frontend/.babelrc
rename to .babelrc
diff --git a/frontend/.eslintrc.json b/.eslintrc.json
similarity index 100%
rename from frontend/.eslintrc.json
rename to .eslintrc.json
diff --git a/.gitignore b/.gitignore
index 553ebdac4..0e2a4677f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@ dist*
 static/bundles/
 static/tmp/
 static/combined/
-frontend/node_modules/
+node_modules/
 *.hi
 *.o
 *.sqlite3
diff --git a/frontend/package-lock.json b/package-lock.json
similarity index 100%
rename from frontend/package-lock.json
rename to package-lock.json
diff --git a/frontend/package.json b/package.json
similarity index 95%
rename from frontend/package.json
rename to package.json
index 54dffc78d..b2691f2bb 100644
--- a/frontend/package.json
+++ b/package.json
@@ -6,11 +6,11 @@
   "author": "",
   "license": "ISC",
   "scripts": {
-    "lint": "eslint src",
+    "lint": "eslint frontend/src",
     "dev": "webpack --watch"
   },
   "husky": {
-    "hooks": { }
+    "hooks": {}
   },
   "lint-staged": {
     "src/js/**/*.js": [
diff --git a/frontend/postcss.config.js b/postcss.config.js
similarity index 100%
rename from frontend/postcss.config.js
rename to postcss.config.js
diff --git a/frontend/webpack.config.js b/webpack.config.js
similarity index 89%
rename from frontend/webpack.config.js
rename to webpack.config.js
index 9d6eb44d5..d2e851ce6 100644
--- a/frontend/webpack.config.js
+++ b/webpack.config.js
@@ -66,13 +66,13 @@ module.exports = {
 
 	entry: {
 		main: [
-			path.resolve(__dirname, 'src', 'main.js'),
+			path.resolve(__dirname, 'frontend/src', 'main.js'),
 		],
 		vendor: [
-			path.resolve(__dirname, 'vendor', 'main.js'),
+			path.resolve(__dirname, 'frontend/vendor', 'main.js'),
 		],
 		polyfills: [
-			path.resolve(__dirname, 'polyfills', 'main.js'),
+			path.resolve(__dirname, 'frontend/polyfills', 'main.js'),
 		],
 	},
 
@@ -85,7 +85,7 @@ module.exports = {
 	output: {
 		chunkFilename: 'js/[name].[chunkname].js',
 		filename: 'js/[name].js',
-		path: path.resolve(__dirname, '..', 'static', 'bundles')
+		path: path.resolve(__dirname, 'static', 'bundles')
 	},
 
 	mode: 'development',

From f840946503d8a42311975bfbc0cf8b867cb30e76 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 22:21:39 +0200
Subject: [PATCH 388/519] re-add git commit hook for js linting

---
 package.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b2691f2bb..2f7e02ac6 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,12 @@
     "dev": "webpack --watch"
   },
   "husky": {
-    "hooks": {}
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
   },
   "lint-staged": {
-    "src/js/**/*.js": [
+    "frontend/src/**/*.js": [
       "eslint",
       "git add"
     ]

From 5e5e35037833b1cc40512e783c536442bbdaf9b8 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 25 May 2019 23:10:23 +0200
Subject: [PATCH 389/519] remove zepto.js and make flatpickr a js import

---
 frontend/src/utils/form/form.js |   1 +
 frontend/vendor/flatpickr.js    |   2 -
 frontend/vendor/main.js         |   3 -
 frontend/vendor/zepto.js        |   2 -
 package-lock.json               | 199 +++++++++++++-------------------
 package.json                    |   9 +-
 src/Foundation.hs               |   2 +-
 7 files changed, 91 insertions(+), 127 deletions(-)
 delete mode 100644 frontend/vendor/flatpickr.js
 delete mode 100644 frontend/vendor/zepto.js

diff --git a/frontend/src/utils/form/form.js b/frontend/src/utils/form/form.js
index 30fa5bef3..c3432dcc6 100644
--- a/frontend/src/utils/form/form.js
+++ b/frontend/src/utils/form/form.js
@@ -1,3 +1,4 @@
+import flatpickr from 'flatpickr';
 import './form.scss';
 
 /**
diff --git a/frontend/vendor/flatpickr.js b/frontend/vendor/flatpickr.js
deleted file mode 100644
index 226f63df3..000000000
--- a/frontend/vendor/flatpickr.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* flatpickr v4.4.4,, @license MIT */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.flatpickr=t()}(this,function(){"use strict";var Z=function(e){return("0"+e).slice(-2)},Q=function(e){return!0===e?1:0};function X(n,a,i){var o;return void 0===i&&(i=!1),function(){var e=this,t=arguments;null!==o&&clearTimeout(o),o=window.setTimeout(function(){o=null,i||n.apply(e,t)},a),i&&!o&&n.apply(e,t)}}var ee=function(e){return e instanceof Array?e:[e]},e=function(){},te=function(e,t,n){return n.months[t?"shorthand":"longhand"][e]},D={D:e,F:function(e,t,n){e.setMonth(n.months.longhand.indexOf(t))},G:function(e,t){e.setHours(parseFloat(t))},H:function(e,t){e.setHours(parseFloat(t))},J:function(e,t){e.setDate(parseFloat(t))},K:function(e,t,n){e.setHours(e.getHours()%12+12*Q(new RegExp(n.amPM[1],"i").test(t)))},M:function(e,t,n){e.setMonth(n.months.shorthand.indexOf(t))},S:function(e,t){e.setSeconds(parseFloat(t))},U:function(e,t){return new Date(1e3*parseFloat(t))},W:function(e,t){var n=parseInt(t);return new Date(e.getFullYear(),0,2+7*(n-1),0,0,0,0)},Y:function(e,t){e.setFullYear(parseFloat(t))},Z:function(e,t){return new Date(t)},d:function(e,t){e.setDate(parseFloat(t))},h:function(e,t){e.setHours(parseFloat(t))},i:function(e,t){e.setMinutes(parseFloat(t))},j:function(e,t){e.setDate(parseFloat(t))},l:e,m:function(e,t){e.setMonth(parseFloat(t)-1)},n:function(e,t){e.setMonth(parseFloat(t)-1)},s:function(e,t){e.setSeconds(parseFloat(t))},w:e,y:function(e,t){e.setFullYear(2e3+parseFloat(t))}},ne={D:"(\\w+)",F:"(\\w+)",G:"(\\d\\d|\\d)",H:"(\\d\\d|\\d)",J:"(\\d\\d|\\d)\\w+",K:"",M:"(\\w+)",S:"(\\d\\d|\\d)",U:"(.+)",W:"(\\d\\d|\\d)",Y:"(\\d{4})",Z:"(.+)",d:"(\\d\\d|\\d)",h:"(\\d\\d|\\d)",i:"(\\d\\d|\\d)",j:"(\\d\\d|\\d)",l:"(\\w+)",m:"(\\d\\d|\\d)",n:"(\\d\\d|\\d)",s:"(\\d\\d|\\d)",w:"(\\d\\d|\\d)",y:"(\\d{2})"},c={Z:function(e){return e.toISOString()},D:function(e,t,n){return t.weekdays.shorthand[c.w(e,t,n)]},F:function(e,t,n){return te(c.n(e,t,n)-1,!1,t)},G:function(e,t,n){return Z(c.h(e,t,n))},H:function(e){return Z(e.getHours())},J:function(e,t){return void 0!==t.ordinal?e.getDate()+t.ordinal(e.getDate()):e.getDate()},K:function(e,t){return t.amPM[Q(11<e.getHours())]},M:function(e,t){return te(e.getMonth(),!0,t)},S:function(e){return Z(e.getSeconds())},U:function(e){return e.getTime()/1e3},W:function(e,t,n){return n.getWeek(e)},Y:function(e){return e.getFullYear()},d:function(e){return Z(e.getDate())},h:function(e){return e.getHours()%12?e.getHours()%12:12},i:function(e){return Z(e.getMinutes())},j:function(e){return e.getDate()},l:function(e,t){return t.weekdays.longhand[e.getDay()]},m:function(e){return Z(e.getMonth()+1)},n:function(e){return e.getMonth()+1},s:function(e){return e.getSeconds()},w:function(e){return e.getDay()},y:function(e){return String(e.getFullYear()).substring(2)}},ae={weekdays:{shorthand:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],longhand:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]},months:{shorthand:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],longhand:["January","February","March","April","May","June","July","August","September","October","November","December"]},daysInMonth:[31,28,31,30,31,30,31,31,30,31,30,31],firstDayOfWeek:0,ordinal:function(e){var t=e%100;if(3<t&&t<21)return"th";switch(t%10){case 1:return"st";case 2:return"nd";case 3:return"rd";default:return"th"}},rangeSeparator:" to ",weekAbbreviation:"Wk",scrollTitle:"Scroll to increment",toggleTitle:"Click to toggle",amPM:["AM","PM"],yearAriaLabel:"Year"},ie=function(e){var t=e.config,o=void 0===t?b:t,n=e.l10n,r=void 0===n?ae:n;return function(a,e,t){if(void 0!==o.formatDate)return o.formatDate(a,e);var i=t||r;return e.split("").map(function(e,t,n){return c[e]&&"\\"!==n[t-1]?c[e](a,i,o):"\\"!==e?e:""}).join("")}},oe=function(e){var t=e.config,h=void 0===t?b:t,n=e.l10n,v=void 0===n?ae:n;return function(e,t,n){if(0===e||e){var a,i=e;if(e instanceof Date)a=new Date(e.getTime());else if("string"!=typeof e&&void 0!==e.toFixed)a=new Date(e);else if("string"==typeof e){var o=t||(h||b).dateFormat,r=String(e).trim();if("today"===r)a=new Date,n=!0;else if(/Z$/.test(r)||/GMT$/.test(r))a=new Date(e);else if(h&&h.parseDate)a=h.parseDate(e,o);else{a=h&&h.noCalendar?new Date((new Date).setHours(0,0,0,0)):new Date((new Date).getFullYear(),0,1,0,0,0,0);for(var c,l=[],d=0,s=0,u="";d<o.length;d++){var f=o[d],m="\\"===f,g="\\"===o[d-1]||m;if(ne[f]&&!g){u+=ne[f];var p=new RegExp(u).exec(e);p&&(c=!0)&&l["Y"!==f?"push":"unshift"]({fn:D[f],val:p[++s]})}else m||(u+=".");l.forEach(function(e){var t=e.fn,n=e.val;return a=t(a,n,v)||a})}a=c?a:void 0}}if(a instanceof Date)return!0===n&&a.setHours(0,0,0,0),a;h.errorHandler(new Error("Invalid date provided: "+i))}}};function re(e,t,n){return void 0===n&&(n=!0),!1!==n?new Date(e.getTime()).setHours(0,0,0,0)-new Date(t.getTime()).setHours(0,0,0,0):e.getTime()-t.getTime()}var ce=function(e,t,n){return e>Math.min(t,n)&&e<Math.max(t,n)},le={DAY:864e5},b={_disable:[],_enable:[],allowInput:!1,altFormat:"F j, Y",altInput:!1,altInputClass:"form-control input",animate:"object"==typeof window&&-1===window.navigator.userAgent.indexOf("MSIE"),ariaDateFormat:"F j, Y",clickOpens:!0,closeOnSelect:!0,conjunction:", ",dateFormat:"Y-m-d",defaultHour:12,defaultMinute:0,defaultSeconds:0,disable:[],disableMobile:!1,enable:[],enableSeconds:!1,enableTime:!1,errorHandler:function(e){return"undefined"!=typeof console&&console.warn(e)},getWeek:function(e){var t=new Date(e.getTime());t.setHours(0,0,0,0),t.setDate(t.getDate()+3-(t.getDay()+6)%7);var n=new Date(t.getFullYear(),0,4);return 1+Math.round(((t.getTime()-n.getTime())/864e5-3+(n.getDay()+6)%7)/7)},hourIncrement:1,ignoredFocusElements:[],inline:!1,locale:"default",minuteIncrement:5,mode:"single",nextArrow:"<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M13.207 8.472l-7.854 7.854-0.707-0.707 7.146-7.146-7.146-7.148 0.707-0.707 7.854 7.854z' /></svg>",noCalendar:!1,now:new Date,onChange:[],onClose:[],onDayCreate:[],onDestroy:[],onKeyDown:[],onMonthChange:[],onOpen:[],onParseConfig:[],onReady:[],onValueUpdate:[],onYearChange:[],onPreCalendarPosition:[],plugins:[],position:"auto",positionElement:void 0,prevArrow:"<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M5.207 8.471l7.146 7.147-0.707 0.707-7.853-7.854 7.854-7.853 0.707 0.707-7.147 7.146z' /></svg>",shorthandCurrentMonth:!1,showMonths:1,static:!1,time_24hr:!1,weekNumbers:!1,wrap:!1};function de(e,t,n){if(!0===n)return e.classList.add(t);e.classList.remove(t)}function se(e,t,n){var a=window.document.createElement(e);return t=t||"",n=n||"",a.className=t,void 0!==n&&(a.textContent=n),a}function ue(e){for(;e.firstChild;)e.removeChild(e.firstChild)}function fe(e,t){var n=se("div","numInputWrapper"),a=se("input","numInput "+e),i=se("span","arrowUp"),o=se("span","arrowDown");if(a.type="text",a.pattern="\\d*",void 0!==t)for(var r in t)a.setAttribute(r,t[r]);return n.appendChild(a),n.appendChild(i),n.appendChild(o),n}"function"!=typeof Object.assign&&(Object.assign=function(n){if(!n)throw TypeError("Cannot convert undefined or null to object");for(var e=arguments.length,t=new Array(1<e?e-1:0),a=1;a<e;a++)t[a-1]=arguments[a];for(var i=function(t){t&&Object.keys(t).forEach(function(e){return n[e]=t[e]})},o=0;o<t.length;o++){i(t[o])}return n});var me=300;function r(s,u){var D={config:Object.assign({},ge.defaultConfig),l10n:ae};function f(e){return e.bind(D)}function t(){if(void 0!==D.daysContainer){D.calendarContainer.style.visibility="hidden",D.calendarContainer.style.display="block";var e=(D.days.offsetWidth+1)*D.config.showMonths;D.daysContainer.style.width=e+"px",D.calendarContainer.style.width=e+"px",void 0!==D.weekWrapper&&(D.calendarContainer.style.width=e+D.weekWrapper.offsetWidth+"px"),D.calendarContainer.style.removeProperty("visibility"),D.calendarContainer.style.removeProperty("display")}}function d(e){0!==D.selectedDates.length&&(!function(e){e.preventDefault();var t="keydown"===e.type,n=e.target;void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[Q(D.amPM.textContent===D.l10n.amPM[0])]);var a=parseFloat(n.getAttribute("data-min")),i=parseFloat(n.getAttribute("data-max")),o=parseFloat(n.getAttribute("data-step")),r=parseInt(n.value,10),c=e.delta||(t?38===e.which?1:-1:0),l=r+o*c;if(void 0!==n.value&&2===n.value.length){var d=n===D.hourElement,s=n===D.minuteElement;l<a?(l=i+l+Q(!d)+(Q(d)&&Q(!D.amPM)),s&&h(void 0,-1,D.hourElement)):i<l&&(l=n===D.hourElement?l-i-Q(!D.amPM):a,s&&h(void 0,1,D.hourElement)),D.amPM&&d&&(1===o?l+r===23:Math.abs(l-r)>o)&&(D.amPM.textContent=D.l10n.amPM[Q(D.amPM.textContent===D.l10n.amPM[0])]),n.value=Z(l)}}(e),"input"!==e.type?(m(),G()):setTimeout(function(){m(),G()},me))}function m(){if(void 0!==D.hourElement&&void 0!==D.minuteElement){var e,t,n=(parseInt(D.hourElement.value.slice(-2),10)||0)%24,a=(parseInt(D.minuteElement.value,10)||0)%60,i=void 0!==D.secondElement?(parseInt(D.secondElement.value,10)||0)%60:0;void 0!==D.amPM&&(e=n,t=D.amPM.textContent,n=e%12+12*Q(t===D.l10n.amPM[1]));var o=void 0!==D.config.minTime||D.config.minDate&&D.minDateHasTime&&D.latestSelectedDateObj&&0===re(D.latestSelectedDateObj,D.config.minDate,!0);if(void 0!==D.config.maxTime||D.config.maxDate&&D.maxDateHasTime&&D.latestSelectedDateObj&&0===re(D.latestSelectedDateObj,D.config.maxDate,!0)){var r=void 0!==D.config.maxTime?D.config.maxTime:D.config.maxDate;(n=Math.min(n,r.getHours()))===r.getHours()&&(a=Math.min(a,r.getMinutes())),a===r.getMinutes()&&(i=Math.min(i,r.getSeconds()))}if(o){var c=void 0!==D.config.minTime?D.config.minTime:D.config.minDate;(n=Math.max(n,c.getHours()))===c.getHours()&&(a=Math.max(a,c.getMinutes())),a===c.getMinutes()&&(i=Math.max(i,c.getSeconds()))}l(n,a,i)}}function g(e){var t=e||D.latestSelectedDateObj;t&&l(t.getHours(),t.getMinutes(),t.getSeconds())}function l(e,t,n){void 0!==D.latestSelectedDateObj&&D.latestSelectedDateObj.setHours(e%24,t,n||0,0),D.hourElement&&D.minuteElement&&!D.isMobile&&(D.hourElement.value=Z(D.config.time_24hr?e:(12+e)%12+12*Q(e%12==0)),D.minuteElement.value=Z(t),void 0!==D.amPM&&(D.amPM.textContent=D.l10n.amPM[Q(12<=e)]),void 0!==D.secondElement&&(D.secondElement.value=Z(n)))}function n(e){var t=parseInt(e.target.value)+(e.delta||0);4!==t.toString().length&&"Enter"!==e.key||(e.target.blur(),/[^\d]/.test(t.toString())||S(t))}function o(t,n,a,i){return n instanceof Array?n.forEach(function(e){return o(t,e,a,i)}):t instanceof Array?t.forEach(function(e){return o(e,n,a,i)}):(t.addEventListener(n,a,i),void D._handlers.push({element:t,event:n,handler:a}))}function a(t){return function(e){1===e.which&&t(e)}}function p(){U("onChange")}function i(e){var t=void 0!==e?D.parseDate(e):D.latestSelectedDateObj||(D.config.minDate&&D.config.minDate>D.now?D.config.minDate:D.config.maxDate&&D.config.maxDate<D.now?D.config.maxDate:D.now);try{void 0!==t&&(D.currentYear=t.getFullYear(),D.currentMonth=t.getMonth())}catch(e){e.message="Invalid date supplied: "+t,D.config.errorHandler(e)}D.redraw()}function r(e){~e.target.className.indexOf("arrow")&&h(e,e.target.classList.contains("arrowUp")?1:-1)}function h(e,t,n){var a=e&&e.target,i=n||a&&a.parentNode&&a.parentNode.firstChild,o=q("increment");o.delta=t,i&&i.dispatchEvent(o)}function v(e,t,n,a){var i,o=P(t,!0),r=se("span","flatpickr-day "+e,t.getDate().toString());return r.dateObj=t,r.$i=a,r.setAttribute("aria-label",D.formatDate(t,D.config.ariaDateFormat)),-1===e.indexOf("hidden")&&0===re(t,D.now)&&((D.todayDateElem=r).classList.add("today"),r.setAttribute("aria-current","date")),o?(r.tabIndex=-1,$(t)&&(r.classList.add("selected"),D.selectedDateElem=r,"range"===D.config.mode&&(de(r,"startRange",D.selectedDates[0]&&0===re(t,D.selectedDates[0],!0)),de(r,"endRange",D.selectedDates[1]&&0===re(t,D.selectedDates[1],!0)),"nextMonthDay"===e&&r.classList.add("inRange")))):r.classList.add("disabled"),"range"===D.config.mode&&(i=t,!("range"!==D.config.mode||D.selectedDates.length<2)&&0<=re(i,D.selectedDates[0])&&re(i,D.selectedDates[1])<=0&&!$(t)&&r.classList.add("inRange")),D.weekNumbers&&1===D.config.showMonths&&"prevMonthDay"!==e&&n%7==1&&D.weekNumbers.insertAdjacentHTML("beforeend","<span class='flatpickr-day'>"+D.config.getWeek(t)+"</span>"),U("onDayCreate",r),r}function b(e){e.focus(),"range"===D.config.mode&&A(e)}function w(e){for(var t=0<e?0:D.config.showMonths-1,n=0<e?D.config.showMonths:-1,a=t;a!=n;a+=e)for(var i=D.daysContainer.children[a],o=0<e?0:i.children.length-1,r=0<e?i.children.length:-1,c=o;c!=r;c+=e){var l=i.children[c];if(-1===l.className.indexOf("hidden")&&P(l.dateObj))return l}}function M(e,t){var n=_(document.activeElement),a=void 0!==e?e:n?document.activeElement:void 0!==D.selectedDateElem&&_(D.selectedDateElem)?D.selectedDateElem:void 0!==D.todayDateElem&&_(D.todayDateElem)?D.todayDateElem:w(0<t?1:-1);return void 0===a?D._input.focus():n?void function(e,t){for(var n=-1===e.className.indexOf("Month")?e.dateObj.getMonth():D.currentMonth,a=0<t?D.config.showMonths:-1,i=0<t?1:-1,o=n-D.currentMonth;o!=a;o+=i)for(var r=D.daysContainer.children[o],c=n-D.currentMonth===o?e.$i+t:t<0?r.children.length-1:0,l=r.children.length,d=c;0<=d&&d<l&&d!=(0<t?l:-1);d+=i){var s=r.children[d];if(-1===s.className.indexOf("hidden")&&P(s.dateObj)&&Math.abs(e.$i-d)>=Math.abs(t))return b(s)}D.changeMonth(i),M(w(i),0)}(a,t):b(a)}function c(e,t){for(var n=(new Date(e,t,1).getDay()-D.l10n.firstDayOfWeek+7)%7,a=D.utils.getDaysInMonth((t-1+12)%12),i=D.utils.getDaysInMonth(t),o=window.document.createDocumentFragment(),r=1<D.config.showMonths,c=r?"prevMonthDay hidden":"prevMonthDay",l=r?"nextMonthDay hidden":"nextMonthDay",d=a+1-n,s=0;d<=a;d++,s++)o.appendChild(v(c,new Date(e,t-1,d),d,s));for(d=1;d<=i;d++,s++)o.appendChild(v("",new Date(e,t,d),d,s));for(var u=i+1;u<=42-n&&(1===D.config.showMonths||s%7!=0);u++,s++)o.appendChild(v(l,new Date(e,t+1,u%i),u,s));var f=se("div","dayContainer");return f.appendChild(o),f}function C(){if(void 0!==D.daysContainer){ue(D.daysContainer),D.weekNumbers&&ue(D.weekNumbers);for(var e=document.createDocumentFragment(),t=0;t<D.config.showMonths;t++){var n=new Date(D.currentYear,D.currentMonth,1);n.setMonth(D.currentMonth+t),e.appendChild(c(n.getFullYear(),n.getMonth()))}D.daysContainer.appendChild(e),D.days=D.daysContainer.firstChild}}function y(){var e=se("div","flatpickr-month"),t=window.document.createDocumentFragment(),n=se("span","cur-month");n.title=D.l10n.scrollTitle;var a=fe("cur-year",{tabindex:"-1"}),i=a.childNodes[0];i.title=D.l10n.scrollTitle,i.setAttribute("aria-label",D.l10n.yearAriaLabel),D.config.minDate&&i.setAttribute("data-min",D.config.minDate.getFullYear().toString()),D.config.maxDate&&(i.setAttribute("data-max",D.config.maxDate.getFullYear().toString()),i.disabled=!!D.config.minDate&&D.config.minDate.getFullYear()===D.config.maxDate.getFullYear());var o=se("div","flatpickr-current-month");return o.appendChild(n),o.appendChild(a),t.appendChild(o),e.appendChild(t),{container:e,yearElement:i,monthElement:n}}function x(){ue(D.monthNav),D.monthNav.appendChild(D.prevMonthNav);for(var e=D.config.showMonths;e--;){var t=y();D.yearElements.push(t.yearElement),D.monthElements.push(t.monthElement),D.monthNav.appendChild(t.container)}D.monthNav.appendChild(D.nextMonthNav)}function E(){D.weekdayContainer?ue(D.weekdayContainer):D.weekdayContainer=se("div","flatpickr-weekdays");for(var e=D.config.showMonths;e--;){var t=se("div","flatpickr-weekdaycontainer");D.weekdayContainer.appendChild(t)}return T(),D.weekdayContainer}function T(){var e=D.l10n.firstDayOfWeek,t=D.l10n.weekdays.shorthand.concat();0<e&&e<t.length&&(t=t.splice(e,t.length).concat(t.splice(0,e)));for(var n=D.config.showMonths;n--;)D.weekdayContainer.children[n].innerHTML="\n      <span class=flatpickr-weekday>\n        "+t.join("</span><span class=flatpickr-weekday>")+"\n      </span>\n      "}function k(e,t){void 0===t&&(t=!0);var n=t?e:e-D.currentMonth;n<0&&!0===D._hidePrevMonthArrow||0<n&&!0===D._hideNextMonthArrow||(D.currentMonth+=n,(D.currentMonth<0||11<D.currentMonth)&&(D.currentYear+=11<D.currentMonth?1:-1,D.currentMonth=(D.currentMonth+12)%12,U("onYearChange")),C(),U("onMonthChange"),z())}function I(e){return!(!D.config.appendTo||!D.config.appendTo.contains(e))||D.calendarContainer.contains(e)}function O(t){if(D.isOpen&&!D.config.inline){var e=I(t.target),n=t.target===D.input||t.target===D.altInput||D.element.contains(t.target)||t.path&&t.path.indexOf&&(~t.path.indexOf(D.input)||~t.path.indexOf(D.altInput)),a="blur"===t.type?n&&t.relatedTarget&&!I(t.relatedTarget):!n&&!e,i=!D.config.ignoredFocusElements.some(function(e){return e.contains(t.target)});a&&i&&(D.close(),"range"===D.config.mode&&1===D.selectedDates.length&&(D.clear(!1),D.redraw()))}}function S(e){if(!(!e||D.config.minDate&&e<D.config.minDate.getFullYear()||D.config.maxDate&&e>D.config.maxDate.getFullYear())){var t=e,n=D.currentYear!==t;D.currentYear=t||D.currentYear,D.config.maxDate&&D.currentYear===D.config.maxDate.getFullYear()?D.currentMonth=Math.min(D.config.maxDate.getMonth(),D.currentMonth):D.config.minDate&&D.currentYear===D.config.minDate.getFullYear()&&(D.currentMonth=Math.max(D.config.minDate.getMonth(),D.currentMonth)),n&&(D.redraw(),U("onYearChange"))}}function P(e,t){void 0===t&&(t=!0);var n=D.parseDate(e,void 0,t);if(D.config.minDate&&n&&re(n,D.config.minDate,void 0!==t?t:!D.minDateHasTime)<0||D.config.maxDate&&n&&0<re(n,D.config.maxDate,void 0!==t?t:!D.maxDateHasTime))return!1;if(0===D.config.enable.length&&0===D.config.disable.length)return!0;if(void 0===n)return!1;for(var a,i=0<D.config.enable.length,o=i?D.config.enable:D.config.disable,r=0;r<o.length;r++){if("function"==typeof(a=o[r])&&a(n))return i;if(a instanceof Date&&void 0!==n&&a.getTime()===n.getTime())return i;if("string"==typeof a&&void 0!==n){var c=D.parseDate(a,void 0,!0);return c&&c.getTime()===n.getTime()?i:!i}if("object"==typeof a&&void 0!==n&&a.from&&a.to&&n.getTime()>=a.from.getTime()&&n.getTime()<=a.to.getTime())return i}return!i}function _(e){return void 0!==D.daysContainer&&(-1===e.className.indexOf("hidden")&&D.daysContainer.contains(e))}function F(e){e.stopPropagation();var t=e.target===D._input,n=I(e.target),a=D.config.allowInput,i=D.isOpen&&(!a||!t),o=D.config.inline&&t&&!a;if(13===e.keyCode&&t){if(a)return D.setDate(D._input.value,!0,e.target===D.altInput?D.config.altFormat:D.config.dateFormat),e.target.blur();D.open()}else if(n||i||o){var r=!!D.timeContainer&&D.timeContainer.contains(e.target);switch(e.keyCode){case 13:r?G():R(e);break;case 27:e.preventDefault(),W();break;case 8:case 46:t&&!D.config.allowInput&&(e.preventDefault(),D.clear());break;case 37:case 39:if(r)D.hourElement&&D.hourElement.focus();else if(e.preventDefault(),void 0!==D.daysContainer&&!1===D.config.allowInput){var c=39===e.keyCode?1:-1;e.ctrlKey?(k(c),M(w(1),0)):M(void 0,c)}break;case 38:case 40:e.preventDefault();var l=40===e.keyCode?1:-1;D.daysContainer?e.ctrlKey?(S(D.currentYear-l),M(w(1),0)):r||M(void 0,7*l):D.config.enableTime&&(!r&&D.hourElement&&D.hourElement.focus(),d(e),D._debouncedChange());break;case 9:e.target===D.hourElement?(e.preventDefault(),D.minuteElement.select()):e.target===D.minuteElement&&(D.secondElement||D.amPM)?(e.preventDefault(),void 0!==D.secondElement?D.secondElement.focus():void 0!==D.amPM&&D.amPM.focus()):e.target===D.secondElement&&D.amPM&&(e.preventDefault(),D.amPM.focus())}switch(e.key){case D.l10n.amPM[0].charAt(0):case D.l10n.amPM[0].charAt(0).toLowerCase():void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[0],m(),G());break;case D.l10n.amPM[1].charAt(0):case D.l10n.amPM[1].charAt(0).toLowerCase():void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[1],m(),G())}U("onKeyDown",e)}}function A(o){if(1===D.selectedDates.length&&o.classList.contains("flatpickr-day")&&!o.classList.contains("disabled")){for(var r=o.dateObj.getTime(),c=D.parseDate(D.selectedDates[0],void 0,!0).getTime(),e=Math.min(r,D.selectedDates[0].getTime()),t=Math.max(r,D.selectedDates[0].getTime()),n=D.daysContainer.children,a=n[0].children[0].dateObj.getTime(),i=n[n.length-1].lastChild.dateObj.getTime(),l=!1,d=0,s=0,u=a;u<i;u+=le.DAY)P(new Date(u),!0)||(l=l||e<u&&u<t,u<c&&(!d||d<u)?d=u:c<u&&(!s||u<s)&&(s=u));for(var f=0;f<D.config.showMonths;f++)for(var m=D.daysContainer.children[f],g=D.daysContainer.children[f-1],p=function(e,t){var n=m.children[e],a=n.dateObj.getTime(),i=0<d&&a<d||0<s&&s<a;return i?(n.classList.add("notAllowed"),["inRange","startRange","endRange"].forEach(function(e){n.classList.remove(e)}),"continue"):l&&!i?"continue":(["startRange","inRange","endRange","notAllowed"].forEach(function(e){n.classList.remove(e)}),o.classList.add(r<D.selectedDates[0].getTime()?"startRange":"endRange"),void(!m.contains(o)&&0<f&&g&&g.lastChild.dateObj.getTime()>=a||(c<r&&a===c?n.classList.add("startRange"):r<c&&a===c&&n.classList.add("endRange"),d<=a&&(0===s||a<=s)&&ce(a,c,r)&&n.classList.add("inRange"))))},h=0,v=m.children.length;h<v;h++)p(h)}}function N(){!D.isOpen||D.config.static||D.config.inline||H()}function j(a){return function(e){var t=D.config["_"+a+"Date"]=D.parseDate(e,D.config.dateFormat),n=D.config["_"+("min"===a?"max":"min")+"Date"];void 0!==t&&(D["min"===a?"minDateHasTime":"maxDateHasTime"]=0<t.getHours()||0<t.getMinutes()||0<t.getSeconds()),D.selectedDates&&(D.selectedDates=D.selectedDates.filter(function(e){return P(e)}),D.selectedDates.length||"min"!==a||g(t),G()),D.daysContainer&&(L(),void 0!==t?D.currentYearElement[a]=t.getFullYear().toString():D.currentYearElement.removeAttribute(a),D.currentYearElement.disabled=!!n&&void 0!==t&&n.getFullYear()===t.getFullYear())}}function Y(){"object"!=typeof D.config.locale&&void 0===ge.l10ns[D.config.locale]&&D.config.errorHandler(new Error("flatpickr: invalid locale "+D.config.locale)),D.l10n=Object.assign({},ge.l10ns.default,"object"==typeof D.config.locale?D.config.locale:"default"!==D.config.locale?ge.l10ns[D.config.locale]:void 0),ne.K="("+D.l10n.amPM[0]+"|"+D.l10n.amPM[1]+"|"+D.l10n.amPM[0].toLowerCase()+"|"+D.l10n.amPM[1].toLowerCase()+")",D.formatDate=ie(D)}function H(e){if(void 0!==D.calendarContainer){U("onPreCalendarPosition");var t=e||D._positionElement,n=Array.prototype.reduce.call(D.calendarContainer.children,function(e,t){return e+t.offsetHeight},0),a=D.calendarContainer.offsetWidth,i=D.config.position,o=t.getBoundingClientRect(),r=window.innerHeight-o.bottom,c="above"===i||"below"!==i&&r<n&&o.top>n,l=window.pageYOffset+o.top+(c?-n-2:t.offsetHeight+2);if(de(D.calendarContainer,"arrowTop",!c),de(D.calendarContainer,"arrowBottom",c),!D.config.inline){var d=window.pageXOffset+o.left,s=window.document.body.offsetWidth-o.right,u=d+a>window.document.body.offsetWidth;de(D.calendarContainer,"rightMost",u),D.config.static||(D.calendarContainer.style.top=l+"px",u?(D.calendarContainer.style.left="auto",D.calendarContainer.style.right=s+"px"):(D.calendarContainer.style.left=d+"px",D.calendarContainer.style.right="auto"))}}}function L(){D.config.noCalendar||D.isMobile||(z(),C())}function W(){D._input.focus(),-1!==window.navigator.userAgent.indexOf("MSIE")||void 0!==navigator.msMaxTouchPoints?setTimeout(D.close,0):D.close()}function R(e){e.preventDefault(),e.stopPropagation();var t=function e(t,n){return n(t)?t:t.parentNode?e(t.parentNode,n):void 0}(e.target,function(e){return e.classList&&e.classList.contains("flatpickr-day")&&!e.classList.contains("disabled")&&!e.classList.contains("notAllowed")});if(void 0!==t){var n=t,a=D.latestSelectedDateObj=new Date(n.dateObj.getTime()),i=(a.getMonth()<D.currentMonth||a.getMonth()>D.currentMonth+D.config.showMonths-1)&&"range"!==D.config.mode;if(D.selectedDateElem=n,"single"===D.config.mode)D.selectedDates=[a];else if("multiple"===D.config.mode){var o=$(a);o?D.selectedDates.splice(parseInt(o),1):D.selectedDates.push(a)}else"range"===D.config.mode&&(2===D.selectedDates.length&&D.clear(!1),D.selectedDates.push(a),0!==re(a,D.selectedDates[0],!0)&&D.selectedDates.sort(function(e,t){return e.getTime()-t.getTime()}));if(m(),i){var r=D.currentYear!==a.getFullYear();D.currentYear=a.getFullYear(),D.currentMonth=a.getMonth(),r&&U("onYearChange"),U("onMonthChange")}if(z(),C(),D.config.minDate&&D.minDateHasTime&&D.config.enableTime&&0===re(a,D.config.minDate)&&g(D.config.minDate),G(),D.config.enableTime&&setTimeout(function(){return D.showTimeInput=!0},50),"range"===D.config.mode&&(1===D.selectedDates.length?A(n):z()),i||"range"===D.config.mode||1!==D.config.showMonths?D.selectedDateElem&&D.selectedDateElem.focus():b(n),void 0!==D.hourElement&&setTimeout(function(){return void 0!==D.hourElement&&D.hourElement.select()},451),D.config.closeOnSelect){var c="single"===D.config.mode&&!D.config.enableTime,l="range"===D.config.mode&&2===D.selectedDates.length&&!D.config.enableTime;(c||l)&&W()}p()}}D.parseDate=oe({config:D.config,l10n:D.l10n}),D._handlers=[],D._bind=o,D._setHoursFromDate=g,D.changeMonth=k,D.changeYear=S,D.clear=function(e){void 0===e&&(e=!0);D.input.value="",void 0!==D.altInput&&(D.altInput.value="");void 0!==D.mobileInput&&(D.mobileInput.value="");D.selectedDates=[],D.latestSelectedDateObj=void 0,!(D.showTimeInput=!1)===D.config.enableTime&&(void 0!==D.config.minDate?g(D.config.minDate):l(D.config.defaultHour,D.config.defaultMinute,D.config.defaultSeconds));D.redraw(),e&&U("onChange")},D.close=function(){D.isOpen=!1,D.isMobile||(D.calendarContainer.classList.remove("open"),D._input.classList.remove("active"));U("onClose")},D._createElement=se,D.destroy=function(){void 0!==D.config&&U("onDestroy");for(var e=D._handlers.length;e--;){var t=D._handlers[e];t.element.removeEventListener(t.event,t.handler)}D._handlers=[],D.mobileInput?(D.mobileInput.parentNode&&D.mobileInput.parentNode.removeChild(D.mobileInput),D.mobileInput=void 0):D.calendarContainer&&D.calendarContainer.parentNode&&D.calendarContainer.parentNode.removeChild(D.calendarContainer);D.altInput&&(D.input.type="text",D.altInput.parentNode&&D.altInput.parentNode.removeChild(D.altInput),delete D.altInput);D.input&&(D.input.type=D.input._type,D.input.classList.remove("flatpickr-input"),D.input.removeAttribute("readonly"),D.input.value="");["_showTimeInput","latestSelectedDateObj","_hideNextMonthArrow","_hidePrevMonthArrow","__hideNextMonthArrow","__hidePrevMonthArrow","isMobile","isOpen","selectedDateElem","minDateHasTime","maxDateHasTime","days","daysContainer","_input","_positionElement","innerContainer","rContainer","monthNav","todayDateElem","calendarContainer","weekdayContainer","prevMonthNav","nextMonthNav","currentMonthElement","currentYearElement","navigationCurrentMonth","selectedDateElem","config"].forEach(function(e){try{delete D[e]}catch(e){}})},D.isEnabled=P,D.jumpToDate=i,D.open=function(e,t){void 0===t&&(t=D._input);if(!0===D.isMobile)return e&&(e.preventDefault(),e.target&&e.target.blur()),setTimeout(function(){void 0!==D.mobileInput&&D.mobileInput.click()},0),void U("onOpen");if(D._input.disabled||D.config.inline)return;var n=D.isOpen;D.isOpen=!0,n||(D.calendarContainer.classList.add("open"),D._input.classList.add("active"),U("onOpen"),H(t));!0===D.config.enableTime&&!0===D.config.noCalendar&&(0===D.selectedDates.length&&(D.setDate(void 0!==D.config.minDate?new Date(D.config.minDate.getTime()):(new Date).setHours(D.config.defaultHour,D.config.defaultMinute,D.config.defaultSeconds,0),!1),m(),G()),setTimeout(function(){return D.hourElement.select()},50))},D.redraw=L,D.set=function(e,t){null!==e&&"object"==typeof e?Object.assign(D.config,e):(D.config[e]=t,void 0!==J[e]&&J[e].forEach(function(e){return e()}));D.redraw(),i()},D.setDate=function(e,t,n){void 0===t&&(t=!1);void 0===n&&(n=D.config.dateFormat);if(0!==e&&!e)return D.clear(t);K(e,n),D.showTimeInput=0<D.selectedDates.length,D.latestSelectedDateObj=D.selectedDates[0],D.redraw(),i(),g(),G(t),t&&U("onChange")},D.toggle=function(){if(D.isOpen)return D.close();D.open()};var J={locale:[Y,T],showMonths:[x,t,E]};function K(e,t){var n=[];if(e instanceof Array)n=e.map(function(e){return D.parseDate(e,t)});else if(e instanceof Date||"number"==typeof e)n=[D.parseDate(e,t)];else if("string"==typeof e)switch(D.config.mode){case"single":n=[D.parseDate(e,t)];break;case"multiple":n=e.split(D.config.conjunction).map(function(e){return D.parseDate(e,t)});break;case"range":n=e.split(D.l10n.rangeSeparator).map(function(e){return D.parseDate(e,t)})}else D.config.errorHandler(new Error("Invalid date supplied: "+JSON.stringify(e)));D.selectedDates=n.filter(function(e){return e instanceof Date&&P(e,!1)}),"range"===D.config.mode&&D.selectedDates.sort(function(e,t){return e.getTime()-t.getTime()})}function B(e){return e.map(function(e){return"string"==typeof e||"number"==typeof e||e instanceof Date?D.parseDate(e,void 0,!0):e&&"object"==typeof e&&e.from&&e.to?{from:D.parseDate(e.from,void 0),to:D.parseDate(e.to,void 0)}:e}).filter(function(e){return e})}function U(e,t){var n=D.config[e];if(void 0!==n&&0<n.length)for(var a=0;n[a]&&a<n.length;a++)n[a](D.selectedDates,D.input.value,D,t);"onChange"===e&&(D.input.dispatchEvent(q("change")),D.input.dispatchEvent(q("input")))}function q(e){var t=document.createEvent("Event");return t.initEvent(e,!0,!0),t}function $(e){for(var t=0;t<D.selectedDates.length;t++)if(0===re(D.selectedDates[t],e))return""+t;return!1}function z(){D.config.noCalendar||D.isMobile||!D.monthNav||(D.yearElements.forEach(function(e,t){var n=new Date(D.currentYear,D.currentMonth,1);n.setMonth(D.currentMonth+t),D.monthElements[t].textContent=te(n.getMonth(),D.config.shorthandCurrentMonth,D.l10n)+" ",e.value=n.getFullYear().toString()}),D._hidePrevMonthArrow=void 0!==D.config.minDate&&(D.currentYear===D.config.minDate.getFullYear()?D.currentMonth<=D.config.minDate.getMonth():D.currentYear<D.config.minDate.getFullYear()),D._hideNextMonthArrow=void 0!==D.config.maxDate&&(D.currentYear===D.config.maxDate.getFullYear()?D.currentMonth+1>D.config.maxDate.getMonth():D.currentYear>D.config.maxDate.getFullYear()))}function G(e){if(void 0===e&&(e=!0),0===D.selectedDates.length)return D.clear(e);void 0!==D.mobileInput&&D.mobileFormatStr&&(D.mobileInput.value=void 0!==D.latestSelectedDateObj?D.formatDate(D.latestSelectedDateObj,D.mobileFormatStr):"");var t="range"!==D.config.mode?D.config.conjunction:D.l10n.rangeSeparator;D.input.value=D.selectedDates.map(function(e){return D.formatDate(e,D.config.dateFormat)}).join(t),void 0!==D.altInput&&(D.altInput.value=D.selectedDates.map(function(e){return D.formatDate(e,D.config.altFormat)}).join(t)),!1!==e&&U("onValueUpdate")}function V(e){var t=D.prevMonthNav.contains(e.target),n=D.nextMonthNav.contains(e.target);t||n?k(t?-1:1):0<=D.yearElements.indexOf(e.target)?(e.preventDefault(),e.target.select()):e.target.classList.contains("arrowUp")?D.changeYear(D.currentYear+1):e.target.classList.contains("arrowDown")&&D.changeYear(D.currentYear-1)}return function(){D.element=D.input=s,D.isOpen=!1,function(){var e=["wrap","weekNumbers","allowInput","clickOpens","time_24hr","enableTime","noCalendar","altInput","shorthandCurrentMonth","inline","static","enableSeconds","disableMobile"],t=["onChange","onClose","onDayCreate","onDestroy","onKeyDown","onMonthChange","onOpen","onParseConfig","onReady","onValueUpdate","onYearChange","onPreCalendarPosition"],n=Object.assign({},u,JSON.parse(JSON.stringify(s.dataset||{}))),a={};D.config.parseDate=n.parseDate,D.config.formatDate=n.formatDate,Object.defineProperty(D.config,"enable",{get:function(){return D.config._enable},set:function(e){D.config._enable=B(e)}}),Object.defineProperty(D.config,"disable",{get:function(){return D.config._disable},set:function(e){D.config._disable=B(e)}}),!n.dateFormat&&n.enableTime&&(a.dateFormat=n.noCalendar?"H:i"+(n.enableSeconds?":S":""):ge.defaultConfig.dateFormat+" H:i"+(n.enableSeconds?":S":"")),n.altInput&&n.enableTime&&!n.altFormat&&(a.altFormat=n.noCalendar?"h:i"+(n.enableSeconds?":S K":" K"):ge.defaultConfig.altFormat+" h:i"+(n.enableSeconds?":S":"")+" K"),Object.defineProperty(D.config,"minDate",{get:function(){return D.config._minDate},set:j("min")}),Object.defineProperty(D.config,"maxDate",{get:function(){return D.config._maxDate},set:j("max")});var i=function(t){return function(e){D.config["min"===t?"_minTime":"_maxTime"]=D.parseDate(e,"H:i")}};Object.defineProperty(D.config,"minTime",{get:function(){return D.config._minTime},set:i("min")}),Object.defineProperty(D.config,"maxTime",{get:function(){return D.config._maxTime},set:i("max")}),Object.assign(D.config,a,n);for(var o=0;o<e.length;o++)D.config[e[o]]=!0===D.config[e[o]]||"true"===D.config[e[o]];for(var r=t.length;r--;)void 0!==D.config[t[r]]&&(D.config[t[r]]=ee(D.config[t[r]]||[]).map(f));"time"===D.config.mode&&(D.config.noCalendar=!0,D.config.enableTime=!0);for(var c=0;c<D.config.plugins.length;c++){var l=D.config.plugins[c](D)||{};for(var d in l)~t.indexOf(d)?D.config[d]=ee(l[d]).map(f).concat(D.config[d]):void 0===n[d]&&(D.config[d]=l[d])}D.isMobile=!D.config.disableMobile&&!D.config.inline&&"single"===D.config.mode&&!D.config.disable.length&&!D.config.enable.length&&!D.config.weekNumbers&&/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),U("onParseConfig")}(),Y(),function(){if(D.input=D.config.wrap?s.querySelector("[data-input]"):s,!D.input)return D.config.errorHandler(new Error("Invalid input element specified"));D.input._type=D.input.type,D.input.type="text",D.input.classList.add("flatpickr-input"),D._input=D.input,D.config.altInput&&(D.altInput=se(D.input.nodeName,D.input.className+" "+D.config.altInputClass),D._input=D.altInput,D.altInput.placeholder=D.input.placeholder,D.altInput.disabled=D.input.disabled,D.altInput.required=D.input.required,D.altInput.tabIndex=D.input.tabIndex,D.altInput.type="text",D.input.type="hidden",!D.config.static&&D.input.parentNode&&D.input.parentNode.insertBefore(D.altInput,D.input.nextSibling)),D.config.allowInput||D._input.setAttribute("readonly","readonly"),D._positionElement=D.config.positionElement||D._input}(),function(){D.selectedDates=[],D.now=D.parseDate(D.config.now)||new Date;var e=D.config.defaultDate||D.input.value;e&&K(e,D.config.dateFormat);var t=0<D.selectedDates.length?D.selectedDates[0]:D.config.minDate&&D.config.minDate.getTime()>D.now.getTime()?D.config.minDate:D.config.maxDate&&D.config.maxDate.getTime()<D.now.getTime()?D.config.maxDate:D.now;D.currentYear=t.getFullYear(),D.currentMonth=t.getMonth(),0<D.selectedDates.length&&(D.latestSelectedDateObj=D.selectedDates[0]),void 0!==D.config.minTime&&(D.config.minTime=D.parseDate(D.config.minTime,"H:i")),void 0!==D.config.maxTime&&(D.config.maxTime=D.parseDate(D.config.maxTime,"H:i")),D.minDateHasTime=!!D.config.minDate&&(0<D.config.minDate.getHours()||0<D.config.minDate.getMinutes()||0<D.config.minDate.getSeconds()),D.maxDateHasTime=!!D.config.maxDate&&(0<D.config.maxDate.getHours()||0<D.config.maxDate.getMinutes()||0<D.config.maxDate.getSeconds()),Object.defineProperty(D,"showTimeInput",{get:function(){return D._showTimeInput},set:function(e){D._showTimeInput=e,D.calendarContainer&&de(D.calendarContainer,"showTimeInput",e),D.isOpen&&H()}})}(),D.utils={getDaysInMonth:function(e,t){return void 0===e&&(e=D.currentMonth),void 0===t&&(t=D.currentYear),1===e&&(t%4==0&&t%100!=0||t%400==0)?29:D.l10n.daysInMonth[e]}},D.isMobile||function(){var e=window.document.createDocumentFragment();if(D.calendarContainer=se("div","flatpickr-calendar"),D.calendarContainer.tabIndex=-1,!D.config.noCalendar){if(e.appendChild((D.monthNav=se("div","flatpickr-months"),D.yearElements=[],D.monthElements=[],D.prevMonthNav=se("span","flatpickr-prev-month"),D.prevMonthNav.innerHTML=D.config.prevArrow,D.nextMonthNav=se("span","flatpickr-next-month"),D.nextMonthNav.innerHTML=D.config.nextArrow,x(),Object.defineProperty(D,"_hidePrevMonthArrow",{get:function(){return D.__hidePrevMonthArrow},set:function(e){D.__hidePrevMonthArrow!==e&&(de(D.prevMonthNav,"disabled",e),D.__hidePrevMonthArrow=e)}}),Object.defineProperty(D,"_hideNextMonthArrow",{get:function(){return D.__hideNextMonthArrow},set:function(e){D.__hideNextMonthArrow!==e&&(de(D.nextMonthNav,"disabled",e),D.__hideNextMonthArrow=e)}}),D.currentYearElement=D.yearElements[0],z(),D.monthNav)),D.innerContainer=se("div","flatpickr-innerContainer"),D.config.weekNumbers){var t=function(){D.calendarContainer.classList.add("hasWeeks");var e=se("div","flatpickr-weekwrapper");e.appendChild(se("span","flatpickr-weekday",D.l10n.weekAbbreviation));var t=se("div","flatpickr-weeks");return e.appendChild(t),{weekWrapper:e,weekNumbers:t}}(),n=t.weekWrapper,a=t.weekNumbers;D.innerContainer.appendChild(n),D.weekNumbers=a,D.weekWrapper=n}D.rContainer=se("div","flatpickr-rContainer"),D.rContainer.appendChild(E()),D.daysContainer||(D.daysContainer=se("div","flatpickr-days"),D.daysContainer.tabIndex=-1),C(),D.rContainer.appendChild(D.daysContainer),D.innerContainer.appendChild(D.rContainer),e.appendChild(D.innerContainer)}D.config.enableTime&&e.appendChild(function(){D.calendarContainer.classList.add("hasTime"),D.config.noCalendar&&D.calendarContainer.classList.add("noCalendar"),D.timeContainer=se("div","flatpickr-time"),D.timeContainer.tabIndex=-1;var e=se("span","flatpickr-time-separator",":"),t=fe("flatpickr-hour");D.hourElement=t.childNodes[0];var n=fe("flatpickr-minute");if(D.minuteElement=n.childNodes[0],D.hourElement.tabIndex=D.minuteElement.tabIndex=-1,D.hourElement.value=Z(D.latestSelectedDateObj?D.latestSelectedDateObj.getHours():D.config.time_24hr?D.config.defaultHour:function(e){switch(e%24){case 0:case 12:return 12;default:return e%12}}(D.config.defaultHour)),D.minuteElement.value=Z(D.latestSelectedDateObj?D.latestSelectedDateObj.getMinutes():D.config.defaultMinute),D.hourElement.setAttribute("data-step",D.config.hourIncrement.toString()),D.minuteElement.setAttribute("data-step",D.config.minuteIncrement.toString()),D.hourElement.setAttribute("data-min",D.config.time_24hr?"0":"1"),D.hourElement.setAttribute("data-max",D.config.time_24hr?"23":"12"),D.minuteElement.setAttribute("data-min","0"),D.minuteElement.setAttribute("data-max","59"),D.timeContainer.appendChild(t),D.timeContainer.appendChild(e),D.timeContainer.appendChild(n),D.config.time_24hr&&D.timeContainer.classList.add("time24hr"),D.config.enableSeconds){D.timeContainer.classList.add("hasSeconds");var a=fe("flatpickr-second");D.secondElement=a.childNodes[0],D.secondElement.value=Z(D.latestSelectedDateObj?D.latestSelectedDateObj.getSeconds():D.config.defaultSeconds),D.secondElement.setAttribute("data-step",D.minuteElement.getAttribute("data-step")),D.secondElement.setAttribute("data-min",D.minuteElement.getAttribute("data-min")),D.secondElement.setAttribute("data-max",D.minuteElement.getAttribute("data-max")),D.timeContainer.appendChild(se("span","flatpickr-time-separator",":")),D.timeContainer.appendChild(a)}return D.config.time_24hr||(D.amPM=se("span","flatpickr-am-pm",D.l10n.amPM[Q(11<(D.latestSelectedDateObj?D.hourElement.value:D.config.defaultHour))]),D.amPM.title=D.l10n.toggleTitle,D.amPM.tabIndex=-1,D.timeContainer.appendChild(D.amPM)),D.timeContainer}()),de(D.calendarContainer,"rangeMode","range"===D.config.mode),de(D.calendarContainer,"animate",!0===D.config.animate),de(D.calendarContainer,"multiMonth",1<D.config.showMonths),D.calendarContainer.appendChild(e);var i=void 0!==D.config.appendTo&&void 0!==D.config.appendTo.nodeType;if((D.config.inline||D.config.static)&&(D.calendarContainer.classList.add(D.config.inline?"inline":"static"),D.config.inline&&(!i&&D.element.parentNode?D.element.parentNode.insertBefore(D.calendarContainer,D._input.nextSibling):void 0!==D.config.appendTo&&D.config.appendTo.appendChild(D.calendarContainer)),D.config.static)){var o=se("div","flatpickr-wrapper");D.element.parentNode&&D.element.parentNode.insertBefore(o,D.element),o.appendChild(D.element),D.altInput&&o.appendChild(D.altInput),o.appendChild(D.calendarContainer)}D.config.static||D.config.inline||(void 0!==D.config.appendTo?D.config.appendTo:window.document.body).appendChild(D.calendarContainer)}(),function(){if(D.config.wrap&&["open","close","toggle","clear"].forEach(function(t){Array.prototype.forEach.call(D.element.querySelectorAll("[data-"+t+"]"),function(e){return o(e,"click",D[t])})}),D.isMobile)return function(){var e=D.config.enableTime?D.config.noCalendar?"time":"datetime-local":"date";D.mobileInput=se("input",D.input.className+" flatpickr-mobile"),D.mobileInput.step=D.input.getAttribute("step")||"any",D.mobileInput.tabIndex=1,D.mobileInput.type=e,D.mobileInput.disabled=D.input.disabled,D.mobileInput.required=D.input.required,D.mobileInput.placeholder=D.input.placeholder,D.mobileFormatStr="datetime-local"===e?"Y-m-d\\TH:i:S":"date"===e?"Y-m-d":"H:i:S",0<D.selectedDates.length&&(D.mobileInput.defaultValue=D.mobileInput.value=D.formatDate(D.selectedDates[0],D.mobileFormatStr)),D.config.minDate&&(D.mobileInput.min=D.formatDate(D.config.minDate,"Y-m-d")),D.config.maxDate&&(D.mobileInput.max=D.formatDate(D.config.maxDate,"Y-m-d")),D.input.type="hidden",void 0!==D.altInput&&(D.altInput.type="hidden");try{D.input.parentNode&&D.input.parentNode.insertBefore(D.mobileInput,D.input.nextSibling)}catch(e){}o(D.mobileInput,"change",function(e){D.setDate(e.target.value,!1,D.mobileFormatStr),U("onChange"),U("onClose")})}();var e=X(N,50);D._debouncedChange=X(p,me),D.daysContainer&&!/iPhone|iPad|iPod/i.test(navigator.userAgent)&&o(D.daysContainer,"mouseover",function(e){"range"===D.config.mode&&A(e.target)}),o(window.document.body,"keydown",F),D.config.static||o(D._input,"keydown",F),D.config.inline||D.config.static||o(window,"resize",e),void 0!==window.ontouchstart&&o(window.document,"touchstart",O),o(window.document,"mousedown",a(O)),o(window.document,"focus",O,{capture:!0}),!0===D.config.clickOpens&&(o(D._input,"focus",D.open),o(D._input,"mousedown",a(D.open))),void 0!==D.daysContainer&&(o(D.monthNav,"mousedown",a(V)),o(D.monthNav,["keyup","increment"],n),o(D.daysContainer,"mousedown",a(R))),void 0!==D.timeContainer&&void 0!==D.minuteElement&&void 0!==D.hourElement&&(o(D.timeContainer,["input","increment"],d),o(D.timeContainer,"mousedown",a(r)),o(D.timeContainer,["input","increment"],D._debouncedChange,{passive:!0}),o([D.hourElement,D.minuteElement],["focus","click"],function(e){return e.target.select()}),void 0!==D.secondElement&&o(D.secondElement,"focus",function(){return D.secondElement&&D.secondElement.select()}),void 0!==D.amPM&&o(D.amPM,"mousedown",a(function(e){d(e),p()})))}(),(D.selectedDates.length||D.config.noCalendar)&&(D.config.enableTime&&g(D.config.noCalendar?D.latestSelectedDateObj||D.config.minDate:void 0),G(!1)),t(),D.showTimeInput=0<D.selectedDates.length||D.config.noCalendar;var e=/^((?!chrome|android).)*safari/i.test(navigator.userAgent);!D.isMobile&&e&&H(),U("onReady")}(),D}function n(e,t){for(var n=Array.prototype.slice.call(e),a=[],i=0;i<n.length;i++){var o=n[i];try{if(null!==o.getAttribute("data-fp-omit"))continue;void 0!==o._flatpickr&&(o._flatpickr.destroy(),o._flatpickr=void 0),o._flatpickr=r(o,t||{}),a.push(o._flatpickr)}catch(e){console.error(e)}}return 1===a.length?a[0]:a}"undefined"!=typeof HTMLElement&&(HTMLCollection.prototype.flatpickr=NodeList.prototype.flatpickr=function(e){return n(this,e)},HTMLElement.prototype.flatpickr=function(e){return n([this],e)});var ge=function(e,t){return e instanceof NodeList?n(e,t):n("string"==typeof e?window.document.querySelectorAll(e):[e],t)};return ge.defaultConfig=b,ge.l10ns={en:Object.assign({},ae),default:Object.assign({},ae)},ge.localize=function(e){ge.l10ns.default=Object.assign({},ge.l10ns.default,e)},ge.setDefaults=function(e){ge.defaultConfig=Object.assign({},ge.defaultConfig,e)},ge.parseDate=oe({}),ge.formatDate=ie({}),ge.compareDates=re,"undefined"!=typeof jQuery&&(jQuery.fn.flatpickr=function(e){return n(this,e)}),Date.prototype.fp_incr=function(e){return new Date(this.getFullYear(),this.getMonth(),this.getDate()+("string"==typeof e?parseInt(e,10):e))},ge});
diff --git a/frontend/vendor/main.js b/frontend/vendor/main.js
index 263a40a71..68daaa8fc 100644
--- a/frontend/vendor/main.js
+++ b/frontend/vendor/main.js
@@ -1,5 +1,2 @@
-import './flatpickr';
-import './zepto';
-
 import './fontawesome.css';
 import './flatpickr.css';
diff --git a/frontend/vendor/zepto.js b/frontend/vendor/zepto.js
deleted file mode 100644
index ad43ef113..000000000
--- a/frontend/vendor/zepto.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Zepto v1.2.0 - zepto event ajax form ie - zeptojs.com/license */
-!function(t,e){"function"==typeof define&&define.amd?define(function(){return e(t)}):e(t)}(this,function(t){var e=function(){function $(t){return null==t?String(t):S[C.call(t)]||"object"}function F(t){return"function"==$(t)}function k(t){return null!=t&&t==t.window}function M(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function R(t){return"object"==$(t)}function Z(t){return R(t)&&!k(t)&&Object.getPrototypeOf(t)==Object.prototype}function z(t){var e=!!t&&"length"in t&&t.length,n=r.type(t);return"function"!=n&&!k(t)&&("array"==n||0===e||"number"==typeof e&&e>0&&e-1 in t)}function q(t){return a.call(t,function(t){return null!=t})}function H(t){return t.length>0?r.fn.concat.apply([],t):t}function I(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function V(t){return t in l?l[t]:l[t]=new RegExp("(^|\\s)"+t+"(\\s|$)")}function _(t,e){return"number"!=typeof e||h[I(t)]?e:e+"px"}function B(t){var e,n;return c[t]||(e=f.createElement(t),f.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),c[t]=n),c[t]}function U(t){return"children"in t?u.call(t.children):r.map(t.childNodes,function(t){return 1==t.nodeType?t:void 0})}function X(t,e){var n,r=t?t.length:0;for(n=0;r>n;n++)this[n]=t[n];this.length=r,this.selector=e||""}function J(t,r,i){for(n in r)i&&(Z(r[n])||L(r[n]))?(Z(r[n])&&!Z(t[n])&&(t[n]={}),L(r[n])&&!L(t[n])&&(t[n]=[]),J(t[n],r[n],i)):r[n]!==e&&(t[n]=r[n])}function W(t,e){return null==e?r(t):r(t).filter(e)}function Y(t,e,n,r){return F(e)?e.call(t,n,r):e}function G(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function K(t,n){var r=t.className||"",i=r&&r.baseVal!==e;return n===e?i?r.baseVal:r:void(i?r.baseVal=n:t.className=n)}function Q(t){try{return t?"true"==t||("false"==t?!1:"null"==t?null:+t+""==t?+t:/^[\[\{]/.test(t)?r.parseJSON(t):t):t}catch(e){return t}}function tt(t,e){e(t);for(var n=0,r=t.childNodes.length;r>n;n++)tt(t.childNodes[n],e)}var e,n,r,i,O,P,o=[],s=o.concat,a=o.filter,u=o.slice,f=t.document,c={},l={},h={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},p=/^\s*<(\w+|!)[^>]*>/,d=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,m=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,g=/^(?:body|html)$/i,v=/([A-Z])/g,y=["val","css","html","text","data","width","height","offset"],x=["after","prepend","before","append"],b=f.createElement("table"),E=f.createElement("tr"),j={tr:f.createElement("tbody"),tbody:b,thead:b,tfoot:b,td:E,th:E,"*":f.createElement("div")},w=/complete|loaded|interactive/,T=/^[\w-]*$/,S={},C=S.toString,N={},A=f.createElement("div"),D={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},L=Array.isArray||function(t){return t instanceof Array};return N.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.matches||t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var r,i=t.parentNode,o=!i;return o&&(i=A).appendChild(t),r=~N.qsa(i,e).indexOf(t),o&&A.removeChild(t),r},O=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},P=function(t){return a.call(t,function(e,n){return t.indexOf(e)==n})},N.fragment=function(t,n,i){var o,s,a;return d.test(t)&&(o=r(f.createElement(RegExp.$1))),o||(t.replace&&(t=t.replace(m,"<$1></$2>")),n===e&&(n=p.test(t)&&RegExp.$1),n in j||(n="*"),a=j[n],a.innerHTML=""+t,o=r.each(u.call(a.childNodes),function(){a.removeChild(this)})),Z(i)&&(s=r(o),r.each(i,function(t,e){y.indexOf(t)>-1?s[t](e):s.attr(t,e)})),o},N.Z=function(t,e){return new X(t,e)},N.isZ=function(t){return t instanceof N.Z},N.init=function(t,n){var i;if(!t)return N.Z();if("string"==typeof t)if(t=t.trim(),"<"==t[0]&&p.test(t))i=N.fragment(t,RegExp.$1,n),t=null;else{if(n!==e)return r(n).find(t);i=N.qsa(f,t)}else{if(F(t))return r(f).ready(t);if(N.isZ(t))return t;if(L(t))i=q(t);else if(R(t))i=[t],t=null;else if(p.test(t))i=N.fragment(t.trim(),RegExp.$1,n),t=null;else{if(n!==e)return r(n).find(t);i=N.qsa(f,t)}}return N.Z(i,t)},r=function(t,e){return N.init(t,e)},r.extend=function(t){var e,n=u.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){J(t,n,e)}),t},N.qsa=function(t,e){var n,r="#"==e[0],i=!r&&"."==e[0],o=r||i?e.slice(1):e,s=T.test(o);return t.getElementById&&s&&r?(n=t.getElementById(o))?[n]:[]:1!==t.nodeType&&9!==t.nodeType&&11!==t.nodeType?[]:u.call(s&&!r&&t.getElementsByClassName?i?t.getElementsByClassName(o):t.getElementsByTagName(e):t.querySelectorAll(e))},r.contains=f.documentElement.contains?function(t,e){return t!==e&&t.contains(e)}:function(t,e){for(;e&&(e=e.parentNode);)if(e===t)return!0;return!1},r.type=$,r.isFunction=F,r.isWindow=k,r.isArray=L,r.isPlainObject=Z,r.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},r.isNumeric=function(t){var e=Number(t),n=typeof t;return null!=t&&"boolean"!=n&&("string"!=n||t.length)&&!isNaN(e)&&isFinite(e)||!1},r.inArray=function(t,e,n){return o.indexOf.call(e,t,n)},r.camelCase=O,r.trim=function(t){return null==t?"":String.prototype.trim.call(t)},r.uuid=0,r.support={},r.expr={},r.noop=function(){},r.map=function(t,e){var n,i,o,r=[];if(z(t))for(i=0;i<t.length;i++)n=e(t[i],i),null!=n&&r.push(n);else for(o in t)n=e(t[o],o),null!=n&&r.push(n);return H(r)},r.each=function(t,e){var n,r;if(z(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(r in t)if(e.call(t[r],r,t[r])===!1)return t;return t},r.grep=function(t,e){return a.call(t,e)},t.JSON&&(r.parseJSON=JSON.parse),r.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){S["[object "+e+"]"]=e.toLowerCase()}),r.fn={constructor:N.Z,length:0,forEach:o.forEach,reduce:o.reduce,push:o.push,sort:o.sort,splice:o.splice,indexOf:o.indexOf,concat:function(){var t,e,n=[];for(t=0;t<arguments.length;t++)e=arguments[t],n[t]=N.isZ(e)?e.toArray():e;return s.apply(N.isZ(this)?this.toArray():this,n)},map:function(t){return r(r.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return r(u.apply(this,arguments))},ready:function(t){return w.test(f.readyState)&&f.body?t(r):f.addEventListener("DOMContentLoaded",function(){t(r)},!1),this},get:function(t){return t===e?u.call(this):this[t>=0?t:t+this.length]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return o.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return F(t)?this.not(this.not(t)):r(a.call(this,function(e){return N.matches(e,t)}))},add:function(t,e){return r(P(this.concat(r(t,e))))},is:function(t){return this.length>0&&N.matches(this[0],t)},not:function(t){var n=[];if(F(t)&&t.call!==e)this.each(function(e){t.call(this,e)||n.push(this)});else{var i="string"==typeof t?this.filter(t):z(t)&&F(t.item)?u.call(t):r(t);this.forEach(function(t){i.indexOf(t)<0&&n.push(t)})}return r(n)},has:function(t){return this.filter(function(){return R(t)?r.contains(this,t):r(this).find(t).size()})},eq:function(t){return-1===t?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!R(t)?t:r(t)},last:function(){var t=this[this.length-1];return t&&!R(t)?t:r(t)},find:function(t){var e,n=this;return e=t?"object"==typeof t?r(t).filter(function(){var t=this;return o.some.call(n,function(e){return r.contains(e,t)})}):1==this.length?r(N.qsa(this[0],t)):this.map(function(){return N.qsa(this,t)}):r()},closest:function(t,e){var n=[],i="object"==typeof t&&r(t);return this.each(function(r,o){for(;o&&!(i?i.indexOf(o)>=0:N.matches(o,t));)o=o!==e&&!M(o)&&o.parentNode;o&&n.indexOf(o)<0&&n.push(o)}),r(n)},parents:function(t){for(var e=[],n=this;n.length>0;)n=r.map(n,function(t){return(t=t.parentNode)&&!M(t)&&e.indexOf(t)<0?(e.push(t),t):void 0});return W(e,t)},parent:function(t){return W(P(this.pluck("parentNode")),t)},children:function(t){return W(this.map(function(){return U(this)}),t)},contents:function(){return this.map(function(){return this.contentDocument||u.call(this.childNodes)})},siblings:function(t){return W(this.map(function(t,e){return a.call(U(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return r.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=B(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var e=F(t);if(this[0]&&!e)var n=r(t).get(0),i=n.parentNode||this.length>1;return this.each(function(o){r(this).wrapAll(e?t.call(this,o):i?n.cloneNode(!0):n)})},wrapAll:function(t){if(this[0]){r(this[0]).before(t=r(t));for(var e;(e=t.children()).length;)t=e.first();r(t).append(this)}return this},wrapInner:function(t){var e=F(t);return this.each(function(n){var i=r(this),o=i.contents(),s=e?t.call(this,n):t;o.length?o.wrapAll(s):i.append(s)})},unwrap:function(){return this.parent().each(function(){r(this).replaceWith(r(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(t){return this.each(function(){var n=r(this);(t===e?"none"==n.css("display"):t)?n.show():n.hide()})},prev:function(t){return r(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return r(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0 in arguments?this.each(function(e){var n=this.innerHTML;r(this).empty().append(Y(this,t,e,n))}):0 in this?this[0].innerHTML:null},text:function(t){return 0 in arguments?this.each(function(e){var n=Y(this,t,e,this.textContent);this.textContent=null==n?"":""+n}):0 in this?this.pluck("textContent").join(""):null},attr:function(t,r){var i;return"string"!=typeof t||1 in arguments?this.each(function(e){if(1===this.nodeType)if(R(t))for(n in t)G(this,n,t[n]);else G(this,t,Y(this,r,e,this.getAttribute(t)))}):0 in this&&1==this[0].nodeType&&null!=(i=this[0].getAttribute(t))?i:e},removeAttr:function(t){return this.each(function(){1===this.nodeType&&t.split(" ").forEach(function(t){G(this,t)},this)})},prop:function(t,e){return t=D[t]||t,1 in arguments?this.each(function(n){this[t]=Y(this,e,n,this[t])}):this[0]&&this[0][t]},removeProp:function(t){return t=D[t]||t,this.each(function(){delete this[t]})},data:function(t,n){var r="data-"+t.replace(v,"-$1").toLowerCase(),i=1 in arguments?this.attr(r,n):this.attr(r);return null!==i?Q(i):e},val:function(t){return 0 in arguments?(null==t&&(t=""),this.each(function(e){this.value=Y(this,t,e,this.value)})):this[0]&&(this[0].multiple?r(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value)},offset:function(e){if(e)return this.each(function(t){var n=r(this),i=Y(this,e,t,n.offset()),o=n.offsetParent().offset(),s={top:i.top-o.top,left:i.left-o.left};"static"==n.css("position")&&(s.position="relative"),n.css(s)});if(!this.length)return null;if(f.documentElement!==this[0]&&!r.contains(f.documentElement,this[0]))return{top:0,left:0};var n=this[0].getBoundingClientRect();return{left:n.left+t.pageXOffset,top:n.top+t.pageYOffset,width:Math.round(n.width),height:Math.round(n.height)}},css:function(t,e){if(arguments.length<2){var i=this[0];if("string"==typeof t){if(!i)return;return i.style[O(t)]||getComputedStyle(i,"").getPropertyValue(t)}if(L(t)){if(!i)return;var o={},s=getComputedStyle(i,"");return r.each(t,function(t,e){o[e]=i.style[O(e)]||s.getPropertyValue(e)}),o}}var a="";if("string"==$(t))e||0===e?a=I(t)+":"+_(t,e):this.each(function(){this.style.removeProperty(I(t))});else for(n in t)t[n]||0===t[n]?a+=I(n)+":"+_(n,t[n])+";":this.each(function(){this.style.removeProperty(I(n))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(r(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return t?o.some.call(this,function(t){return this.test(K(t))},V(t)):!1},addClass:function(t){return t?this.each(function(e){if("className"in this){i=[];var n=K(this),o=Y(this,t,e,n);o.split(/\s+/g).forEach(function(t){r(this).hasClass(t)||i.push(t)},this),i.length&&K(this,n+(n?" ":"")+i.join(" "))}}):this},removeClass:function(t){return this.each(function(n){if("className"in this){if(t===e)return K(this,"");i=K(this),Y(this,t,n,i).split(/\s+/g).forEach(function(t){i=i.replace(V(t)," ")}),K(this,i.trim())}})},toggleClass:function(t,n){return t?this.each(function(i){var o=r(this),s=Y(this,t,i,K(this));s.split(/\s+/g).forEach(function(t){(n===e?!o.hasClass(t):n)?o.addClass(t):o.removeClass(t)})}):this},scrollTop:function(t){if(this.length){var n="scrollTop"in this[0];return t===e?n?this[0].scrollTop:this[0].pageYOffset:this.each(n?function(){this.scrollTop=t}:function(){this.scrollTo(this.scrollX,t)})}},scrollLeft:function(t){if(this.length){var n="scrollLeft"in this[0];return t===e?n?this[0].scrollLeft:this[0].pageXOffset:this.each(n?function(){this.scrollLeft=t}:function(){this.scrollTo(t,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),n=this.offset(),i=g.test(e[0].nodeName)?{top:0,left:0}:e.offset();return n.top-=parseFloat(r(t).css("margin-top"))||0,n.left-=parseFloat(r(t).css("margin-left"))||0,i.top+=parseFloat(r(e[0]).css("border-top-width"))||0,i.left+=parseFloat(r(e[0]).css("border-left-width"))||0,{top:n.top-i.top,left:n.left-i.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||f.body;t&&!g.test(t.nodeName)&&"static"==r(t).css("position");)t=t.offsetParent;return t})}},r.fn.detach=r.fn.remove,["width","height"].forEach(function(t){var n=t.replace(/./,function(t){return t[0].toUpperCase()});r.fn[t]=function(i){var o,s=this[0];return i===e?k(s)?s["inner"+n]:M(s)?s.documentElement["scroll"+n]:(o=this.offset())&&o[t]:this.each(function(e){s=r(this),s.css(t,Y(this,i,e,s[t]()))})}}),x.forEach(function(n,i){var o=i%2;r.fn[n]=function(){var n,a,s=r.map(arguments,function(t){var i=[];return n=$(t),"array"==n?(t.forEach(function(t){return t.nodeType!==e?i.push(t):r.zepto.isZ(t)?i=i.concat(t.get()):void(i=i.concat(N.fragment(t)))}),i):"object"==n||null==t?t:N.fragment(t)}),u=this.length>1;return s.length<1?this:this.each(function(e,n){a=o?n:n.parentNode,n=0==i?n.nextSibling:1==i?n.firstChild:2==i?n:null;var c=r.contains(f.documentElement,a);s.forEach(function(e){if(u)e=e.cloneNode(!0);else if(!a)return r(e).remove();a.insertBefore(e,n),c&&tt(e,function(e){if(!(null==e.nodeName||"SCRIPT"!==e.nodeName.toUpperCase()||e.type&&"text/javascript"!==e.type||e.src)){var n=e.ownerDocument?e.ownerDocument.defaultView:t;n.eval.call(n,e.innerHTML)}})})})},r.fn[o?n+"To":"insert"+(i?"Before":"After")]=function(t){return r(t)[n](this),this}}),N.Z.prototype=X.prototype=r.fn,N.uniq=P,N.deserializeValue=Q,r.zepto=N,r}();return t.Zepto=e,void 0===t.$&&(t.$=e),function(e){function h(t){return t._zid||(t._zid=n++)}function p(t,e,n,r){if(e=d(e),e.ns)var i=m(e.ns);return(a[h(t)]||[]).filter(function(t){return t&&(!e.e||t.e==e.e)&&(!e.ns||i.test(t.ns))&&(!n||h(t.fn)===h(n))&&(!r||t.sel==r)})}function d(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function m(t){return new RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function g(t,e){return t.del&&!f&&t.e in c||!!e}function v(t){return l[t]||f&&c[t]||t}function y(t,n,i,o,s,u,f){var c=h(t),p=a[c]||(a[c]=[]);n.split(/\s/).forEach(function(n){if("ready"==n)return e(document).ready(i);var a=d(n);a.fn=i,a.sel=s,a.e in l&&(i=function(t){var n=t.relatedTarget;return!n||n!==this&&!e.contains(this,n)?a.fn.apply(this,arguments):void 0}),a.del=u;var c=u||i;a.proxy=function(e){if(e=T(e),!e.isImmediatePropagationStopped()){e.data=o;var n=c.apply(t,e._args==r?[e]:[e].concat(e._args));return n===!1&&(e.preventDefault(),e.stopPropagation()),n}},a.i=p.length,p.push(a),"addEventListener"in t&&t.addEventListener(v(a.e),a.proxy,g(a,f))})}function x(t,e,n,r,i){var o=h(t);(e||"").split(/\s/).forEach(function(e){p(t,e,n,r).forEach(function(e){delete a[o][e.i],"removeEventListener"in t&&t.removeEventListener(v(e.e),e.proxy,g(e,i))})})}function T(t,n){return(n||!t.isDefaultPrevented)&&(n||(n=t),e.each(w,function(e,r){var i=n[e];t[e]=function(){return this[r]=b,i&&i.apply(n,arguments)},t[r]=E}),t.timeStamp||(t.timeStamp=Date.now()),(n.defaultPrevented!==r?n.defaultPrevented:"returnValue"in n?n.returnValue===!1:n.getPreventDefault&&n.getPreventDefault())&&(t.isDefaultPrevented=b)),t}function S(t){var e,n={originalEvent:t};for(e in t)j.test(e)||t[e]===r||(n[e]=t[e]);return T(n,t)}var r,n=1,i=Array.prototype.slice,o=e.isFunction,s=function(t){return"string"==typeof t},a={},u={},f="onfocusin"in t,c={focus:"focusin",blur:"focusout"},l={mouseenter:"mouseover",mouseleave:"mouseout"};u.click=u.mousedown=u.mouseup=u.mousemove="MouseEvents",e.event={add:y,remove:x},e.proxy=function(t,n){var r=2 in arguments&&i.call(arguments,2);if(o(t)){var a=function(){return t.apply(n,r?r.concat(i.call(arguments)):arguments)};return a._zid=h(t),a}if(s(n))return r?(r.unshift(t[n],t),e.proxy.apply(null,r)):e.proxy(t[n],t);throw new TypeError("expected function")},e.fn.bind=function(t,e,n){return this.on(t,e,n)},e.fn.unbind=function(t,e){return this.off(t,e)},e.fn.one=function(t,e,n,r){return this.on(t,e,n,r,1)};var b=function(){return!0},E=function(){return!1},j=/^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/,w={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};e.fn.delegate=function(t,e,n){return this.on(e,t,n)},e.fn.undelegate=function(t,e,n){return this.off(e,t,n)},e.fn.live=function(t,n){return e(document.body).delegate(this.selector,t,n),this},e.fn.die=function(t,n){return e(document.body).undelegate(this.selector,t,n),this},e.fn.on=function(t,n,a,u,f){var c,l,h=this;return t&&!s(t)?(e.each(t,function(t,e){h.on(t,n,a,e,f)}),h):(s(n)||o(u)||u===!1||(u=a,a=n,n=r),(u===r||a===!1)&&(u=a,a=r),u===!1&&(u=E),h.each(function(r,o){f&&(c=function(t){return x(o,t.type,u),u.apply(this,arguments)}),n&&(l=function(t){var r,s=e(t.target).closest(n,o).get(0);return s&&s!==o?(r=e.extend(S(t),{currentTarget:s,liveFired:o}),(c||u).apply(s,[r].concat(i.call(arguments,1)))):void 0}),y(o,t,u,a,n,l||c)}))},e.fn.off=function(t,n,i){var a=this;return t&&!s(t)?(e.each(t,function(t,e){a.off(t,n,e)}),a):(s(n)||o(i)||i===!1||(i=n,n=r),i===!1&&(i=E),a.each(function(){x(this,t,i,n)}))},e.fn.trigger=function(t,n){return t=s(t)||e.isPlainObject(t)?e.Event(t):T(t),t._args=n,this.each(function(){t.type in c&&"function"==typeof this[t.type]?this[t.type]():"dispatchEvent"in this?this.dispatchEvent(t):e(this).triggerHandler(t,n)})},e.fn.triggerHandler=function(t,n){var r,i;return this.each(function(o,a){r=S(s(t)?e.Event(t):t),r._args=n,r.target=a,e.each(p(a,t.type||t),function(t,e){return i=e.proxy(r),r.isImmediatePropagationStopped()?!1:void 0})}),i},"focusin focusout focus blur load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(t){e.fn[t]=function(e){return 0 in arguments?this.bind(t,e):this.trigger(t)}}),e.Event=function(t,e){s(t)||(e=t,t=e.type);var n=document.createEvent(u[t]||"Events"),r=!0;if(e)for(var i in e)"bubbles"==i?r=!!e[i]:n[i]=e[i];return n.initEvent(t,r,!0),T(n)}}(e),function(e){function p(t,n,r){var i=e.Event(n);return e(t).trigger(i,r),!i.isDefaultPrevented()}function d(t,e,n,i){return t.global?p(e||r,n,i):void 0}function m(t){t.global&&0===e.active++&&d(t,null,"ajaxStart")}function g(t){t.global&&!--e.active&&d(t,null,"ajaxStop")}function v(t,e){var n=e.context;return e.beforeSend.call(n,t,e)===!1||d(e,n,"ajaxBeforeSend",[t,e])===!1?!1:void d(e,n,"ajaxSend",[t,e])}function y(t,e,n,r){var i=n.context,o="success";n.success.call(i,t,o,e),r&&r.resolveWith(i,[t,o,e]),d(n,i,"ajaxSuccess",[e,n,t]),b(o,e,n)}function x(t,e,n,r,i){var o=r.context;r.error.call(o,n,e,t),i&&i.rejectWith(o,[n,e,t]),d(r,o,"ajaxError",[n,r,t||e]),b(e,n,r)}function b(t,e,n){var r=n.context;n.complete.call(r,e,t),d(n,r,"ajaxComplete",[e,n]),g(n)}function E(t,e,n){if(n.dataFilter==j)return t;var r=n.context;return n.dataFilter.call(r,t,e)}function j(){}function w(t){return t&&(t=t.split(";",2)[0]),t&&(t==c?"html":t==f?"json":a.test(t)?"script":u.test(t)&&"xml")||"text"}function T(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function S(t){t.processData&&t.data&&"string"!=e.type(t.data)&&(t.data=e.param(t.data,t.traditional)),!t.data||t.type&&"GET"!=t.type.toUpperCase()&&"jsonp"!=t.dataType||(t.url=T(t.url,t.data),t.data=void 0)}function C(t,n,r,i){return e.isFunction(n)&&(i=r,r=n,n=void 0),e.isFunction(r)||(i=r,r=void 0),{url:t,data:n,success:r,dataType:i}}function O(t,n,r,i){var o,s=e.isArray(n),a=e.isPlainObject(n);e.each(n,function(n,u){o=e.type(u),i&&(n=r?i:i+"["+(a||"object"==o||"array"==o?n:"")+"]"),!i&&s?t.add(u.name,u.value):"array"==o||!r&&"object"==o?O(t,u,r,n):t.add(n,u)})}var i,o,n=+new Date,r=t.document,s=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,a=/^(?:text|application)\/javascript/i,u=/^(?:text|application)\/xml/i,f="application/json",c="text/html",l=/^\s*$/,h=r.createElement("a");h.href=t.location.href,e.active=0,e.ajaxJSONP=function(i,o){if(!("type"in i))return e.ajax(i);var c,p,s=i.jsonpCallback,a=(e.isFunction(s)?s():s)||"Zepto"+n++,u=r.createElement("script"),f=t[a],l=function(t){e(u).triggerHandler("error",t||"abort")},h={abort:l};return o&&o.promise(h),e(u).on("load error",function(n,r){clearTimeout(p),e(u).off().remove(),"error"!=n.type&&c?y(c[0],h,i,o):x(null,r||"error",h,i,o),t[a]=f,c&&e.isFunction(f)&&f(c[0]),f=c=void 0}),v(h,i)===!1?(l("abort"),h):(t[a]=function(){c=arguments},u.src=i.url.replace(/\?(.+)=\?/,"?$1="+a),r.head.appendChild(u),i.timeout>0&&(p=setTimeout(function(){l("timeout")},i.timeout)),h)},e.ajaxSettings={type:"GET",beforeSend:j,success:j,error:j,complete:j,context:null,global:!0,xhr:function(){return new t.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:f,xml:"application/xml, text/xml",html:c,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0,dataFilter:j},e.ajax=function(n){var u,f,s=e.extend({},n||{}),a=e.Deferred&&e.Deferred();for(i in e.ajaxSettings)void 0===s[i]&&(s[i]=e.ajaxSettings[i]);m(s),s.crossDomain||(u=r.createElement("a"),u.href=s.url,u.href=u.href,s.crossDomain=h.protocol+"//"+h.host!=u.protocol+"//"+u.host),s.url||(s.url=t.location.toString()),(f=s.url.indexOf("#"))>-1&&(s.url=s.url.slice(0,f)),S(s);var c=s.dataType,p=/\?.+=\?/.test(s.url);if(p&&(c="jsonp"),s.cache!==!1&&(n&&n.cache===!0||"script"!=c&&"jsonp"!=c)||(s.url=T(s.url,"_="+Date.now())),"jsonp"==c)return p||(s.url=T(s.url,s.jsonp?s.jsonp+"=?":s.jsonp===!1?"":"callback=?")),e.ajaxJSONP(s,a);var P,d=s.accepts[c],g={},b=function(t,e){g[t.toLowerCase()]=[t,e]},C=/^([\w-]+:)\/\//.test(s.url)?RegExp.$1:t.location.protocol,N=s.xhr(),O=N.setRequestHeader;if(a&&a.promise(N),s.crossDomain||b("X-Requested-With","XMLHttpRequest"),b("Accept",d||"*/*"),(d=s.mimeType||d)&&(d.indexOf(",")>-1&&(d=d.split(",",2)[0]),N.overrideMimeType&&N.overrideMimeType(d)),(s.contentType||s.contentType!==!1&&s.data&&"GET"!=s.type.toUpperCase())&&b("Content-Type",s.contentType||"application/x-www-form-urlencoded"),s.headers)for(o in s.headers)b(o,s.headers[o]);if(N.setRequestHeader=b,N.onreadystatechange=function(){if(4==N.readyState){N.onreadystatechange=j,clearTimeout(P);var t,n=!1;if(N.status>=200&&N.status<300||304==N.status||0==N.status&&"file:"==C){if(c=c||w(s.mimeType||N.getResponseHeader("content-type")),"arraybuffer"==N.responseType||"blob"==N.responseType)t=N.response;else{t=N.responseText;try{t=E(t,c,s),"script"==c?(1,eval)(t):"xml"==c?t=N.responseXML:"json"==c&&(t=l.test(t)?null:e.parseJSON(t))}catch(r){n=r}if(n)return x(n,"parsererror",N,s,a)}y(t,N,s,a)}else x(N.statusText||null,N.status?"error":"abort",N,s,a)}},v(N,s)===!1)return N.abort(),x(null,"abort",N,s,a),N;var A="async"in s?s.async:!0;if(N.open(s.type,s.url,A,s.username,s.password),s.xhrFields)for(o in s.xhrFields)N[o]=s.xhrFields[o];for(o in g)O.apply(N,g[o]);return s.timeout>0&&(P=setTimeout(function(){N.onreadystatechange=j,N.abort(),x(null,"timeout",N,s,a)},s.timeout)),N.send(s.data?s.data:null),N},e.get=function(){return e.ajax(C.apply(null,arguments))},e.post=function(){var t=C.apply(null,arguments);return t.type="POST",e.ajax(t)},e.getJSON=function(){var t=C.apply(null,arguments);return t.dataType="json",e.ajax(t)},e.fn.load=function(t,n,r){if(!this.length)return this;var a,i=this,o=t.split(/\s/),u=C(t,n,r),f=u.success;return o.length>1&&(u.url=o[0],a=o[1]),u.success=function(t){i.html(a?e("<div>").html(t.replace(s,"")).find(a):t),f&&f.apply(i,arguments)},e.ajax(u),this};var N=encodeURIComponent;e.param=function(t,n){var r=[];return r.add=function(t,n){e.isFunction(n)&&(n=n()),null==n&&(n=""),this.push(N(t)+"="+N(n))},O(r,t,n),r.join("&").replace(/%20/g,"+")}}(e),function(t){t.fn.serializeArray=function(){var e,n,r=[],i=function(t){return t.forEach?t.forEach(i):void r.push({name:e,value:t})};return this[0]&&t.each(this[0].elements,function(r,o){n=o.type,e=o.name,e&&"fieldset"!=o.nodeName.toLowerCase()&&!o.disabled&&"submit"!=n&&"reset"!=n&&"button"!=n&&"file"!=n&&("radio"!=n&&"checkbox"!=n||o.checked)&&i(t(o).val())}),r},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(0 in arguments)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(e),function(){try{getComputedStyle(void 0)}catch(e){var n=getComputedStyle;t.getComputedStyle=function(t,e){try{return n(t,e)}catch(r){return null}}}}(),e});
diff --git a/package-lock.json b/package-lock.json
index 68363cdde..5e089118d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2411,9 +2411,9 @@
       "dev": true
     },
     "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
     "camelcase-keys": {
@@ -2424,6 +2424,14 @@
       "requires": {
         "camelcase": "^2.0.0",
         "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        }
       }
     },
     "caniuse-lite": {
@@ -2912,72 +2920,28 @@
       }
     },
     "css-loader": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.0.tgz",
-      "integrity": "sha512-MoOu+CStsGrSt5K2OeZ89q3Snf+IkxRfAIt9aAKg4piioTrhtP1iEFPu+OVn3Ohz24FO6L+rw9UJxBILiSBw5Q==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
+      "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
       "dev": true,
       "requires": {
-        "icss-utils": "^4.0.0",
-        "loader-utils": "^1.2.1",
-        "lodash": "^4.17.11",
-        "postcss": "^7.0.6",
+        "camelcase": "^5.2.0",
+        "icss-utils": "^4.1.0",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.14",
         "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^2.0.3",
-        "postcss-modules-scope": "^2.0.0",
+        "postcss-modules-local-by-default": "^2.0.6",
+        "postcss-modules-scope": "^2.1.0",
         "postcss-modules-values": "^2.0.0",
         "postcss-value-parser": "^3.3.0",
         "schema-utils": "^1.0.0"
       }
     },
-    "css-selector-tokenizer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
-      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        },
-        "regexpu-core": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
-          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.2.1",
-            "regjsgen": "^0.2.0",
-            "regjsparser": "^0.1.4"
-          }
-        },
-        "regjsgen": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-          "dev": true
-        },
-        "regjsparser": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-          "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
-        }
-      }
-    },
     "cssesc": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
-      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true
     },
     "currently-unhandled": {
@@ -3663,12 +3627,6 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
-    "fastparse": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
-      "dev": true
-    },
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -3787,6 +3745,11 @@
         "write": "1.0.3"
       }
     },
+    "flatpickr": {
+      "version": "4.5.7",
+      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.5.7.tgz",
+      "integrity": "sha512-JqPfihUc9A/j9QAsh6otoARmMyUauPE17vRBEG+ThJwbl8zAq4ssGpxlPK3wWM/i8EFxkHg9UuVo0ds7XluKxw=="
+    },
     "flatted": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
@@ -4414,9 +4377,9 @@
       }
     },
     "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -4934,6 +4897,12 @@
       "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
       "dev": true
     },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
     "indexof": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
@@ -5666,24 +5635,6 @@
       "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
       "dev": true
     },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "lodash.mergewith": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
-      "dev": true
-    },
     "lodash.tail": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
@@ -6165,9 +6116,9 @@
       }
     },
     "node-sass": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
-      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
+      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -6177,12 +6128,10 @@
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
         "in-publish": "^2.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.clonedeep": "^4.3.2",
-        "lodash.mergewith": "^4.6.0",
+        "lodash": "^4.17.11",
         "meow": "^3.7.0",
         "mkdirp": "^0.5.1",
-        "nan": "^2.10.0",
+        "nan": "^2.13.2",
         "node-gyp": "^3.8.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
@@ -6822,24 +6771,24 @@
       }
     },
     "postcss-modules-local-by-default": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.5.tgz",
-      "integrity": "sha512-iFgxlCAVLno5wIJq+4hyuOmc4VjZEZxzpdeuZcBytLNWEK5Bx2oRF9PPcAz5TALbaFvrZm8sJYtJ3hV+tMSEIg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
+      "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "^0.7.0",
         "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0",
         "postcss-value-parser": "^3.3.1"
       }
     },
     "postcss-modules-scope": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.0.1.tgz",
-      "integrity": "sha512-7+6k9c3/AuZ5c596LJx9n923A/j3nF3ormewYBF1RrIQvjvjXe1xE8V8A1KFyFwXbvnshT6FBZFX0k/F1igneg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz",
+      "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^7.0.6"
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
       }
     },
     "postcss-modules-values": {
@@ -6852,6 +6801,17 @@
         "postcss": "^7.0.6"
       }
     },
+    "postcss-selector-parser": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
+      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
     "postcss-value-parser": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
@@ -8060,13 +8020,13 @@
       "dev": true
     },
     "tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "dev": true,
       "requires": {
         "block-stream": "*",
-        "fstream": "^1.0.2",
+        "fstream": "^1.0.12",
         "inherits": "2"
       }
     },
@@ -8331,19 +8291,20 @@
       }
     },
     "uglifyjs-webpack-plugin": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.0.1.tgz",
-      "integrity": "sha512-1HhCHkOB6wRCcv7htcz1QRPVbWPEY074RP9vzt/X0LF4xXm9l4YGd0qja7z88abDixQlnVwBjXsTBs+Xsn/eeQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.1.3.tgz",
+      "integrity": "sha512-/lRkCaFbI6pT3CxsQHDhBcqB6tocOnqba0vJqJ2DzSWFLRgOIiip8q0nVFydyXk+n8UtF7ZuS6hvWopcYH5FuA==",
       "dev": true,
       "requires": {
-        "cacache": "^11.2.0",
-        "find-cache-dir": "^2.0.0",
+        "cacache": "^11.3.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
         "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.4.0",
+        "serialize-javascript": "^1.7.0",
         "source-map": "^0.6.1",
-        "uglify-js": "^3.0.0",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "uglify-js": "^3.5.12",
+        "webpack-sources": "^1.3.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
         "source-map": {
@@ -8417,6 +8378,12 @@
         }
       }
     },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
     "unique-filename": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
diff --git a/package.json b/package.json
index 2f7e02ac6..7e8e619b0 100644
--- a/package.json
+++ b/package.json
@@ -31,18 +31,21 @@
     "babel-loader": "^8.0.6",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-preset-es2015": "^6.24.1",
-    "css-loader": "^2.1.0",
+    "css-loader": "^2.1.1",
     "eslint": "^5.16.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "husky": "^2.3.0",
     "lint-staged": "^8.1.7",
-    "node-sass": "^4.11.0",
+    "node-sass": "^4.12.0",
     "postcss-loader": "^3.0.0",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
-    "uglifyjs-webpack-plugin": "^2.0.1",
+    "uglifyjs-webpack-plugin": "^2.1.3",
     "watch": "^1.0.2",
     "webpack": "^4.32.2",
     "webpack-cli": "^3.3.2"
+  },
+  "dependencies": {
+    "flatpickr": "^4.5.7"
   }
 }
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 412c6cc38..f88913801 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1329,7 +1329,7 @@ siteLayout' headingOverride widget = do
       addStylesheet $ StaticR bundles_css_main_css
       -- JavaScript
       addScript $ StaticR bundles_js_polyfills_js
-      -- addScript $ StaticR bundles_js_vendor_js
+      addScript $ StaticR bundles_js_vendor_js
       addScript $ StaticR bundles_js_main_js
       -- widgets
       $(widgetFile "default-layout")

From e83df05a6964d14c33e026ebbecb4b44ae46fb99 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 26 May 2019 12:45:43 +0200
Subject: [PATCH 390/519] Log watchdog/status interactions

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

diff --git a/src/Application.hs b/src/Application.hs
index a4112003d..8113f74f8 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -425,7 +425,7 @@ appMain = runResourceT $ do
         Just wInterval
           | maybe True (== myProcessID) watchdogProcess
             -> let notifyWatchdog :: IO ()
-                   notifyWatchdog = forever $ do
+                   notifyWatchdog = runAppLoggingT foundation . forever $ do
                      d <- liftIO . newDelay . floor $ wInterval % 2
 
                      status <- atomically $ asum
@@ -438,14 +438,16 @@ appMain = runResourceT $ do
                        ]
 
                      case status of
-                       Just (_, Min status') -> void . Systemd.notifyStatus . unpack $ toPathPiece status'
+                       Just (_, Min status') -> do
+                         $logInfoS "NotifyStatus" $ toPathPiece status'
+                         liftIO . void . Systemd.notifyStatus . unpack $ toPathPiece status'
                        Nothing -> return ()
 
                      case status of
-                       Just (_, Min HealthSuccess)
-                         -> void Systemd.notifyWatchdog
-                       _other
-                         -> return ()
+                       Just (_, Min HealthSuccess) -> do
+                         $logInfoS "NotifyWatchdog" "Notify"
+                         liftIO $ void Systemd.notifyWatchdog
+                       _other -> return ()
                 in void $ allocate (async notifyWatchdog >>= \a -> a <$ link a) cancel
         _other -> return ()
 

From 679fb7cf9b3913645d39522b7efc0506e36d2245 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 26 May 2019 13:09:12 +0200
Subject: [PATCH 391/519] Fix notification delay

---
 src/Application.hs | 47 ++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/Application.hs b/src/Application.hs
index 8113f74f8..b0eddd7ec 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -425,29 +425,36 @@ appMain = runResourceT $ do
         Just wInterval
           | maybe True (== myProcessID) watchdogProcess
             -> let notifyWatchdog :: IO ()
-                   notifyWatchdog = runAppLoggingT foundation . forever $ do
-                     d <- liftIO . newDelay . floor $ wInterval % 2
+                   notifyWatchdog = runAppLoggingT foundation $ go Nothing
+                     where
+                       go pStatus = do
+                         d <- liftIO . newDelay . floor $ wInterval % 2
 
-                     status <- atomically $ asum
-                       [ Nothing <$ waitDelay d
-                       , Just <$> do
-                           results <- readTVar $ foundation ^. _appHealthReport
-                           case fromNullable results of
-                             Nothing -> retry
-                             Just rs -> return $ ofoldMap1 (Max *** Min . healthReportStatus) rs
-                       ]
+                         status <- atomically $ asum
+                           [ Nothing <$ waitDelay d
+                           , Just <$> do
+                               results <- readTVar $ foundation ^. _appHealthReport
+                               case fromNullable results of
+                                 Nothing -> retry
+                                 Just rs -> do
+                                   let status = ofoldMap1 (Max *** Min . healthReportStatus) rs
+                                   guard $ maybe True (/= status) pStatus
+                                   return status
+                           ]
 
-                     case status of
-                       Just (_, Min status') -> do
-                         $logInfoS "NotifyStatus" $ toPathPiece status'
-                         liftIO . void . Systemd.notifyStatus . unpack $ toPathPiece status'
-                       Nothing -> return ()
+                         case status of
+                           Just (_, Min status') -> do
+                             $logInfoS "NotifyStatus" $ toPathPiece status'
+                             liftIO . void . Systemd.notifyStatus . unpack $ toPathPiece status'
+                           Nothing -> return ()
 
-                     case status of
-                       Just (_, Min HealthSuccess) -> do
-                         $logInfoS "NotifyWatchdog" "Notify"
-                         liftIO $ void Systemd.notifyWatchdog
-                       _other -> return ()
+                         case status of
+                           Just (_, Min HealthSuccess) -> do
+                             $logInfoS "NotifyWatchdog" "Notify"
+                             liftIO $ void Systemd.notifyWatchdog
+                           _other -> return ()
+
+                         go status
                 in void $ allocate (async notifyWatchdog >>= \a -> a <$ link a) cancel
         _other -> return ()
 

From 4a621cbb2f3e5ec50c47a9c6cf028e432deb44b6 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 26 May 2019 13:40:03 +0200
Subject: [PATCH 392/519] Hlint

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

diff --git a/src/Application.hs b/src/Application.hs
index b0eddd7ec..bf7927e51 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -438,7 +438,7 @@ appMain = runResourceT $ do
                                  Nothing -> retry
                                  Just rs -> do
                                    let status = ofoldMap1 (Max *** Min . healthReportStatus) rs
-                                   guard $ maybe True (/= status) pStatus
+                                   guard $ pStatus /= Just status
                                    return status
                            ]
 

From 1bc0170bc2b222aa2ffc9df55157493f8ca425f2 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 26 May 2019 16:46:16 +0200
Subject: [PATCH 393/519] add frontend unit testing and collect scripts in
 package.json

---
 .eslintrc.json                                |    3 +-
 .../html-helpers/html-helpers.spec.js         |   60 +
 frontend/src/utils/alerts/alerts.spec.js      |    8 +
 karma.conf.js                                 |   80 +
 package-lock.json                             | 1406 +++++++++++++++++
 package.json                                  |   18 +-
 6 files changed, 1571 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/services/html-helpers/html-helpers.spec.js
 create mode 100644 frontend/src/utils/alerts/alerts.spec.js
 create mode 100644 karma.conf.js

diff --git a/.eslintrc.json b/.eslintrc.json
index 17b895f2d..8c0382cfa 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,7 +1,8 @@
 {
     "env": {
         "browser": true,
-        "es6": true
+        "es6": true,
+        "jasmine": true
     },
     "extends": "eslint:recommended",
     "globals": {
diff --git a/frontend/src/services/html-helpers/html-helpers.spec.js b/frontend/src/services/html-helpers/html-helpers.spec.js
new file mode 100644
index 000000000..cd13b5cac
--- /dev/null
+++ b/frontend/src/services/html-helpers/html-helpers.spec.js
@@ -0,0 +1,60 @@
+import { HtmlHelpers } from "./html-helpers";
+
+describe('HtmlHelpers', () => {
+  let htmlHelpers;
+  beforeEach(() => {
+    htmlHelpers = new HtmlHelpers();
+  });
+
+  it('should create', () => {
+    expect(htmlHelpers).toBeTruthy();
+  });
+
+  describe('parseResponse', () => {
+    it('should return a promise with idPrefix and element', (done) => {
+      const response = {
+        text: () => Promise.resolve('<div>Test</div>'),
+      };
+
+      htmlHelpers.parseResponse(response).then(result => {
+        expect(result.idPrefix).toBeDefined();
+        expect(result.element).toBeDefined();
+        expect(result.element.textContent).toMatch('Test');
+        done();
+      });
+    });
+
+    it('should nudge IDs', (done) => {
+      const response = {
+        text: () => Promise.resolve('<div id="test-div">Test</div>'),
+      };
+
+      htmlHelpers.parseResponse(response).then(result => {
+        expect(result.idPrefix).toBeDefined();
+        expect(result.element).toBeDefined();
+        const origElement = result.element.querySelector('#test-div');
+        expect(origElement).toBeFalsy();
+        const nudgedElement = result.element.querySelector('#' + result.idPrefix + 'test-div');
+        expect(nudgedElement).toBeTruthy();
+        done();
+      });
+    });
+
+    it('should not nudge IDs with option "keepIds"', (done) => {
+      const response = {
+        text: () => Promise.resolve('<div id="test-div">Test</div>'),
+      };
+      const options = { keepIds: true };
+
+      htmlHelpers.parseResponse(response, options).then(result => {
+        expect(result.idPrefix).not.toBeDefined();
+        expect(result.element).toBeDefined();
+        const origElement = result.element.querySelector('#test-div');
+        expect(origElement).toBeTruthy();
+        const nudgedElement = result.element.querySelector('#' + result.idPrefix + 'test-div');
+        expect(nudgedElement).toBeFalsy();
+        done();
+      });
+    });
+  });
+});
diff --git a/frontend/src/utils/alerts/alerts.spec.js b/frontend/src/utils/alerts/alerts.spec.js
new file mode 100644
index 000000000..65a4c4a72
--- /dev/null
+++ b/frontend/src/utils/alerts/alerts.spec.js
@@ -0,0 +1,8 @@
+import alerts from "./alerts";
+
+describe('Alerts', () => {
+
+  it('should be called alerts', () => {
+    expect(alerts.name).toMatch('alerts');
+  });
+});
diff --git a/karma.conf.js b/karma.conf.js
new file mode 100644
index 000000000..14d98840f
--- /dev/null
+++ b/karma.conf.js
@@ -0,0 +1,80 @@
+/* eslint-disable */
+module.exports = function(config) {
+  config.set({
+    //root path location to resolve paths defined in files and exclude
+    basePath: '',
+    //files/patterns to load in the browser
+    files: ['frontend/src/**/*.spec.js'],
+
+    //executes the tests whenever one of watched files changes
+    autoWatch: true,
+    //if true, Karma will run tests and then exit browser
+    singleRun: true,
+    //if true, Karma fails on running empty test-suites
+    failOnEmptyTestSuite:false,
+    //reduce the kind of information passed to the bash
+    logLevel: config.LOG_WARN, //config.LOG_DISABLE, config.LOG_ERROR, config.LOG_INFO, config.LOG_DEBUG
+
+    //list of frameworks you want to use, only jasmine is installed automatically
+    frameworks: ['jasmine'],
+    //list of browsers to launch and capture
+    browsers: ['ChromeHeadless'/*,'PhantomJS','Firefox','Edge','ChromeCanary','Opera','IE','Safari'*/],
+    //list of reporters to use
+    reporters: ['mocha','kjhtml'/*,'dots','progress','spec'*/],
+
+    client: {
+      jasmine:{
+        //tells jasmine to run specs in semi random order, false is default
+        random: false
+      }
+    },
+
+    /* karma-webpack config
+       pass your webpack configuration for karma
+       add `babel-loader` to the webpack configuration to make the ES6+ code readable to the browser */
+    webpack: {
+      module: {
+        rules: [
+          {
+            test: /\.js$/i,
+            exclude:/(node_modules)/,
+            loader:'babel-loader',
+            options:{
+              presets:['@babel/preset-env']
+            }
+          },
+          {
+            test: /\.(css|scss)$/i,
+            loader:'null-loader',
+          }
+        ]
+      }
+    },
+    preprocessors: {
+      //add webpack as preprocessor to support require() in test-suits .js files
+      './frontend/src/**/*.js': ['webpack']
+    },
+    webpackMiddleware: {
+      //turn off webpack bash output when run the tests
+      noInfo: true,
+      stats: 'errors-only'
+    },
+    customLaunchers: {
+      ChromeHeadless: {
+        base: 'Chrome',
+        flags: [
+          '--headless',
+          '--disable-gpu',
+          '--no-sandbox',
+          // Without a remote debugging port, Google Chrome exits immediately.
+          '--remote-debugging-port=9222',
+        ],
+      }
+    },
+
+    /*karma-mocha-reporter config*/
+    mochaReporter: {
+      output: 'noFailures'  //full, autowatch, minimal
+    }
+  });
+};
diff --git a/package-lock.json b/package-lock.json
index 5e089118d..8b6fc2054 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1050,6 +1050,16 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dev": true,
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
     "acorn": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
@@ -1068,6 +1078,12 @@
       "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
       "dev": true
     },
+    "after": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "dev": true
+    },
     "ajv": {
       "version": "6.10.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
@@ -1098,6 +1114,12 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true
+    },
     "ansi-escapes": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
@@ -1189,12 +1211,36 @@
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
+    "array-filter": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
+      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
+      "dev": true
+    },
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
       "dev": true
     },
+    "array-map": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
+      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=",
+      "dev": true
+    },
+    "array-reduce": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
+      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
+      "dev": true
+    },
+    "array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+      "dev": true
+    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -1216,6 +1262,12 @@
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
+    "arraybuffer.slice": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "dev": true
+    },
     "arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -1308,6 +1360,12 @@
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
       "dev": true
     },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "dev": true
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -2059,6 +2117,12 @@
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
       "dev": true
     },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+      "dev": true
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -2120,12 +2184,24 @@
         }
       }
     },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "dev": true
+    },
     "base64-js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
       "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
       "dev": true
     },
+    "base64id": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+      "dev": true
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -2135,6 +2211,15 @@
         "tweetnacl": "^0.14.3"
       }
     },
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "dev": true,
+      "requires": {
+        "callsite": "1.0.0"
+      }
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -2147,6 +2232,12 @@
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
       "dev": true
     },
+    "blob": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
+      "dev": true
+    },
     "block-stream": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -2168,6 +2259,32 @@
       "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
       "dev": true
     },
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        }
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2306,6 +2423,28 @@
         "isarray": "^1.0.0"
       }
     },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
+    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -2324,6 +2463,12 @@
       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
       "dev": true
     },
+    "bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "dev": true
+    },
     "cacache": {
       "version": "11.3.2",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
@@ -2404,6 +2549,12 @@
         "caller-callsite": "^2.0.0"
       }
     },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+      "dev": true
+    },
     "callsites": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
@@ -2514,6 +2665,12 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "circular-json": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
+      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
+      "dev": true
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -2706,6 +2863,21 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
+    "colors": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+      "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+      "dev": true
+    },
+    "combine-lists": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
+      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.5.0"
+      }
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -2727,12 +2899,24 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+      "dev": true
+    },
     "component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+      "dev": true
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -2751,6 +2935,18 @@
         "typedarray": "^0.0.6"
       }
     },
+    "connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
+      }
+    },
     "console-browserify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
@@ -2772,6 +2968,12 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
     "convert-source-map": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
@@ -2781,6 +2983,12 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "dev": true
+    },
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -2953,6 +3161,12 @@
         "array-find-index": "^1.0.1"
       }
     },
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "dev": true
+    },
     "cyclist": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
@@ -2974,6 +3188,12 @@
       "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
       "dev": true
     },
+    "date-format": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
+      "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+      "dev": true
+    },
     "date-now": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -3013,6 +3233,15 @@
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -3080,6 +3309,12 @@
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
       "dev": true
     },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
     "des.js": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
@@ -3105,6 +3340,12 @@
         "repeating": "^2.0.0"
       }
     },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
     "diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
@@ -3125,6 +3366,18 @@
         "esutils": "^2.0.2"
       }
     },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "dev": true,
+      "requires": {
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -3153,6 +3406,18 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "edge-launcher": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/edge-launcher/-/edge-launcher-1.2.2.tgz",
+      "integrity": "sha1-60Cq+9Bnpup27/+rBke81VCbN7I=",
+      "dev": true
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
     "electron-to-chromium": {
       "version": "1.3.136",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.136.tgz",
@@ -3192,6 +3457,12 @@
       "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
       "dev": true
     },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
     "end-of-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -3201,6 +3472,80 @@
         "once": "^1.4.0"
       }
     },
+    "engine.io": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
+      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.0",
+        "ws": "~3.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.1",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "~3.3.1",
+        "xmlhttprequest-ssl": "~1.5.4",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
+      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "~0.0.7",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.5",
+        "has-binary2": "~1.0.2"
+      }
+    },
     "enhanced-resolve": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
@@ -3212,6 +3557,12 @@
         "tapable": "^1.0.0"
       }
     },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "dev": true
+    },
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
@@ -3230,6 +3581,43 @@
         "is-arrayish": "^0.2.1"
       }
     },
+    "es-abstract": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-keys": "^1.0.12"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es6-promise": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
+      "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==",
+      "dev": true
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -3392,6 +3780,12 @@
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
       "dev": true
     },
+    "eventemitter3": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
+      "dev": true
+    },
     "events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
@@ -3432,6 +3826,34 @@
         "strip-eof": "^1.0.0"
       }
     },
+    "expand-braces": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
+      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
+      "dev": true,
+      "requires": {
+        "array-slice": "^0.2.3",
+        "array-unique": "^0.2.1",
+        "braces": "^0.1.2"
+      },
+      "dependencies": {
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+          "dev": true
+        },
+        "braces": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
+          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
+          "dev": true,
+          "requires": {
+            "expand-range": "^0.1.0"
+          }
+        }
+      }
+    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -3467,6 +3889,30 @@
         }
       }
     },
+    "expand-range": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
+      "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
+      "dev": true,
+      "requires": {
+        "is-number": "^0.1.1",
+        "repeat-string": "^0.2.2"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
+          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
+          "dev": true
+        },
+        "repeat-string": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
+          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
+          "dev": true
+        }
+      }
+    },
     "expand-tilde": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
@@ -3603,6 +4049,18 @@
         }
       }
     },
+    "extract-zip": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
+      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.2",
+        "debug": "2.6.9",
+        "mkdirp": "0.5.1",
+        "yauzl": "2.4.1"
+      }
+    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -3627,6 +4085,15 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "dev": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -3674,6 +4141,21 @@
         }
       }
     },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      }
+    },
     "find-cache-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -3772,6 +4254,32 @@
       "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=",
       "dev": true
     },
+    "follow-redirects": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -3823,6 +4331,26 @@
         "readable-stream": "^2.0.0"
       }
     },
+    "fs-access": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "dev": true,
+      "requires": {
+        "null-check": "^1.0.0"
+      }
+    },
+    "fs-extra": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
+      "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0"
+      }
+    },
     "fs-readdir-recursive": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
@@ -4388,6 +4916,12 @@
         "rimraf": "2"
       }
     },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
@@ -4628,6 +5162,15 @@
         "har-schema": "^2.0.0"
       }
     },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -4645,12 +5188,41 @@
         }
       }
     },
+    "has-binary2": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "dev": true,
+      "requires": {
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "dev": true
+    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
+    },
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -4709,6 +5281,16 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hasha": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
+      "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
+      "dev": true,
+      "requires": {
+        "is-stream": "^1.0.1",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -4745,6 +5327,30 @@
       "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
       "dev": true
     },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      }
+    },
+    "http-proxy": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -5031,6 +5637,12 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
     "is-ci": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -5060,6 +5672,12 @@
         }
       }
     },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -5201,6 +5819,15 @@
       "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
       "dev": true
     },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
     "is-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
@@ -5213,6 +5840,15 @@
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true
     },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -5243,6 +5879,15 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
+    "isbinaryfile": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc": "^1.2.0"
+      }
+    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -5261,6 +5906,12 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "jasmine-core": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.2.1.tgz",
+      "integrity": "sha512-pa9tbBWgU0EE4SWgc85T4sa886ufuQdsgruQANhECYjwqgV4z7Vw/499aCaP8ZH79JDS4vhm8doDG9HO4+e4sA==",
+      "dev": true
+    },
     "js-base64": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
@@ -5348,6 +5999,21 @@
         }
       }
     },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -5360,12 +6026,171 @@
         "verror": "1.10.0"
       }
     },
+    "karma": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-3.1.4.tgz",
+      "integrity": "sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.3.0",
+        "body-parser": "^1.16.1",
+        "chokidar": "^2.0.3",
+        "colors": "^1.1.0",
+        "combine-lists": "^1.0.0",
+        "connect": "^3.6.0",
+        "core-js": "^2.2.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.0",
+        "expand-braces": "^0.1.1",
+        "flatted": "^2.0.0",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "http-proxy": "^1.13.0",
+        "isbinaryfile": "^3.0.0",
+        "lodash": "^4.17.5",
+        "log4js": "^3.0.0",
+        "mime": "^2.3.1",
+        "minimatch": "^3.0.2",
+        "optimist": "^0.6.1",
+        "qjobs": "^1.1.4",
+        "range-parser": "^1.2.0",
+        "rimraf": "^2.6.0",
+        "safe-buffer": "^5.0.1",
+        "socket.io": "2.1.1",
+        "source-map": "^0.6.1",
+        "tmp": "0.0.33",
+        "useragent": "2.3.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "karma-chrome-launcher": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
+      "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
+      "dev": true,
+      "requires": {
+        "fs-access": "^1.0.0",
+        "which": "^1.2.1"
+      }
+    },
+    "karma-edge-launcher": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/karma-edge-launcher/-/karma-edge-launcher-0.4.2.tgz",
+      "integrity": "sha512-YAJZb1fmRcxNhMIWYsjLuxwODBjh2cSHgTW/jkVmdpGguJjLbs9ZgIK/tEJsMQcBLUkO+yO4LBbqYxqgGW2HIw==",
+      "dev": true,
+      "requires": {
+        "edge-launcher": "1.2.2"
+      }
+    },
+    "karma-firefox-launcher": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz",
+      "integrity": "sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==",
+      "dev": true
+    },
+    "karma-ie-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz",
+      "integrity": "sha1-SXmGhCxJAZA0bNifVJTKmDDG1Zw=",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.6.1"
+      }
+    },
+    "karma-jasmine": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
+      "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=",
+      "dev": true
+    },
+    "karma-jasmine-html-reporter": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.2.0.tgz",
+      "integrity": "sha512-OkWFy96p2BrRLsicKlbVK4pxYPRwr8KK+pRvsscVxkxNGoCPrTw+JRTmvcJfOWhLVze8Fd6TGhAOXmpLe9O7yg==",
+      "dev": true
+    },
+    "karma-mocha-reporter": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
+      "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "karma-opera-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-opera-launcher/-/karma-opera-launcher-1.0.0.tgz",
+      "integrity": "sha1-+lFihTGh0L6EstjcDX7iCfyP+Ro=",
+      "dev": true
+    },
+    "karma-phantomjs-launcher": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz",
+      "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.0.1",
+        "phantomjs-prebuilt": "^2.1.7"
+      }
+    },
+    "karma-safari-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
+      "integrity": "sha1-lpgqLMR9BmquccVTursoMZEVos4=",
+      "dev": true
+    },
+    "karma-spec-reporter": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
+      "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
+      "dev": true,
+      "requires": {
+        "colors": "^1.1.2"
+      }
+    },
+    "karma-webpack": {
+      "version": "4.0.0-rc.6",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-4.0.0-rc.6.tgz",
+      "integrity": "sha512-fN3EfHc10bZxP7dqgsaIFdmkynABFsgMxqgVZJYqxzt0CDBH6j1LbHrMilnijnDYZ8fZDLtx/OKWshXiYyhIig==",
+      "dev": true,
+      "requires": {
+        "async": "^2.0.0",
+        "loader-utils": "^1.1.0",
+        "source-map": "^0.5.6",
+        "webpack-dev-middleware": "^3.2.0"
+      }
+    },
+    "kew": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+      "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
+      "dev": true
+    },
     "kind-of": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
       "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
       "dev": true
     },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
@@ -5661,6 +6486,36 @@
         "wrap-ansi": "^3.0.1"
       }
     },
+    "log4js": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
+      "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
+      "dev": true,
+      "requires": {
+        "circular-json": "^0.5.5",
+        "date-format": "^1.2.0",
+        "debug": "^3.1.0",
+        "rfdc": "^1.1.2",
+        "streamroller": "0.7.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -5764,6 +6619,12 @@
         "safe-buffer": "^5.1.2"
       }
     },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
     "mem": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
@@ -5793,6 +6654,12 @@
         "readable-stream": "^2.0.1"
       }
     },
+    "memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
+      "dev": true
+    },
     "meow": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -5856,6 +6723,12 @@
         "brorand": "^1.0.1"
       }
     },
+    "mime": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz",
+      "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==",
+      "dev": true
+    },
     "mime-db": {
       "version": "1.40.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
@@ -6027,6 +6900,12 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true
+    },
     "neo-async": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
@@ -6240,6 +7119,63 @@
         "which": "^1.2.10"
       }
     },
+    "npm-run-all": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "memorystream": "^0.3.1",
+        "minimatch": "^3.0.4",
+        "pidtree": "^0.3.0",
+        "read-pkg": "^3.0.0",
+        "shell-quote": "^1.6.1",
+        "string.prototype.padend": "^3.0.0"
+      },
+      "dependencies": {
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -6272,6 +7208,22 @@
         "set-blocking": "~2.0.0"
       }
     },
+    "null-check": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
+      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
+      "dev": true
+    },
+    "null-loader": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-2.0.0.tgz",
+      "integrity": "sha512-PhEeA3v/tAacxC5dNO1i2yXzGVWWrZ9jTx+TMEJ716amvnBXzvrxIwy9HW7MyJsHe8ACQzpiQgbrAjDRMA7gcg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^1.0.0"
+      }
+    },
     "num2fraction": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
@@ -6296,6 +7248,12 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true
     },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+      "dev": true
+    },
     "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
@@ -6327,6 +7285,12 @@
         }
       }
     },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -6345,6 +7309,15 @@
         "isobject": "^3.0.1"
       }
     },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -6363,6 +7336,24 @@
         "mimic-fn": "^1.0.0"
       }
     },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
+        }
+      }
+    },
     "optionator": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -6537,6 +7528,30 @@
       "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
       "dev": true
     },
+    "parseqs": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -6617,12 +7632,49 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
+    "phantomjs-prebuilt": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz",
+      "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "^4.0.3",
+        "extract-zip": "^1.6.5",
+        "fs-extra": "^1.0.0",
+        "hasha": "^2.2.0",
+        "kew": "^0.7.0",
+        "progress": "^1.1.8",
+        "request": "^2.81.0",
+        "request-progress": "^2.0.1",
+        "which": "^1.2.10"
+      },
+      "dependencies": {
+        "progress": {
+          "version": "1.1.8",
+          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+          "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
+          "dev": true
+        }
+      }
+    },
+    "pidtree": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
+      "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==",
+      "dev": true
+    },
     "pify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -6931,6 +7983,12 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
+    "qjobs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "dev": true
+    },
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
@@ -6968,6 +8026,24 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
     "read-pkg": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.1.1.tgz",
@@ -7213,6 +8289,15 @@
         "uuid": "^3.3.2"
       }
     },
+    "request-progress": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
+      "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
+      "dev": true,
+      "requires": {
+        "throttleit": "^1.0.0"
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -7231,6 +8316,12 @@
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
     "resolve": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
@@ -7287,6 +8378,12 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "rfdc": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
+      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
+      "dev": true
+    },
     "rimraf": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -7471,6 +8568,12 @@
       "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
       "dev": true
     },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "dev": true
+    },
     "sha.js": {
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
@@ -7515,6 +8618,18 @@
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
       "dev": true
     },
+    "shell-quote": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
+      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
+      "dev": true,
+      "requires": {
+        "array-filter": "~0.0.0",
+        "array-map": "~0.0.0",
+        "array-reduce": "~0.0.0",
+        "jsonify": "~0.0.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
@@ -7671,6 +8786,110 @@
         }
       }
     },
+    "socket.io": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+      "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+      "dev": true,
+      "requires": {
+        "debug": "~3.1.0",
+        "engine.io": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "socket.io-adapter": "~1.1.0",
+        "socket.io-client": "2.1.1",
+        "socket.io-parser": "~3.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
+      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
+      "dev": true
+    },
+    "socket.io-client": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+      "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "base64-arraybuffer": "0.1.5",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "~3.2.0",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -7811,6 +9030,12 @@
         }
       }
     },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true
+    },
     "stdout-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
@@ -7859,6 +9084,35 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "dev": true
     },
+    "streamroller": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
+      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "dev": true,
+      "requires": {
+        "date-format": "^1.2.0",
+        "debug": "^3.1.0",
+        "mkdirp": "^0.5.1",
+        "readable-stream": "^2.3.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
     "string-argv": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz",
@@ -7875,6 +9129,17 @@
         "strip-ansi": "^4.0.0"
       }
     },
+    "string.prototype.padend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz",
+      "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.4.3",
+        "function-bind": "^1.0.2"
+      }
+    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -8091,6 +9356,12 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
+    "throttleit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
+      "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
+      "dev": true
+    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -8125,6 +9396,12 @@
         "os-tmpdir": "~1.0.2"
       }
     },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -8179,6 +9456,12 @@
         "repeat-string": "^1.6.1"
       }
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
     "toposort": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
@@ -8266,6 +9549,16 @@
       "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==",
       "dev": true
     },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -8315,6 +9608,12 @@
         }
       }
     },
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "dev": true
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -8402,6 +9701,12 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -8487,6 +9792,16 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
+    "useragent": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.x",
+        "tmp": "0.0.x"
+      }
+    },
     "util": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
@@ -8502,6 +9817,12 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
     "uuid": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
@@ -8544,6 +9865,12 @@
         "indexof": "0.0.1"
       }
     },
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
     "watch": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
@@ -8764,6 +10091,53 @@
         }
       }
     },
+    "webpack-dev-middleware": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
+      "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
+      "dev": true,
+      "requires": {
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.2",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
+      }
+    },
+    "webpack-karma-jasmine": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/webpack-karma-jasmine/-/webpack-karma-jasmine-3.0.6.tgz",
+      "integrity": "sha512-QVrxlpWyUG/zL4bkW38a/ZH2vfJJ39YF4P+Bl7jjkXtXmK3Jbqe9jESWKE3ek10sy5qKEWX+KuvhNiia80gi8Q==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.3.4",
+        "@babel/preset-env": "^7.3.4",
+        "babel-loader": "^8.0.5",
+        "jasmine-core": "3.2.1",
+        "karma": "^3.0.0",
+        "karma-chrome-launcher": "^2.2.0",
+        "karma-edge-launcher": "^0.4.2",
+        "karma-firefox-launcher": "^1.1.0",
+        "karma-ie-launcher": "^1.0.0",
+        "karma-jasmine": "^1.1.2",
+        "karma-jasmine-html-reporter": "1.2.0",
+        "karma-mocha-reporter": "^2.2.5",
+        "karma-opera-launcher": "^1.0.0",
+        "karma-phantomjs-launcher": "^1.0.4",
+        "karma-safari-launcher": "^1.0.0",
+        "karma-spec-reporter": "0.0.32",
+        "karma-webpack": "^4.0.0-rc.6"
+      }
+    },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
     "webpack-sources": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
@@ -8846,6 +10220,23 @@
         "mkdirp": "^0.5.1"
       }
     },
+    "ws": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "dev": true,
+      "requires": {
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
+      }
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
+      "dev": true
+    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
@@ -8945,6 +10336,21 @@
         }
       }
     },
+    "yauzl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "dev": true,
+      "requires": {
+        "fd-slicer": "~1.0.1"
+      }
+    },
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+      "dev": true
+    },
     "yup": {
       "version": "0.27.0",
       "resolved": "https://registry.npmjs.org/yup/-/yup-0.27.0.tgz",
diff --git a/package.json b/package.json
index 7e8e619b0..9b4914798 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,17 @@
   "author": "",
   "license": "ISC",
   "scripts": {
-    "lint": "eslint frontend/src",
-    "dev": "webpack --watch"
+    "start": "run-p frontend:build:watch yesod:start",
+    "test": "run-s frontend:test yesod:test",
+    "lint": "run-s frontend:lint yesod:lint",
+    "yesod:db": "./db.sh",
+    "yesod:start": "./start.sh",
+    "yesod:lint": "./hlint.sh",
+    "yesod:test": "./test.sh",
+    "frontend:lint": "eslint frontend/src",
+    "frontend:test": "karma start --conf karma.conf.js",
+    "frontend:build": "webpack",
+    "frontend:build:watch": "webpack --watch"
   },
   "husky": {
     "hooks": {
@@ -37,13 +46,16 @@
     "husky": "^2.3.0",
     "lint-staged": "^8.1.7",
     "node-sass": "^4.12.0",
+    "npm-run-all": "^4.1.5",
+    "null-loader": "^2.0.0",
     "postcss-loader": "^3.0.0",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
     "uglifyjs-webpack-plugin": "^2.1.3",
     "watch": "^1.0.2",
     "webpack": "^4.32.2",
-    "webpack-cli": "^3.3.2"
+    "webpack-cli": "^3.3.2",
+    "webpack-karma-jasmine": "^3.0.6"
   },
   "dependencies": {
     "flatpickr": "^4.5.7"

From f2ea8eb2cfd573ae3d50974098c2703d0b981816 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 26 May 2019 17:18:15 +0200
Subject: [PATCH 394/519] Ensure HealthChecks can be disabled

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

diff --git a/src/Settings.hs b/src/Settings.hs
index ce28237a3..884b1bd35 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -389,7 +389,7 @@ instance FromJSON AppSettings where
         appJwtExpiration          <- o .:? "jwt-expiration"
         appJwtEncoding            <- o .: "jwt-encoding"
 
-        appHealthCheckInterval    <- o .:  "health-check-interval"
+        appHealthCheckInterval    <- (assertM' (> 0) . ) <$> o .: "health-check-interval"
         appHealthCheckDelayNotify <- o .:  "health-check-delay-notify"
         appHealthCheckHTTP        <- o .:  "health-check-http"
 

From b32c80b457f45551be29d01e072ce66fd016b409 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 26 May 2019 20:37:09 +0200
Subject: [PATCH 395/519] add more unit tests for js services

---
 .../src/services/html-helpers/html-helpers.js |   2 +-
 .../html-helpers/html-helpers.spec.js         |  44 +++---
 .../services/http-client/http-client.spec.js  | 116 ++++++++++++++++
 frontend/src/services/i18n/i18n.spec.js       |  51 +++++++
 .../services/util-registry/util-registry.js   |   6 +-
 .../util-registry/util-registry.spec.js       | 126 ++++++++++++++++++
 package.json                                  |   1 +
 7 files changed, 318 insertions(+), 28 deletions(-)
 create mode 100644 frontend/src/services/http-client/http-client.spec.js
 create mode 100644 frontend/src/services/i18n/i18n.spec.js
 create mode 100644 frontend/src/services/util-registry/util-registry.spec.js

diff --git a/frontend/src/services/html-helpers/html-helpers.js b/frontend/src/services/html-helpers/html-helpers.js
index 7956a569c..92d3168b5 100644
--- a/frontend/src/services/html-helpers/html-helpers.js
+++ b/frontend/src/services/html-helpers/html-helpers.js
@@ -11,7 +11,7 @@ export class HtmlHelpers {
       .then(
         (responseText) => {
           const docFrag = document.createRange().createContextualFragment(responseText);
-          let idPrefix;
+          let idPrefix = '';
           if (!options.keepIds) {
             idPrefix = this._getIdPrefix();
             this._prefixIds(docFrag, idPrefix);
diff --git a/frontend/src/services/html-helpers/html-helpers.spec.js b/frontend/src/services/html-helpers/html-helpers.spec.js
index cd13b5cac..c77015b26 100644
--- a/frontend/src/services/html-helpers/html-helpers.spec.js
+++ b/frontend/src/services/html-helpers/html-helpers.spec.js
@@ -2,6 +2,7 @@ import { HtmlHelpers } from "./html-helpers";
 
 describe('HtmlHelpers', () => {
   let htmlHelpers;
+
   beforeEach(() => {
     htmlHelpers = new HtmlHelpers();
   });
@@ -10,13 +11,17 @@ describe('HtmlHelpers', () => {
     expect(htmlHelpers).toBeTruthy();
   });
 
-  describe('parseResponse', () => {
-    it('should return a promise with idPrefix and element', (done) => {
-      const response = {
-        text: () => Promise.resolve('<div>Test</div>'),
-      };
+  describe('parseResponse()', () => {
+    let fakeHttpResponse;
 
-      htmlHelpers.parseResponse(response).then(result => {
+    beforeEach(() => {
+      fakeHttpResponse = {
+        text: () => Promise.resolve('<div id="test-div">Test</div>'),
+      };
+    });
+
+    it('should return a promise with idPrefix and element', (done) => {
+      htmlHelpers.parseResponse(fakeHttpResponse).then(result => {
         expect(result.idPrefix).toBeDefined();
         expect(result.element).toBeDefined();
         expect(result.element.textContent).toMatch('Test');
@@ -25,34 +30,25 @@ describe('HtmlHelpers', () => {
     });
 
     it('should nudge IDs', (done) => {
-      const response = {
-        text: () => Promise.resolve('<div id="test-div">Test</div>'),
-      };
-
-      htmlHelpers.parseResponse(response).then(result => {
+      htmlHelpers.parseResponse(fakeHttpResponse).then(result => {
         expect(result.idPrefix).toBeDefined();
         expect(result.element).toBeDefined();
-        const origElement = result.element.querySelector('#test-div');
-        expect(origElement).toBeFalsy();
-        const nudgedElement = result.element.querySelector('#' + result.idPrefix + 'test-div');
-        expect(nudgedElement).toBeTruthy();
+        const elementWithOrigId = result.element.querySelector('#test-div');
+        expect(elementWithOrigId).toBeFalsy();
+        const elementWithNudgedId = result.element.querySelector('#' + result.idPrefix + 'test-div');
+        expect(elementWithNudgedId).toBeTruthy();
         done();
       });
     });
 
     it('should not nudge IDs with option "keepIds"', (done) => {
-      const response = {
-        text: () => Promise.resolve('<div id="test-div">Test</div>'),
-      };
       const options = { keepIds: true };
 
-      htmlHelpers.parseResponse(response, options).then(result => {
-        expect(result.idPrefix).not.toBeDefined();
+      htmlHelpers.parseResponse(fakeHttpResponse, options).then(result => {
+        expect(result.idPrefix).toBe('');
         expect(result.element).toBeDefined();
-        const origElement = result.element.querySelector('#test-div');
-        expect(origElement).toBeTruthy();
-        const nudgedElement = result.element.querySelector('#' + result.idPrefix + 'test-div');
-        expect(nudgedElement).toBeFalsy();
+        const elementWithOrigId = result.element.querySelector('#test-div');
+        expect(elementWithOrigId).toBeTruthy();
         done();
       });
     });
diff --git a/frontend/src/services/http-client/http-client.spec.js b/frontend/src/services/http-client/http-client.spec.js
new file mode 100644
index 000000000..e61e248f0
--- /dev/null
+++ b/frontend/src/services/http-client/http-client.spec.js
@@ -0,0 +1,116 @@
+import { HttpClient } from "./http-client";
+
+const TEST_URL = 'http://example.com';
+const FAKE_RESPONSE = {
+  data: 'data',
+};
+
+describe('HttpClient', () => {
+  let httpClient;
+
+  beforeEach(() => {
+    httpClient = new HttpClient();
+
+    // setup and spy on fake fetch API
+    spyOn(window, 'fetch').and.returnValue(Promise.resolve(FAKE_RESPONSE));
+  });
+
+  it('should create', () => {
+    expect(httpClient).toBeTruthy();
+  });
+
+  describe('get()', () => {
+    let params;
+
+    beforeEach(() => {
+      params = {
+        url: TEST_URL,
+      };
+    });
+
+    it('should GET the given url', () => {
+      httpClient.get(params);
+      expect(window.fetch).toHaveBeenCalledWith(params.url, jasmine.objectContaining({ method: 'GET' }));
+    });
+
+    it('should return a promise', (done) => {
+      const result = httpClient.get(params);
+      result.then((response) => {
+        expect(response).toEqual(FAKE_RESPONSE);
+        done();
+      });
+    });
+  });
+
+  describe('post()', () => {
+    let params;
+
+    beforeEach(() => {
+      params = {
+        url: TEST_URL,
+      };
+    });
+
+    it('should POST the given url', () => {
+      httpClient.post(params);
+      expect(window.fetch).toHaveBeenCalledWith(params.url, jasmine.objectContaining({ method: 'POST' }));
+    });
+
+    it('should return a promise', (done) => {
+      const result = httpClient.post(params);
+      result.then((response) => {
+        expect(response).toEqual(FAKE_RESPONSE);
+        done();
+      });
+    });
+  });
+
+  describe('Response Interceptors', () => {
+    it('can be added', () => {
+      const interceptor = () => {};
+      expect(httpClient._responseInterceptors.length).toBe(0);
+      httpClient.addResponseInterceptor(interceptor);
+      expect(httpClient._responseInterceptors.length).toBe(1);
+      httpClient.addResponseInterceptor(interceptor);
+      expect(httpClient._responseInterceptors.length).toBe(2);
+    });
+
+    describe('get called', () => {
+      let intercepted1;
+      let intercepted2;
+      const interceptors = {
+        interceptor1: () => intercepted1 = true,
+        interceptor2: () => intercepted2 = true,
+      };
+
+      beforeEach(() => {
+        intercepted1 = false;
+        intercepted2 = false;
+        spyOn(interceptors, 'interceptor1').and.callThrough();
+        spyOn(interceptors, 'interceptor2').and.callThrough();
+        httpClient.addResponseInterceptor(interceptors.interceptor1);
+        httpClient.addResponseInterceptor(interceptors.interceptor2);
+      });
+
+      it('for GET requests', (done) => {
+        httpClient.get({ url: TEST_URL }).then(() => {
+          expect(intercepted1).toBeTruthy();
+          expect(intercepted2).toBeTruthy();
+          expect(interceptors.interceptor1).toHaveBeenCalledWith(FAKE_RESPONSE, jasmine.any(Object));
+          expect(interceptors.interceptor2).toHaveBeenCalledWith(FAKE_RESPONSE, jasmine.any(Object));
+          done();
+        });
+      });
+
+      it('for POST requests', (done) => {
+        httpClient.post({ url: TEST_URL }).then(() => {
+          expect(intercepted1).toBeTruthy();
+          expect(intercepted2).toBeTruthy();
+          expect(interceptors.interceptor1).toHaveBeenCalledWith(FAKE_RESPONSE, jasmine.any(Object));
+          expect(interceptors.interceptor2).toHaveBeenCalledWith(FAKE_RESPONSE, jasmine.any(Object));
+          done();
+        });
+      });
+    });
+  });
+});
diff --git a/frontend/src/services/i18n/i18n.spec.js b/frontend/src/services/i18n/i18n.spec.js
new file mode 100644
index 000000000..76e5348c0
--- /dev/null
+++ b/frontend/src/services/i18n/i18n.spec.js
@@ -0,0 +1,51 @@
+import { I18n } from "./i18n";
+
+describe('I18n', () => {
+  let i18n;
+
+  beforeEach(() => {
+    i18n = new I18n();
+  });
+
+  // helper function
+  function expectTranslation(id, value) {
+    expect(i18n.translations[id]).toMatch(value);
+  }
+
+  it('should create', () => {
+    expect(i18n).toBeTruthy();
+  });
+
+  describe('add()', () => {
+    it('should add the translation', () => {
+      i18n.add('id1', 'translated-id1');
+      expectTranslation('id1', 'translated-id1');
+    });
+  });
+
+  describe('addMany()', () => {
+    it('should add many translations', () => {
+      i18n.addMany({
+        id1: 'translated-id1',
+        id2: 'translated-id2',
+        id3: 'translated-id3',
+      });
+      expectTranslation('id1', 'translated-id1');
+      expectTranslation('id2', 'translated-id2');
+      expectTranslation('id3', 'translated-id3');
+    });
+  });
+
+  describe('get()', () => {
+    it('should return stored translations', () => {
+      i18n.translations.id1 = 'something';
+      expect(i18n.get('id1')).toMatch('something');
+    });
+
+    it('should throw error if translation is missing', () => {
+      expect(() => {
+        i18n.get('id1');
+      }).toThrow();
+    });
+  });
+});
diff --git a/frontend/src/services/util-registry/util-registry.js b/frontend/src/services/util-registry/util-registry.js
index 001bb1e6b..18b656b8c 100644
--- a/frontend/src/services/util-registry/util-registry.js
+++ b/frontend/src/services/util-registry/util-registry.js
@@ -46,10 +46,10 @@ export class UtilRegistry {
   }
 
   setApp(appInstance) {
-    this.appInstance = appInstance;
+    this._appInstance = appInstance;
   }
 
-  setupAll = (scope) => {
+  setupAll(scope) {
     if (DEBUG_MODE > 1) {
       console.info('registered js utilities:');
       console.table(this._registeredUtils);
@@ -70,7 +70,7 @@ export class UtilRegistry {
         let utilInstance = null;
 
         try {
-          utilInstance = util.setup(element, this.appInstance);
+          utilInstance = util.setup(element, this._appInstance);
         } catch(err) {
           if (DEBUG_MODE > 0) {
             console.warn('Error while trying to initialize a utility!', { util , element, err });
diff --git a/frontend/src/services/util-registry/util-registry.spec.js b/frontend/src/services/util-registry/util-registry.spec.js
new file mode 100644
index 000000000..2e4afedf2
--- /dev/null
+++ b/frontend/src/services/util-registry/util-registry.spec.js
@@ -0,0 +1,126 @@
+import { UtilRegistry } from "./util-registry";
+
+const TEST_UTILS = [{
+  name: 'util1',
+  selector: '#some-id',
+  setup: () => {},
+}, {
+  name: 'util2',
+  selector: '[uw-util]',
+  setup: () => {},
+}];
+
+describe('UtilRegistry', () => {
+  let utilRegistry;
+
+  beforeEach(() => {
+    utilRegistry = new UtilRegistry();
+  });
+
+  it('should create', () => {
+    expect(utilRegistry).toBeTruthy();
+  });
+
+  describe('register()', () => {
+    it('should allow to add utilities', () => {
+      utilRegistry.register(TEST_UTILS[0]);
+
+      const foundUtil = utilRegistry.find(TEST_UTILS[0].name);
+      expect(foundUtil).toEqual(TEST_UTILS[0]);
+    });
+  });
+
+  describe('deregister()', () => {
+    it('should remove util', () => {
+      // register util
+      utilRegistry.register(TEST_UTILS[0]);
+      let foundUtil = utilRegistry.find('util1');
+      expect(foundUtil).toBeTruthy();
+
+      // deregister util
+      utilRegistry.deregister(TEST_UTILS[0].name);
+      foundUtil = utilRegistry.find('util1');
+      expect(foundUtil).toBeFalsy();
+    });
+
+    it('should destroy util instances if requested', () => {
+      pending('TBD');
+    });
+  });
+
+  describe('setup()', () => {
+    it('should catch errors thrown by the utility', () => {
+      spyOn(TEST_UTILS[0], 'setup').and.throwError('some error');
+      expect(() => {
+        utilRegistry.setup(TEST_UTILS[0]);
+      }).not.toThrow();
+    });
+
+    it('should pass the app instance', () => {
+      const scope = document.createElement('div');
+      const utilElement = document.createElement('div');
+      utilElement.id = 'some-id';
+      scope.appendChild(utilElement);
+      const fakeApp = { fn: () => {} };
+      utilRegistry.setApp(fakeApp);
+      spyOn(TEST_UTILS[0], 'setup');
+      utilRegistry.setup(TEST_UTILS[0], scope);
+      expect(TEST_UTILS[0].setup).toHaveBeenCalledWith(utilElement, fakeApp);
+    });
+
+    describe('given no scope', () => {
+      it('should use fallback scope', () => {
+        spyOn(TEST_UTILS[0], 'setup');
+        utilRegistry.setup(TEST_UTILS[0]);
+        expect(TEST_UTILS[0].setup).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('given a scope', () => {
+      let scope;
+      let utilElement1;
+      let utilElement2;
+
+      beforeEach(() => {
+        scope = document.createElement('div');
+        utilElement1 = document.createElement('div');
+        utilElement2 = document.createElement('div');
+        utilElement1.setAttribute('uw-util', '');
+        utilElement2.setAttribute('uw-util', '');
+        scope.appendChild(utilElement1);
+        scope.appendChild(utilElement2);
+      });
+
+      it('should call the utilities\' setup function for each matching element', () => {
+        spyOn(TEST_UTILS[1], 'setup');
+        utilRegistry.setup(TEST_UTILS[1], scope);
+        // 2 matching elements in scope
+        expect(TEST_UTILS[1].setup.calls.count()).toBe(2);
+        expect(TEST_UTILS[1].setup.calls.argsFor(0)).toEqual([utilElement1, undefined]);
+        expect(TEST_UTILS[1].setup.calls.argsFor(1)).toEqual([utilElement2, undefined]);
+      });
+    });
+  });
+
+  describe('setupAll()', () => {
+    it('should setup all the utilities', () => {
+      spyOn(utilRegistry, 'setup');
+      utilRegistry.register(TEST_UTILS[0]);
+      utilRegistry.register(TEST_UTILS[1]);
+      utilRegistry.setupAll();
+
+      expect(utilRegistry.setup.calls.count()).toBe(2);
+      expect(utilRegistry.setup.calls.argsFor(0)).toEqual([TEST_UTILS[0], undefined]);
+      expect(utilRegistry.setup.calls.argsFor(1)).toEqual([TEST_UTILS[1], undefined]);
+    });
+
+    it('should pass the given scope', () => {
+      spyOn(utilRegistry, 'setup');
+      utilRegistry.register(TEST_UTILS[0]);
+      const scope = document.createElement('div');
+      utilRegistry.setupAll(scope);
+
+      expect(utilRegistry.setup).toHaveBeenCalledWith(TEST_UTILS[0], scope);
+    });
+  });
+});
diff --git a/package.json b/package.json
index 9b4914798..494be6bb6 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "yesod:test": "./test.sh",
     "frontend:lint": "eslint frontend/src",
     "frontend:test": "karma start --conf karma.conf.js",
+    "frontend:test:watch": "karma start --conf karma.conf.js --single-run false",
     "frontend:build": "webpack",
     "frontend:build:watch": "webpack --watch"
   },

From cb2895e1f8dc6995089d1f9391e4098f453d2a14 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 26 May 2019 20:49:34 +0200
Subject: [PATCH 396/519] replace webpack-karma-jasmine dependecy with manual
 list of packages

---
 karma.conf.js     |    4 +-
 package-lock.json | 4496 ++++++++++++++++++++++++++++++++++++++-------
 package.json      |   12 +-
 3 files changed, 3875 insertions(+), 637 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 14d98840f..8f95f851a 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -18,9 +18,9 @@ module.exports = function(config) {
     //list of frameworks you want to use, only jasmine is installed automatically
     frameworks: ['jasmine'],
     //list of browsers to launch and capture
-    browsers: ['ChromeHeadless'/*,'PhantomJS','Firefox','Edge','ChromeCanary','Opera','IE','Safari'*/],
+    browsers: ['ChromeHeadless'],
     //list of reporters to use
-    reporters: ['mocha','kjhtml'/*,'dots','progress','spec'*/],
+    reporters: ['mocha','kjhtml'],
 
     client: {
       jasmine:{
diff --git a/package-lock.json b/package-lock.json
index 8b6fc2054..b757dbbcd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -783,6 +783,14 @@
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.2"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.13.2",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+          "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+          "dev": true
+        }
       }
     },
     "@babel/template": {
@@ -1114,12 +1122,6 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
-    "ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true
-    },
     "ansi-escapes": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
@@ -1127,9 +1129,9 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
       "dev": true
     },
     "ansi-styles": {
@@ -1235,12 +1237,6 @@
       "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
       "dev": true
     },
-    "array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true
-    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -1415,12 +1411,6 @@
         "js-tokens": "^3.0.2"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -1446,15 +1436,6 @@
           "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -1654,14 +1635,6 @@
         "loader-utils": "^1.0.2",
         "mkdirp": "^0.5.1",
         "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
       }
     },
     "babel-messages": {
@@ -2043,14 +2016,6 @@
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-          "dev": true
-        }
       }
     },
     "babel-template": {
@@ -2275,14 +2240,6 @@
         "qs": "6.7.0",
         "raw-body": "2.4.0",
         "type-is": "~1.6.17"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
-        }
       }
     },
     "brace-expansion": {
@@ -2538,6 +2495,14 @@
       "dev": true,
       "requires": {
         "callsites": "^2.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+          "dev": true
+        }
       }
     },
     "caller-path": {
@@ -2556,9 +2521,9 @@
       "dev": true
     },
     "callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
     "camelcase": {
@@ -2641,11 +2606,12 @@
       "dev": true
     },
     "chrome-trace-event": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
-      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.1.tgz",
+      "integrity": "sha512-3P9FCnp/nBrggFnGrjhaJBH/+VSlHxJm1phFJ0fQvKm/p8aUp1MjW7fK4BqYwbUNzLXuA5wufl35ouonEBAWtw==",
       "dev": true,
       "requires": {
+        "npm": "^6.9.0",
         "tslib": "^1.9.0"
       }
     },
@@ -2665,12 +2631,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "circular-json": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
-      "dev": true
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -2713,12 +2673,6 @@
         "string-width": "^1.0.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -2744,15 +2698,6 @@
             "is-fullwidth-code-point": "^1.0.0",
             "strip-ansi": "^3.0.0"
           }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
         }
       }
     },
@@ -2773,12 +2718,6 @@
         "wrap-ansi": "^2.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -2799,15 +2738,6 @@
             "strip-ansi": "^3.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
         "wrap-ansi": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -2869,15 +2799,6 @@
       "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
       "dev": true
     },
-    "combine-lists": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.5.0"
-      }
-    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -3056,6 +2977,24 @@
         "is-directory": "^0.3.1",
         "js-yaml": "^3.13.1",
         "parse-json": "^4.0.0"
+      },
+      "dependencies": {
+        "import-fresh": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+          "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+          "dev": true,
+          "requires": {
+            "caller-path": "^2.0.0",
+            "resolve-from": "^3.0.0"
+          }
+        },
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
       }
     },
     "create-ecdh": {
@@ -3173,6 +3112,15 @@
       "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
       "dev": true
     },
+    "d": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "^0.10.9"
+      }
+    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -3189,9 +3137,9 @@
       "dev": true
     },
     "date-format": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-      "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
+      "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==",
       "dev": true
     },
     "date-now": {
@@ -3295,6 +3243,14 @@
         "p-map": "^1.1.1",
         "pify": "^3.0.0",
         "rimraf": "^2.2.8"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
       }
     },
     "delayed-stream": {
@@ -3406,12 +3362,6 @@
         "safer-buffer": "^2.1.0"
       }
     },
-    "edge-launcher": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/edge-launcher/-/edge-launcher-1.2.2.tgz",
-      "integrity": "sha1-60Cq+9Bnpup27/+rBke81VCbN7I=",
-      "dev": true
-    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -3419,9 +3369,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.136",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.136.tgz",
-      "integrity": "sha512-xHkYkbEi4kI+2w5v6yBGCQTRXL7N0PWscygTFZu/1bArnPSo2WR9xjdw4m06RR4J5PncrWJcuOVv+MAG2mK5JQ==",
+      "version": "1.3.137",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz",
+      "integrity": "sha512-kGi32g42a8vS/WnYE7ELJyejRT7hbr3UeOOu0WeuYuQ29gCpg9Lrf6RdcTQVXSt/v0bjCfnlb/EWOOsiKpTmkw==",
       "dev": true
     },
     "elegant-spinner": {
@@ -3606,11 +3556,37 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "es6-promise": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
-      "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==",
-      "dev": true
+    "es5-ext": {
+      "version": "0.10.50",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz",
+      "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "^1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
     },
     "escape-html": {
       "version": "1.0.3",
@@ -3668,6 +3644,12 @@
         "text-table": "^0.2.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -3687,27 +3669,20 @@
             "estraverse": "^4.1.1"
           }
         },
-        "import-fresh": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
-          "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
-          "dev": true,
-          "requires": {
-            "parent-module": "^1.0.0",
-            "resolve-from": "^4.0.0"
-          }
-        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
         },
-        "resolve-from": {
+        "strip-ansi": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
         }
       }
     },
@@ -3802,15 +3777,6 @@
         "safe-buffer": "^5.1.1"
       }
     },
-    "exec-sh": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
-      "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
-      "dev": true,
-      "requires": {
-        "merge": "^1.2.0"
-      }
-    },
     "execa": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -3826,34 +3792,6 @@
         "strip-eof": "^1.0.0"
       }
     },
-    "expand-braces": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
-      "dev": true,
-      "requires": {
-        "array-slice": "^0.2.3",
-        "array-unique": "^0.2.1",
-        "braces": "^0.1.2"
-      },
-      "dependencies": {
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
-        },
-        "braces": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-          "dev": true,
-          "requires": {
-            "expand-range": "^0.1.0"
-          }
-        }
-      }
-    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -3889,30 +3827,6 @@
         }
       }
     },
-    "expand-range": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-      "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
-      "dev": true,
-      "requires": {
-        "is-number": "^0.1.1",
-        "repeat-string": "^0.2.2"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-          "dev": true
-        },
-        "repeat-string": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
-          "dev": true
-        }
-      }
-    },
     "expand-tilde": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
@@ -4049,18 +3963,6 @@
         }
       }
     },
-    "extract-zip": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
-      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
-      "dev": true,
-      "requires": {
-        "concat-stream": "1.6.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1",
-        "yauzl": "2.4.1"
-      }
-    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -4085,15 +3987,6 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
-    "fd-slicer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-      "dev": true,
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -4165,17 +4058,6 @@
         "commondir": "^1.0.1",
         "make-dir": "^2.0.0",
         "pkg-dir": "^3.0.0"
-      },
-      "dependencies": {
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
       }
     },
     "find-parent-dir": {
@@ -4341,14 +4223,14 @@
       }
     },
     "fs-extra": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
-      "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
-        "jsonfile": "^2.1.0",
-        "klaw": "^1.0.0"
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "fs-readdir-recursive": {
@@ -4955,12 +4837,6 @@
         "wide-align": "^1.1.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -4980,15 +4856,6 @@
             "is-fullwidth-code-point": "^1.0.0",
             "strip-ansi": "^3.0.0"
           }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
         }
       }
     },
@@ -5178,14 +5045,6 @@
       "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        }
       }
     },
     "has-binary2": {
@@ -5281,16 +5140,6 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
-    "hasha": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
-      "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
-      "dev": true,
-      "requires": {
-        "is-stream": "^1.0.1",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -5386,6 +5235,44 @@
         "slash": "^3.0.0"
       },
       "dependencies": {
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.0.0.tgz",
+              "integrity": "sha512-zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^5.0.0"
+              }
+            }
+          }
+        },
         "slash": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -5446,13 +5333,13 @@
       }
     },
     "import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
+      "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
       "dev": true,
       "requires": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
       }
     },
     "import-from": {
@@ -5462,6 +5349,14 @@
       "dev": true,
       "requires": {
         "resolve-from": "^3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
       }
     },
     "import-local": {
@@ -5472,17 +5367,6 @@
       "requires": {
         "pkg-dir": "^3.0.0",
         "resolve-cwd": "^2.0.0"
-      },
-      "dependencies": {
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
       }
     },
     "imurmurhash": {
@@ -5907,9 +5791,9 @@
       "dev": true
     },
     "jasmine-core": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.2.1.tgz",
-      "integrity": "sha512-pa9tbBWgU0EE4SWgc85T4sa886ufuQdsgruQANhECYjwqgV4z7Vw/499aCaP8ZH79JDS4vhm8doDG9HO4+e4sA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.4.0.tgz",
+      "integrity": "sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==",
       "dev": true
     },
     "js-base64": {
@@ -6000,9 +5884,9 @@
       }
     },
     "jsonfile": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6"
@@ -6027,28 +5911,27 @@
       }
     },
     "karma": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-3.1.4.tgz",
-      "integrity": "sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-4.1.0.tgz",
+      "integrity": "sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==",
       "dev": true,
       "requires": {
         "bluebird": "^3.3.0",
         "body-parser": "^1.16.1",
+        "braces": "^2.3.2",
         "chokidar": "^2.0.3",
         "colors": "^1.1.0",
-        "combine-lists": "^1.0.0",
         "connect": "^3.6.0",
         "core-js": "^2.2.0",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.0",
-        "expand-braces": "^0.1.1",
         "flatted": "^2.0.0",
         "glob": "^7.1.1",
         "graceful-fs": "^4.1.2",
         "http-proxy": "^1.13.0",
         "isbinaryfile": "^3.0.0",
-        "lodash": "^4.17.5",
-        "log4js": "^3.0.0",
+        "lodash": "^4.17.11",
+        "log4js": "^4.0.0",
         "mime": "^2.3.1",
         "minimatch": "^3.0.2",
         "optimist": "^0.6.1",
@@ -6080,40 +5963,28 @@
         "which": "^1.2.1"
       }
     },
-    "karma-edge-launcher": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/karma-edge-launcher/-/karma-edge-launcher-0.4.2.tgz",
-      "integrity": "sha512-YAJZb1fmRcxNhMIWYsjLuxwODBjh2cSHgTW/jkVmdpGguJjLbs9ZgIK/tEJsMQcBLUkO+yO4LBbqYxqgGW2HIw==",
+    "karma-cli": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-2.0.0.tgz",
+      "integrity": "sha512-1Kb28UILg1ZsfqQmeELbPzuEb5C6GZJfVIk0qOr8LNYQuYWmAaqP16WpbpKEjhejDrDYyYOwwJXSZO6u7q5Pvw==",
       "dev": true,
       "requires": {
-        "edge-launcher": "1.2.2"
-      }
-    },
-    "karma-firefox-launcher": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz",
-      "integrity": "sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==",
-      "dev": true
-    },
-    "karma-ie-launcher": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz",
-      "integrity": "sha1-SXmGhCxJAZA0bNifVJTKmDDG1Zw=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.6.1"
+        "resolve": "^1.3.3"
       }
     },
     "karma-jasmine": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
-      "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=",
-      "dev": true
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz",
+      "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
+      "dev": true,
+      "requires": {
+        "jasmine-core": "^3.3"
+      }
     },
     "karma-jasmine-html-reporter": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.2.0.tgz",
-      "integrity": "sha512-OkWFy96p2BrRLsicKlbVK4pxYPRwr8KK+pRvsscVxkxNGoCPrTw+JRTmvcJfOWhLVze8Fd6TGhAOXmpLe9O7yg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz",
+      "integrity": "sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==",
       "dev": true
     },
     "karma-mocha-reporter": {
@@ -6125,72 +5996,45 @@
         "chalk": "^2.1.0",
         "log-symbols": "^2.1.0",
         "strip-ansi": "^4.0.0"
-      }
-    },
-    "karma-opera-launcher": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/karma-opera-launcher/-/karma-opera-launcher-1.0.0.tgz",
-      "integrity": "sha1-+lFihTGh0L6EstjcDX7iCfyP+Ro=",
-      "dev": true
-    },
-    "karma-phantomjs-launcher": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz",
-      "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.0.1",
-        "phantomjs-prebuilt": "^2.1.7"
-      }
-    },
-    "karma-safari-launcher": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
-      "integrity": "sha1-lpgqLMR9BmquccVTursoMZEVos4=",
-      "dev": true
-    },
-    "karma-spec-reporter": {
-      "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
-      "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
-      "dev": true,
-      "requires": {
-        "colors": "^1.1.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "karma-webpack": {
-      "version": "4.0.0-rc.6",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-4.0.0-rc.6.tgz",
-      "integrity": "sha512-fN3EfHc10bZxP7dqgsaIFdmkynABFsgMxqgVZJYqxzt0CDBH6j1LbHrMilnijnDYZ8fZDLtx/OKWshXiYyhIig==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-3.0.5.tgz",
+      "integrity": "sha512-nRudGJWstvVuA6Tbju9tyGUfXTtI1UXMXoRHVmM2/78D0q6s/Ye2IC157PKNDC15PWFGR0mVIRtWLAdcfsRJoA==",
       "dev": true,
       "requires": {
         "async": "^2.0.0",
-        "loader-utils": "^1.1.0",
+        "babel-runtime": "^6.0.0",
+        "loader-utils": "^1.0.0",
+        "lodash": "^4.0.0",
         "source-map": "^0.5.6",
-        "webpack-dev-middleware": "^3.2.0"
+        "webpack-dev-middleware": "^2.0.6"
       }
     },
-    "kew": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
-      "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
-      "dev": true
-    },
     "kind-of": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
       "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
       "dev": true
     },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
@@ -6257,6 +6101,12 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
         }
       }
     },
@@ -6307,12 +6157,6 @@
         "strip-ansi": "^3.0.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -6351,15 +6195,6 @@
             "chalk": "^1.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -6487,22 +6322,22 @@
       }
     },
     "log4js": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
-      "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.3.0.tgz",
+      "integrity": "sha512-ivqZBkBvWLJ8rXfhb4E0979olSwnYBPSZy/5WhLNXwntqRgUhxHnqcXGmVw0t+XmLNTr3GAWEzjqHMzu4KM7rA==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.5.5",
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
+        "date-format": "^2.0.0",
+        "debug": "^4.1.1",
+        "flatted": "^2.0.0",
         "rfdc": "^1.1.2",
-        "streamroller": "0.7.0"
+        "streamroller": "^1.0.5"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -6516,6 +6351,16 @@
         }
       }
     },
+    "loglevelnext": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz",
+      "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
+      "dev": true,
+      "requires": {
+        "es6-symbol": "^3.1.1",
+        "object.assign": "^4.1.0"
+      }
+    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -6553,14 +6398,6 @@
       "requires": {
         "pify": "^4.0.1",
         "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
       }
     },
     "mamacro": {
@@ -6686,12 +6523,6 @@
         }
       }
     },
-    "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
-      "dev": true
-    },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -6912,6 +6743,12 @@
       "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
       "dev": true
     },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -7019,12 +6856,6 @@
         "true-case-path": "^1.0.2"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -7060,15 +6891,6 @@
           "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -7110,6 +6932,3463 @@
       "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "dev": true
     },
+    "npm": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-6.9.0.tgz",
+      "integrity": "sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==",
+      "dev": true,
+      "requires": {
+        "JSONStream": "^1.3.5",
+        "abbrev": "~1.1.1",
+        "ansicolors": "~0.3.2",
+        "ansistyles": "~0.1.3",
+        "aproba": "^2.0.0",
+        "archy": "~1.0.0",
+        "bin-links": "^1.1.2",
+        "bluebird": "^3.5.3",
+        "byte-size": "^5.0.1",
+        "cacache": "^11.3.2",
+        "call-limit": "~1.1.0",
+        "chownr": "^1.1.1",
+        "ci-info": "^2.0.0",
+        "cli-columns": "^3.1.2",
+        "cli-table3": "^0.5.1",
+        "cmd-shim": "~2.0.2",
+        "columnify": "~1.5.4",
+        "config-chain": "^1.1.12",
+        "debuglog": "*",
+        "detect-indent": "~5.0.0",
+        "detect-newline": "^2.1.0",
+        "dezalgo": "~1.0.3",
+        "editor": "~1.0.0",
+        "figgy-pudding": "^3.5.1",
+        "find-npm-prefix": "^1.0.2",
+        "fs-vacuum": "~1.2.10",
+        "fs-write-stream-atomic": "~1.0.10",
+        "gentle-fs": "^2.0.1",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.1.15",
+        "has-unicode": "~2.0.1",
+        "hosted-git-info": "^2.7.1",
+        "iferr": "^1.0.2",
+        "imurmurhash": "*",
+        "inflight": "~1.0.6",
+        "inherits": "~2.0.3",
+        "ini": "^1.3.5",
+        "init-package-json": "^1.10.3",
+        "is-cidr": "^3.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "lazy-property": "~1.0.0",
+        "libcipm": "^3.0.3",
+        "libnpm": "^2.0.1",
+        "libnpmaccess": "*",
+        "libnpmhook": "^5.0.2",
+        "libnpmorg": "*",
+        "libnpmsearch": "*",
+        "libnpmteam": "*",
+        "libnpx": "^10.2.0",
+        "lock-verify": "^2.1.0",
+        "lockfile": "^1.0.4",
+        "lodash._baseindexof": "*",
+        "lodash._baseuniq": "~4.6.0",
+        "lodash._bindcallback": "*",
+        "lodash._cacheindexof": "*",
+        "lodash._createcache": "*",
+        "lodash._getnative": "*",
+        "lodash.clonedeep": "~4.5.0",
+        "lodash.restparam": "*",
+        "lodash.union": "~4.6.0",
+        "lodash.uniq": "~4.5.0",
+        "lodash.without": "~4.4.0",
+        "lru-cache": "^4.1.5",
+        "meant": "~1.0.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "~0.5.1",
+        "move-concurrently": "^1.0.1",
+        "node-gyp": "^3.8.0",
+        "nopt": "~4.0.1",
+        "normalize-package-data": "^2.5.0",
+        "npm-audit-report": "^1.3.2",
+        "npm-cache-filename": "~1.0.2",
+        "npm-install-checks": "~3.0.0",
+        "npm-lifecycle": "^2.1.0",
+        "npm-package-arg": "^6.1.0",
+        "npm-packlist": "^1.4.1",
+        "npm-pick-manifest": "^2.2.3",
+        "npm-profile": "*",
+        "npm-registry-fetch": "^3.9.0",
+        "npm-user-validate": "~1.0.0",
+        "npmlog": "~4.1.2",
+        "once": "~1.4.0",
+        "opener": "^1.5.1",
+        "osenv": "^0.1.5",
+        "pacote": "^9.5.0",
+        "path-is-inside": "~1.0.2",
+        "promise-inflight": "~1.0.1",
+        "qrcode-terminal": "^0.12.0",
+        "query-string": "^6.2.0",
+        "qw": "~1.0.1",
+        "read": "~1.0.7",
+        "read-cmd-shim": "~1.0.1",
+        "read-installed": "~4.0.3",
+        "read-package-json": "^2.0.13",
+        "read-package-tree": "^5.2.2",
+        "readable-stream": "^3.1.1",
+        "readdir-scoped-modules": "*",
+        "request": "^2.88.0",
+        "retry": "^0.12.0",
+        "rimraf": "^2.6.3",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.6.0",
+        "sha": "~2.0.1",
+        "slide": "~1.1.6",
+        "sorted-object": "~2.0.1",
+        "sorted-union-stream": "~2.1.3",
+        "ssri": "^6.0.1",
+        "stringify-package": "^1.0.0",
+        "tar": "^4.4.8",
+        "text-table": "~0.2.0",
+        "tiny-relative-date": "^1.3.0",
+        "uid-number": "0.0.6",
+        "umask": "~1.1.0",
+        "unique-filename": "^1.1.1",
+        "unpipe": "~1.0.0",
+        "update-notifier": "^2.5.0",
+        "uuid": "^3.3.2",
+        "validate-npm-package-license": "^3.0.4",
+        "validate-npm-package-name": "~3.0.0",
+        "which": "^1.3.1",
+        "worker-farm": "^1.6.0",
+        "write-file-atomic": "^2.4.2"
+      },
+      "dependencies": {
+        "JSONStream": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "jsonparse": "^1.2.0",
+            "through": ">=2.2.7 <3"
+          }
+        },
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "agent-base": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "es6-promisify": "^5.0.0"
+          }
+        },
+        "agentkeepalive": {
+          "version": "3.4.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "humanize-ms": "^1.2.1"
+          }
+        },
+        "ajv": {
+          "version": "5.5.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "ansi-align": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "string-width": "^2.0.0"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "ansicolors": {
+          "version": "0.3.2",
+          "bundled": true,
+          "dev": true
+        },
+        "ansistyles": {
+          "version": "0.1.3",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "archy": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "asap": {
+          "version": "2.0.6",
+          "bundled": true,
+          "dev": true
+        },
+        "asn1": {
+          "version": "0.2.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safer-buffer": "~2.1.0"
+          }
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "bundled": true,
+          "dev": true
+        },
+        "aws4": {
+          "version": "1.8.0",
+          "bundled": true,
+          "dev": true
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "^0.14.3"
+          }
+        },
+        "bin-links": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.0",
+            "cmd-shim": "^2.0.2",
+            "gentle-fs": "^2.0.0",
+            "graceful-fs": "^4.1.11",
+            "write-file-atomic": "^2.3.0"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "~2.0.0"
+          }
+        },
+        "bluebird": {
+          "version": "3.5.3",
+          "bundled": true,
+          "dev": true
+        },
+        "boxen": {
+          "version": "1.3.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-align": "^2.0.0",
+            "camelcase": "^4.0.0",
+            "chalk": "^2.0.1",
+            "cli-boxes": "^1.0.0",
+            "string-width": "^2.0.0",
+            "term-size": "^1.2.0",
+            "widest-line": "^2.0.0"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-from": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "builtins": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "byline": {
+          "version": "5.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "byte-size": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "cacache": {
+          "version": "11.3.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.3",
+            "graceful-fs": "^4.1.15",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.2",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          },
+          "dependencies": {
+            "chownr": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true
+            },
+            "lru-cache": {
+              "version": "5.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "yallist": "^3.0.2"
+              }
+            },
+            "unique-filename": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "unique-slug": "^2.0.0"
+              }
+            },
+            "yallist": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "call-limit": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "capture-stack-trace": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.4.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "ci-info": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "cidr-regex": {
+          "version": "2.0.10",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ip-regex": "^2.1.0"
+          }
+        },
+        "cli-boxes": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "cli-columns": {
+          "version": "3.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "string-width": "^2.0.0",
+            "strip-ansi": "^3.0.1"
+          }
+        },
+        "cli-table3": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "colors": "^1.1.2",
+            "object-assign": "^4.1.0",
+            "string-width": "^2.1.1"
+          }
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "bundled": true,
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "clone": {
+          "version": "1.0.4",
+          "bundled": true,
+          "dev": true
+        },
+        "cmd-shim": {
+          "version": "2.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "mkdirp": "~0.5.0"
+          }
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "color-convert": {
+          "version": "1.9.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "color-name": "^1.1.1"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true
+        },
+        "colors": {
+          "version": "1.3.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "columnify": {
+          "version": "1.5.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "strip-ansi": "^3.0.0",
+            "wcwidth": "^1.0.0"
+          }
+        },
+        "combined-stream": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "concat-stream": {
+          "version": "1.6.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^2.2.2",
+            "typedarray": "^0.0.6"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "config-chain": {
+          "version": "1.1.12",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ini": "^1.3.4",
+            "proto-list": "~1.2.1"
+          }
+        },
+        "configstore": {
+          "version": "3.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "dot-prop": "^4.1.0",
+            "graceful-fs": "^4.1.2",
+            "make-dir": "^1.0.0",
+            "unique-string": "^1.0.0",
+            "write-file-atomic": "^2.0.0",
+            "xdg-basedir": "^3.0.0"
+          }
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "copy-concurrently": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^1.1.1",
+            "fs-write-stream-atomic": "^1.0.8",
+            "iferr": "^0.1.5",
+            "mkdirp": "^0.5.1",
+            "rimraf": "^2.5.4",
+            "run-queue": "^1.0.0"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true
+            },
+            "iferr": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "create-error-class": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "capture-stack-trace": "^1.0.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "5.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "crypto-random-string": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "cyclist": {
+          "version": "0.2.2",
+          "bundled": true,
+          "dev": true
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "^1.0.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "debuglog": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "decamelize": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "decode-uri-component": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "deep-extend": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true
+        },
+        "defaults": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "clone": "^1.0.2"
+          }
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "detect-indent": {
+          "version": "5.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "detect-newline": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "dezalgo": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "asap": "^2.0.0",
+            "wrappy": "1"
+          }
+        },
+        "dot-prop": {
+          "version": "4.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "is-obj": "^1.0.0"
+          }
+        },
+        "dotenv": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "duplexer3": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true
+        },
+        "duplexify": {
+          "version": "3.6.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0",
+            "stream-shift": "^1.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "ecc-jsbn": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.1.0"
+          }
+        },
+        "editor": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "encoding": {
+          "version": "0.1.12",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "iconv-lite": "~0.4.13"
+          }
+        },
+        "end-of-stream": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "^1.4.0"
+          }
+        },
+        "err-code": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "errno": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "prr": "~1.0.1"
+          }
+        },
+        "es6-promise": {
+          "version": "4.2.6",
+          "bundled": true,
+          "dev": true
+        },
+        "es6-promisify": {
+          "version": "5.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "es6-promise": "^4.0.3"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true
+        },
+        "execa": {
+          "version": "0.7.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "3.0.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "extend": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "extsprintf": {
+          "version": "1.3.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fast-json-stable-stringify": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "figgy-pudding": {
+          "version": "3.5.1",
+          "bundled": true,
+          "dev": true
+        },
+        "find-npm-prefix": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "flush-write-stream": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.4"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true
+        },
+        "form-data": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "from2": {
+          "version": "2.3.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs-vacuum": {
+          "version": "1.2.10",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "path-is-inside": "^1.0.1",
+            "rimraf": "^2.5.2"
+          }
+        },
+        "fs-write-stream-atomic": {
+          "version": "1.0.10",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "iferr": "^0.1.5",
+            "imurmurhash": "^0.1.4",
+            "readable-stream": "1 || 2"
+          },
+          "dependencies": {
+            "iferr": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "inherits": "~2.0.0",
+            "mkdirp": ">=0.5 0",
+            "rimraf": "2"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "genfun": {
+          "version": "5.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "gentle-fs": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^1.1.2",
+            "fs-vacuum": "^1.2.10",
+            "graceful-fs": "^4.1.11",
+            "iferr": "^0.1.5",
+            "mkdirp": "^0.5.1",
+            "path-is-inside": "^1.0.2",
+            "read-cmd-shim": "^1.0.1",
+            "slide": "^1.1.6"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true
+            },
+            "iferr": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "get-caller-file": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "^1.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "global-dirs": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ini": "^1.3.4"
+          }
+        },
+        "got": {
+          "version": "6.7.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "create-error-class": "^3.0.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "is-redirect": "^1.0.0",
+            "is-retry-allowed": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "lowercase-keys": "^1.0.0",
+            "safe-buffer": "^5.0.1",
+            "timed-out": "^4.0.0",
+            "unzip-response": "^2.0.1",
+            "url-parse-lax": "^1.0.0"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "3.0.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.15",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "har-validator": {
+          "version": "5.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ajv": "^5.3.0",
+            "har-schema": "^2.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "hosted-git-info": {
+          "version": "2.7.1",
+          "bundled": true,
+          "dev": true
+        },
+        "http-cache-semantics": {
+          "version": "3.8.1",
+          "bundled": true,
+          "dev": true
+        },
+        "http-proxy-agent": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "agent-base": "4",
+            "debug": "3.1.0"
+          }
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "^1.0.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "agent-base": "^4.1.0",
+            "debug": "^3.1.0"
+          }
+        },
+        "humanize-ms": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ms": "^2.0.0"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.23",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "iferr": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "import-lazy": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "imurmurhash": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true
+        },
+        "init-package-json": {
+          "version": "1.10.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.1",
+            "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+            "promzard": "^0.3.0",
+            "read": "~1.0.1",
+            "read-package-json": "1 || 2",
+            "semver": "2.x || 3.x || 4 || 5",
+            "validate-npm-package-license": "^3.0.1",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "invert-kv": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "ip": {
+          "version": "1.1.5",
+          "bundled": true,
+          "dev": true
+        },
+        "ip-regex": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "is-ci": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ci-info": "^1.0.0"
+          },
+          "dependencies": {
+            "ci-info": {
+              "version": "1.6.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "is-cidr": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "cidr-regex": "^2.0.10"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "is-installed-globally": {
+          "version": "0.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "global-dirs": "^0.1.0",
+            "is-path-inside": "^1.0.0"
+          }
+        },
+        "is-npm": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "is-obj": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "is-path-inside": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "path-is-inside": "^1.0.1"
+          }
+        },
+        "is-redirect": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "is-retry-allowed": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isexe": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-parse-better-errors": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "bundled": true,
+          "dev": true
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "jsonparse": {
+          "version": "1.3.1",
+          "bundled": true,
+          "dev": true
+        },
+        "jsprim": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.3.0",
+            "json-schema": "0.2.3",
+            "verror": "1.10.0"
+          }
+        },
+        "latest-version": {
+          "version": "3.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "package-json": "^4.0.0"
+          }
+        },
+        "lazy-property": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lcid": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "invert-kv": "^1.0.0"
+          }
+        },
+        "libcipm": {
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "bin-links": "^1.1.2",
+            "bluebird": "^3.5.1",
+            "figgy-pudding": "^3.5.1",
+            "find-npm-prefix": "^1.0.2",
+            "graceful-fs": "^4.1.11",
+            "ini": "^1.3.5",
+            "lock-verify": "^2.0.2",
+            "mkdirp": "^0.5.1",
+            "npm-lifecycle": "^2.0.3",
+            "npm-logical-tree": "^1.2.1",
+            "npm-package-arg": "^6.1.0",
+            "pacote": "^9.1.0",
+            "read-package-json": "^2.0.13",
+            "rimraf": "^2.6.2",
+            "worker-farm": "^1.6.0"
+          }
+        },
+        "libnpm": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "bin-links": "^1.1.2",
+            "bluebird": "^3.5.3",
+            "find-npm-prefix": "^1.0.2",
+            "libnpmaccess": "^3.0.1",
+            "libnpmconfig": "^1.2.1",
+            "libnpmhook": "^5.0.2",
+            "libnpmorg": "^1.0.0",
+            "libnpmpublish": "^1.1.0",
+            "libnpmsearch": "^2.0.0",
+            "libnpmteam": "^1.0.1",
+            "lock-verify": "^2.0.2",
+            "npm-lifecycle": "^2.1.0",
+            "npm-logical-tree": "^1.2.1",
+            "npm-package-arg": "^6.1.0",
+            "npm-profile": "^4.0.1",
+            "npm-registry-fetch": "^3.8.0",
+            "npmlog": "^4.1.2",
+            "pacote": "^9.2.3",
+            "read-package-json": "^2.0.13",
+            "stringify-package": "^1.0.0"
+          }
+        },
+        "libnpmaccess": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "get-stream": "^4.0.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^3.8.0"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "libnpmconfig": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "find-up": "^3.0.0",
+            "ini": "^1.3.5"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "3.0.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "locate-path": "^3.0.0"
+              }
+            },
+            "locate-path": {
+              "version": "3.0.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "2.1.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "3.0.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "p-limit": "^2.0.0"
+              }
+            },
+            "p-try": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "libnpmhook": {
+          "version": "5.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^3.8.0"
+          }
+        },
+        "libnpmorg": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^3.8.0"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "libnpmpublish": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "lodash.clonedeep": "^4.5.0",
+            "normalize-package-data": "^2.4.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^3.8.0",
+            "semver": "^5.5.1",
+            "ssri": "^6.0.1"
+          }
+        },
+        "libnpmsearch": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^3.8.0"
+          }
+        },
+        "libnpmteam": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^3.8.0"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "libnpx": {
+          "version": "10.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "dotenv": "^5.0.1",
+            "npm-package-arg": "^6.0.0",
+            "rimraf": "^2.6.2",
+            "safe-buffer": "^5.1.0",
+            "update-notifier": "^2.3.0",
+            "which": "^1.3.0",
+            "y18n": "^4.0.0",
+            "yargs": "^11.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "lock-verify": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "npm-package-arg": "^6.1.0",
+            "semver": "^5.4.1"
+          }
+        },
+        "lockfile": {
+          "version": "1.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "lodash._baseindexof": {
+          "version": "3.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash._baseuniq": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "lodash._createset": "~4.0.0",
+            "lodash._root": "~3.0.0"
+          }
+        },
+        "lodash._bindcallback": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash._cacheindexof": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash._createcache": {
+          "version": "3.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "lodash._getnative": "^3.0.0"
+          }
+        },
+        "lodash._createset": {
+          "version": "4.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash._getnative": {
+          "version": "3.9.1",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash._root": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.clonedeep": {
+          "version": "4.5.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.restparam": {
+          "version": "3.6.1",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.union": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.uniq": {
+          "version": "4.5.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lodash.without": {
+          "version": "4.4.0",
+          "bundled": true,
+          "dev": true
+        },
+        "lowercase-keys": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "4.1.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
+        "make-dir": {
+          "version": "1.3.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "make-fetch-happen": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "agentkeepalive": "^3.4.1",
+            "cacache": "^11.0.1",
+            "http-cache-semantics": "^3.8.1",
+            "http-proxy-agent": "^2.1.0",
+            "https-proxy-agent": "^2.2.1",
+            "lru-cache": "^4.1.2",
+            "mississippi": "^3.0.0",
+            "node-fetch-npm": "^2.0.2",
+            "promise-retry": "^1.1.1",
+            "socks-proxy-agent": "^4.0.0",
+            "ssri": "^6.0.0"
+          }
+        },
+        "meant": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "mem": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^1.0.0"
+          }
+        },
+        "mime-db": {
+          "version": "1.35.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.19",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "~1.35.0"
+          }
+        },
+        "mimic-fn": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "minipass": {
+          "version": "2.3.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          },
+          "dependencies": {
+            "yallist": {
+              "version": "3.0.2",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "minizlib": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "move-concurrently": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^1.1.1",
+            "copy-concurrently": "^1.0.0",
+            "fs-write-stream-atomic": "^1.0.8",
+            "mkdirp": "^0.5.1",
+            "rimraf": "^2.5.4",
+            "run-queue": "^1.0.3"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "node-fetch-npm": {
+          "version": "2.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "encoding": "^0.1.11",
+            "json-parse-better-errors": "^1.0.0",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "node-gyp": {
+          "version": "3.8.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fstream": "^1.0.0",
+            "glob": "^7.0.3",
+            "graceful-fs": "^4.1.2",
+            "mkdirp": "^0.5.0",
+            "nopt": "2 || 3",
+            "npmlog": "0 || 1 || 2 || 3 || 4",
+            "osenv": "0",
+            "request": "^2.87.0",
+            "rimraf": "2",
+            "semver": "~5.3.0",
+            "tar": "^2.0.0",
+            "which": "1"
+          },
+          "dependencies": {
+            "nopt": {
+              "version": "3.0.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "abbrev": "1"
+              }
+            },
+            "semver": {
+              "version": "5.3.0",
+              "bundled": true,
+              "dev": true
+            },
+            "tar": {
+              "version": "2.2.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "block-stream": "*",
+                "fstream": "^1.0.2",
+                "inherits": "2"
+              }
+            }
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          },
+          "dependencies": {
+            "resolve": {
+              "version": "1.10.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "path-parse": "^1.0.6"
+              }
+            }
+          }
+        },
+        "npm-audit-report": {
+          "version": "1.3.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "cli-table3": "^0.5.0",
+            "console-control-strings": "^1.1.0"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true
+        },
+        "npm-cache-filename": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "npm-install-checks": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "semver": "^2.3.0 || 3.x || 4 || 5"
+          }
+        },
+        "npm-lifecycle": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "byline": "^5.0.0",
+            "graceful-fs": "^4.1.11",
+            "node-gyp": "^3.8.0",
+            "resolve-from": "^4.0.0",
+            "slide": "^1.1.6",
+            "uid-number": "0.0.6",
+            "umask": "^1.1.0",
+            "which": "^1.3.1"
+          }
+        },
+        "npm-logical-tree": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true
+        },
+        "npm-package-arg": {
+          "version": "6.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.6.0",
+            "osenv": "^0.1.5",
+            "semver": "^5.5.0",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "npm-packlist": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npm-pick-manifest": {
+          "version": "2.2.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "npm-package-arg": "^6.0.0",
+            "semver": "^5.4.1"
+          }
+        },
+        "npm-profile": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^1.1.2 || 2",
+            "figgy-pudding": "^3.4.1",
+            "npm-registry-fetch": "^3.8.0"
+          }
+        },
+        "npm-registry-fetch": {
+          "version": "3.9.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "JSONStream": "^1.3.4",
+            "bluebird": "^3.5.1",
+            "figgy-pudding": "^3.4.1",
+            "lru-cache": "^4.1.3",
+            "make-fetch-happen": "^4.0.1",
+            "npm-package-arg": "^6.1.0"
+          }
+        },
+        "npm-run-path": {
+          "version": "2.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "path-key": "^2.0.0"
+          }
+        },
+        "npm-user-validate": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "bundled": true,
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "opener": {
+          "version": "1.5.1",
+          "bundled": true,
+          "dev": true
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
+          }
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "p-finally": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "package-json": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "got": "^6.7.1",
+            "registry-auth-token": "^3.0.1",
+            "registry-url": "^3.0.3",
+            "semver": "^5.1.0"
+          }
+        },
+        "pacote": {
+          "version": "9.5.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "cacache": "^11.3.2",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.1.0",
+            "glob": "^7.1.3",
+            "lru-cache": "^5.1.1",
+            "make-fetch-happen": "^4.0.1",
+            "minimatch": "^3.0.4",
+            "minipass": "^2.3.5",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "normalize-package-data": "^2.4.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-packlist": "^1.1.12",
+            "npm-pick-manifest": "^2.2.3",
+            "npm-registry-fetch": "^3.8.0",
+            "osenv": "^0.1.5",
+            "promise-inflight": "^1.0.1",
+            "promise-retry": "^1.1.1",
+            "protoduck": "^5.0.1",
+            "rimraf": "^2.6.2",
+            "safe-buffer": "^5.1.2",
+            "semver": "^5.6.0",
+            "ssri": "^6.0.1",
+            "tar": "^4.4.8",
+            "unique-filename": "^1.1.1",
+            "which": "^1.3.1"
+          },
+          "dependencies": {
+            "lru-cache": {
+              "version": "5.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "yallist": "^3.0.2"
+              }
+            },
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "yallist": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "parallel-transform": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "cyclist": "~0.2.2",
+            "inherits": "^2.0.3",
+            "readable-stream": "^2.1.5"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "path-is-inside": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "path-parse": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "pify": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "prepend-http": {
+          "version": "1.0.4",
+          "bundled": true,
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "promise-inflight": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "promise-retry": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "err-code": "^1.0.0",
+            "retry": "^0.10.0"
+          },
+          "dependencies": {
+            "retry": {
+              "version": "0.10.1",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "promzard": {
+          "version": "0.3.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "read": "1"
+          }
+        },
+        "proto-list": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true
+        },
+        "protoduck": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "genfun": "^5.0.0"
+          }
+        },
+        "prr": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "pseudomap": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "psl": {
+          "version": "1.1.29",
+          "bundled": true,
+          "dev": true
+        },
+        "pump": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "pumpify": {
+          "version": "1.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "duplexify": "^3.6.0",
+            "inherits": "^2.0.3",
+            "pump": "^2.0.0"
+          },
+          "dependencies": {
+            "pump": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
+              }
+            }
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true
+        },
+        "qrcode-terminal": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true
+        },
+        "qs": {
+          "version": "6.5.2",
+          "bundled": true,
+          "dev": true
+        },
+        "query-string": {
+          "version": "6.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "decode-uri-component": "^0.2.0",
+            "strict-uri-encode": "^2.0.0"
+          }
+        },
+        "qw": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "rc": {
+          "version": "1.2.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "deep-extend": "^0.5.1",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "read": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mute-stream": "~0.0.4"
+          }
+        },
+        "read-cmd-shim": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2"
+          }
+        },
+        "read-installed": {
+          "version": "4.0.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "debuglog": "^1.0.1",
+            "graceful-fs": "^4.1.2",
+            "read-package-json": "^2.0.0",
+            "readdir-scoped-modules": "^1.0.0",
+            "semver": "2 || 3 || 4 || 5",
+            "slide": "~1.1.3",
+            "util-extend": "^1.0.1"
+          }
+        },
+        "read-package-json": {
+          "version": "2.0.13",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.1.2",
+            "json-parse-better-errors": "^1.0.1",
+            "normalize-package-data": "^2.0.0",
+            "slash": "^1.0.0"
+          }
+        },
+        "read-package-tree": {
+          "version": "5.2.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "debuglog": "^1.0.1",
+            "dezalgo": "^1.0.0",
+            "once": "^1.3.0",
+            "read-package-json": "^2.0.0",
+            "readdir-scoped-modules": "^1.0.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.1.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "readdir-scoped-modules": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "debuglog": "^1.0.1",
+            "dezalgo": "^1.0.0",
+            "graceful-fs": "^4.1.2",
+            "once": "^1.3.0"
+          }
+        },
+        "registry-auth-token": {
+          "version": "3.3.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "rc": "^1.1.6",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "registry-url": {
+          "version": "3.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "rc": "^1.0.1"
+          }
+        },
+        "request": {
+          "version": "2.88.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.0",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.4.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          }
+        },
+        "require-directory": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "retry": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "run-queue": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "aproba": "^1.1.1"
+          },
+          "dependencies": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.6.0",
+          "bundled": true,
+          "dev": true
+        },
+        "semver-diff": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "semver": "^5.0.3"
+          }
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "sha": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "readable-stream": "^2.0.2"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "slash": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "slide": {
+          "version": "1.1.6",
+          "bundled": true,
+          "dev": true
+        },
+        "smart-buffer": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "socks": {
+          "version": "2.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ip": "^1.1.5",
+            "smart-buffer": "^4.0.1"
+          }
+        },
+        "socks-proxy-agent": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "agent-base": "~4.2.0",
+            "socks": "~2.2.0"
+          }
+        },
+        "sorted-object": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "sorted-union-stream": {
+          "version": "2.1.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "from2": "^1.3.0",
+            "stream-iterate": "^1.1.0"
+          },
+          "dependencies": {
+            "from2": {
+              "version": "1.3.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "inherits": "~2.0.1",
+                "readable-stream": "~1.1.10"
+              }
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true
+            },
+            "readable-stream": {
+              "version": "1.1.14",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.1",
+                "isarray": "0.0.1",
+                "string_decoder": "~0.10.x"
+              }
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "spdx-correct": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "spdx-expression-parse": "^3.0.0",
+            "spdx-license-ids": "^3.0.0"
+          }
+        },
+        "spdx-exceptions": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "spdx-expression-parse": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "spdx-exceptions": "^2.1.0",
+            "spdx-license-ids": "^3.0.0"
+          }
+        },
+        "spdx-license-ids": {
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "sshpk": {
+          "version": "1.14.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "asn1": "~0.2.3",
+            "assert-plus": "^1.0.0",
+            "bcrypt-pbkdf": "^1.0.0",
+            "dashdash": "^1.12.0",
+            "ecc-jsbn": "~0.1.1",
+            "getpass": "^0.1.1",
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.0.2",
+            "tweetnacl": "~0.14.0"
+          }
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "stream-each": {
+          "version": "1.2.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "stream-shift": "^1.0.0"
+          }
+        },
+        "stream-iterate": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "readable-stream": "^2.1.5",
+            "stream-shift": "^1.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "stream-shift": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "strict-uri-encode": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "bundled": true,
+              "dev": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "stringify-package": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-eof": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
+          },
+          "dependencies": {
+            "chownr": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true
+            },
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "yallist": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "term-size": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "execa": "^0.7.0"
+          }
+        },
+        "text-table": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "through": {
+          "version": "2.3.8",
+          "bundled": true,
+          "dev": true
+        },
+        "through2": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "readable-stream": "^2.1.5",
+            "xtend": "~4.0.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "timed-out": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "tiny-relative-date": {
+          "version": "1.3.0",
+          "bundled": true,
+          "dev": true
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "typedarray": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true
+        },
+        "umask": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "unique-filename": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "unique-slug": "^2.0.0"
+          }
+        },
+        "unique-slug": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "imurmurhash": "^0.1.4"
+          }
+        },
+        "unique-string": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "crypto-random-string": "^1.0.0"
+          }
+        },
+        "unpipe": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "unzip-response": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "update-notifier": {
+          "version": "2.5.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boxen": "^1.2.1",
+            "chalk": "^2.0.1",
+            "configstore": "^3.0.0",
+            "import-lazy": "^2.1.0",
+            "is-ci": "^1.0.10",
+            "is-installed-globally": "^0.1.0",
+            "is-npm": "^1.0.0",
+            "latest-version": "^3.0.0",
+            "semver-diff": "^2.0.0",
+            "xdg-basedir": "^3.0.0"
+          }
+        },
+        "url-parse-lax": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "prepend-http": "^1.0.1"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "util-extend": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "bundled": true,
+          "dev": true
+        },
+        "validate-npm-package-license": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "spdx-correct": "^3.0.0",
+            "spdx-expression-parse": "^3.0.0"
+          }
+        },
+        "validate-npm-package-name": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "builtins": "^1.0.3"
+          }
+        },
+        "verror": {
+          "version": "1.10.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "^1.0.0",
+            "core-util-is": "1.0.2",
+            "extsprintf": "^1.2.0"
+          }
+        },
+        "wcwidth": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "defaults": "^1.0.3"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.2"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "widest-line": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1"
+          }
+        },
+        "worker-farm": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "errno": "~0.1.7"
+          }
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "write-file-atomic": {
+          "version": "2.4.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "xdg-basedir": {
+          "version": "3.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "yargs": {
+          "version": "11.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.1.1",
+            "find-up": "^2.1.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^9.0.2"
+          },
+          "dependencies": {
+            "y18n": {
+              "version": "3.2.1",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "yargs-parser": {
+          "version": "9.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
     "npm-path": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz",
@@ -7157,6 +10436,12 @@
             "pify": "^3.0.0"
           }
         },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
         "read-pkg": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -7300,6 +10585,18 @@
         "isobject": "^3.0.0"
       }
     },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
     "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -7488,14 +10785,6 @@
       "dev": true,
       "requires": {
         "callsites": "^3.0.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-          "dev": true
-        }
       }
     },
     "parse-asn1": {
@@ -7632,43 +10921,12 @@
         "sha.js": "^2.4.8"
       }
     },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true
-    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
-    "phantomjs-prebuilt": {
-      "version": "2.1.16",
-      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz",
-      "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=",
-      "dev": true,
-      "requires": {
-        "es6-promise": "^4.0.3",
-        "extract-zip": "^1.6.5",
-        "fs-extra": "^1.0.0",
-        "hasha": "^2.2.0",
-        "kew": "^0.7.0",
-        "progress": "^1.1.8",
-        "request": "^2.81.0",
-        "request-progress": "^2.0.1",
-        "which": "^1.2.10"
-      },
-      "dependencies": {
-        "progress": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-          "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-          "dev": true
-        }
-      }
-    },
     "pidtree": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
@@ -7676,9 +10934,9 @@
       "dev": true
     },
     "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true
     },
     "pinkie": {
@@ -7697,41 +10955,12 @@
       }
     },
     "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
       "requires": {
-        "find-up": "^4.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.0.0.tgz",
-          "integrity": "sha512-zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        }
+        "find-up": "^3.0.0"
       }
     },
     "please-upgrade-node": {
@@ -7750,9 +10979,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.14",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-      "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
+      "version": "7.0.16",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz",
+      "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -7925,9 +11154,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.1.31",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
-      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+      "version": "1.1.32",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz",
+      "integrity": "sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==",
       "dev": true
     },
     "public-encrypt": {
@@ -7990,9 +11219,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
       "dev": true
     },
     "querystring": {
@@ -8161,9 +11390,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
-      "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "dev": true
     },
     "regenerator-transform": {
@@ -8287,15 +11516,14 @@
         "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
-      }
-    },
-    "request-progress": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
-      "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
-      "dev": true,
-      "requires": {
-        "throttleit": "^1.0.0"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+          "dev": true
+        }
       }
     },
     "require-directory": {
@@ -8338,6 +11566,14 @@
       "dev": true,
       "requires": {
         "resolve-from": "^3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
       }
     },
     "resolve-dir": {
@@ -8351,9 +11587,9 @@
       }
     },
     "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
     "resolve-url": {
@@ -8481,6 +11717,14 @@
         "neo-async": "^2.5.0",
         "pify": "^3.0.0",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
       }
     },
     "schema-utils": {
@@ -9085,15 +12329,16 @@
       "dev": true
     },
     "streamroller": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.5.tgz",
+      "integrity": "sha512-iGVaMcyF5PcUY0cPbW3xFQUXnr9O4RZXNBBjhuLZgrjLO4XCLLGfx4T2sGqygSeylUjwgWRsnNbT9aV0Zb8AYw==",
       "dev": true,
       "requires": {
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "readable-stream": "^2.3.0"
+        "async": "^2.6.2",
+        "date-format": "^2.0.0",
+        "debug": "^3.2.6",
+        "fs-extra": "^7.0.1",
+        "lodash": "^4.17.11"
       },
       "dependencies": {
         "debug": {
@@ -9127,6 +12372,23 @@
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
         "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "string.prototype.padend": {
@@ -9161,12 +12423,12 @@
       }
     },
     "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
@@ -9356,12 +12618,6 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "throttleit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-      "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
-      "dev": true
-    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -9701,6 +12957,12 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -9786,6 +13048,12 @@
         }
       }
     },
+    "url-join": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz",
+      "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=",
+      "dev": true
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -9871,24 +13139,6 @@
       "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
       "dev": true
     },
-    "watch": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
-      "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=",
-      "dev": true,
-      "requires": {
-        "exec-sh": "^0.2.0",
-        "minimist": "^1.2.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
     "watchpack": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
@@ -9964,15 +13214,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
         "cliui": {
@@ -10021,6 +13265,15 @@
             "mem": "^4.0.0"
           }
         },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
         "which-module": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
@@ -10037,6 +13290,12 @@
             "strip-ansi": "^3.0.1"
           },
           "dependencies": {
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
             "string-width": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -10092,50 +13351,30 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
-      "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz",
+      "integrity": "sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==",
       "dev": true,
       "requires": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.4.2",
-        "range-parser": "^1.2.1",
-        "webpack-log": "^2.0.0"
-      }
-    },
-    "webpack-karma-jasmine": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/webpack-karma-jasmine/-/webpack-karma-jasmine-3.0.6.tgz",
-      "integrity": "sha512-QVrxlpWyUG/zL4bkW38a/ZH2vfJJ39YF4P+Bl7jjkXtXmK3Jbqe9jESWKE3ek10sy5qKEWX+KuvhNiia80gi8Q==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.3.4",
-        "@babel/preset-env": "^7.3.4",
-        "babel-loader": "^8.0.5",
-        "jasmine-core": "3.2.1",
-        "karma": "^3.0.0",
-        "karma-chrome-launcher": "^2.2.0",
-        "karma-edge-launcher": "^0.4.2",
-        "karma-firefox-launcher": "^1.1.0",
-        "karma-ie-launcher": "^1.0.0",
-        "karma-jasmine": "^1.1.2",
-        "karma-jasmine-html-reporter": "1.2.0",
-        "karma-mocha-reporter": "^2.2.5",
-        "karma-opera-launcher": "^1.0.0",
-        "karma-phantomjs-launcher": "^1.0.4",
-        "karma-safari-launcher": "^1.0.0",
-        "karma-spec-reporter": "0.0.32",
-        "karma-webpack": "^4.0.0-rc.6"
+        "loud-rejection": "^1.6.0",
+        "memory-fs": "~0.4.1",
+        "mime": "^2.1.0",
+        "path-is-absolute": "^1.0.0",
+        "range-parser": "^1.0.3",
+        "url-join": "^2.0.2",
+        "webpack-log": "^1.0.1"
       }
     },
     "webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz",
+      "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "loglevelnext": "^1.0.1",
+        "uuid": "^3.1.0"
       }
     },
     "webpack-sources": {
@@ -10203,6 +13442,23 @@
       "requires": {
         "string-width": "^2.1.1",
         "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "wrappy": {
@@ -10276,12 +13532,6 @@
         "yargs-parser": "^5.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "camelcase": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
@@ -10307,15 +13557,6 @@
             "is-fullwidth-code-point": "^1.0.0",
             "strip-ansi": "^3.0.0"
           }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
         }
       }
     },
@@ -10336,15 +13577,6 @@
         }
       }
     },
-    "yauzl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
-      "dev": true,
-      "requires": {
-        "fd-slicer": "~1.0.1"
-      }
-    },
     "yeast": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
diff --git a/package.json b/package.json
index 494be6bb6..504ba9930 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,14 @@
     "eslint": "^5.16.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "husky": "^2.3.0",
+    "jasmine-core": "^3.4.0",
+    "karma": "^4.1.0",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-cli": "^2.0.0",
+    "karma-jasmine": "^2.0.1",
+    "karma-jasmine-html-reporter": "^1.4.2",
+    "karma-mocha-reporter": "^2.2.5",
+    "karma-webpack": "^3.0.5",
     "lint-staged": "^8.1.7",
     "node-sass": "^4.12.0",
     "npm-run-all": "^4.1.5",
@@ -53,10 +61,8 @@
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
     "uglifyjs-webpack-plugin": "^2.1.3",
-    "watch": "^1.0.2",
     "webpack": "^4.32.2",
-    "webpack-cli": "^3.3.2",
-    "webpack-karma-jasmine": "^3.0.6"
+    "webpack-cli": "^3.3.2"
   },
   "dependencies": {
     "flatpickr": "^4.5.7"

From bb411a1a28643616f856346d5d06317877a7186e Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 26 May 2019 20:57:45 +0200
Subject: [PATCH 397/519] add another test for UtilRegistry

---
 frontend/src/services/util-registry/util-registry.spec.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/services/util-registry/util-registry.spec.js b/frontend/src/services/util-registry/util-registry.spec.js
index 2e4afedf2..e3f69f63c 100644
--- a/frontend/src/services/util-registry/util-registry.spec.js
+++ b/frontend/src/services/util-registry/util-registry.spec.js
@@ -21,6 +21,12 @@ describe('UtilRegistry', () => {
     expect(utilRegistry).toBeTruthy();
   });
 
+  it('should setup all utlites when page is done loading', () => {
+    spyOn(utilRegistry, 'setupAll');
+    document.dispatchEvent(new Event('DOMContentLoaded'));
+    expect(utilRegistry.setupAll).toHaveBeenCalled();
+  });
+
   describe('register()', () => {
     it('should allow to add utilities', () => {
       utilRegistry.register(TEST_UTILS[0]);

From 431d693e686431512282659f314558957aef22bf Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 26 May 2019 21:07:23 +0200
Subject: [PATCH 398/519] move frontend app into separate file

---
 frontend/src/app.js  | 25 +++++++++++++++++++++++++
 frontend/src/main.js | 23 ++---------------------
 2 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 frontend/src/app.js

diff --git a/frontend/src/app.js b/frontend/src/app.js
new file mode 100644
index 000000000..6c7fa215f
--- /dev/null
+++ b/frontend/src/app.js
@@ -0,0 +1,25 @@
+import { HttpClient } from './services/http-client/http-client';
+import { HtmlHelpers } from './services/html-helpers/html-helpers';
+import { I18n } from './services/i18n/i18n';
+import { UtilRegistry } from './services/util-registry/util-registry';
+
+export class App {
+  httpClient = new HttpClient();
+  htmlHelpers = new HtmlHelpers();
+  i18n = new I18n();
+  utilRegistry = new UtilRegistry();
+
+  constructor() {
+    this.utilRegistry.setApp(this);
+  }
+
+  registerUtilities(utils) {
+    if (!Array.isArray(utils)) {
+      throw new Error('Utils are expected to be passed as array!');
+    }
+
+    utils.forEach((util) => {
+      this.utilRegistry.register(util);
+    });
+  }
+}
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 91ebb8e24..ada0b5890 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -1,27 +1,8 @@
-import { HttpClient } from './services/http-client/http-client';
-import { HtmlHelpers } from './services/html-helpers/html-helpers';
-import { I18n } from './services/i18n/i18n';
-import { UtilRegistry } from './services/util-registry/util-registry';
-
-// import utils
+import { App } from './app';
 import Utils from './utils/utils';
 
-class App {
-  httpClient = new HttpClient();
-  htmlHelpers = new HtmlHelpers();
-  i18n = new I18n();
-  utilRegistry = new UtilRegistry();
-
-  constructor() {
-    this.utilRegistry.setApp(this);
-
-    Utils.forEach(util => {
-      this.utilRegistry.register(util);
-    });
-  }
-}
-
 export const app = new App();
+app.registerUtilities(Utils);
 
 // attach the app to window to be able to get a hold of the
 // app instance from the shakespearean templates

From 7426f0cd3ec74b947a9f2c561b9abdda2c9b6e5d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 26 May 2019 21:12:29 +0200
Subject: [PATCH 399/519] dont default export utils array

---
 frontend/src/main.js        | 2 +-
 frontend/src/utils/utils.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/main.js b/frontend/src/main.js
index ada0b5890..eb76d102e 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -1,5 +1,5 @@
 import { App } from './app';
-import Utils from './utils/utils';
+import { Utils } from './utils/utils';
 
 export const app = new App();
 app.registerUtilities(Utils);
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index b3f73084e..05c430456 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -17,7 +17,7 @@ import {
 } from './form/form';
 import tooltips from './tooltips/tooltips';
 
-export default [
+export const Utils = [
   alerts,
   asidenav,
   asyncForm,

From 4c1a38b517f0b1cfad202928cbf44b859602fb2c Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 26 May 2019 22:26:22 +0200
Subject: [PATCH 400/519] remove custom polyfills, let babel do the work

---
 .babelrc                                |   9 +-
 .browserslistrc                         |   2 +
 frontend/polyfills/fetch.js             | 466 ------------------------
 frontend/polyfills/main.js              |   2 -
 frontend/polyfills/url-search-params.js | 348 ------------------
 src/Foundation.hs                       |   1 -
 webpack.config.js                       |   3 -
 7 files changed, 10 insertions(+), 821 deletions(-)
 create mode 100644 .browserslistrc
 delete mode 100644 frontend/polyfills/fetch.js
 delete mode 100644 frontend/polyfills/main.js
 delete mode 100644 frontend/polyfills/url-search-params.js

diff --git a/.babelrc b/.babelrc
index 644dde977..bfb50c21e 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,11 @@
 {
-  "presets": ["@babel/preset-env"],
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "useBuiltIns": "entry"
+      }
+    ]
+  ],
   "plugins": ["@babel/plugin-proposal-class-properties"]
 }
diff --git a/.browserslistrc b/.browserslistrc
new file mode 100644
index 000000000..2c90ae7e7
--- /dev/null
+++ b/.browserslistrc
@@ -0,0 +1,2 @@
+> 0.25%
+not dead
diff --git a/frontend/polyfills/fetch.js b/frontend/polyfills/fetch.js
deleted file mode 100644
index ac9a4fd87..000000000
--- a/frontend/polyfills/fetch.js
+++ /dev/null
@@ -1,466 +0,0 @@
-(function(self) {
-  'use strict';
-
-  if (self.fetch) {
-    return
-  }
-
-  var support = {
-    searchParams: 'URLSearchParams' in self,
-    iterable: 'Symbol' in self && 'iterator' in Symbol,
-    blob: 'FileReader' in self && 'Blob' in self && (function() {
-      try {
-        new Blob()
-        return true
-      } catch(e) {
-        return false
-      }
-    })(),
-    formData: 'FormData' in self,
-    arrayBuffer: 'ArrayBuffer' in self
-  }
-
-  if (support.arrayBuffer) {
-    var viewClasses = [
-      '[object Int8Array]',
-      '[object Uint8Array]',
-      '[object Uint8ClampedArray]',
-      '[object Int16Array]',
-      '[object Uint16Array]',
-      '[object Int32Array]',
-      '[object Uint32Array]',
-      '[object Float32Array]',
-      '[object Float64Array]'
-    ]
-
-    var isDataView = function(obj) {
-      return obj && DataView.prototype.isPrototypeOf(obj)
-    }
-
-    var isArrayBufferView = ArrayBuffer.isView || function(obj) {
-      return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1
-    }
-  }
-
-  function normalizeName(name) {
-    if (typeof name !== 'string') {
-      name = String(name)
-    }
-    if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) {
-      throw new TypeError('Invalid character in header field name')
-    }
-    return name.toLowerCase()
-  }
-
-  function normalizeValue(value) {
-    if (typeof value !== 'string') {
-      value = String(value)
-    }
-    return value
-  }
-
-  // Build a destructive iterator for the value list
-  function iteratorFor(items) {
-    var iterator = {
-      next: function() {
-        var value = items.shift()
-        return {done: value === undefined, value: value}
-      }
-    }
-
-    if (support.iterable) {
-      iterator[Symbol.iterator] = function() {
-        return iterator
-      }
-    }
-
-    return iterator
-  }
-
-  function Headers(headers) {
-    this.map = {}
-
-    if (headers instanceof Headers) {
-      headers.forEach(function(value, name) {
-        this.append(name, value)
-      }, this)
-    } else if (Array.isArray(headers)) {
-      headers.forEach(function(header) {
-        this.append(header[0], header[1])
-      }, this)
-    } else if (headers) {
-      Object.getOwnPropertyNames(headers).forEach(function(name) {
-        this.append(name, headers[name])
-      }, this)
-    }
-  }
-
-  Headers.prototype.append = function(name, value) {
-    name = normalizeName(name)
-    value = normalizeValue(value)
-    var oldValue = this.map[name]
-    this.map[name] = oldValue ? oldValue+','+value : value
-  }
-
-  Headers.prototype['delete'] = function(name) {
-    delete this.map[normalizeName(name)]
-  }
-
-  Headers.prototype.get = function(name) {
-    name = normalizeName(name)
-    return this.has(name) ? this.map[name] : null
-  }
-
-  Headers.prototype.has = function(name) {
-    return this.map.hasOwnProperty(normalizeName(name))
-  }
-
-  Headers.prototype.set = function(name, value) {
-    this.map[normalizeName(name)] = normalizeValue(value)
-  }
-
-  Headers.prototype.forEach = function(callback, thisArg) {
-    for (var name in this.map) {
-      if (this.map.hasOwnProperty(name)) {
-        callback.call(thisArg, this.map[name], name, this)
-      }
-    }
-  }
-
-  Headers.prototype.keys = function() {
-    var items = []
-    this.forEach(function(value, name) { items.push(name) })
-    return iteratorFor(items)
-  }
-
-  Headers.prototype.values = function() {
-    var items = []
-    this.forEach(function(value) { items.push(value) })
-    return iteratorFor(items)
-  }
-
-  Headers.prototype.entries = function() {
-    var items = []
-    this.forEach(function(value, name) { items.push([name, value]) })
-    return iteratorFor(items)
-  }
-
-  if (support.iterable) {
-    Headers.prototype[Symbol.iterator] = Headers.prototype.entries
-  }
-
-  function consumed(body) {
-    if (body.bodyUsed) {
-      return Promise.reject(new TypeError('Already read'))
-    }
-    body.bodyUsed = true
-  }
-
-  function fileReaderReady(reader) {
-    return new Promise(function(resolve, reject) {
-      reader.onload = function() {
-        resolve(reader.result)
-      }
-      reader.onerror = function() {
-        reject(reader.error)
-      }
-    })
-  }
-
-  function readBlobAsArrayBuffer(blob) {
-    var reader = new FileReader()
-    var promise = fileReaderReady(reader)
-    reader.readAsArrayBuffer(blob)
-    return promise
-  }
-
-  function readBlobAsText(blob) {
-    var reader = new FileReader()
-    var promise = fileReaderReady(reader)
-    reader.readAsText(blob)
-    return promise
-  }
-
-  function readArrayBufferAsText(buf) {
-    var view = new Uint8Array(buf)
-    var chars = new Array(view.length)
-
-    for (var i = 0; i < view.length; i++) {
-      chars[i] = String.fromCharCode(view[i])
-    }
-    return chars.join('')
-  }
-
-  function bufferClone(buf) {
-    if (buf.slice) {
-      return buf.slice(0)
-    } else {
-      var view = new Uint8Array(buf.byteLength)
-      view.set(new Uint8Array(buf))
-      return view.buffer
-    }
-  }
-
-  function Body() {
-    this.bodyUsed = false
-
-    this._initBody = function(body) {
-      this._bodyInit = body
-      if (!body) {
-        this._bodyText = ''
-      } else if (typeof body === 'string') {
-        this._bodyText = body
-      } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
-        this._bodyBlob = body
-      } else if (support.formData && FormData.prototype.isPrototypeOf(body)) {
-        this._bodyFormData = body
-      } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
-        this._bodyText = body.toString()
-      } else if (support.arrayBuffer && support.blob && isDataView(body)) {
-        this._bodyArrayBuffer = bufferClone(body.buffer)
-        // IE 10-11 can't handle a DataView body.
-        this._bodyInit = new Blob([this._bodyArrayBuffer])
-      } else if (support.arrayBuffer && (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))) {
-        this._bodyArrayBuffer = bufferClone(body)
-      } else {
-        throw new Error('unsupported BodyInit type')
-      }
-
-      if (!this.headers.get('content-type')) {
-        if (typeof body === 'string') {
-          this.headers.set('content-type', 'text/plain;charset=UTF-8')
-        } else if (this._bodyBlob && this._bodyBlob.type) {
-          this.headers.set('content-type', this._bodyBlob.type)
-        } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
-          this.headers.set('content-type', 'application/x-www-form-urlencoded;charset=UTF-8')
-        }
-      }
-    }
-
-    if (support.blob) {
-      this.blob = function() {
-        var rejected = consumed(this)
-        if (rejected) {
-          return rejected
-        }
-
-        if (this._bodyBlob) {
-          return Promise.resolve(this._bodyBlob)
-        } else if (this._bodyArrayBuffer) {
-          return Promise.resolve(new Blob([this._bodyArrayBuffer]))
-        } else if (this._bodyFormData) {
-          throw new Error('could not read FormData body as blob')
-        } else {
-          return Promise.resolve(new Blob([this._bodyText]))
-        }
-      }
-
-      this.arrayBuffer = function() {
-        if (this._bodyArrayBuffer) {
-          return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
-        } else {
-          return this.blob().then(readBlobAsArrayBuffer)
-        }
-      }
-    }
-
-    this.text = function() {
-      var rejected = consumed(this)
-      if (rejected) {
-        return rejected
-      }
-
-      if (this._bodyBlob) {
-        return readBlobAsText(this._bodyBlob)
-      } else if (this._bodyArrayBuffer) {
-        return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer))
-      } else if (this._bodyFormData) {
-        throw new Error('could not read FormData body as text')
-      } else {
-        return Promise.resolve(this._bodyText)
-      }
-    }
-
-    if (support.formData) {
-      this.formData = function() {
-        return this.text().then(decode)
-      }
-    }
-
-    this.json = function() {
-      return this.text().then(JSON.parse)
-    }
-
-    return this
-  }
-
-  // HTTP methods whose capitalization should be normalized
-  var methods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT']
-
-  function normalizeMethod(method) {
-    var upcased = method.toUpperCase()
-    return (methods.indexOf(upcased) > -1) ? upcased : method
-  }
-
-  function Request(input, options) {
-    options = options || {}
-    var body = options.body
-
-    if (input instanceof Request) {
-      if (input.bodyUsed) {
-        throw new TypeError('Already read')
-      }
-      this.url = input.url
-      this.credentials = input.credentials
-      if (!options.headers) {
-        this.headers = new Headers(input.headers)
-      }
-      this.method = input.method
-      this.mode = input.mode
-      if (!body && input._bodyInit != null) {
-        body = input._bodyInit
-        input.bodyUsed = true
-      }
-    } else {
-      this.url = String(input)
-    }
-
-    this.credentials = options.credentials || this.credentials || 'omit'
-    if (options.headers || !this.headers) {
-      this.headers = new Headers(options.headers)
-    }
-    this.method = normalizeMethod(options.method || this.method || 'GET')
-    this.mode = options.mode || this.mode || null
-    this.referrer = null
-
-    if ((this.method === 'GET' || this.method === 'HEAD') && body) {
-      throw new TypeError('Body not allowed for GET or HEAD requests')
-    }
-    this._initBody(body)
-  }
-
-  Request.prototype.clone = function() {
-    return new Request(this, { body: this._bodyInit })
-  }
-
-  function decode(body) {
-    var form = new FormData()
-    body.trim().split('&').forEach(function(bytes) {
-      if (bytes) {
-        var split = bytes.split('=')
-        var name = split.shift().replace(/\+/g, ' ')
-        var value = split.join('=').replace(/\+/g, ' ')
-        form.append(decodeURIComponent(name), decodeURIComponent(value))
-      }
-    })
-    return form
-  }
-
-  function parseHeaders(rawHeaders) {
-    var headers = new Headers()
-    // Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
-    // https://tools.ietf.org/html/rfc7230#section-3.2
-    var preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ')
-    preProcessedHeaders.split(/\r?\n/).forEach(function(line) {
-      var parts = line.split(':')
-      var key = parts.shift().trim()
-      if (key) {
-        var value = parts.join(':').trim()
-        headers.append(key, value)
-      }
-    })
-    return headers
-  }
-
-  Body.call(Request.prototype)
-
-  function Response(bodyInit, options) {
-    if (!options) {
-      options = {}
-    }
-
-    this.type = 'default'
-    this.status = options.status === undefined ? 200 : options.status
-    this.ok = this.status >= 200 && this.status < 300
-    this.statusText = 'statusText' in options ? options.statusText : 'OK'
-    this.headers = new Headers(options.headers)
-    this.url = options.url || ''
-    this._initBody(bodyInit)
-  }
-
-  Body.call(Response.prototype)
-
-  Response.prototype.clone = function() {
-    return new Response(this._bodyInit, {
-      status: this.status,
-      statusText: this.statusText,
-      headers: new Headers(this.headers),
-      url: this.url
-    })
-  }
-
-  Response.error = function() {
-    var response = new Response(null, {status: 0, statusText: ''})
-    response.type = 'error'
-    return response
-  }
-
-  var redirectStatuses = [301, 302, 303, 307, 308]
-
-  Response.redirect = function(url, status) {
-    if (redirectStatuses.indexOf(status) === -1) {
-      throw new RangeError('Invalid status code')
-    }
-
-    return new Response(null, {status: status, headers: {location: url}})
-  }
-
-  self.Headers = Headers
-  self.Request = Request
-  self.Response = Response
-
-  self.fetch = function(input, init) {
-    return new Promise(function(resolve, reject) {
-      var request = new Request(input, init)
-      var xhr = new XMLHttpRequest()
-
-      xhr.onload = function() {
-        var options = {
-          status: xhr.status,
-          statusText: xhr.statusText,
-          headers: parseHeaders(xhr.getAllResponseHeaders() || '')
-        }
-        options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL')
-        var body = 'response' in xhr ? xhr.response : xhr.responseText
-        resolve(new Response(body, options))
-      }
-
-      xhr.onerror = function() {
-        reject(new TypeError('Network request failed'))
-      }
-
-      xhr.ontimeout = function() {
-        reject(new TypeError('Network request failed'))
-      }
-
-      xhr.open(request.method, request.url, true)
-
-      if (request.credentials === 'include') {
-        xhr.withCredentials = true
-      } else if (request.credentials === 'omit') {
-        xhr.withCredentials = false
-      }
-
-      if ('responseType' in xhr && support.blob) {
-        xhr.responseType = 'blob'
-      }
-
-      request.headers.forEach(function(value, name) {
-        xhr.setRequestHeader(name, value)
-      })
-
-      xhr.send(typeof request._bodyInit === 'undefined' ? null : request._bodyInit)
-    })
-  }
-  self.fetch.polyfill = true
-})(typeof self !== 'undefined' ? self : this);
\ No newline at end of file
diff --git a/frontend/polyfills/main.js b/frontend/polyfills/main.js
deleted file mode 100644
index 7e4c554ea..000000000
--- a/frontend/polyfills/main.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import './fetch';
-import './url-search-params';
diff --git a/frontend/polyfills/url-search-params.js b/frontend/polyfills/url-search-params.js
deleted file mode 100644
index e38c12021..000000000
--- a/frontend/polyfills/url-search-params.js
+++ /dev/null
@@ -1,348 +0,0 @@
-(function(global) {
-  /**
-   * Polyfill URLSearchParams
-   *
-   * Inspired from : https://github.com/WebReflection/url-search-params/blob/master/src/url-search-params.js
-   */
-
-  var checkIfIteratorIsSupported = function() {
-    try {
-      return !!Symbol.iterator;
-    } catch(error) {
-      return false;
-    }
-  };
-
-
-  var iteratorSupported = checkIfIteratorIsSupported();
-
-  var createIterator = function(items) {
-    var iterator = {
-      next: function() {
-        var value = items.shift();
-        return { done: value === void 0, value: value };
-      }
-    };
-
-    if(iteratorSupported) {
-      iterator[Symbol.iterator] = function() {
-        return iterator;
-      };
-    }
-
-    return iterator;
-  };
-
-  /**
-   * Search param name and values should be encoded according to https://url.spec.whatwg.org/#urlencoded-serializing
-   * encodeURIComponent() produces the same result except encoding spaces as `%20` instead of `+`.
-   */
-  var serializeParam = function(value) {
-    return encodeURIComponent(value).replace(/%20/g, '+');
-  };
-
-  var deserializeParam = function(value) {
-    return decodeURIComponent(value).replace(/\+/g, ' ');
-  };
-
-  var polyfillURLSearchParams= function() {
-
-    var URLSearchParams = function(searchString) {
-      Object.defineProperty(this, '_entries', { value: {} });
-
-      if(typeof searchString === 'string') {
-        if(searchString !== '') {
-          searchString = searchString.replace(/^\?/, '');
-          var attributes = searchString.split('&');
-          var attribute;
-          for(var i = 0; i < attributes.length; i++) {
-            attribute = attributes[i].split('=');
-            this.append(
-              deserializeParam(attribute[0]),
-              (attribute.length > 1) ? deserializeParam(attribute[1]) : ''
-            );
-          }
-        }
-      } else if(searchString instanceof URLSearchParams) {
-        var _this = this;
-        searchString.forEach(function(value, name) {
-          _this.append(value, name);
-        });
-      }
-    };
-
-    var proto = URLSearchParams.prototype;
-
-    proto.append = function(name, value) {
-      if(name in this._entries) {
-        this._entries[name].push(value.toString());
-      } else {
-        this._entries[name] = [value.toString()];
-      }
-    };
-
-    proto.delete = function(name) {
-      delete this._entries[name];
-    };
-
-    proto.get = function(name) {
-      return (name in this._entries) ? this._entries[name][0] : null;
-    };
-
-    proto.getAll = function(name) {
-      return (name in this._entries) ? this._entries[name].slice(0) : [];
-    };
-
-    proto.has = function(name) {
-      return (name in this._entries);
-    };
-
-    proto.set = function(name, value) {
-      this._entries[name] = [value.toString()];
-    };
-
-    proto.forEach = function(callback, thisArg) {
-      var entries;
-      for(var name in this._entries) {
-        if(this._entries.hasOwnProperty(name)) {
-          entries = this._entries[name];
-          for(var i = 0; i < entries.length; i++) {
-            callback.call(thisArg, entries[i], name, this);
-          }
-        }
-      }
-    };
-
-    proto.keys = function() {
-      var items = [];
-      this.forEach(function(value, name) { items.push(name); });
-      return createIterator(items);
-    };
-
-    proto.values = function() {
-      var items = [];
-      this.forEach(function(value) { items.push(value); });
-      return createIterator(items);
-    };
-
-    proto.entries = function() {
-      var items = [];
-      this.forEach(function(value, name) { items.push([name, value]); });
-      return createIterator(items);
-    };
-
-    if(iteratorSupported) {
-      proto[Symbol.iterator] = proto.entries;
-    }
-
-    proto.toString = function() {
-      var searchString = '';
-      this.forEach(function(value, name) {
-        if(searchString.length > 0) searchString+= '&';
-        searchString += serializeParam(name) + '=' + serializeParam(value);
-      });
-      return searchString;
-    };
-
-    global.URLSearchParams = URLSearchParams;
-  };
-
-  if(!('URLSearchParams' in global) || (new URLSearchParams('?a=1').toString() !== 'a=1')) {
-    polyfillURLSearchParams();
-  }
-
-  // HTMLAnchorElement
-
-})(
-  (typeof global !== 'undefined') ? global
-    : ((typeof window !== 'undefined') ? window
-    : ((typeof self !== 'undefined') ? self : this))
-);
-
-(function(global) {
-  /**
-   * Polyfill URL
-   *
-   * Inspired from : https://github.com/arv/DOM-URL-Polyfill/blob/master/src/url.js
-   */
-
-  var checkIfURLIsSupported = function() {
-    try {
-      var u = new URL('b', 'http://a');
-      u.pathname = 'c%20d';
-      return (u.href === 'http://a/c%20d') && u.searchParams;
-    } catch(e) {
-      return false;
-    }
-  };
-
-
-  var polyfillURL = function() {
-    var _URL = global.URL;
-
-    var URL = function(url, base) {
-      if(typeof url !== 'string') url = String(url);
-
-      var doc = document.implementation.createHTMLDocument('');
-      window.doc = doc;
-      if(base) {
-        var baseElement = doc.createElement('base');
-        baseElement.href = base;
-        doc.head.appendChild(baseElement);
-      }
-
-      var anchorElement = doc.createElement('a');
-      anchorElement.href = url;
-      doc.body.appendChild(anchorElement);
-      anchorElement.href = anchorElement.href; // force href to refresh
-
-      if(anchorElement.protocol === ':' || !/:/.test(anchorElement.href)) {
-        throw new TypeError('Invalid URL');
-      }
-
-      Object.defineProperty(this, '_anchorElement', {
-        value: anchorElement
-      });
-    };
-
-    var proto = URL.prototype;
-
-    var linkURLWithAnchorAttribute = function(attributeName) {
-      Object.defineProperty(proto, attributeName, {
-        get: function() {
-          return this._anchorElement[attributeName];
-        },
-        set: function(value) {
-          this._anchorElement[attributeName] = value;
-        },
-        enumerable: true
-      });
-    };
-
-    ['hash', 'host', 'hostname', 'port', 'protocol', 'search']
-    .forEach(function(attributeName) {
-      linkURLWithAnchorAttribute(attributeName);
-    });
-
-    Object.defineProperties(proto, {
-
-      'toString': {
-        get: function() {
-          var _this = this;
-          return function() {
-            return _this.href;
-          };
-        }
-      },
-
-      'href' : {
-        get: function() {
-          return this._anchorElement.href.replace(/\?$/,'');
-        },
-        set: function(value) {
-          this._anchorElement.href = value;
-        },
-        enumerable: true
-      },
-
-      'pathname' : {
-        get: function() {
-          return this._anchorElement.pathname.replace(/(^\/?)/,'/');
-        },
-        set: function(value) {
-          this._anchorElement.pathname = value;
-        },
-        enumerable: true
-      },
-
-      'origin': {
-        get: function() {
-          // get expected port from protocol
-          var expectedPort = {'http:': 80, 'https:': 443, 'ftp:': 21}[this._anchorElement.protocol];
-          // add port to origin if, expected port is different than actual port
-          // and it is not empty f.e http://foo:8080
-          // 8080 != 80 && 8080 != ''
-          var addPortToOrigin = this._anchorElement.port != expectedPort &&
-            this._anchorElement.port !== ''
-
-          return this._anchorElement.protocol +
-            '//' +
-            this._anchorElement.hostname +
-            (addPortToOrigin ? (':' + this._anchorElement.port) : '');
-        },
-        enumerable: true
-      },
-
-      'password': { // TODO
-        get: function() {
-          return '';
-        },
-        set: function(value) {
-        },
-        enumerable: true
-      },
-
-      'username': { // TODO
-        get: function() {
-          return '';
-        },
-        set: function(value) {
-        },
-        enumerable: true
-      },
-
-      'searchParams': {
-        get: function() {
-          var searchParams = new URLSearchParams(this.search);
-          var _this = this;
-          ['append', 'delete', 'set'].forEach(function(methodName) {
-            var method = searchParams[methodName];
-            searchParams[methodName] = function() {
-              method.apply(searchParams, arguments);
-              _this.search = searchParams.toString();
-            };
-          });
-          return searchParams;
-        },
-        enumerable: true
-      }
-    });
-
-    URL.createObjectURL = function(blob) {
-      return _URL.createObjectURL.apply(_URL, arguments);
-    };
-
-    URL.revokeObjectURL = function(url) {
-      return _URL.revokeObjectURL.apply(_URL, arguments);
-    };
-
-    global.URL = URL;
-
-  };
-
-  if(!checkIfURLIsSupported()) {
-    polyfillURL();
-  }
-
-  if((global.location !== void 0) && !('origin' in global.location)) {
-    var getOrigin = function() {
-      return global.location.protocol + '//' + global.location.hostname + (global.location.port ? (':' + global.location.port) : '');
-    };
-
-    try {
-      Object.defineProperty(global.location, 'origin', {
-        get: getOrigin,
-        enumerable: true
-      });
-    } catch(e) {
-      setInterval(function() {
-        global.location.origin = getOrigin();
-      }, 100);
-    }
-  }
-
-})(
-  (typeof global !== 'undefined') ? global
-    : ((typeof window !== 'undefined') ? window
-    : ((typeof self !== 'undefined') ? self : this))
-);
diff --git a/src/Foundation.hs b/src/Foundation.hs
index f88913801..365a6e863 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1328,7 +1328,6 @@ siteLayout' headingOverride widget = do
       addStylesheet $ StaticR bundles_css_vendor_css
       addStylesheet $ StaticR bundles_css_main_css
       -- JavaScript
-      addScript $ StaticR bundles_js_polyfills_js
       addScript $ StaticR bundles_js_vendor_js
       addScript $ StaticR bundles_js_main_js
       -- widgets
diff --git a/webpack.config.js b/webpack.config.js
index d2e851ce6..886c4a958 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -71,9 +71,6 @@ module.exports = {
 		vendor: [
 			path.resolve(__dirname, 'frontend/vendor', 'main.js'),
 		],
-		polyfills: [
-			path.resolve(__dirname, 'frontend/polyfills', 'main.js'),
-		],
 	},
 
 	plugins: [

From 3de8a2b2c8c40ab718a4144b48be37d9294e6553 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 26 May 2019 22:39:40 +0200
Subject: [PATCH 401/519] move browserslist to package.json

---
 .browserslistrc | 2 --
 package.json    | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 .browserslistrc

diff --git a/.browserslistrc b/.browserslistrc
deleted file mode 100644
index 2c90ae7e7..000000000
--- a/.browserslistrc
+++ /dev/null
@@ -1,2 +0,0 @@
-> 0.25%
-not dead
diff --git a/package.json b/package.json
index 504ba9930..10ab7582a 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,9 @@
       "git add"
     ]
   },
+  "browserslist": [
+    "defaults"
+  ],
   "devDependencies": {
     "@babel/cli": "^7.4.4",
     "@babel/core": "^7.4.5",

From dbb208112f78ee26a0451e515ec83ac6513e38df Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 27 May 2019 14:23:58 +0200
Subject: [PATCH 402/519] Aggressively refactor Model.Types

---
 src/Data/Aeson/Types/Instances.hs       |   6 +-
 src/Data/Time/Calendar/Instances.hs     |  18 ++
 src/Data/Time/Clock/Instances.hs        |  11 +-
 src/Data/Time/Format/Instances.hs       |  14 ++
 src/Data/Time/LocalTime/Instances.hs    |  23 ++
 src/Data/UUID/Instances.hs              |  27 +++
 src/Database/Persist/Class/Instances.hs |  22 ++
 src/Database/Persist/Sql/Instances.hs   |  33 ---
 src/Database/Persist/Types/Instances.hs |  16 +-
 src/Handler/Utils/Communication.hs      |   3 -
 src/Handler/Utils/Form/MassInput.hs     |   4 +-
 src/Handler/Utils/Invitations.hs        |   1 -
 src/Handler/Utils/Table/Pagination.hs   |   2 -
 src/Import/NoFoundation.hs              | 100 +-------
 src/Import/NoModel.hs                   | 105 ++++++++
 src/Mail.hs                             |   8 +-
 src/Model.hs                            |   8 +-
 src/Model/Migration/Types.hs            |   2 +-
 src/Model/Types.hs                      |  80 +-----
 src/Model/Types/Common.hs               |  29 +++
 src/Model/Types/Course.hs               |  20 ++
 src/Model/Types/DateTime.hs             |  69 ++++--
 src/Model/Types/Exam.hs                 |  12 +
 src/Model/Types/Health.hs               |  83 +++++++
 src/Model/Types/Mail.hs                 |  70 ++++++
 src/Model/Types/Misc.hs                 | 120 +--------
 src/Model/Types/Security.hs             | 309 +-----------------------
 src/Model/Types/Sheet.hs                |  88 ++-----
 src/Model/Types/Submission.hs           | 146 +++++++++++
 src/Model/Types/{ => TH}/JSON.hs        |   2 +-
 src/Model/Types/{ => TH}/Wordlist.hs    |   4 +-
 src/Settings.hs                         |  11 +-
 src/System/FilePath/Instances.hs        |  16 ++
 src/Time/Types/Instances.hs             |   6 +
 src/Utils.hs                            |  10 +-
 src/Utils/DateTime.hs                   |  13 +-
 test/MailSpec.hs                        |   2 +-
 test/Model/TypesSpec.hs                 |   2 -
 test/TestImport.hs                      |   1 +
 test/Utils/DateTimeSpec.hs              |   3 +
 40 files changed, 750 insertions(+), 749 deletions(-)
 create mode 100644 src/Data/Time/Calendar/Instances.hs
 create mode 100644 src/Data/Time/Format/Instances.hs
 create mode 100644 src/Data/Time/LocalTime/Instances.hs
 create mode 100644 src/Data/UUID/Instances.hs
 create mode 100644 src/Database/Persist/Class/Instances.hs
 delete mode 100644 src/Database/Persist/Sql/Instances.hs
 create mode 100644 src/Import/NoModel.hs
 create mode 100644 src/Model/Types/Common.hs
 create mode 100644 src/Model/Types/Course.hs
 create mode 100644 src/Model/Types/Exam.hs
 create mode 100644 src/Model/Types/Health.hs
 create mode 100644 src/Model/Types/Mail.hs
 create mode 100644 src/Model/Types/Submission.hs
 rename src/Model/Types/{ => TH}/JSON.hs (98%)
 rename src/Model/Types/{ => TH}/Wordlist.hs (95%)
 create mode 100644 src/System/FilePath/Instances.hs

diff --git a/src/Data/Aeson/Types/Instances.hs b/src/Data/Aeson/Types/Instances.hs
index 66ff1df61..4e87d05a9 100644
--- a/src/Data/Aeson/Types/Instances.hs
+++ b/src/Data/Aeson/Types/Instances.hs
@@ -14,9 +14,13 @@ import Data.Binary (Binary)
 import Data.HashMap.Strict.Instances ()
 import Data.Vector.Instances ()
 
+import Model.Types.TH.JSON (derivePersistFieldJSON)
+
 
 instance MonadThrow Parser where
   throwM = fail . show
 
-
 instance Binary Value
+
+
+derivePersistFieldJSON ''Value
diff --git a/src/Data/Time/Calendar/Instances.hs b/src/Data/Time/Calendar/Instances.hs
new file mode 100644
index 000000000..395f455f8
--- /dev/null
+++ b/src/Data/Time/Calendar/Instances.hs
@@ -0,0 +1,18 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Time.Calendar.Instances
+  (
+  ) where
+
+import ClassyPrelude
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
+
+deriving newtype instance Hashable Day
+
+instance Binary Day where
+  get = ModifiedJulianDay <$> Binary.get
+  put = Binary.put . toModifiedJulianDay
+
diff --git a/src/Data/Time/Clock/Instances.hs b/src/Data/Time/Clock/Instances.hs
index 1783ac465..b9721ab7d 100644
--- a/src/Data/Time/Clock/Instances.hs
+++ b/src/Data/Time/Clock/Instances.hs
@@ -11,14 +11,17 @@ import Data.Time.Clock
 import Data.Binary (Binary)
 import qualified Data.Binary as Binary
 
+import Data.Time.Calendar.Instances ()
+
+
+instance Hashable DiffTime where
+  hashWithSalt s = hashWithSalt s . toRational
+
 
 deriving instance Generic UTCTime
+instance Hashable 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
diff --git a/src/Data/Time/Format/Instances.hs b/src/Data/Time/Format/Instances.hs
new file mode 100644
index 000000000..dd2d68144
--- /dev/null
+++ b/src/Data/Time/Format/Instances.hs
@@ -0,0 +1,14 @@
+{-# OPTIONS -fno-warn-orphans #-}
+
+module Data.Time.Format.Instances
+  (
+  ) where
+
+import qualified Language.Haskell.TH.Syntax as TH
+
+import Data.Time.Format
+
+import Data.Time.LocalTime.Instances ()
+
+
+deriving instance TH.Lift TimeLocale
diff --git a/src/Data/Time/LocalTime/Instances.hs b/src/Data/Time/LocalTime/Instances.hs
new file mode 100644
index 000000000..39c0d70f0
--- /dev/null
+++ b/src/Data/Time/LocalTime/Instances.hs
@@ -0,0 +1,23 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Time.LocalTime.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Data.Time.LocalTime
+
+import Data.Binary (Binary)
+
+import qualified Language.Haskell.TH.Syntax as TH
+
+
+deriving instance Generic TimeOfDay
+deriving instance Typeable TimeOfDay
+
+instance Hashable TimeOfDay
+instance Binary TimeOfDay
+
+
+deriving instance TH.Lift TimeZone
diff --git a/src/Data/UUID/Instances.hs b/src/Data/UUID/Instances.hs
new file mode 100644
index 000000000..8a00de5e3
--- /dev/null
+++ b/src/Data/UUID/Instances.hs
@@ -0,0 +1,27 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.UUID.Instances
+  () where
+
+import ClassyPrelude
+import Data.UUID (UUID)
+import qualified Data.UUID as UUID
+
+import Database.Persist.Sql
+import Web.PathPieces
+  
+
+instance PathPiece UUID where
+  fromPathPiece = UUID.fromString . unpack
+  toPathPiece = pack . UUID.toString
+
+instance PersistField UUID where
+  toPersistValue = PersistDbSpecific . UUID.toASCIIBytes
+
+  fromPersistValue (PersistText t)        = maybe (Left "Failed to parse UUID") Right $ UUID.fromText t
+  fromPersistValue (PersistByteString bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
+  fromPersistValue (PersistDbSpecific bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
+  fromPersistValue  x                     = Left $ "Expected UUID, received: " <> tshow x
+
+instance PersistFieldSql UUID where
+  sqlType _ = SqlOther "uuid"
diff --git a/src/Database/Persist/Class/Instances.hs b/src/Database/Persist/Class/Instances.hs
new file mode 100644
index 000000000..4864f0df3
--- /dev/null
+++ b/src/Database/Persist/Class/Instances.hs
@@ -0,0 +1,22 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Database.Persist.Class.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Database.Persist.Class
+import Database.Persist.Types.Instances ()
+
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
+
+instance PersistEntity record => Hashable (Key record) where
+  hashWithSalt s = hashWithSalt s . toPersistValue
+
+instance PersistEntity record => Binary (Key record) where
+  put = Binary.put . toPersistValue
+  putList = Binary.putList . map toPersistValue
+  get = either (fail . unpack) return . fromPersistValue =<< Binary.get
diff --git a/src/Database/Persist/Sql/Instances.hs b/src/Database/Persist/Sql/Instances.hs
deleted file mode 100644
index 2d0044164..000000000
--- a/src/Database/Persist/Sql/Instances.hs
+++ /dev/null
@@ -1,33 +0,0 @@
-{-# LANGUAGE UndecidableInstances #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-
-module Database.Persist.Sql.Instances
-  (
-  ) where
-
-import ClassyPrelude.Yesod
-
-import Data.Binary (Binary)
-import qualified Data.Binary as B
-
-import Database.Persist.Sql
-
-
-instance Binary (BackendKey SqlWriteBackend) where
-  put = B.put . unSqlWriteBackendKey
-  putList = B.putList . map unSqlWriteBackendKey
-  get = SqlWriteBackendKey <$> B.get
-instance Binary (BackendKey SqlReadBackend) where
-  put = B.put . unSqlReadBackendKey
-  putList = B.putList . map unSqlReadBackendKey
-  get = SqlReadBackendKey <$> B.get
-instance Binary (BackendKey SqlBackend) where
-  put = B.put . unSqlBackendKey
-  putList = B.putList . map unSqlBackendKey
-  get = SqlBackendKey <$> B.get
-  
-
-instance {-# OVERLAPPABLE #-} ToBackendKey SqlBackend record => Binary (Key record) where
-  put = B.put . fromSqlKey
-  putList = B.putList . map fromSqlKey
-  get = toSqlKey <$> B.get
diff --git a/src/Database/Persist/Types/Instances.hs b/src/Database/Persist/Types/Instances.hs
index db5957d54..eb02f5a22 100644
--- a/src/Database/Persist/Types/Instances.hs
+++ b/src/Database/Persist/Types/Instances.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Database.Persist.Types.Instances
@@ -6,7 +5,18 @@ 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
+import Data.Time.Calendar.Instances ()
+import Data.Time.LocalTime.Instances ()
+import Data.Time.Clock.Instances ()
+
+import Data.Binary (Binary)
+
+
+deriving instance Generic PersistValue
+deriving instance Typeable PersistValue
+
+instance Hashable PersistValue
+instance Binary PersistValue
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 042e90a52..7ee1f815a 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -20,9 +20,6 @@ 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(..))
-
 
 data RecipientGroup = RGCourseParticipants | RGCourseLecturers | RGCourseCorrectors | RGCourseTutors
                     | RGTutorialParticipants
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index e9121be5f..dab7f1d51 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-} -- tupleBoxCoord
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
 module Handler.Utils.Form.MassInput
@@ -20,8 +20,6 @@ import Utils.Lens
 import Handler.Utils.Form.MassInput.Liveliness
 import Handler.Utils.Form.MassInput.TH
 
-import Data.Aeson hiding (Result(..))
-
 import Algebra.Lattice hiding (join)
 
 import Text.Blaze (Markup)
diff --git a/src/Handler/Utils/Invitations.hs b/src/Handler/Utils/Invitations.hs
index ba80dd1fe..510da890b 100644
--- a/src/Handler/Utils/Invitations.hs
+++ b/src/Handler/Utils/Invitations.hs
@@ -32,7 +32,6 @@ import qualified Data.HashSet as HashSet
 
 import Data.Aeson (fromJSON)
 import qualified Data.Aeson as JSON
-import Data.Aeson.TH
 
 import Data.Proxy (Proxy(..))
 import Data.Typeable
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 15a2952f5..063b06fd6 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS -fno-warn-orphans #-}
-
 module Handler.Utils.Table.Pagination
   ( module Handler.Utils.Table.Pagination.Types
   , SortColumn(..), SortDirection(..)
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 7043c799e..0577f3915 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -1,109 +1,17 @@
 module Import.NoFoundation
     ( module Import
-    , MForm
     ) where
 
-import ClassyPrelude.Yesod    as Import hiding (formatTime, derivePersistFieldJSON, addMessage, addMessageI, (.=), MForm, Proxy, foldlM, static, boolField, identifyForm, cons)
+import Import.NoModel         as Import
 import Model                  as Import
-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 Utils.Tokens           as Import
+import Utils.Frontend.Modal   as Import
+
 import Settings               as Import
 import Settings.StaticFiles   as Import
-import Yesod.Auth             as Import
-import Yesod.Core.Types       as Import (loggerSet)
-import Yesod.Default.Config2  as Import
-import Utils                  as Import
-import Utils.Frontend.Modal   as Import
-import Utils.Frontend.I18n    as Import
-import Utils.DB               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
 
 import CryptoID               as Import
-import Data.UUID              as Import (UUID)
-
-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)
-
-import Mail                   as Import
-
-import Data.Data              as Import (Data)
-import Data.Typeable          as Import (Typeable)
-import GHC.Generics           as Import (Generic)
-import GHC.Exts               as Import (IsList)
-
-import Data.Hashable          as Import
-import Data.List.NonEmpty     as Import (NonEmpty(..), 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(..), Any(..), All(..), Sum(..))
-import Data.Monoid.Instances  as Import ()
-import Data.Set.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)
-
-import Control.Monad.Morph    as Import (MFunctor(..))
-
-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
-
-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)
-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 ()
-
-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 Data.Ratio as Import ((%))
-
-import Network.Mime as Import
-
-import Data.Universe.Instances.Reverse.MonoTraversable ()
-
-
-import Control.Monad.Trans.RWS (RWST)
-
-type MForm m = RWST (Maybe (Env, FileEnv), HandlerSite m, [Lang]) Enctype Ints m
diff --git a/src/Import/NoModel.hs b/src/Import/NoModel.hs
new file mode 100644
index 000000000..639eca131
--- /dev/null
+++ b/src/Import/NoModel.hs
@@ -0,0 +1,105 @@
+module Import.NoModel
+  ( module Import
+  , MForm
+  ) where
+
+import ClassyPrelude.Yesod    as Import hiding (formatTime, derivePersistFieldJSON, addMessage, addMessageI, (.=), MForm, Proxy, foldlM, static, boolField, identifyForm, cons)
+
+import Model.Types.TH.JSON as Import
+import Model.Types.TH.Wordlist as Import
+
+import Mail                   as Import
+
+import Yesod.Auth             as Import
+import Yesod.Core.Types       as Import (loggerSet)
+import Yesod.Default.Config2  as Import
+import Yesod.Core.Json        as Import (provideJson)
+import Yesod.Core.Types.Instances as Import (CachedMemoT(..))
+
+import Utils                  as Import
+import Utils.Frontend.I18n    as Import
+import Utils.DB               as Import
+
+import Data.Fixed             as Import
+
+import Data.UUID              as Import (UUID)
+
+import Data.CaseInsensitive   as Import (CI, FoldCase(..), foldedCase)
+
+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)
+
+import Data.Data              as Import (Data)
+import Data.Typeable          as Import (Typeable)
+import GHC.Generics           as Import (Generic)
+import GHC.Exts               as Import (IsList)
+import Data.Ix                as Import (Ix)
+
+import Data.Hashable          as Import
+import Data.List.NonEmpty     as Import (NonEmpty(..), nonEmpty)
+import Data.Text.Encoding.Error as Import(UnicodeException(..))
+import Data.Semigroup         as Import (Semigroup)
+import Data.Monoid            as Import (Last(..), First(..), Any(..), All(..), Sum(..))
+import Data.Binary            as Import (Binary)
+
+import Numeric.Natural        as Import (Natural)
+import Data.Ratio             as Import ((%))
+
+import Database.Persist.Sql as Import (SqlReadT, SqlWriteT, fromSqlKey, toSqlKey)
+  
+import Ldap.Client.Pool as Import
+
+import System.Random as Import (Random(..))
+import Control.Monad.Random.Class as Import (MonadRandom(..))
+
+import Control.Monad.Morph    as Import (MFunctor(..))
+import Control.Monad.Trans.Resource as Import (ReleaseKey)
+
+import Jose.Jwt as Import (Jwt)
+
+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 Network.Mime as Import
+  
+import Data.Aeson.TH as Import
+import Data.Aeson.Types as Import (FromJSON(..), ToJSON(..), FromJSONKey(..), ToJSONKey(..), toJSONKeyText, FromJSONKeyFunction(..), ToJSONKeyFunction(..), Value)
+
+import Language.Haskell.TH.Instances as Import ()
+import Data.List.NonEmpty.Instances as Import ()
+import Data.NonNull.Instances as Import ()
+import Data.Monoid.Instances  as Import ()
+import Data.Set.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.Time.LocalTime.Instances as Import ()
+import Data.Time.Calendar.Instances as Import ()
+import Data.Time.Format.Instances as Import ()
+import Time.Types.Instances as Import ()
+import Network.Mail.Mime.Instances as Import ()
+import Yesod.Core.Instances as Import ()
+import Data.Aeson.Types.Instances as Import ()
+import Database.Esqueleto.Instances as Import ()
+import Numeric.Natural.Instances as Import ()
+import Text.Blaze.Instances as Import ()
+import Jose.Jwt.Instances as Import ()
+import Web.PathPieces.Instances as Import ()
+import Data.Universe.Instances.Reverse.MonoTraversable ()
+import Database.Persist.Class.Instances as Import ()
+import Database.Persist.Types.Instances as Import ()
+import Data.UUID.Instances as Import ()
+import System.FilePath.Instances as Import ()
+
+
+import Control.Monad.Trans.RWS (RWST)
+
+type MForm m = RWST (Maybe (Env, FileEnv), HandlerSite m, [Lang]) Enctype Ints m
diff --git a/src/Mail.hs b/src/Mail.hs
index 82bac2273..8cfa03200 100644
--- a/src/Mail.hs
+++ b/src/Mail.hs
@@ -35,7 +35,9 @@ module Mail
   , _partType, _partEncoding, _partFilename, _partHeaders, _partContent
   ) where
 
-import ClassyPrelude.Yesod hiding (snoc, (.=), getMessageRender)
+import ClassyPrelude.Yesod hiding (snoc, (.=), getMessageRender, derivePersistFieldJSON)
+
+import Model.Types.TH.JSON
 
 import Network.Mail.Mime hiding (addPart, addAttachment)
 import qualified Network.Mail.Mime as Mime (addPart)
@@ -159,6 +161,7 @@ instance Default MailLanguages where
 
 instance Hashable MailLanguages
 
+
 data MailContext = MailContext
   { mcLanguages :: MailLanguages
   , mcDateTimeFormat :: SelDateTimeFormat -> DateTimeFormat
@@ -506,3 +509,6 @@ setMailSmtpData = do
         in tell $ mempty { smtpEnvelopeFrom = Last $ Just verp }
     | otherwise
     -> tell $ mempty { smtpEnvelopeFrom = Last $ Just from }
+
+
+derivePersistFieldJSON ''MailLanguages
diff --git a/src/Model.hs b/src/Model.hs
index 1e1ecf062..c86406275 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -6,7 +6,7 @@ module Model
   , module Cron.Types
   ) where
 
-import ClassyPrelude.Yesod
+import Import.NoModel
 import Database.Persist.Quasi
 import Database.Persist.TH.Directory
 -- import Data.Time
@@ -23,8 +23,6 @@ import Utils.Message (MessageStatus)
 
 import Settings.Cluster (ClusterSettingsKey)
 
-import Data.Binary (Binary)
-
 -- You can define all of your database entities in the entities file.
 -- You can find more information on persistent and how to declare entities
 -- at:
@@ -38,9 +36,5 @@ deriving instance Eq (Unique Sheet)     -- instance Eq CourseSheet
 deriving instance Eq (Unique Material)  -- instance Eq UniqueMaterial
 deriving instance Eq (Unique Tutorial)  -- instance Eq Tutorial
 
--- Primary keys mentioned in dbtable row-keys must be Binary
--- Automatically generated (i.e. numeric) ids are already taken care of
-deriving instance Binary (Key Term)
-
 submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime
diff --git a/src/Model/Migration/Types.hs b/src/Model/Migration/Types.hs
index 4720bf099..e5ed53362 100644
--- a/src/Model/Migration/Types.hs
+++ b/src/Model/Migration/Types.hs
@@ -7,7 +7,7 @@ import Data.Aeson.TH (deriveJSON, defaultOptions)
 import Utils.PathPiece
 
 import qualified Model as Current
-import qualified Model.Types.JSON as Current
+import qualified Model.Types.TH.JSON as Current
 
 import Data.Universe
 
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index b1692283c..a8e2fc90c 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -1,72 +1,14 @@
-{-# LANGUAGE UndecidableInstances #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
-
-
-
 module Model.Types
-  ( module Model.Types
-  , module Model.Types.Sheet
-  , module Model.Types.DateTime
-  , module Model.Types.Security
-  , module Model.Types.Misc
-  , module Numeric.Natural
-  , module Mail
-  , module Utils.DateTime
-  , module Data.UUID.Types
+  ( module Types
   ) where
 
-import ClassyPrelude
-import Data.UUID.Types (UUID)
-import qualified Data.UUID.Types as UUID
-import Data.NonNull.Instances ()
-
-import Data.Text (Text)
-import qualified Data.Text as Text
-import Data.CaseInsensitive (CI)
-import Data.CaseInsensitive.Instances ()
-
-import Data.Universe.Instances.Reverse ()
-
-import Yesod.Core.Dispatch (PathPiece(..))
-import qualified Yesod.Auth.Util.PasswordStore as PWStore
-import Web.PathPieces
-
-import Mail (MailLanguages(..))
-import Utils.DateTime (DateTimeFormat(..), SelDateTimeFormat(..))
-import Numeric.Natural
-
-import Model.Types.Sheet
-import Model.Types.DateTime
-import Model.Types.Security
-import Model.Types.Misc
-
-----
--- Just bringing together the different Model.Types submodules.
-
-instance PathPiece UUID where
-  fromPathPiece = UUID.fromString . unpack
-  toPathPiece = pack . UUID.toString
-
-instance {-# OVERLAPS #-} PathMultiPiece FilePath where
-  fromPathMultiPiece = Just . unpack . intercalate "/"
-  toPathMultiPiece = Text.splitOn "/" . pack
-
-
--- Type synonyms
-
-type Email           = Text
-
-type SchoolName      = CI Text
-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 TutorialName    = CI Text
-
-type PWHashAlgorithm = ByteString -> PWStore.Salt -> Int -> ByteString
-type InstanceId      = UUID
-type ClusterId       = UUID
-type TokenId         = UUID
-type TermCandidateIncidence = UUID
+import Model.Types.Common as Types
+import Model.Types.Course as Types
+import Model.Types.DateTime as Types
+import Model.Types.Exam as Types
+import Model.Types.Health as Types
+import Model.Types.Mail as Types
+import Model.Types.Security as Types
+import Model.Types.Sheet as Types
+import Model.Types.Submission as Types
+import Model.Types.Misc as Types
diff --git a/src/Model/Types/Common.hs b/src/Model/Types/Common.hs
new file mode 100644
index 000000000..ae8f79f83
--- /dev/null
+++ b/src/Model/Types/Common.hs
@@ -0,0 +1,29 @@
+module Model.Types.Common
+  ( module Model.Types.Common
+  ) where
+
+import Import.NoModel
+
+import qualified Yesod.Auth.Util.PasswordStore as PWStore
+  
+
+type Count  = Sum Integer
+type Points = Centi
+
+
+type Email           = Text
+
+type SchoolName      = CI Text
+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 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/Model/Types/Course.hs b/src/Model/Types/Course.hs
new file mode 100644
index 000000000..ca619a77a
--- /dev/null
+++ b/src/Model/Types/Course.hs
@@ -0,0 +1,20 @@
+module Model.Types.Course
+  ( module Model.Types.Course
+  ) where
+
+import Import.NoModel
+
+
+data LecturerType = CourseLecturer | CourseAssistant
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+
+instance Universe LecturerType
+instance Finite LecturerType
+
+nullaryPathPiece ''LecturerType $ camelToPathPiece' 1
+deriveJSON  defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  } ''LecturerType
+derivePersistFieldJSON ''LecturerType
+
+instance Hashable LecturerType
diff --git a/src/Model/Types/DateTime.hs b/src/Model/Types/DateTime.hs
index cb7b2999d..795647003 100644
--- a/src/Model/Types/DateTime.hs
+++ b/src/Model/Types/DateTime.hs
@@ -1,34 +1,22 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving
-           , UndecidableInstances
-  #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
+module Model.Types.DateTime
+  ( module Model.Types.DateTime
+  ) where
 
-module Model.Types.DateTime where
-
-
-import ClassyPrelude
-import GHC.Generics (Generic)
-import Utils
+import Import.NoModel
 import Control.Lens
-import Data.NonNull.Instances ()
-import Data.Typeable (Typeable)
-import Data.Universe.Instances.Reverse ()
-import Data.Binary (Binary)
 
-import Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.CaseInsensitive as CI
-import Data.CaseInsensitive.Instances ()
 import Text.Read (readMaybe)
 
-import Database.Persist.Class
 import Database.Persist.Sql
 
 import Web.HttpApiData
 
-import Yesod.Core.Dispatch (PathPiece(..))
-import qualified Data.Aeson as Aeson
-import Data.Aeson (FromJSON(..), ToJSON(..), withText)
+import Data.Aeson.Types as Aeson
+
+import Time.Types (WeekDay(..))
+import Data.Time.LocalTime (LocalTime, TimeOfDay)
 
 
 ----
@@ -156,3 +144,44 @@ time `withinTerm` term = timeYear `mod` 100 == termYear `mod` 100
     timeYear = fst3 $ toGregorian time
     termYear = year term
 
+
+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
+
diff --git a/src/Model/Types/Exam.hs b/src/Model/Types/Exam.hs
new file mode 100644
index 000000000..f037ce79b
--- /dev/null
+++ b/src/Model/Types/Exam.hs
@@ -0,0 +1,12 @@
+module Model.Types.Exam
+  ( module Model.Types.Exam
+  ) where
+
+import Import.NoModel
+
+import Database.Persist.TH (derivePersistField)
+
+
+data ExamStatus = Attended | NoShow | Voided
+  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
+derivePersistField "ExamStatus"
diff --git a/src/Model/Types/Health.hs b/src/Model/Types/Health.hs
new file mode 100644
index 000000000..788ca54f7
--- /dev/null
+++ b/src/Model/Types/Health.hs
@@ -0,0 +1,83 @@
+module Model.Types.Health
+  ( module Model.Types.Health
+  ) where
+
+import Import.NoModel
+
+
+data HealthCheck
+  = HealthCheckMatchingClusterConfig
+  | HealthCheckHTTPReachable
+  | HealthCheckLDAPAdmins
+  | HealthCheckSMTPConnect
+  | HealthCheckWidgetMemcached
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe HealthCheck
+instance Finite HealthCheck
+instance Hashable HealthCheck
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 2
+  } ''HealthCheck
+nullaryPathPiece ''HealthCheck $ camelToPathPiece' 2
+pathPieceJSONKey ''HealthCheck
+  
+data HealthReport
+  = HealthMatchingClusterConfig { healthMatchingClusterConfig :: Bool }
+    -- ^ Is the database-stored configuration we're running under still up to date?
+    --
+    -- Also tests database connection as a side effect
+  | HealthHTTPReachable { healthHTTPReachable :: Maybe Bool }
+    -- ^ Can we reach a uni2work-instance with the same `ClusterId` under our configured `approot` via HTTP?
+  | HealthLDAPAdmins { healthLDAPAdmins :: Maybe Rational }
+    -- ^ Proportion of school admins that could be found in LDAP
+  | HealthSMTPConnect { healthSMTPConnect :: Maybe Bool }
+    -- ^ Can we connect to the SMTP server and say @NOOP@?
+  | HealthWidgetMemcached { healthWidgetMemcached :: Maybe Bool }
+    -- ^ Can we store values in memcached and retrieve them via HTTP?
+  deriving (Eq, Ord, Read, Show, Data, Generic, Typeable)
+
+instance NFData HealthReport
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  , fieldLabelModifier = camelToPathPiece' 1
+  , omitNothingFields  = True
+  , sumEncoding = TaggedObject "test" "result"
+  , tagSingleConstructors = True
+  } ''HealthReport
+
+classifyHealthReport :: HealthReport -> HealthCheck
+classifyHealthReport HealthMatchingClusterConfig{} = HealthCheckMatchingClusterConfig
+classifyHealthReport HealthLDAPAdmins{}            = HealthCheckLDAPAdmins
+classifyHealthReport HealthHTTPReachable{}         = HealthCheckHTTPReachable
+classifyHealthReport HealthSMTPConnect{}           = HealthCheckSMTPConnect
+classifyHealthReport HealthWidgetMemcached{}       = HealthCheckWidgetMemcached
+
+-- | `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)
+
+instance Universe HealthStatus
+instance Finite HealthStatus
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  } ''HealthStatus
+nullaryPathPiece ''HealthStatus $ camelToPathPiece' 1
+
+healthReportStatus :: HealthReport -> HealthStatus
+-- ^ Classify `HealthReport` by badness
+healthReportStatus = \case
+  HealthMatchingClusterConfig       False  -> HealthFailure
+  HealthHTTPReachable         (Just False) -> HealthFailure
+  HealthLDAPAdmins            (Just prop )
+    | prop <= 0                            -> HealthFailure
+  HealthSMTPConnect           (Just False) -> HealthFailure 
+  HealthWidgetMemcached       (Just False) -> HealthFailure -- TODO: investigate this failure mode; do we just handle it gracefully?
+  _other                                   -> maxBound -- Minimum badness
diff --git a/src/Model/Types/Mail.hs b/src/Model/Types/Mail.hs
new file mode 100644
index 000000000..5aeb1d14a
--- /dev/null
+++ b/src/Model/Types/Mail.hs
@@ -0,0 +1,70 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE UndecidableInstances #-}
+
+module Model.Types.Mail
+  ( module Model.Types.Mail
+  ) where
+
+import Import.NoModel
+
+import qualified Data.Aeson.Types as Aeson
+
+import qualified Data.HashMap.Strict as HashMap
+
+
+-- ^ `NotificationSettings` is for now a series of boolean checkboxes, i.e. a mapping @NotificationTrigger -> Bool@
+--
+-- Could maybe be replaced with `Structure Notification` in the long term
+data NotificationTrigger
+  = NTSubmissionRatedGraded
+  | NTSubmissionRated
+  | NTSheetActive
+  | NTSheetSoonInactive
+  | NTSheetInactive
+  | NTCorrectionsAssigned
+  | NTCorrectionsNotDistributed
+  | NTUserRightsUpdate
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+
+instance Universe NotificationTrigger
+instance Finite NotificationTrigger
+
+instance Hashable NotificationTrigger
+
+deriveJSON defaultOptions
+  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
+  } ''NotificationTrigger
+
+instance ToJSONKey NotificationTrigger where
+  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
+
+instance FromJSONKey NotificationTrigger where
+  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
+
+
+newtype NotificationSettings = NotificationSettings { notificationAllowed :: NotificationTrigger -> Bool }
+  deriving (Generic, Typeable)
+  deriving newtype (Eq, Ord, Read, Show)
+
+instance Default NotificationSettings where
+  def = NotificationSettings $ \case
+    NTSubmissionRatedGraded -> True
+    NTSubmissionRated -> False
+    NTSheetActive -> True
+    NTSheetSoonInactive -> False
+    NTSheetInactive -> True
+    NTCorrectionsAssigned -> True
+    NTCorrectionsNotDistributed -> True
+    NTUserRightsUpdate -> True
+
+instance ToJSON NotificationSettings where
+  toJSON v = toJSON . HashMap.fromList $ map (id &&& notificationAllowed v) universeF
+
+instance FromJSON NotificationSettings where
+  parseJSON = Aeson.withObject "NotificationSettings" $ \o -> do
+    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap NotificationTrigger Bool)
+    return . NotificationSettings $ \n -> case HashMap.lookup n o' of
+      Nothing -> notificationAllowed def n
+      Just b  -> b
+
+derivePersistFieldJSON ''NotificationSettings
diff --git a/src/Model/Types/Misc.hs b/src/Model/Types/Misc.hs
index aa3811f9d..8d45e6798 100644
--- a/src/Model/Types/Misc.hs
+++ b/src/Model/Types/Misc.hs
@@ -1,50 +1,20 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving
-           , UndecidableInstances
-  #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
+module Model.Types.Misc
+  ( module Model.Types.Misc
+  ) where
 
-module Model.Types.Misc where
-
-
-import ClassyPrelude
-import Utils
+import Import.NoModel
 import Control.Lens
 
-import Data.NonNull.Instances ()
-import Data.Set (Set)
 import Data.Maybe (fromJust)
-import Data.Universe
-import Data.Universe.Helpers
 
 import qualified Data.Text as Text
 import qualified Data.Text.Lens as Text
-import Data.CaseInsensitive.Instances ()
 
-import Database.Persist.TH hiding (derivePersistFieldJSON)
-import Model.Types.JSON
-
-import Data.Aeson (Value())
-import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..))
-
-import GHC.Generics (Generic)
-import Data.Typeable (Typeable)
-
-import Data.Universe.Instances.Reverse ()
-
-import Data.Time.LocalTime (LocalTime, TimeOfDay)
-import Time.Types (WeekDay(..))
-
-
------
--- Miscellaneous Model.Types
-
-derivePersistFieldJSON ''Value
 
 data StudyFieldType = FieldPrimary | FieldSecondary
   deriving (Eq, Ord, Enum, Show, Read, Bounded, Generic)
 derivePersistField "StudyFieldType"
 
--- instance DisplayAble StudyFieldType
 
 data Theme
   = ThemeDefault
@@ -59,89 +29,11 @@ deriveJSON defaultOptions
   { constructorTagModifier = fromJust . stripPrefix "Theme"
   } ''Theme
 
-instance Universe Theme where universe = universeDef
+instance Universe Theme
 instance Finite Theme
 
-nullaryPathPiece ''Theme (camelToPathPiece' 1)
+nullaryPathPiece ''Theme $ camelToPathPiece' 1
 
 $(deriveSimpleWith ''DisplayAble 'display (over Text.packed $ Text.intercalate " " . unsafeTail . splitCamel) ''Theme) -- describe theme to user
 
 derivePersistField "Theme"
-
-
-data CorrectorState = CorrectorNormal | CorrectorMissing | CorrectorExcused
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic)
-
-deriveJSON defaultOptions
-  { constructorTagModifier = fromJust . stripPrefix "Corrector"
-  } ''CorrectorState
-
-instance Universe CorrectorState
-instance Finite CorrectorState
-
-instance Hashable CorrectorState
-
-nullaryPathPiece ''CorrectorState (camelToPathPiece' 1)
-
-derivePersistField "CorrectorState"
-
-
-data LecturerType = CourseLecturer | CourseAssistant
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
-
-instance Universe LecturerType
-instance Finite LecturerType
-
-nullaryPathPiece ''LecturerType $ camelToPathPiece' 1
-deriveJSON  defaultOptions
-  { constructorTagModifier = camelToPathPiece' 1
-  } ''LecturerType
-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
-
diff --git a/src/Model/Types/Security.hs b/src/Model/Types/Security.hs
index 04aad122b..cba46f371 100644
--- a/src/Model/Types/Security.hs
+++ b/src/Model/Types/Security.hs
@@ -1,80 +1,22 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving
-           , UndecidableInstances
-  #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
-module Model.Types.Security where
+module Model.Types.Security
+  ( module Model.Types.Security
+  ) where
 
-
-import ClassyPrelude
-import Utils
-import Control.Lens hiding (universe)
+import Import.NoModel
 
 import Data.Set (Set)
-import qualified Data.Set as Set
-import Data.Universe
-import Data.UUID.Types (UUID)
-import qualified Data.UUID.Types as UUID
 
-import Data.NonNull.Instances ()
-
-import Data.Default
-
-import Model.Types.JSON
-import Database.Persist.Class
-import Database.Persist.Sql
-
-import Data.Text (Text)
 import qualified Data.Text as Text
 
 import qualified Data.HashMap.Strict as HashMap
 
-import Data.CaseInsensitive (CI)
-import qualified Data.CaseInsensitive as CI
-import Data.CaseInsensitive.Instances ()
-
-import Yesod.Core.Dispatch (PathPiece(..))
-import qualified Data.Aeson as Aeson
 import qualified Data.Aeson.Types as Aeson
-import Data.Aeson (FromJSON(..), ToJSON(..), FromJSONKey(..), ToJSONKey(..), FromJSONKeyFunction(..), withObject)
-import Data.Aeson.Types (toJSONKeyText)
-import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..), mkToJSON, mkParseJSON)
 
-import GHC.Generics (Generic)
-import Data.Typeable (Typeable)
-
-import Data.Universe.Instances.Reverse ()
-
-import Mail (MailLanguages(..))
-
-import Data.Word.Word24 (Word24)
-import Data.Bits
-import Data.Ix
-import Data.List (genericIndex, elemIndex)
-import System.Random (Random(..))
-import Data.Data (Data)
-
-import Model.Types.Wordlist
-import Data.Text.Metrics (damerauLevenshtein)
-
-import Data.Binary (Binary)
 import qualified Data.Binary as Binary
 
 
-----
--- Security, Authentification, Notification Stuff
-
-instance PersistField UUID where
-  toPersistValue = PersistDbSpecific . UUID.toASCIIBytes
-  fromPersistValue (PersistText t) = maybe (Left "Failed to parse UUID") Right $ UUID.fromText t
-  fromPersistValue (PersistByteString bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
-  fromPersistValue (PersistDbSpecific bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs
-  fromPersistValue x = Left $ "Expected UUID, received: " <> tshow x
-
-instance PersistFieldSql UUID where
-  sqlType _ = SqlOther "uuid"
-
-
 data AuthenticationMode = AuthLDAP
                         | AuthPWHash { authPWHash :: Text }
   deriving (Eq, Ord, Read, Show, Generic)
@@ -88,167 +30,6 @@ deriveJSON defaultOptions
 derivePersistFieldJSON ''AuthenticationMode
 
 
-
--- ^ `NotificationSettings` is for now a series of boolean checkboxes, i.e. a mapping @NotificationTrigger -> Bool@
---
--- Could maybe be replaced with `Structure Notification` in the long term
-data NotificationTrigger = NTSubmissionRatedGraded
-                         | NTSubmissionRated
-                         | NTSheetActive
-                         | NTSheetSoonInactive
-                         | NTSheetInactive
-                         | NTCorrectionsAssigned
-                         | NTCorrectionsNotDistributed
-                         | NTUserRightsUpdate
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
-
-instance Universe NotificationTrigger
-instance Finite NotificationTrigger
-
-instance Hashable NotificationTrigger
-
-deriveJSON defaultOptions
-  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
-  } ''NotificationTrigger
-
-instance ToJSONKey NotificationTrigger where
-  toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t
-
-instance FromJSONKey NotificationTrigger where
-  fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
-
-
-newtype NotificationSettings = NotificationSettings { notificationAllowed :: NotificationTrigger -> Bool }
-  deriving (Generic, Typeable)
-  deriving newtype (Eq, Ord, Read, Show)
-
-instance Default NotificationSettings where
-  def = NotificationSettings $ \case
-    NTSubmissionRatedGraded -> True
-    NTSubmissionRated -> False
-    NTSheetActive -> True
-    NTSheetSoonInactive -> False
-    NTSheetInactive -> True
-    NTCorrectionsAssigned -> True
-    NTCorrectionsNotDistributed -> True
-    NTUserRightsUpdate -> True
-
-instance ToJSON NotificationSettings where
-  toJSON v = toJSON . HashMap.fromList $ map (id &&& notificationAllowed v) universeF
-
-instance FromJSON NotificationSettings where
-  parseJSON = withObject "NotificationSettings" $ \o -> do
-    o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap NotificationTrigger Bool)
-    return . NotificationSettings $ \n -> case HashMap.lookup n o' of
-      Nothing -> notificationAllowed def n
-      Just b  -> b
-
-derivePersistFieldJSON ''NotificationSettings
-
-
-instance ToBackendKey SqlBackend record => Hashable (Key record) where
-  hashWithSalt s key = s `hashWithSalt` fromSqlKey key
-
-derivePersistFieldJSON ''MailLanguages
-
-
-type PseudonymWord   = CI Text
-
-newtype Pseudonym = Pseudonym Word24
-  deriving (Eq, Ord, Read, Show, Generic, Data)
-  deriving newtype (Bounded, Enum, Integral, Num, Real, Ix)
-
-
-instance PersistField Pseudonym where
-  toPersistValue p = toPersistValue (fromIntegral p :: Word32)
-  fromPersistValue v = do
-    w <- fromPersistValue v :: Either Text Word32
-    if
-      | 0 <= w
-      , w <= fromIntegral (maxBound :: Pseudonym)
-        -> return $ fromIntegral w
-      | otherwise
-        -> Left "Pseudonym out of range"
-
-instance PersistFieldSql Pseudonym where
-  sqlType _ = SqlInt32
-
-instance Random Pseudonym where
-  randomR (max minBound -> lo, min maxBound -> hi) gen = over _1 (fromIntegral :: Word32 -> Pseudonym) $ randomR (fromIntegral lo, fromIntegral hi) gen
-  random = randomR (minBound, maxBound)
-
-instance FromJSON Pseudonym where
-  parseJSON v@(Aeson.Number _) = do
-    w <- parseJSON v :: Aeson.Parser Word32
-    if
-      | 0 <= w
-      , w <= fromIntegral (maxBound :: Pseudonym)
-        -> return $ fromIntegral w
-      | otherwise
-        -> fail "Pseudonym out auf range"
-  parseJSON (Aeson.String t)
-    = case t ^? _PseudonymText of
-        Just p -> return p
-        Nothing -> fail "Could not parse pseudonym"
-  parseJSON v = flip (Aeson.withArray "Pseudonym") v $ \ws -> do
-    ws' <- toList . map CI.mk <$> mapM parseJSON ws
-    case ws' ^? _PseudonymWords of
-      Just p -> return p
-      Nothing -> fail "Could not parse pseudonym words"
-
-instance ToJSON Pseudonym where
-  toJSON = toJSON . (review _PseudonymWords :: Pseudonym -> [PseudonymWord])
-
-pseudonymWordlist :: [PseudonymWord]
-pseudonymCharacters :: Set (CI Char)
-(pseudonymWordlist, pseudonymCharacters) = $(wordlist "config/wordlist.txt")
-
-_PseudonymWords :: Prism' [PseudonymWord] Pseudonym
-_PseudonymWords = prism' pToWords pFromWords
-  where
-    pFromWords :: [PseudonymWord] -> Maybe Pseudonym
-    pFromWords [w1, w2]
-      | Just i1 <- elemIndex w1 pseudonymWordlist
-      , Just i2 <- elemIndex w2 pseudonymWordlist
-      , i1 <= maxWord, i2 <= maxWord
-      = Just . Pseudonym $ shiftL (fromIntegral i1) 12 .|. fromIntegral i2
-    pFromWords _ = Nothing
-
-    pToWords :: Pseudonym -> [PseudonymWord]
-    pToWords (Pseudonym p)
-      = [ genericIndex pseudonymWordlist $ shiftR p 12 .&. maxWord
-        , genericIndex pseudonymWordlist $ p .&. maxWord
-        ]
-
-    maxWord :: Num a => a
-    maxWord = 0b111111111111
-
-_PseudonymText :: Prism' Text Pseudonym
-_PseudonymText = prism' tToWords tFromWords . _PseudonymWords
-  where
-    tFromWords :: Text -> Maybe [PseudonymWord]
-    tFromWords input
-      | [result] <- input ^.. pseudonymFragments
-      = Just result
-      | otherwise
-      = Nothing
-
-    tToWords :: [PseudonymWord] -> Text
-    tToWords = Text.unwords . map CI.original
-
-pseudonymWords :: Fold Text PseudonymWord
-pseudonymWords = folding
-  $ \(CI.mk -> input) -> map (view _2) . fromMaybe [] . listToMaybe . groupBy ((==) `on` view _1) . sortBy (comparing $ view _1) . filter ((<= distanceCutoff) . view _1) $ map (distance input &&& id) pseudonymWordlist
-  where
-    distance = damerauLevenshtein `on` CI.foldedCase
-    -- | Arbitrary cutoff point, for reference: ispell cuts off at 1
-    distanceCutoff = 2
-
-pseudonymFragments :: Fold Text [PseudonymWord]
-pseudonymFragments = folding
-  $ mapM (toListOf pseudonymWords) . (\l -> guard (length l == 2) *> l) . filter (not . null) . Text.split (\(CI.mk -> c) -> not $ Set.member c pseudonymCharacters)
-
-
 data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prädikate sind sortier nach Relevanz für Benutzer
   = AuthAdmin
   | AuthLecturer
@@ -309,7 +90,7 @@ instance ToJSON AuthTagActive where
   toJSON v = toJSON . HashMap.fromList $ map (id &&& authTagIsActive v) universeF
 
 instance FromJSON AuthTagActive where
-  parseJSON = withObject "AuthTagActive" $ \o -> do
+  parseJSON = Aeson.withObject "AuthTagActive" $ \o -> do
     o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap AuthTag Bool)
     return . AuthTagActive $ \n -> case HashMap.lookup n o' of
       Nothing -> authTagIsActive def n
@@ -355,81 +136,3 @@ instance (Ord a, Binary a) => Binary (PredDNF a) where
 type AuthLiteral = PredLiteral AuthTag
 
 type AuthDNF = PredDNF AuthTag
-
-
-data HealthCheck
-  = HealthCheckMatchingClusterConfig
-  | HealthCheckHTTPReachable
-  | HealthCheckLDAPAdmins
-  | HealthCheckSMTPConnect
-  | HealthCheckWidgetMemcached
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
-instance Universe HealthCheck
-instance Finite HealthCheck
-instance Hashable HealthCheck
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 2
-  } ''HealthCheck
-nullaryPathPiece ''HealthCheck $ camelToPathPiece' 2
-pathPieceJSONKey ''HealthCheck
-  
-data HealthReport
-  = HealthMatchingClusterConfig { healthMatchingClusterConfig :: Bool }
-    -- ^ Is the database-stored configuration we're running under still up to date?
-    --
-    -- Also tests database connection as a side effect
-  | HealthHTTPReachable { healthHTTPReachable :: Maybe Bool }
-    -- ^ Can we reach a uni2work-instance with the same `ClusterId` under our configured `approot` via HTTP?
-  | HealthLDAPAdmins { healthLDAPAdmins :: Maybe Rational }
-    -- ^ Proportion of school admins that could be found in LDAP
-  | HealthSMTPConnect { healthSMTPConnect :: Maybe Bool }
-    -- ^ Can we connect to the SMTP server and say @NOOP@?
-  | HealthWidgetMemcached { healthWidgetMemcached :: Maybe Bool }
-    -- ^ Can we store values in memcached and retrieve them via HTTP?
-  deriving (Eq, Ord, Read, Show, Data, Generic, Typeable)
-
-instance NFData HealthReport
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 1
-  , fieldLabelModifier = camelToPathPiece' 1
-  , omitNothingFields  = True
-  , sumEncoding = TaggedObject "test" "result"
-  , tagSingleConstructors = True
-  } ''HealthReport
-
-classifyHealthReport :: HealthReport -> HealthCheck
-classifyHealthReport HealthMatchingClusterConfig{} = HealthCheckMatchingClusterConfig
-classifyHealthReport HealthLDAPAdmins{}            = HealthCheckLDAPAdmins
-classifyHealthReport HealthHTTPReachable{}         = HealthCheckHTTPReachable
-classifyHealthReport HealthSMTPConnect{}           = HealthCheckSMTPConnect
-classifyHealthReport HealthWidgetMemcached{}       = HealthCheckWidgetMemcached
-
--- | `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)
-
-instance Universe HealthStatus
-instance Finite HealthStatus
-
-deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 1
-  } ''HealthStatus
-nullaryPathPiece ''HealthStatus $ camelToPathPiece' 1
-
-healthReportStatus :: HealthReport -> HealthStatus
--- ^ Classify `HealthReport` by badness
-healthReportStatus = \case
-  HealthMatchingClusterConfig       False  -> HealthFailure
-  HealthHTTPReachable         (Just False) -> HealthFailure
-  HealthLDAPAdmins            (Just prop )
-    | prop <= 0                            -> HealthFailure
-  HealthSMTPConnect           (Just False) -> HealthFailure 
-  HealthWidgetMemcached       (Just False) -> HealthFailure -- TODO: investigate this failure mode; do we just handle it gracefully?
-  _other                                   -> maxBound -- Minimum badness
diff --git a/src/Model/Types/Sheet.hs b/src/Model/Types/Sheet.hs
index 426e375c5..961ea7400 100644
--- a/src/Model/Types/Sheet.hs
+++ b/src/Model/Types/Sheet.hs
@@ -1,62 +1,26 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving
-           , UndecidableInstances
-  #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text)
+module Model.Types.Sheet
+  ( module Model.Types.Sheet
+  ) where
 
-module Model.Types.Sheet where
-
-import ClassyPrelude
-import Utils
-import Numeric.Natural
+import Import.NoModel
+import Model.Types.Common
+import Utils.Lens.TH
 
 import Control.Lens
-import Utils.Lens.TH
-import GHC.Generics (Generic)
 import Generics.Deriving.Monoid (memptydefault, mappenddefault)
-import Data.Typeable (Typeable)
-import Data.Universe
-import Data.Universe.Helpers
-import Data.Universe.Instances.Reverse ()
 
-import Data.NonNull.Instances ()
 import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
-import Data.Fixed
-import Data.Monoid (Sum(..))
 import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..))
 
-import Data.CaseInsensitive.Instances ()
 import Text.Blaze (Markup)
 
-import Database.Persist.TH hiding (derivePersistFieldJSON)
-import Model.Types.JSON
 import Yesod.Core.Dispatch (PathPiece(..))
 
-import Network.Mime
+import Data.Maybe (fromJust)
 
 
-
-----
--- Sheet and Submission realted Model.Types
-
-type Count  = Sum Integer
-type Points = Centi
-
-toPoints :: Integral a => a -> Points -- deprecated
-toPoints = fromIntegral
-
-pToI :: Points -> Integer -- deprecated
-pToI = fromPoints
-
-fromPoints :: Integral a => Points -> a -- deprecated
-fromPoints = round
-
-instance DisplayAble Points
-
-instance DisplayAble a => DisplayAble (Sum a) where
-   display (Sum x) = display x
-
 data SheetGrading
   = Points     { maxPoints :: Points }
   | PassPoints { maxPoints, passingPoints :: Points }
@@ -179,7 +143,7 @@ data SheetFileType = SheetExercise | SheetHint | SheetSolution | SheetMarking
   deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
 derivePersistField "SheetFileType"
 
-instance Universe SheetFileType where universe = universeDef
+instance Universe SheetFileType
 instance Finite SheetFileType
 
 instance PathPiece SheetFileType where
@@ -208,22 +172,6 @@ sheetFile2markup SheetMarking  = iconMarking
 partitionFileType :: Ord a => [(SheetFileType,a)] -> SheetFileType -> Set a
 partitionFileType fs t = Map.findWithDefault Set.empty t . Map.fromListWith Set.union $ map (over _2 Set.singleton) fs
 
-data SubmissionFileType = SubmissionOriginal | SubmissionCorrected
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
-
-instance Universe SubmissionFileType
-instance Finite SubmissionFileType
-
-nullaryPathPiece ''SubmissionFileType $ camelToPathPiece' 1
-
-submissionFileTypeIsUpdate :: SubmissionFileType -> Bool
-submissionFileTypeIsUpdate SubmissionOriginal  = False
-submissionFileTypeIsUpdate SubmissionCorrected = True
-
-isUpdateSubmissionFileType :: Bool -> SubmissionFileType
-isUpdateSubmissionFileType False = SubmissionOriginal
-isUpdateSubmissionFileType True  = SubmissionCorrected
-
 
 data UploadSpecificFile = UploadSpecificFile
   { specificFileLabel :: Text
@@ -306,10 +254,6 @@ classifySubmissionMode (SubmissionMode False (Just _)) = SubmissionModeUser
 classifySubmissionMode (SubmissionMode True  (Just _)) = SubmissionModeBoth
 
 
-data ExamStatus = Attended | NoShow | Voided
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
-derivePersistField "ExamStatus"
-
 -- | Specify a corrector's workload
 data Load -- = ByTutorial { countsToLoad :: Bool } | ByProportion { load :: Rational }
     = Load { byTutorial :: Maybe Bool  -- ^ @Just@ all from Tutorial, @True@ if counting towards overall workload
@@ -340,3 +284,19 @@ instance Monoid Load where
   isByTutorial (ByTutorial {}) = True
   isByTutorial _               = False
 -}
+
+data CorrectorState = CorrectorNormal | CorrectorMissing | CorrectorExcused
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic)
+
+deriveJSON defaultOptions
+  { constructorTagModifier = fromJust . stripPrefix "Corrector"
+  } ''CorrectorState
+
+instance Universe CorrectorState
+instance Finite CorrectorState
+
+instance Hashable CorrectorState
+
+nullaryPathPiece ''CorrectorState (camelToPathPiece' 1)
+
+derivePersistField "CorrectorState"
diff --git a/src/Model/Types/Submission.hs b/src/Model/Types/Submission.hs
new file mode 100644
index 000000000..c70919195
--- /dev/null
+++ b/src/Model/Types/Submission.hs
@@ -0,0 +1,146 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Model.Types.Submission
+  ( module Model.Types.Submission
+  ) where
+
+import Import.NoModel
+
+import Data.Aeson.Types (ToJSON(..), FromJSON(..))
+import qualified Data.Aeson.Types as Aeson
+
+import Database.Persist.Sql
+
+import Data.Word.Word24
+
+import qualified Data.CaseInsensitive as CI
+
+import Control.Lens
+
+import qualified Data.Text as Text
+import qualified Data.Set as Set
+
+
+import Data.List (elemIndex, genericIndex)
+import Data.Bits
+import Data.Text.Metrics (damerauLevenshtein)
+  
+-------------------------
+-- Submission Download --
+-------------------------
+
+data SubmissionFileType = SubmissionOriginal | SubmissionCorrected
+  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
+
+instance Universe SubmissionFileType
+instance Finite SubmissionFileType
+
+nullaryPathPiece ''SubmissionFileType $ camelToPathPiece' 1
+
+submissionFileTypeIsUpdate :: SubmissionFileType -> Bool
+submissionFileTypeIsUpdate SubmissionOriginal  = False
+submissionFileTypeIsUpdate SubmissionCorrected = True
+
+isUpdateSubmissionFileType :: Bool -> SubmissionFileType
+isUpdateSubmissionFileType False = SubmissionOriginal
+isUpdateSubmissionFileType True  = SubmissionCorrected
+
+---------------------------
+-- Submission Pseudonyms --
+---------------------------
+  
+type PseudonymWord = CI Text
+
+newtype Pseudonym = Pseudonym Word24
+  deriving (Eq, Ord, Read, Show, Generic, Data)
+  deriving newtype (Bounded, Enum, Integral, Num, Real, Ix)
+
+
+instance PersistField Pseudonym where
+  toPersistValue p = toPersistValue (fromIntegral p :: Word32)
+  fromPersistValue v = do
+    w <- fromPersistValue v :: Either Text Word32
+    if
+      | 0 <= w
+      , w <= fromIntegral (maxBound :: Pseudonym)
+        -> return $ fromIntegral w
+      | otherwise
+        -> Left "Pseudonym out of range"
+
+instance PersistFieldSql Pseudonym where
+  sqlType _ = SqlInt32
+
+instance Random Pseudonym where
+  randomR (max minBound -> lo, min maxBound -> hi) gen = over _1 (fromIntegral :: Word32 -> Pseudonym) $ randomR (fromIntegral lo, fromIntegral hi) gen
+  random = randomR (minBound, maxBound)
+
+instance FromJSON Pseudonym where
+  parseJSON v@(Aeson.Number _) = do
+    w <- parseJSON v :: Aeson.Parser Word32
+    if
+      | 0 <= w
+      , w <= fromIntegral (maxBound :: Pseudonym)
+        -> return $ fromIntegral w
+      | otherwise
+        -> fail "Pseudonym out auf range"
+  parseJSON (Aeson.String t)
+    = case t ^? _PseudonymText of
+        Just p -> return p
+        Nothing -> fail "Could not parse pseudonym"
+  parseJSON v = flip (Aeson.withArray "Pseudonym") v $ \ws -> do
+    ws' <- toList . map CI.mk <$> mapM parseJSON ws
+    case ws' ^? _PseudonymWords of
+      Just p -> return p
+      Nothing -> fail "Could not parse pseudonym words"
+
+instance ToJSON Pseudonym where
+  toJSON = toJSON . (review _PseudonymWords :: Pseudonym -> [PseudonymWord])
+
+pseudonymWordlist :: [PseudonymWord]
+pseudonymCharacters :: Set (CI Char)
+(pseudonymWordlist, pseudonymCharacters) = $(wordlist "config/wordlist.txt")
+
+_PseudonymWords :: Prism' [PseudonymWord] Pseudonym
+_PseudonymWords = prism' pToWords pFromWords
+  where
+    pFromWords :: [PseudonymWord] -> Maybe Pseudonym
+    pFromWords [w1, w2]
+      | Just i1 <- elemIndex w1 pseudonymWordlist
+      , Just i2 <- elemIndex w2 pseudonymWordlist
+      , i1 <= maxWord, i2 <= maxWord
+      = Just . Pseudonym $ shiftL (fromIntegral i1) 12 .|. fromIntegral i2
+    pFromWords _ = Nothing
+
+    pToWords :: Pseudonym -> [PseudonymWord]
+    pToWords (Pseudonym p)
+      = [ genericIndex pseudonymWordlist $ shiftR p 12 .&. maxWord
+        , genericIndex pseudonymWordlist $ p .&. maxWord
+        ]
+
+    maxWord :: Num a => a
+    maxWord = 0b111111111111
+
+_PseudonymText :: Prism' Text Pseudonym
+_PseudonymText = prism' tToWords tFromWords . _PseudonymWords
+  where
+    tFromWords :: Text -> Maybe [PseudonymWord]
+    tFromWords input
+      | [result] <- input ^.. pseudonymFragments
+      = Just result
+      | otherwise
+      = Nothing
+
+    tToWords :: [PseudonymWord] -> Text
+    tToWords = Text.unwords . map CI.original
+
+pseudonymWords :: Fold Text PseudonymWord
+pseudonymWords = folding
+  $ \(CI.mk -> input) -> map (view _2) . fromMaybe [] . listToMaybe . groupBy ((==) `on` view _1) . sortBy (comparing $ view _1) . filter ((<= distanceCutoff) . view _1) $ map (distance input &&& id) pseudonymWordlist
+  where
+    distance = damerauLevenshtein `on` CI.foldedCase
+    -- | Arbitrary cutoff point, for reference: ispell cuts off at 1
+    distanceCutoff = 2
+
+pseudonymFragments :: Fold Text [PseudonymWord]
+pseudonymFragments = folding
+  $ mapM (toListOf pseudonymWords) . (\l -> guard (length l == 2) *> l) . filter (not . null) . Text.split (\(CI.mk -> c) -> not $ Set.member c pseudonymCharacters)
diff --git a/src/Model/Types/JSON.hs b/src/Model/Types/TH/JSON.hs
similarity index 98%
rename from src/Model/Types/JSON.hs
rename to src/Model/Types/TH/JSON.hs
index 66ed78163..34a752350 100644
--- a/src/Model/Types/JSON.hs
+++ b/src/Model/Types/TH/JSON.hs
@@ -1,4 +1,4 @@
-module Model.Types.JSON
+module Model.Types.TH.JSON
   ( derivePersistFieldJSON
   , predNFAesonOptions
   ) where
diff --git a/src/Model/Types/Wordlist.hs b/src/Model/Types/TH/Wordlist.hs
similarity index 95%
rename from src/Model/Types/Wordlist.hs
rename to src/Model/Types/TH/Wordlist.hs
index 5cfecd662..de3d159d8 100644
--- a/src/Model/Types/Wordlist.hs
+++ b/src/Model/Types/TH/Wordlist.hs
@@ -1,4 +1,6 @@
-module Model.Types.Wordlist (wordlist) where
+module Model.Types.TH.Wordlist
+  ( wordlist
+  ) where
 
 import ClassyPrelude hiding (lift)
 
diff --git a/src/Settings.hs b/src/Settings.hs
index 884b1bd35..c53e90269 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -10,14 +10,13 @@ module Settings
   , module Settings.Cluster
   ) where
 
-import           ClassyPrelude.Yesod
+import           Import.NoModel
 import Data.UUID (UUID)
 import qualified Control.Exception           as Exception
-import           Data.Aeson                  (Result (..), fromJSON, withObject
+import           Data.Aeson                  (fromJSON, withObject
                                              ,(.!=), (.:?), withScientific
                                              )
 import qualified Data.Aeson.Types as Aeson
-import           Data.Aeson.TH
 import           Data.FileEmbed              (embedFile)
 import           Data.Yaml                   (decodeEither')
 import           Database.Persist.Postgresql (PostgresConf)
@@ -45,7 +44,6 @@ import qualified Data.Text.Encoding as Text
 
 import qualified Ldap.Client as Ldap
 
-import Utils hiding (MessageStatus(..))
 import Control.Lens
 
 import qualified Network.HaskellNet.Auth as HaskellNet (UserName, Password, AuthType(..))
@@ -70,7 +68,6 @@ import Jose.Jwt (JwtEncoding(..))
 
 import System.FilePath.Glob
 import Handler.Utils.Submission.TH
-import Network.Mime
 import Network.Mime.TH
 
 import qualified Data.Map as Map
@@ -483,5 +480,5 @@ configSettingsYmlValue = either Exception.throw id
 compileTimeAppSettings :: AppSettings
 compileTimeAppSettings =
     case fromJSON $ applyEnvValue False mempty configSettingsYmlValue of
-        Error e -> error e
-        Success settings -> settings
+        Aeson.Error e -> error e
+        Aeson.Success settings -> settings
diff --git a/src/System/FilePath/Instances.hs b/src/System/FilePath/Instances.hs
new file mode 100644
index 000000000..b37e2291a
--- /dev/null
+++ b/src/System/FilePath/Instances.hs
@@ -0,0 +1,16 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module System.FilePath.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import qualified Data.Text as Text
+
+import Web.PathPieces
+
+
+instance {-# OVERLAPS #-} PathMultiPiece FilePath where
+  fromPathMultiPiece = Just . unpack . intercalate "/"
+  toPathMultiPiece = Text.splitOn "/" . pack
diff --git a/src/Time/Types/Instances.hs b/src/Time/Types/Instances.hs
index af91312e3..fa61bca45 100644
--- a/src/Time/Types/Instances.hs
+++ b/src/Time/Types/Instances.hs
@@ -12,8 +12,14 @@ import Data.Universe
 
 import Utils.PathPiece
 
+import Data.Aeson.TH
+
 
 instance Universe WeekDay
 instance Finite WeekDay
 
 nullaryPathPiece ''WeekDay camelToPathPiece
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece
+  } ''WeekDay
diff --git a/src/Utils.hs b/src/Utils.hs
index 81f08b684..2080947ec 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-} -- Monad FormResult
-
 module Utils
   ( module Utils
   ) where
@@ -68,7 +66,7 @@ import qualified Crypto.Saltine.Core.SecretBox as SecretBox
 import qualified Crypto.Saltine.Class as Saltine
 import qualified Crypto.Data.PKCS7 as PKCS7
 
-import Data.Fixed (Centi)
+import Data.Fixed
 import Data.Ratio ((%))
 
 import qualified Data.Binary as Binary
@@ -277,6 +275,12 @@ instance DisplayAble a => DisplayAble (E.Value a) where
 instance DisplayAble a => DisplayAble (CI a) where
   display = display . CI.original
 
+instance HasResolution a => DisplayAble (Fixed a) where
+  display = pack . showFixed True
+
+instance DisplayAble a => DisplayAble (Sum a) where
+  display = display . getSum
+
 {- We do not want DisplayAble for every Show-Class:
    We want to explicitly verify that the resulting text can be displayed to the User!
    For example: UTCTime values were shown without proper format rendering!
diff --git a/src/Utils/DateTime.hs b/src/Utils/DateTime.hs
index 0b5855566..3f66c65ee 100644
--- a/src/Utils/DateTime.hs
+++ b/src/Utils/DateTime.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Utils.DateTime
   ( timeLocaleMap
@@ -14,10 +13,9 @@ module Utils.DateTime
 import ClassyPrelude.Yesod hiding (lift)
 import System.Locale.Read
 
-import Data.Time (TimeZone(..), TimeLocale(..))
+import Data.Time (TimeLocale(..))
 import Data.Time.Zones (TZ)
 import Data.Time.Zones.TH (includeSystemTZ)
-import Data.Time.Clock.POSIX
 
 import Language.Haskell.TH
 import Language.Haskell.TH.Syntax (Lift(..))
@@ -35,11 +33,8 @@ import Data.Aeson.TH
 
 import Utils.PathPiece
 
-deriving instance Lift TimeZone
-deriving instance Lift TimeLocale
-
-instance Hashable UTCTime where
-  hashWithSalt s = hashWithSalt s . toRational . utcTimeToPOSIXSeconds
+import Data.Time.Format.Instances ()
+  
 
 -- $(timeLocaleMap _) :: [Lang] -> TimeLocale
 timeLocaleMap :: [(Lang, String)] -- ^ Languages and matching locales, first is taken as default
@@ -91,7 +86,7 @@ instance Finite SelDateTimeFormat
 instance Hashable SelDateTimeFormat
 
 deriveJSON defaultOptions
-  { constructorTagModifier = intercalate "-" . map toLower . drop 2 . splitCamel
+  { constructorTagModifier = camelToPathPiece' 2
   } ''SelDateTimeFormat
 
 instance ToJSONKey SelDateTimeFormat where
diff --git a/test/MailSpec.hs b/test/MailSpec.hs
index c9972548d..ad54385c6 100644
--- a/test/MailSpec.hs
+++ b/test/MailSpec.hs
@@ -27,7 +27,7 @@ spec = do
     lawsCheckHspec (Proxy @MailSmtpData)
       [ eqLaws, ordLaws, showReadLaws, monoidLaws ]
     lawsCheckHspec (Proxy @MailLanguages)
-      [ eqLaws, ordLaws, showReadLaws, isListLaws, jsonLaws, hashableLaws ]
+      [ eqLaws, ordLaws, showReadLaws, isListLaws, jsonLaws, hashableLaws, persistFieldLaws ]
     lawsCheckHspec (Proxy @MailContext)
       [ eqLaws, ordLaws, showReadLaws, jsonLaws, hashableLaws ]
     lawsCheckHspec (Proxy @VerpMode)
diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index ad74f5831..3805809db 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -267,8 +267,6 @@ spec = do
       [ eqLaws, ordLaws, showReadLaws, jsonLaws, boundedEnumLaws, finiteLaws, hashableLaws, jsonLaws, jsonKeyLaws ]
     lawsCheckHspec (Proxy @NotificationSettings)
       [ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws ]
-    lawsCheckHspec (Proxy @MailLanguages)
-      [ persistFieldLaws ]
     lawsCheckHspec (Proxy @Pseudonym)
       [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, integralLaws, jsonLaws, persistFieldLaws ]
     lawsCheckHspec (Proxy @AuthTag)
diff --git a/test/TestImport.hs b/test/TestImport.hs
index a9c5cd88d..4fb09576b 100644
--- a/test/TestImport.hs
+++ b/test/TestImport.hs
@@ -32,6 +32,7 @@ import Data.Proxy as X
 import Data.UUID as X (UUID)
 import System.IO as X (hPrint, hPutStrLn, stderr)
 import Jobs (handleJobs, stopJobCtl)
+import Numeric.Natural as X
 
 import Control.Lens as X hiding ((<.), elements)
 
diff --git a/test/Utils/DateTimeSpec.hs b/test/Utils/DateTimeSpec.hs
index b2480749d..2e0d086eb 100644
--- a/test/Utils/DateTimeSpec.hs
+++ b/test/Utils/DateTimeSpec.hs
@@ -2,6 +2,9 @@ module Utils.DateTimeSpec where
 
 import TestImport
 
+import Utils.DateTime
+
+
 instance Arbitrary DateTimeFormat where
   arbitrary = DateTimeFormat <$> arbitrary
   shrink = genericShrink

From 06862cf8fd63fd0bfc3840824e2094490fac355d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 27 May 2019 14:45:08 +0200
Subject: [PATCH 403/519] Some haddock

---
 src/Model/Types/Common.hs     | 6 ++++++
 src/Model/Types/Course.hs     | 6 ++++++
 src/Model/Types/DateTime.hs   | 7 +++++++
 src/Model/Types/Exam.hs       | 4 ++++
 src/Model/Types/Health.hs     | 4 ++++
 src/Model/Types/Mail.hs       | 5 +++++
 src/Model/Types/Misc.hs       | 5 +++++
 src/Model/Types/Security.hs   | 5 +++++
 src/Model/Types/Sheet.hs      | 5 +++++
 src/Model/Types/Submission.hs | 5 +++++
 10 files changed, 52 insertions(+)

diff --git a/src/Model/Types/Common.hs b/src/Model/Types/Common.hs
index ae8f79f83..5ffbcfb07 100644
--- a/src/Model/Types/Common.hs
+++ b/src/Model/Types/Common.hs
@@ -1,3 +1,9 @@
+{-|
+Module: Model.Types.Common
+Description: Common types used by most @Model.Types.*@-Modules
+
+Types used by multiple other @Model.Types.*@-Modules
+-}
 module Model.Types.Common
   ( module Model.Types.Common
   ) where
diff --git a/src/Model/Types/Course.hs b/src/Model/Types/Course.hs
index ca619a77a..4a1a08b3c 100644
--- a/src/Model/Types/Course.hs
+++ b/src/Model/Types/Course.hs
@@ -1,3 +1,9 @@
+{-|
+Module: Model.Types.Course
+Description: Types for modeling Courses
+
+Also see `Model.Types.Sheet`
+-}
 module Model.Types.Course
   ( module Model.Types.Course
   ) where
diff --git a/src/Model/Types/DateTime.hs b/src/Model/Types/DateTime.hs
index 795647003..10783550e 100644
--- a/src/Model/Types/DateTime.hs
+++ b/src/Model/Types/DateTime.hs
@@ -1,3 +1,9 @@
+{-|
+Module: Model.Types.DateTime
+Description: Time related types
+
+Terms, Seasons, and Occurence schedules
+-}
 module Model.Types.DateTime
   ( module Model.Types.DateTime
   ) where
@@ -58,6 +64,7 @@ instance Enum TermIdentifier where
 -- from_TermIdentifier_to_TermId = TermKey
 
 shortened :: Iso' Integer Integer
+-- ^ Year numbers shortened to two digits
 shortened = iso shorten expand
   where
     century = ($currentYear `div` 100) * 100
diff --git a/src/Model/Types/Exam.hs b/src/Model/Types/Exam.hs
index f037ce79b..fb7ed10a1 100644
--- a/src/Model/Types/Exam.hs
+++ b/src/Model/Types/Exam.hs
@@ -1,3 +1,7 @@
+{-|
+Module: Model.Types.Exam
+Description: Types for modeling Exams
+-}
 module Model.Types.Exam
   ( module Model.Types.Exam
   ) where
diff --git a/src/Model/Types/Health.hs b/src/Model/Types/Health.hs
index 788ca54f7..aea99d735 100644
--- a/src/Model/Types/Health.hs
+++ b/src/Model/Types/Health.hs
@@ -1,3 +1,7 @@
+{-|
+Module: Model.Types.Health
+Description: Types for running self-tests
+-}
 module Model.Types.Health
   ( module Model.Types.Health
   ) where
diff --git a/src/Model/Types/Mail.hs b/src/Model/Types/Mail.hs
index 5aeb1d14a..d2507e6f9 100644
--- a/src/Model/Types/Mail.hs
+++ b/src/Model/Types/Mail.hs
@@ -1,6 +1,11 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE UndecidableInstances #-}
 
+{-|
+Module: Model.Types.Mail
+Description: Types related to Notifications
+-}
+
 module Model.Types.Mail
   ( module Model.Types.Mail
   ) where
diff --git a/src/Model/Types/Misc.hs b/src/Model/Types/Misc.hs
index 8d45e6798..efe0308a6 100644
--- a/src/Model/Types/Misc.hs
+++ b/src/Model/Types/Misc.hs
@@ -1,3 +1,8 @@
+{-|
+Module: Model.Types.Misc
+Description: Additional uncategorized types
+-}
+
 module Model.Types.Misc
   ( module Model.Types.Misc
   ) where
diff --git a/src/Model/Types/Security.hs b/src/Model/Types/Security.hs
index cba46f371..1c1919fdf 100644
--- a/src/Model/Types/Security.hs
+++ b/src/Model/Types/Security.hs
@@ -1,5 +1,10 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
+{-|
+Module: Model.Types.Security
+Description: Types for authentication and authorisation
+-}
+
 module Model.Types.Security
   ( module Model.Types.Security
   ) where
diff --git a/src/Model/Types/Sheet.hs b/src/Model/Types/Sheet.hs
index 961ea7400..74fb91dc1 100644
--- a/src/Model/Types/Sheet.hs
+++ b/src/Model/Types/Sheet.hs
@@ -1,3 +1,8 @@
+{-|
+Module: Model.Types.Sheet
+Description: Types for modeling sheets
+-}
+
 module Model.Types.Sheet
   ( module Model.Types.Sheet
   ) where
diff --git a/src/Model/Types/Submission.hs b/src/Model/Types/Submission.hs
index c70919195..c31fa38fc 100644
--- a/src/Model/Types/Submission.hs
+++ b/src/Model/Types/Submission.hs
@@ -1,5 +1,10 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
+{-|
+Module: Model.Types.Submission
+Description: Types to support sheet submissions
+-}
+
 module Model.Types.Submission
   ( module Model.Types.Submission
   ) where

From dbc0e5d49b19817266fc971afa65ad747e7f4b00 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 27 May 2019 16:20:15 +0200
Subject: [PATCH 404/519] Visibility timestamp for exams and room assignments

---
 models/exams | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/models/exams b/models/exams
index 13dbf658e..7d61e2e6d 100644
--- a/models/exams
+++ b/models/exams
@@ -4,9 +4,11 @@ Exam
   gradingKey [Points] -- [n1,n2,n3,...] means 0 <= p < n1 -> p ~= 5, n1 <= p < n2 -> p ~ 4.7, n2 <= p < n3 -> p ~ 4.3, ...
   bonusRule ExamBonusRule
   occurrenceRule ExamOccurenceRule
+  visibleFrom UTCTime Maybe
   registerFrom UTCTime Maybe
   registerTo UTCTime Maybe
   deregisterUntil UTCTime Maybe
+  publishOccurenceAssignments UTCTime
   start UTCTime
   end UTCTime Maybe
   finished UTCTime Maybe -- Grades shown to students, `ExamCorrector`s locked out

From beecc1796270e559017524698b540ed0bdd61a04 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 27 May 2019 19:50:35 +0200
Subject: [PATCH 405/519] Revert "remove custom polyfills, let babel do the
 work"

This reverts commit 4c1a38b517f0b1cfad202928cbf44b859602fb2c.
---
 .babelrc                                |   9 +-
 frontend/polyfills/fetch.js             | 466 ++++++++++++++++++++++++
 frontend/polyfills/main.js              |   2 +
 frontend/polyfills/url-search-params.js | 348 ++++++++++++++++++
 src/Foundation.hs                       |   1 +
 webpack.config.js                       |   3 +
 6 files changed, 821 insertions(+), 8 deletions(-)
 create mode 100644 frontend/polyfills/fetch.js
 create mode 100644 frontend/polyfills/main.js
 create mode 100644 frontend/polyfills/url-search-params.js

diff --git a/.babelrc b/.babelrc
index bfb50c21e..644dde977 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,11 +1,4 @@
 {
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "useBuiltIns": "entry"
-      }
-    ]
-  ],
+  "presets": ["@babel/preset-env"],
   "plugins": ["@babel/plugin-proposal-class-properties"]
 }
diff --git a/frontend/polyfills/fetch.js b/frontend/polyfills/fetch.js
new file mode 100644
index 000000000..ac9a4fd87
--- /dev/null
+++ b/frontend/polyfills/fetch.js
@@ -0,0 +1,466 @@
+(function(self) {
+  'use strict';
+
+  if (self.fetch) {
+    return
+  }
+
+  var support = {
+    searchParams: 'URLSearchParams' in self,
+    iterable: 'Symbol' in self && 'iterator' in Symbol,
+    blob: 'FileReader' in self && 'Blob' in self && (function() {
+      try {
+        new Blob()
+        return true
+      } catch(e) {
+        return false
+      }
+    })(),
+    formData: 'FormData' in self,
+    arrayBuffer: 'ArrayBuffer' in self
+  }
+
+  if (support.arrayBuffer) {
+    var viewClasses = [
+      '[object Int8Array]',
+      '[object Uint8Array]',
+      '[object Uint8ClampedArray]',
+      '[object Int16Array]',
+      '[object Uint16Array]',
+      '[object Int32Array]',
+      '[object Uint32Array]',
+      '[object Float32Array]',
+      '[object Float64Array]'
+    ]
+
+    var isDataView = function(obj) {
+      return obj && DataView.prototype.isPrototypeOf(obj)
+    }
+
+    var isArrayBufferView = ArrayBuffer.isView || function(obj) {
+      return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1
+    }
+  }
+
+  function normalizeName(name) {
+    if (typeof name !== 'string') {
+      name = String(name)
+    }
+    if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) {
+      throw new TypeError('Invalid character in header field name')
+    }
+    return name.toLowerCase()
+  }
+
+  function normalizeValue(value) {
+    if (typeof value !== 'string') {
+      value = String(value)
+    }
+    return value
+  }
+
+  // Build a destructive iterator for the value list
+  function iteratorFor(items) {
+    var iterator = {
+      next: function() {
+        var value = items.shift()
+        return {done: value === undefined, value: value}
+      }
+    }
+
+    if (support.iterable) {
+      iterator[Symbol.iterator] = function() {
+        return iterator
+      }
+    }
+
+    return iterator
+  }
+
+  function Headers(headers) {
+    this.map = {}
+
+    if (headers instanceof Headers) {
+      headers.forEach(function(value, name) {
+        this.append(name, value)
+      }, this)
+    } else if (Array.isArray(headers)) {
+      headers.forEach(function(header) {
+        this.append(header[0], header[1])
+      }, this)
+    } else if (headers) {
+      Object.getOwnPropertyNames(headers).forEach(function(name) {
+        this.append(name, headers[name])
+      }, this)
+    }
+  }
+
+  Headers.prototype.append = function(name, value) {
+    name = normalizeName(name)
+    value = normalizeValue(value)
+    var oldValue = this.map[name]
+    this.map[name] = oldValue ? oldValue+','+value : value
+  }
+
+  Headers.prototype['delete'] = function(name) {
+    delete this.map[normalizeName(name)]
+  }
+
+  Headers.prototype.get = function(name) {
+    name = normalizeName(name)
+    return this.has(name) ? this.map[name] : null
+  }
+
+  Headers.prototype.has = function(name) {
+    return this.map.hasOwnProperty(normalizeName(name))
+  }
+
+  Headers.prototype.set = function(name, value) {
+    this.map[normalizeName(name)] = normalizeValue(value)
+  }
+
+  Headers.prototype.forEach = function(callback, thisArg) {
+    for (var name in this.map) {
+      if (this.map.hasOwnProperty(name)) {
+        callback.call(thisArg, this.map[name], name, this)
+      }
+    }
+  }
+
+  Headers.prototype.keys = function() {
+    var items = []
+    this.forEach(function(value, name) { items.push(name) })
+    return iteratorFor(items)
+  }
+
+  Headers.prototype.values = function() {
+    var items = []
+    this.forEach(function(value) { items.push(value) })
+    return iteratorFor(items)
+  }
+
+  Headers.prototype.entries = function() {
+    var items = []
+    this.forEach(function(value, name) { items.push([name, value]) })
+    return iteratorFor(items)
+  }
+
+  if (support.iterable) {
+    Headers.prototype[Symbol.iterator] = Headers.prototype.entries
+  }
+
+  function consumed(body) {
+    if (body.bodyUsed) {
+      return Promise.reject(new TypeError('Already read'))
+    }
+    body.bodyUsed = true
+  }
+
+  function fileReaderReady(reader) {
+    return new Promise(function(resolve, reject) {
+      reader.onload = function() {
+        resolve(reader.result)
+      }
+      reader.onerror = function() {
+        reject(reader.error)
+      }
+    })
+  }
+
+  function readBlobAsArrayBuffer(blob) {
+    var reader = new FileReader()
+    var promise = fileReaderReady(reader)
+    reader.readAsArrayBuffer(blob)
+    return promise
+  }
+
+  function readBlobAsText(blob) {
+    var reader = new FileReader()
+    var promise = fileReaderReady(reader)
+    reader.readAsText(blob)
+    return promise
+  }
+
+  function readArrayBufferAsText(buf) {
+    var view = new Uint8Array(buf)
+    var chars = new Array(view.length)
+
+    for (var i = 0; i < view.length; i++) {
+      chars[i] = String.fromCharCode(view[i])
+    }
+    return chars.join('')
+  }
+
+  function bufferClone(buf) {
+    if (buf.slice) {
+      return buf.slice(0)
+    } else {
+      var view = new Uint8Array(buf.byteLength)
+      view.set(new Uint8Array(buf))
+      return view.buffer
+    }
+  }
+
+  function Body() {
+    this.bodyUsed = false
+
+    this._initBody = function(body) {
+      this._bodyInit = body
+      if (!body) {
+        this._bodyText = ''
+      } else if (typeof body === 'string') {
+        this._bodyText = body
+      } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
+        this._bodyBlob = body
+      } else if (support.formData && FormData.prototype.isPrototypeOf(body)) {
+        this._bodyFormData = body
+      } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
+        this._bodyText = body.toString()
+      } else if (support.arrayBuffer && support.blob && isDataView(body)) {
+        this._bodyArrayBuffer = bufferClone(body.buffer)
+        // IE 10-11 can't handle a DataView body.
+        this._bodyInit = new Blob([this._bodyArrayBuffer])
+      } else if (support.arrayBuffer && (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))) {
+        this._bodyArrayBuffer = bufferClone(body)
+      } else {
+        throw new Error('unsupported BodyInit type')
+      }
+
+      if (!this.headers.get('content-type')) {
+        if (typeof body === 'string') {
+          this.headers.set('content-type', 'text/plain;charset=UTF-8')
+        } else if (this._bodyBlob && this._bodyBlob.type) {
+          this.headers.set('content-type', this._bodyBlob.type)
+        } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
+          this.headers.set('content-type', 'application/x-www-form-urlencoded;charset=UTF-8')
+        }
+      }
+    }
+
+    if (support.blob) {
+      this.blob = function() {
+        var rejected = consumed(this)
+        if (rejected) {
+          return rejected
+        }
+
+        if (this._bodyBlob) {
+          return Promise.resolve(this._bodyBlob)
+        } else if (this._bodyArrayBuffer) {
+          return Promise.resolve(new Blob([this._bodyArrayBuffer]))
+        } else if (this._bodyFormData) {
+          throw new Error('could not read FormData body as blob')
+        } else {
+          return Promise.resolve(new Blob([this._bodyText]))
+        }
+      }
+
+      this.arrayBuffer = function() {
+        if (this._bodyArrayBuffer) {
+          return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
+        } else {
+          return this.blob().then(readBlobAsArrayBuffer)
+        }
+      }
+    }
+
+    this.text = function() {
+      var rejected = consumed(this)
+      if (rejected) {
+        return rejected
+      }
+
+      if (this._bodyBlob) {
+        return readBlobAsText(this._bodyBlob)
+      } else if (this._bodyArrayBuffer) {
+        return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer))
+      } else if (this._bodyFormData) {
+        throw new Error('could not read FormData body as text')
+      } else {
+        return Promise.resolve(this._bodyText)
+      }
+    }
+
+    if (support.formData) {
+      this.formData = function() {
+        return this.text().then(decode)
+      }
+    }
+
+    this.json = function() {
+      return this.text().then(JSON.parse)
+    }
+
+    return this
+  }
+
+  // HTTP methods whose capitalization should be normalized
+  var methods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT']
+
+  function normalizeMethod(method) {
+    var upcased = method.toUpperCase()
+    return (methods.indexOf(upcased) > -1) ? upcased : method
+  }
+
+  function Request(input, options) {
+    options = options || {}
+    var body = options.body
+
+    if (input instanceof Request) {
+      if (input.bodyUsed) {
+        throw new TypeError('Already read')
+      }
+      this.url = input.url
+      this.credentials = input.credentials
+      if (!options.headers) {
+        this.headers = new Headers(input.headers)
+      }
+      this.method = input.method
+      this.mode = input.mode
+      if (!body && input._bodyInit != null) {
+        body = input._bodyInit
+        input.bodyUsed = true
+      }
+    } else {
+      this.url = String(input)
+    }
+
+    this.credentials = options.credentials || this.credentials || 'omit'
+    if (options.headers || !this.headers) {
+      this.headers = new Headers(options.headers)
+    }
+    this.method = normalizeMethod(options.method || this.method || 'GET')
+    this.mode = options.mode || this.mode || null
+    this.referrer = null
+
+    if ((this.method === 'GET' || this.method === 'HEAD') && body) {
+      throw new TypeError('Body not allowed for GET or HEAD requests')
+    }
+    this._initBody(body)
+  }
+
+  Request.prototype.clone = function() {
+    return new Request(this, { body: this._bodyInit })
+  }
+
+  function decode(body) {
+    var form = new FormData()
+    body.trim().split('&').forEach(function(bytes) {
+      if (bytes) {
+        var split = bytes.split('=')
+        var name = split.shift().replace(/\+/g, ' ')
+        var value = split.join('=').replace(/\+/g, ' ')
+        form.append(decodeURIComponent(name), decodeURIComponent(value))
+      }
+    })
+    return form
+  }
+
+  function parseHeaders(rawHeaders) {
+    var headers = new Headers()
+    // Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
+    // https://tools.ietf.org/html/rfc7230#section-3.2
+    var preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ')
+    preProcessedHeaders.split(/\r?\n/).forEach(function(line) {
+      var parts = line.split(':')
+      var key = parts.shift().trim()
+      if (key) {
+        var value = parts.join(':').trim()
+        headers.append(key, value)
+      }
+    })
+    return headers
+  }
+
+  Body.call(Request.prototype)
+
+  function Response(bodyInit, options) {
+    if (!options) {
+      options = {}
+    }
+
+    this.type = 'default'
+    this.status = options.status === undefined ? 200 : options.status
+    this.ok = this.status >= 200 && this.status < 300
+    this.statusText = 'statusText' in options ? options.statusText : 'OK'
+    this.headers = new Headers(options.headers)
+    this.url = options.url || ''
+    this._initBody(bodyInit)
+  }
+
+  Body.call(Response.prototype)
+
+  Response.prototype.clone = function() {
+    return new Response(this._bodyInit, {
+      status: this.status,
+      statusText: this.statusText,
+      headers: new Headers(this.headers),
+      url: this.url
+    })
+  }
+
+  Response.error = function() {
+    var response = new Response(null, {status: 0, statusText: ''})
+    response.type = 'error'
+    return response
+  }
+
+  var redirectStatuses = [301, 302, 303, 307, 308]
+
+  Response.redirect = function(url, status) {
+    if (redirectStatuses.indexOf(status) === -1) {
+      throw new RangeError('Invalid status code')
+    }
+
+    return new Response(null, {status: status, headers: {location: url}})
+  }
+
+  self.Headers = Headers
+  self.Request = Request
+  self.Response = Response
+
+  self.fetch = function(input, init) {
+    return new Promise(function(resolve, reject) {
+      var request = new Request(input, init)
+      var xhr = new XMLHttpRequest()
+
+      xhr.onload = function() {
+        var options = {
+          status: xhr.status,
+          statusText: xhr.statusText,
+          headers: parseHeaders(xhr.getAllResponseHeaders() || '')
+        }
+        options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL')
+        var body = 'response' in xhr ? xhr.response : xhr.responseText
+        resolve(new Response(body, options))
+      }
+
+      xhr.onerror = function() {
+        reject(new TypeError('Network request failed'))
+      }
+
+      xhr.ontimeout = function() {
+        reject(new TypeError('Network request failed'))
+      }
+
+      xhr.open(request.method, request.url, true)
+
+      if (request.credentials === 'include') {
+        xhr.withCredentials = true
+      } else if (request.credentials === 'omit') {
+        xhr.withCredentials = false
+      }
+
+      if ('responseType' in xhr && support.blob) {
+        xhr.responseType = 'blob'
+      }
+
+      request.headers.forEach(function(value, name) {
+        xhr.setRequestHeader(name, value)
+      })
+
+      xhr.send(typeof request._bodyInit === 'undefined' ? null : request._bodyInit)
+    })
+  }
+  self.fetch.polyfill = true
+})(typeof self !== 'undefined' ? self : this);
\ No newline at end of file
diff --git a/frontend/polyfills/main.js b/frontend/polyfills/main.js
new file mode 100644
index 000000000..7e4c554ea
--- /dev/null
+++ b/frontend/polyfills/main.js
@@ -0,0 +1,2 @@
+import './fetch';
+import './url-search-params';
diff --git a/frontend/polyfills/url-search-params.js b/frontend/polyfills/url-search-params.js
new file mode 100644
index 000000000..e38c12021
--- /dev/null
+++ b/frontend/polyfills/url-search-params.js
@@ -0,0 +1,348 @@
+(function(global) {
+  /**
+   * Polyfill URLSearchParams
+   *
+   * Inspired from : https://github.com/WebReflection/url-search-params/blob/master/src/url-search-params.js
+   */
+
+  var checkIfIteratorIsSupported = function() {
+    try {
+      return !!Symbol.iterator;
+    } catch(error) {
+      return false;
+    }
+  };
+
+
+  var iteratorSupported = checkIfIteratorIsSupported();
+
+  var createIterator = function(items) {
+    var iterator = {
+      next: function() {
+        var value = items.shift();
+        return { done: value === void 0, value: value };
+      }
+    };
+
+    if(iteratorSupported) {
+      iterator[Symbol.iterator] = function() {
+        return iterator;
+      };
+    }
+
+    return iterator;
+  };
+
+  /**
+   * Search param name and values should be encoded according to https://url.spec.whatwg.org/#urlencoded-serializing
+   * encodeURIComponent() produces the same result except encoding spaces as `%20` instead of `+`.
+   */
+  var serializeParam = function(value) {
+    return encodeURIComponent(value).replace(/%20/g, '+');
+  };
+
+  var deserializeParam = function(value) {
+    return decodeURIComponent(value).replace(/\+/g, ' ');
+  };
+
+  var polyfillURLSearchParams= function() {
+
+    var URLSearchParams = function(searchString) {
+      Object.defineProperty(this, '_entries', { value: {} });
+
+      if(typeof searchString === 'string') {
+        if(searchString !== '') {
+          searchString = searchString.replace(/^\?/, '');
+          var attributes = searchString.split('&');
+          var attribute;
+          for(var i = 0; i < attributes.length; i++) {
+            attribute = attributes[i].split('=');
+            this.append(
+              deserializeParam(attribute[0]),
+              (attribute.length > 1) ? deserializeParam(attribute[1]) : ''
+            );
+          }
+        }
+      } else if(searchString instanceof URLSearchParams) {
+        var _this = this;
+        searchString.forEach(function(value, name) {
+          _this.append(value, name);
+        });
+      }
+    };
+
+    var proto = URLSearchParams.prototype;
+
+    proto.append = function(name, value) {
+      if(name in this._entries) {
+        this._entries[name].push(value.toString());
+      } else {
+        this._entries[name] = [value.toString()];
+      }
+    };
+
+    proto.delete = function(name) {
+      delete this._entries[name];
+    };
+
+    proto.get = function(name) {
+      return (name in this._entries) ? this._entries[name][0] : null;
+    };
+
+    proto.getAll = function(name) {
+      return (name in this._entries) ? this._entries[name].slice(0) : [];
+    };
+
+    proto.has = function(name) {
+      return (name in this._entries);
+    };
+
+    proto.set = function(name, value) {
+      this._entries[name] = [value.toString()];
+    };
+
+    proto.forEach = function(callback, thisArg) {
+      var entries;
+      for(var name in this._entries) {
+        if(this._entries.hasOwnProperty(name)) {
+          entries = this._entries[name];
+          for(var i = 0; i < entries.length; i++) {
+            callback.call(thisArg, entries[i], name, this);
+          }
+        }
+      }
+    };
+
+    proto.keys = function() {
+      var items = [];
+      this.forEach(function(value, name) { items.push(name); });
+      return createIterator(items);
+    };
+
+    proto.values = function() {
+      var items = [];
+      this.forEach(function(value) { items.push(value); });
+      return createIterator(items);
+    };
+
+    proto.entries = function() {
+      var items = [];
+      this.forEach(function(value, name) { items.push([name, value]); });
+      return createIterator(items);
+    };
+
+    if(iteratorSupported) {
+      proto[Symbol.iterator] = proto.entries;
+    }
+
+    proto.toString = function() {
+      var searchString = '';
+      this.forEach(function(value, name) {
+        if(searchString.length > 0) searchString+= '&';
+        searchString += serializeParam(name) + '=' + serializeParam(value);
+      });
+      return searchString;
+    };
+
+    global.URLSearchParams = URLSearchParams;
+  };
+
+  if(!('URLSearchParams' in global) || (new URLSearchParams('?a=1').toString() !== 'a=1')) {
+    polyfillURLSearchParams();
+  }
+
+  // HTMLAnchorElement
+
+})(
+  (typeof global !== 'undefined') ? global
+    : ((typeof window !== 'undefined') ? window
+    : ((typeof self !== 'undefined') ? self : this))
+);
+
+(function(global) {
+  /**
+   * Polyfill URL
+   *
+   * Inspired from : https://github.com/arv/DOM-URL-Polyfill/blob/master/src/url.js
+   */
+
+  var checkIfURLIsSupported = function() {
+    try {
+      var u = new URL('b', 'http://a');
+      u.pathname = 'c%20d';
+      return (u.href === 'http://a/c%20d') && u.searchParams;
+    } catch(e) {
+      return false;
+    }
+  };
+
+
+  var polyfillURL = function() {
+    var _URL = global.URL;
+
+    var URL = function(url, base) {
+      if(typeof url !== 'string') url = String(url);
+
+      var doc = document.implementation.createHTMLDocument('');
+      window.doc = doc;
+      if(base) {
+        var baseElement = doc.createElement('base');
+        baseElement.href = base;
+        doc.head.appendChild(baseElement);
+      }
+
+      var anchorElement = doc.createElement('a');
+      anchorElement.href = url;
+      doc.body.appendChild(anchorElement);
+      anchorElement.href = anchorElement.href; // force href to refresh
+
+      if(anchorElement.protocol === ':' || !/:/.test(anchorElement.href)) {
+        throw new TypeError('Invalid URL');
+      }
+
+      Object.defineProperty(this, '_anchorElement', {
+        value: anchorElement
+      });
+    };
+
+    var proto = URL.prototype;
+
+    var linkURLWithAnchorAttribute = function(attributeName) {
+      Object.defineProperty(proto, attributeName, {
+        get: function() {
+          return this._anchorElement[attributeName];
+        },
+        set: function(value) {
+          this._anchorElement[attributeName] = value;
+        },
+        enumerable: true
+      });
+    };
+
+    ['hash', 'host', 'hostname', 'port', 'protocol', 'search']
+    .forEach(function(attributeName) {
+      linkURLWithAnchorAttribute(attributeName);
+    });
+
+    Object.defineProperties(proto, {
+
+      'toString': {
+        get: function() {
+          var _this = this;
+          return function() {
+            return _this.href;
+          };
+        }
+      },
+
+      'href' : {
+        get: function() {
+          return this._anchorElement.href.replace(/\?$/,'');
+        },
+        set: function(value) {
+          this._anchorElement.href = value;
+        },
+        enumerable: true
+      },
+
+      'pathname' : {
+        get: function() {
+          return this._anchorElement.pathname.replace(/(^\/?)/,'/');
+        },
+        set: function(value) {
+          this._anchorElement.pathname = value;
+        },
+        enumerable: true
+      },
+
+      'origin': {
+        get: function() {
+          // get expected port from protocol
+          var expectedPort = {'http:': 80, 'https:': 443, 'ftp:': 21}[this._anchorElement.protocol];
+          // add port to origin if, expected port is different than actual port
+          // and it is not empty f.e http://foo:8080
+          // 8080 != 80 && 8080 != ''
+          var addPortToOrigin = this._anchorElement.port != expectedPort &&
+            this._anchorElement.port !== ''
+
+          return this._anchorElement.protocol +
+            '//' +
+            this._anchorElement.hostname +
+            (addPortToOrigin ? (':' + this._anchorElement.port) : '');
+        },
+        enumerable: true
+      },
+
+      'password': { // TODO
+        get: function() {
+          return '';
+        },
+        set: function(value) {
+        },
+        enumerable: true
+      },
+
+      'username': { // TODO
+        get: function() {
+          return '';
+        },
+        set: function(value) {
+        },
+        enumerable: true
+      },
+
+      'searchParams': {
+        get: function() {
+          var searchParams = new URLSearchParams(this.search);
+          var _this = this;
+          ['append', 'delete', 'set'].forEach(function(methodName) {
+            var method = searchParams[methodName];
+            searchParams[methodName] = function() {
+              method.apply(searchParams, arguments);
+              _this.search = searchParams.toString();
+            };
+          });
+          return searchParams;
+        },
+        enumerable: true
+      }
+    });
+
+    URL.createObjectURL = function(blob) {
+      return _URL.createObjectURL.apply(_URL, arguments);
+    };
+
+    URL.revokeObjectURL = function(url) {
+      return _URL.revokeObjectURL.apply(_URL, arguments);
+    };
+
+    global.URL = URL;
+
+  };
+
+  if(!checkIfURLIsSupported()) {
+    polyfillURL();
+  }
+
+  if((global.location !== void 0) && !('origin' in global.location)) {
+    var getOrigin = function() {
+      return global.location.protocol + '//' + global.location.hostname + (global.location.port ? (':' + global.location.port) : '');
+    };
+
+    try {
+      Object.defineProperty(global.location, 'origin', {
+        get: getOrigin,
+        enumerable: true
+      });
+    } catch(e) {
+      setInterval(function() {
+        global.location.origin = getOrigin();
+      }, 100);
+    }
+  }
+
+})(
+  (typeof global !== 'undefined') ? global
+    : ((typeof window !== 'undefined') ? window
+    : ((typeof self !== 'undefined') ? self : this))
+);
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 365a6e863..f88913801 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1328,6 +1328,7 @@ siteLayout' headingOverride widget = do
       addStylesheet $ StaticR bundles_css_vendor_css
       addStylesheet $ StaticR bundles_css_main_css
       -- JavaScript
+      addScript $ StaticR bundles_js_polyfills_js
       addScript $ StaticR bundles_js_vendor_js
       addScript $ StaticR bundles_js_main_js
       -- widgets
diff --git a/webpack.config.js b/webpack.config.js
index 886c4a958..d2e851ce6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -71,6 +71,9 @@ module.exports = {
 		vendor: [
 			path.resolve(__dirname, 'frontend/vendor', 'main.js'),
 		],
+		polyfills: [
+			path.resolve(__dirname, 'frontend/polyfills', 'main.js'),
+		],
 	},
 
 	plugins: [

From 08b804998a9945f9b85673da06a858d132f6a543 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 27 May 2019 19:55:22 +0200
Subject: [PATCH 406/519] Fix CryptoID serialization

---
 src/CryptoID.hs                         |  1 +
 src/CryptoID/TH.hs                      | 10 ++++++++++
 src/Database/Persist/Class/Instances.hs |  1 +
 3 files changed, 12 insertions(+)

diff --git a/src/CryptoID.hs b/src/CryptoID.hs
index 4914bac78..59b925060 100644
--- a/src/CryptoID.hs
+++ b/src/CryptoID.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module CryptoID
diff --git a/src/CryptoID/TH.hs b/src/CryptoID/TH.hs
index c3f1e4322..85f73dc03 100644
--- a/src/CryptoID/TH.hs
+++ b/src/CryptoID/TH.hs
@@ -11,6 +11,11 @@ import Data.Binary.SerializationLength
 import Data.CaseInsensitive (CI)
 import System.FilePath (FilePath)
 
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
+import Database.Persist.Sql
+
 
 decCryptoIDs :: [Name] -> DecsQ
 decCryptoIDs = fmap concat . mapM decCryptoID
@@ -21,6 +26,11 @@ decCryptoIDs = fmap concat . mapM decCryptoID
           instance HasFixedSerializationLength $(t) where
             type SerializationLength $(t) = SerializationLength Int64
 
+          instance {-# OVERLAPPING #-} Binary $(t) where
+            put = Binary.put . fromSqlKey
+            putList = Binary.putList . map fromSqlKey
+            get = toSqlKey <$> Binary.get
+
           type instance CryptoIDNamespace a $(t) = $(litT $ strTyLit ns)
         |]
 
diff --git a/src/Database/Persist/Class/Instances.hs b/src/Database/Persist/Class/Instances.hs
index 4864f0df3..23209a44b 100644
--- a/src/Database/Persist/Class/Instances.hs
+++ b/src/Database/Persist/Class/Instances.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 module Database.Persist.Class.Instances
   (

From c98c3703177bc1805eb8c9ecca3d6c0c6d678742 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 27 May 2019 19:56:38 +0200
Subject: [PATCH 407/519] only include babel polyfills where needed

---
 .babelrc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.babelrc b/.babelrc
index 644dde977..352d48a80 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,11 @@
 {
-  "presets": ["@babel/preset-env"],
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "useBuiltIns": "usage"
+      }
+    ]
+  ],
   "plugins": ["@babel/plugin-proposal-class-properties"]
 }

From 6d3385aa8831b26142ad2218fc40303aa843f278 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 27 May 2019 20:11:27 +0200
Subject: [PATCH 408/519] add unit test for main frontend application

---
 frontend/src/app.spec.js | 52 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 frontend/src/app.spec.js

diff --git a/frontend/src/app.spec.js b/frontend/src/app.spec.js
new file mode 100644
index 000000000..8ce962b2d
--- /dev/null
+++ b/frontend/src/app.spec.js
@@ -0,0 +1,52 @@
+import { App } from "./app";
+
+const TEST_UTILS = [
+  { name: 'util1' },
+  { name: 'util2' },
+];
+
+describe('App', () => {
+  let app;
+
+  beforeEach(() => {
+    app = new App();
+  });
+
+  it('should create', () => {
+    expect(app).toBeTruthy();
+  });
+
+  describe('provides services', () => {
+    it('HttpClient as httpClient', () => {
+      expect(app.httpClient).toBeTruthy();
+    });
+
+    it('HtmlHelpers as htmlHelpers', () => {
+      expect(app.htmlHelpers).toBeTruthy();
+    });
+
+    it('I18n as i18n', () => {
+      expect(app.i18n).toBeTruthy();
+    });
+
+    it('UtilRegistry as utilRegistry', () => {
+      expect(app.utilRegistry).toBeTruthy();
+    });
+  });
+
+  describe('registerUtilities()', () => {
+    it('should register the given utilities', () => {
+      spyOn(app.utilRegistry, 'register');
+      app.registerUtilities(TEST_UTILS);
+      expect(app.utilRegistry.register.calls.count()).toBe(TEST_UTILS.length);
+      expect(app.utilRegistry.register.calls.argsFor(0)).toEqual([TEST_UTILS[0]]);
+      expect(app.utilRegistry.register.calls.argsFor(1)).toEqual([TEST_UTILS[1]]);
+    });
+
+    it('should throw an error if not passed an array of utilities', () => {
+      expect(() => {
+        app.registerUtilities({});
+      }).toThrow();
+    });
+  });
+});

From b31514d9c69cd6603ef225acd6cf8a2412c42a01 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 28 May 2019 00:19:03 +0200
Subject: [PATCH 409/519] allow js decorator functions

---
 .babelrc          | 12 +++++-------
 .eslintrc.json    |  5 ++++-
 package-lock.json | 43 +++++++++++++++++++++++++++++++++++++++++++
 package.json      |  3 +++
 4 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/.babelrc b/.babelrc
index 352d48a80..857e7ba32 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,11 +1,9 @@
 {
   "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "useBuiltIns": "usage"
-      }
-    ]
+    ["@babel/preset-env", { "useBuiltIns": "usage" }]
   ],
-  "plugins": ["@babel/plugin-proposal-class-properties"]
+  "plugins": [
+    ["@babel/plugin-proposal-decorators", { "legacy": true }],
+    ["@babel/plugin-proposal-class-properties", { "loose": true }]
+  ]
 }
diff --git a/.eslintrc.json b/.eslintrc.json
index 8c0382cfa..06d95155c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -13,7 +13,10 @@
     },
     "parser": "babel-eslint",
     "parserOptions": {
-        "ecmaVersion": 2018
+        "ecmaVersion": 2018,
+        "ecmaFeatures": {
+            "legacyDecorators": true
+        }
     },
     "rules": {
         "no-console": "off",
diff --git a/package-lock.json b/package-lock.json
index b757dbbcd..ef0a855d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -338,6 +338,17 @@
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
+    "@babel/plugin-proposal-decorators": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz",
+      "integrity": "sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-decorators": "^7.2.0"
+      }
+    },
     "@babel/plugin-proposal-json-strings": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
@@ -388,6 +399,15 @@
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
+    "@babel/plugin-syntax-decorators": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz",
+      "integrity": "sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
     "@babel/plugin-syntax-json-strings": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
@@ -1655,12 +1675,29 @@
         "babel-runtime": "^6.22.0"
       }
     },
+    "babel-plugin-syntax-decorators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+      "dev": true
+    },
     "babel-plugin-syntax-dynamic-import": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
       "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
       "dev": true
     },
+    "babel-plugin-transform-decorators-legacy": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz",
+      "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-decorators": "^6.1.18",
+        "babel-runtime": "^6.2.0",
+        "babel-template": "^6.3.0"
+      }
+    },
     "babel-plugin-transform-es2015-arrow-functions": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
@@ -6295,6 +6332,12 @@
       "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
       "dev": true
     },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
     "lodash.tail": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
diff --git a/package.json b/package.json
index 10ab7582a..a8744aec4 100644
--- a/package.json
+++ b/package.json
@@ -37,12 +37,14 @@
     "@babel/cli": "^7.4.4",
     "@babel/core": "^7.4.5",
     "@babel/plugin-proposal-class-properties": "^7.4.4",
+    "@babel/plugin-proposal-decorators": "^7.4.4",
     "@babel/preset-env": "^7.4.5",
     "autoprefixer": "^9.5.1",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.6",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-transform-decorators-legacy": "^1.3.5",
     "babel-preset-es2015": "^6.24.1",
     "css-loader": "^2.1.1",
     "eslint": "^5.16.0",
@@ -57,6 +59,7 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-webpack": "^3.0.5",
     "lint-staged": "^8.1.7",
+    "lodash.debounce": "^4.0.8",
     "node-sass": "^4.12.0",
     "npm-run-all": "^4.1.5",
     "null-loader": "^2.0.0",

From befa9f394129336110a60ed59a74f5223fc8c2ea Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 28 May 2019 00:19:39 +0200
Subject: [PATCH 410/519] refactor js utilities to use class syntax and Utility
 decorator

---
 frontend/src/app.js                           |   5 +-
 frontend/src/app.spec.js                      |   6 +
 frontend/src/core/utility.js                  |  22 +
 .../services/util-registry/util-registry.js   |   8 +-
 .../util-registry/util-registry.spec.js       |   6 -
 frontend/src/utils/alerts/alerts.js           | 207 +++---
 frontend/src/utils/alerts/alerts.md           |  35 +
 frontend/src/utils/alerts/alerts.spec.js      |  19 +-
 frontend/src/utils/asidenav/asidenav.js       |  98 +--
 frontend/src/utils/asidenav/asidenav.md       |  21 +
 frontend/src/utils/async-form/async-form.js   | 126 ++--
 frontend/src/utils/async-form/async-form.md   |  17 +
 frontend/src/utils/async-table/async-table.js | 344 +++++-----
 frontend/src/utils/async-table/async-table.md |   7 +
 frontend/src/utils/check-all/check-all.js     | 132 ++--
 frontend/src/utils/check-all/check-all.md     |   9 +
 frontend/src/utils/form/auto-submit-button.js |  29 +
 frontend/src/utils/form/auto-submit-button.md |  11 +
 frontend/src/utils/form/auto-submit-input.js  |  47 ++
 frontend/src/utils/form/auto-submit-input.md  |   9 +
 frontend/src/utils/form/datepicker.js         |  62 ++
 frontend/src/utils/form/datepicker.md         |   8 +
 frontend/src/utils/form/form-error-remover.js |  46 ++
 frontend/src/utils/form/form-error-remover.md |   8 +
 frontend/src/utils/form/form.js               | 615 +-----------------
 .../src/utils/form/interactive-fieldset.js    |  97 +++
 .../src/utils/form/interactive-fieldset.md    |  35 +
 .../src/utils/form/navigate-away-prompt.js    |  64 ++
 .../src/utils/form/navigate-away-prompt.md    |  11 +
 .../src/utils/form/reactive-submit-button.js  |  85 +++
 .../src/utils/form/reactive-submit-button.md  |  17 +
 frontend/src/utils/inputs/checkbox.js         |  43 ++
 frontend/src/utils/inputs/checkbox.md         |  10 +
 frontend/src/utils/inputs/file-input.js       |  99 +++
 frontend/src/utils/inputs/file-input.md       |  23 +
 frontend/src/utils/inputs/inputs.js           | 200 +-----
 frontend/src/utils/mass-input/mass-input.js   | 179 +++--
 frontend/src/utils/mass-input/mass-input.md   |  17 +
 frontend/src/utils/modal/modal.js             | 207 +++---
 frontend/src/utils/modal/modal.md             |  16 +
 frontend/src/utils/show-hide/show-hide.js     | 120 ++--
 frontend/src/utils/show-hide/show-hide.md     |  21 +
 frontend/src/utils/tooltips/tooltips.js       |   9 +-
 frontend/src/utils/utils.js                   |  58 +-
 44 files changed, 1564 insertions(+), 1644 deletions(-)
 create mode 100644 frontend/src/core/utility.js
 create mode 100644 frontend/src/utils/alerts/alerts.md
 create mode 100644 frontend/src/utils/asidenav/asidenav.md
 create mode 100644 frontend/src/utils/async-form/async-form.md
 create mode 100644 frontend/src/utils/async-table/async-table.md
 create mode 100644 frontend/src/utils/check-all/check-all.md
 create mode 100644 frontend/src/utils/form/auto-submit-button.js
 create mode 100644 frontend/src/utils/form/auto-submit-button.md
 create mode 100644 frontend/src/utils/form/auto-submit-input.js
 create mode 100644 frontend/src/utils/form/auto-submit-input.md
 create mode 100644 frontend/src/utils/form/datepicker.js
 create mode 100644 frontend/src/utils/form/datepicker.md
 create mode 100644 frontend/src/utils/form/form-error-remover.js
 create mode 100644 frontend/src/utils/form/form-error-remover.md
 create mode 100644 frontend/src/utils/form/interactive-fieldset.js
 create mode 100644 frontend/src/utils/form/interactive-fieldset.md
 create mode 100644 frontend/src/utils/form/navigate-away-prompt.js
 create mode 100644 frontend/src/utils/form/navigate-away-prompt.md
 create mode 100644 frontend/src/utils/form/reactive-submit-button.js
 create mode 100644 frontend/src/utils/form/reactive-submit-button.md
 create mode 100644 frontend/src/utils/inputs/checkbox.js
 create mode 100644 frontend/src/utils/inputs/checkbox.md
 create mode 100644 frontend/src/utils/inputs/file-input.js
 create mode 100644 frontend/src/utils/inputs/file-input.md
 create mode 100644 frontend/src/utils/mass-input/mass-input.md
 create mode 100644 frontend/src/utils/modal/modal.md
 create mode 100644 frontend/src/utils/show-hide/show-hide.md

diff --git a/frontend/src/app.js b/frontend/src/app.js
index 6c7fa215f..b2db86c31 100644
--- a/frontend/src/app.js
+++ b/frontend/src/app.js
@@ -2,6 +2,7 @@ import { HttpClient } from './services/http-client/http-client';
 import { HtmlHelpers } from './services/html-helpers/html-helpers';
 import { I18n } from './services/i18n/i18n';
 import { UtilRegistry } from './services/util-registry/util-registry';
+import { isValidUtility } from './core/utility';
 
 export class App {
   httpClient = new HttpClient();
@@ -11,6 +12,8 @@ export class App {
 
   constructor() {
     this.utilRegistry.setApp(this);
+
+    document.addEventListener('DOMContentLoaded', () => this.utilRegistry.setupAll());
   }
 
   registerUtilities(utils) {
@@ -18,7 +21,7 @@ export class App {
       throw new Error('Utils are expected to be passed as array!');
     }
 
-    utils.forEach((util) => {
+    utils.filter(isValidUtility).forEach((util) => {
       this.utilRegistry.register(util);
     });
   }
diff --git a/frontend/src/app.spec.js b/frontend/src/app.spec.js
index 8ce962b2d..21a381a68 100644
--- a/frontend/src/app.spec.js
+++ b/frontend/src/app.spec.js
@@ -16,6 +16,12 @@ describe('App', () => {
     expect(app).toBeTruthy();
   });
 
+  it('should setup all utlites when page is done loading', () => {
+    spyOn(app.utilRegistry, 'setupAll');
+    document.dispatchEvent(new Event('DOMContentLoaded'));
+    expect(app.utilRegistry.setupAll).toHaveBeenCalled();
+  });
+
   describe('provides services', () => {
     it('HttpClient as httpClient', () => {
       expect(app.httpClient).toBeTruthy();
diff --git a/frontend/src/core/utility.js b/frontend/src/core/utility.js
new file mode 100644
index 000000000..6b74920dd
--- /dev/null
+++ b/frontend/src/core/utility.js
@@ -0,0 +1,22 @@
+export function isValidUtility(utility) {
+  if (!utility) {
+    return false;
+  }
+
+  if (Utility.selector) {
+    return false;
+  }
+
+  return true;
+};
+
+export function Utility(metadata) {
+  if (!metadata.selector) {
+    throw new Error('Utility needs to have a selector!');
+  }
+
+  return function (target) {
+    target.selector = metadata.selector;
+    target.isUtility = true;
+  };
+};
diff --git a/frontend/src/services/util-registry/util-registry.js b/frontend/src/services/util-registry/util-registry.js
index 18b656b8c..5e71554bc 100644
--- a/frontend/src/services/util-registry/util-registry.js
+++ b/frontend/src/services/util-registry/util-registry.js
@@ -6,10 +6,6 @@ export class UtilRegistry {
   _activeUtilInstances = [];
   _appInstance;
 
-  constructor() {
-    document.addEventListener('DOMContentLoaded', () => this.setupAll());
-  }
-
   /**
    * function registerUtil
    *
@@ -63,14 +59,14 @@ export class UtilRegistry {
       console.log('setting up util', { util });
     }
 
-    if (util && typeof util.setup === 'function') {
+    if (util) {
       const elements = this._findUtilElements(util, scope);
 
       elements.forEach((element) => {
         let utilInstance = null;
 
         try {
-          utilInstance = util.setup(element, this._appInstance);
+          utilInstance = new util(element, this._appInstance);
         } catch(err) {
           if (DEBUG_MODE > 0) {
             console.warn('Error while trying to initialize a utility!', { util , element, err });
diff --git a/frontend/src/services/util-registry/util-registry.spec.js b/frontend/src/services/util-registry/util-registry.spec.js
index e3f69f63c..2e4afedf2 100644
--- a/frontend/src/services/util-registry/util-registry.spec.js
+++ b/frontend/src/services/util-registry/util-registry.spec.js
@@ -21,12 +21,6 @@ describe('UtilRegistry', () => {
     expect(utilRegistry).toBeTruthy();
   });
 
-  it('should setup all utlites when page is done loading', () => {
-    spyOn(utilRegistry, 'setupAll');
-    document.dispatchEvent(new Event('DOMContentLoaded'));
-    expect(utilRegistry.setupAll).toHaveBeenCalled();
-  });
-
   describe('register()', () => {
     it('should allow to add utilities', () => {
       utilRegistry.register(TEST_UTILS[0]);
diff --git a/frontend/src/utils/alerts/alerts.js b/frontend/src/utils/alerts/alerts.js
index 3e49080bc..e7e04ddbb 100644
--- a/frontend/src/utils/alerts/alerts.js
+++ b/frontend/src/utils/alerts/alerts.js
@@ -1,191 +1,158 @@
+import { Utility } from '../../core/utility';
 import './alerts.scss';
 
-/**
- *
- * 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
- *
- */
+const ALERTS_INITIALIZED_CLASS = 'alerts--initialized';
+const ALERTS_ELEVATED_CLASS = 'alerts--elevated';
+const ALERTS_TOGGLER_CLASS = 'alerts__toggler';
+const ALERTS_TOGGLER_VISIBLE_CLASS = 'alerts__toggler--visible';
+const ALERTS_TOGGLER_APPEAR_DELAY = 120;
 
-var ALERTS_UTIL_NAME = 'alerts';
-var ALERTS_UTIL_SELECTOR = '[uw-alerts]';
+const ALERT_CLASS = 'alert';
+const ALERT_INITIALIZED_CLASS = 'alert--initialized';
+const ALERT_CLOSER_CLASS = 'alert__closer';
+const ALERT_ICON_CLASS = 'alert__icon';
+const ALERT_CONTENT_CLASS = 'alert__content';
+const ALERT_INVISIBLE_CLASS = 'alert--invisible';
+const ALERT_AUTO_HIDE_DELAY = 10;
+const ALERT_AUTOCLOSING_MATCHER = '.alert-info, .alert-success';
 
-var ALERTS_INITIALIZED_CLASS = 'alerts--initialized';
-var ALERTS_ELEVATED_CLASS = 'alerts--elevated';
-var ALERTS_TOGGLER_CLASS = 'alerts__toggler';
-var ALERTS_TOGGLER_VISIBLE_CLASS = 'alerts__toggler--visible';
-var ALERTS_TOGGLER_APPEAR_DELAY = 120;
+@Utility({
+  selector: '[uw-alerts]',
+})
+export class Alerts {
+  _togglerCheckRequested = false;
+  _togglerElement;
+  _alertElements;
 
-var ALERT_CLASS = 'alert';
-var ALERT_INITIALIZED_CLASS = 'alert--initialized';
-var ALERT_CLOSER_CLASS = 'alert__closer';
-var ALERT_ICON_CLASS = 'alert__icon';
-var ALERT_CONTENT_CLASS = 'alert__content';
-var ALERT_INVISIBLE_CLASS = 'alert--invisible';
-var ALERT_AUTO_HIDE_DELAY = 10;
-var ALERT_AUTOCLOSING_MATCHER = '.alert-info, .alert-success';
+  _element;
+  _app;
 
-var alertsUtil = function(element, app) {
-  var togglerCheckRequested = false;
-  var togglerElement;
-  var alertElements;
-
-  function init() {
+  constructor(element, app) {
     if (!element) {
       throw new Error('Alerts util has to be called with an element!');
     }
 
-    if (element.classList.contains(ALERTS_INITIALIZED_CLASS)) {
+    this._element = element;
+    this._app = app;
+
+    if (this._element.classList.contains(ALERTS_INITIALIZED_CLASS)) {
       return false;
     }
 
-    togglerElement = element.querySelector('.' + ALERTS_TOGGLER_CLASS);
-    alertElements = gatherAlertElements();
+    this._togglerElement = this._element.querySelector('.' + ALERTS_TOGGLER_CLASS);
+    this._alertElements = this._gatherAlertElements();
 
-    initToggler();
-    initAlerts();
+    if (this._togglerElement) {
+      this._initToggler();
+    }
+
+    this._initAlerts();
 
     // register http client interceptor to filter out Alerts Header
-    setupHttpInterceptor();
+    this._setupHttpInterceptor();
 
     // mark initialized
-    element.classList.add(ALERTS_INITIALIZED_CLASS);
-
-    return {
-      name: ALERTS_UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
+    this._element.classList.add(ALERTS_INITIALIZED_CLASS);
   }
 
-  function gatherAlertElements() {
-    return Array.from(element.querySelectorAll('.' + ALERT_CLASS)).filter(function(alert) {
+  destroy() {
+    console.log('TBD: Destroy Alert');
+  }
+
+  _gatherAlertElements() {
+    return Array.from(this._element.querySelectorAll('.' + ALERT_CLASS)).filter(function(alert) {
       return !alert.classList.contains(ALERT_INITIALIZED_CLASS);
     });
   }
 
-  function initToggler() {
-    togglerElement.addEventListener('click', function() {
-      alertElements.forEach(function(alertEl) {
-        toggleAlert(alertEl, true);
-      });
-      togglerElement.classList.remove(ALERTS_TOGGLER_VISIBLE_CLASS);
+  _initToggler() {
+    this._togglerElement.addEventListener('click', () => {
+      this._alertElements.forEach((alertEl) => this._toggleAlert(alertEl, true));
+      this._togglerElement.classList.remove(ALERTS_TOGGLER_VISIBLE_CLASS);
     });
   }
 
-  function initAlerts() {
-    alertElements.forEach(initAlert);
+  _initAlerts() {
+    this._alertElements.forEach((alert) => this._initAlert(alert));
   }
 
-  function initAlert(alertElement) {
-    var autoHideDelay = ALERT_AUTO_HIDE_DELAY;
+  _initAlert(alertElement) {
+    let autoHideDelay = ALERT_AUTO_HIDE_DELAY;
     if (alertElement.dataset.decay) {
       autoHideDelay = parseInt(alertElement.dataset.decay, 10);
     }
 
-    var closeEl = alertElement.querySelector('.' + ALERT_CLOSER_CLASS);
-    closeEl.addEventListener('click', function() {
-      toggleAlert(alertElement);
+    const closeEl = alertElement.querySelector('.' + ALERT_CLOSER_CLASS);
+    closeEl.addEventListener('click', () => {
+      this._toggleAlert(alertElement);
     });
 
     if (autoHideDelay > 0 && alertElement.matches(ALERT_AUTOCLOSING_MATCHER)) {
-      window.setTimeout(function() {
-        toggleAlert(alertElement);
-      }, autoHideDelay * 1000);
+      window.setTimeout(() => this._toggleAlert(alertElement), autoHideDelay * 1000);
     }
   }
 
-  function toggleAlert(alertEl, visible) {
+  _toggleAlert(alertEl, visible) {
     alertEl.classList.toggle(ALERT_INVISIBLE_CLASS, !visible);
-    checkToggler();
+    this._checkToggler();
   }
 
-  function checkToggler() {
-    if (togglerCheckRequested) {
+  _checkToggler() {
+    if (this._togglerCheckRequested) {
       return;
     }
 
-    var alertsHidden = alertElements.reduce(function(acc, alert) {
+    const alertsHidden = this._alertElements.reduce(function(acc, alert) {
       return acc && alert.classList.contains(ALERT_INVISIBLE_CLASS);
     }, true);
 
-    window.setTimeout(function() {
-      togglerElement.classList.toggle(ALERTS_TOGGLER_VISIBLE_CLASS, alertsHidden);
-      togglerCheckRequested = false;
+    window.setTimeout(() => {
+      this._togglerElement.classList.toggle(ALERTS_TOGGLER_VISIBLE_CLASS, alertsHidden);
+      this._togglerCheckRequested = false;
     }, ALERTS_TOGGLER_APPEAR_DELAY);
   }
 
-  function setupHttpInterceptor() {
-    app.httpClient.addResponseInterceptor(responseInterceptor.bind(this));
+  _setupHttpInterceptor() {
+    this._app.httpClient.addResponseInterceptor(this._responseInterceptor.bind(this));
   }
 
-  function elevateAlerts() {
-    element.classList.add(ALERTS_ELEVATED_CLASS);
+  _elevateAlerts() {
+    this._element.classList.add(ALERTS_ELEVATED_CLASS);
   }
 
-  function responseInterceptor(response) {
-    var alerts;
-    for (var header of response.headers) {
+  _responseInterceptor = (response) => {
+    let alerts;
+    for (const header of response.headers) {
       if (header[0] === 'alerts') {
-        var decodedHeader = decodeURIComponent(header[1]);
+        const decodedHeader = decodeURIComponent(header[1]);
         alerts = JSON.parse(decodedHeader);
         break;
       }
     }
 
     if (alerts) {
-      alerts.forEach(function(alert) {
-        var alertElement = createAlertElement(alert.status, alert.content);
-        element.appendChild(alertElement);
-        alertElements.push(alertElement);
-        initAlert(alertElement);
+      alerts.forEach((alert) => {
+        const alertElement = this._createAlertElement(alert.status, alert.content);
+        this._element.appendChild(alertElement);
+        this._alertElements.push(alertElement);
+        this._initAlert(alertElement);
       });
 
-      elevateAlerts();
+      this._elevateAlerts();
     }
   }
 
-  function createAlertElement(type, content) {
-    var alertElement = document.createElement('div');
+  _createAlertElement(type, content) {
+    const alertElement = document.createElement('div');
     alertElement.classList.add(ALERT_CLASS, 'alert-' + type);
 
-    var alertCloser = document.createElement('div');
+    const alertCloser = document.createElement('div');
     alertCloser.classList.add(ALERT_CLOSER_CLASS);
 
-    var alertIcon = document.createElement('div');
+    const alertIcon = document.createElement('div');
     alertIcon.classList.add(ALERT_ICON_CLASS);
 
-    var alertContent = document.createElement('div');
+    const alertContent = document.createElement('div');
     alertContent.classList.add(ALERT_CONTENT_CLASS);
     alertContent.innerHTML = content;
 
@@ -195,12 +162,4 @@ var alertsUtil = function(element, app) {
 
     return alertElement;
   }
-
-  return init();
-};
-
-export default {
-  name: ALERTS_UTIL_NAME,
-  selector: ALERTS_UTIL_SELECTOR,
-  setup: alertsUtil,
-};
+}
diff --git a/frontend/src/utils/alerts/alerts.md b/frontend/src/utils/alerts/alerts.md
new file mode 100644
index 000000000..e3b36feed
--- /dev/null
+++ b/frontend/src/utils/alerts/alerts.md
@@ -0,0 +1,35 @@
+# Alerts
+
+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:
+```html
+<div .alerts uw-alerts>
+  <div .alerts__toggler>
+  <div .alert.alert-info>
+    <div .alert__closer>
+    <div .alert__icon>
+    <div .alert__content>
+      This is some information
+```
diff --git a/frontend/src/utils/alerts/alerts.spec.js b/frontend/src/utils/alerts/alerts.spec.js
index 65a4c4a72..6d0440391 100644
--- a/frontend/src/utils/alerts/alerts.spec.js
+++ b/frontend/src/utils/alerts/alerts.spec.js
@@ -1,8 +1,21 @@
-import alerts from "./alerts";
+import { Alerts } from "./alerts";
+
+const MOCK_APP = {
+  httpClient: {
+    addResponseInterceptor: () => {},
+  },
+};
 
 describe('Alerts', () => {
 
-  it('should be called alerts', () => {
-    expect(alerts.name).toMatch('alerts');
+  let alerts;
+
+  beforeEach(() => {
+    const element = document.createElement('div');
+    alerts = new Alerts(element, MOCK_APP);
+  });
+
+  it('should create', () => {
+    expect(alerts).toBeTruthy();
   });
 });
diff --git a/frontend/src/utils/asidenav/asidenav.js b/frontend/src/utils/asidenav/asidenav.js
index c5ba552c9..09d295063 100644
--- a/frontend/src/utils/asidenav/asidenav.js
+++ b/frontend/src/utils/asidenav/asidenav.js
@@ -1,89 +1,69 @@
+import { Utility } from '../../core/utility';
 import './asidenav.scss';
 
-/**
- *
- * 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
- *                ...
- *
- */
+const FAVORITES_BTN_CLASS = 'navbar__list-item--favorite';
+const FAVORITES_BTN_ACTIVE_CLASS = 'navbar__list-item--active';
+const ASIDENAV_INITIALIZED_CLASS = 'asidenav--initialized';
+const ASIDENAV_EXPANDED_CLASS = 'main__aside--expanded';
+const ASIDENAV_LIST_ITEM_CLASS = 'asidenav__list-item';
+const ASIDENAV_SUBMENU_CLASS = 'asidenav__nested-list-wrapper';
 
-var ASIDENAV_UTIL_NAME = 'asidenav';
-var ASIDENAV_UTIL_SELECTOR = '[uw-asidenav]';
+@Utility({
+  selector: '[uw-asidenav]',
+})
+export class 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';
+  _element;
 
-var asidenavUtil = function(element) {
-
-  function init() {
+  constructor(element) {
     if (!element) {
       throw new Error('Asidenav utility cannot be setup without an element!');
     }
 
-    if (element.classList.contains(ASIDENAV_INITIALIZED_CLASS)) {
+    this._element = element;
+
+    if (this._element.classList.contains(ASIDENAV_INITIALIZED_CLASS)) {
       return false;
     }
 
-    initFavoritesButton();
-    initAsidenavSubmenus();
+    this._initFavoritesButton();
+    this._initAsidenavSubmenus();
 
     // mark initialized
-    element.classList.add(ASIDENAV_INITIALIZED_CLASS);
-
-    return {
-      name: ASIDENAV_UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
+    this._element.classList.add(ASIDENAV_INITIALIZED_CLASS);
   }
 
-  function initFavoritesButton() {
-    var favoritesBtn = document.querySelector('.' + FAVORITES_BTN_CLASS);
+  destroy() {
+    console.log('TBD: Destroy Asidenav');
+  }
+
+  _initFavoritesButton() {
+    const favoritesBtn = document.querySelector('.' + FAVORITES_BTN_CLASS);
     favoritesBtn.addEventListener('click', function(event) {
       favoritesBtn.classList.toggle(FAVORITES_BTN_ACTIVE_CLASS);
-      element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
+      this._element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
       event.preventDefault();
     }, true);
   }
 
-  function initAsidenavSubmenus() {
-    var asidenavLinksWithSubmenus = Array.from(element.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
+  _initAsidenavSubmenus() {
+    const asidenavLinksWithSubmenus = Array.from(this._element.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
       .map(function(listItem) {
-        var submenu = listItem.querySelector('.' + ASIDENAV_SUBMENU_CLASS);
+        const submenu = listItem.querySelector('.' + ASIDENAV_SUBMENU_CLASS);
         return { listItem, submenu };
       }).filter(function(union) {
         return union.submenu !== null;
       });
 
     asidenavLinksWithSubmenus.forEach(function(union) {
-      union.listItem.addEventListener('mouseover', createMouseoverHandler(union));
+      union.listItem.addEventListener('mouseover', this.createMouseoverHandler(union));
     });
   }
 
-  function createMouseoverHandler(union) {
-    return function mouseoverHanlder() {
-      var rectListItem = union.listItem.getBoundingClientRect();
-      var rectSubMenu = union.submenu.getBoundingClientRect();
+  _createMouseoverHandler(union) {
+    return function mouseoverHandler() {
+      const rectListItem = union.listItem.getBoundingClientRect();
+      const rectSubMenu = union.submenu.getBoundingClientRect();
 
       union.submenu.style.left = (rectListItem.left + rectListItem.width) + 'px';
       if (window.innerHeight - rectListItem.top < rectSubMenu.height) {
@@ -94,12 +74,4 @@ var asidenavUtil = function(element) {
 
     };
   }
-
-  return init();
-};
-
-export default {
-  name: ASIDENAV_UTIL_NAME,
-  selector: ASIDENAV_UTIL_SELECTOR,
-  setup: asidenavUtil,
-};
+}
diff --git a/frontend/src/utils/asidenav/asidenav.md b/frontend/src/utils/asidenav/asidenav.md
new file mode 100644
index 000000000..87fda9847
--- /dev/null
+++ b/frontend/src/utils/asidenav/asidenav.md
@@ -0,0 +1,21 @@
+# Asidenav
+
+Correctly positions hovered asidenav submenus and handles the favorites button on mobile
+
+## Attribute: `uw-asidenav`
+
+## Example usage:
+```html
+<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
+              ...
+```
diff --git a/frontend/src/utils/async-form/async-form.js b/frontend/src/utils/async-form/async-form.js
index 5af38c7e9..b731c81da 100644
--- a/frontend/src/utils/async-form/async-form.js
+++ b/frontend/src/utils/async-form/async-form.js
@@ -1,74 +1,60 @@
+import { Utility } from '../../core/utility';
 import './async-form.scss';
 
-/**
- *
- * 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='...'>
- *     ...
- *
- * 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."
- */
+const ASYNC_FORM_INITIALIZED_CLASS = 'check-all--initialized';
+const ASYNC_FORM_RESPONSE_CLASS = 'async-form__response';
+const ASYNC_FORM_LOADING_CLASS = 'async-form--loading';
+const ASYNC_FORM_MIN_DELAY = 600;
 
-var ASYNC_FORM_UTIL_NAME = 'asyncForm';
-var ASYNC_FORM_UTIL_SELECTOR = 'form[uw-async-form]';
+const MODAL_SELECTOR = '.modal';
+const MODAL_HEADER_KEY = 'Is-Modal';
+const MODAL_HEADER_VALUE = 'True';
 
-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;
+@Utility({
+  selector: 'form[uw-async-form]',
+})
+export class AsyncForm {
 
-var MODAL_SELECTOR = '.modal';
-var MODAL_HEADER_KEY = 'Is-Modal';
-var MODAL_HEADER_VALUE = 'True';
+  _lastRequestTimestamp = 0;
+  _element;
+  _app;
 
-var asyncFormUtil = function(element, app) {
-
-  var lastRequestTimestamp = 0;
-
-  function init() {
+  constructor(element, app) {
     if (!element) {
       throw new Error('Async Form Utility cannot be setup without an element!');
     }
 
-    if (element.classList.contains(ASYNC_FORM_INITIALIZED_CLASS)) {
+    this._element = element;
+    this._app = app;
+
+    if (this._element.classList.contains(ASYNC_FORM_INITIALIZED_CLASS)) {
       return false;
     }
 
-    element.addEventListener('submit', submitHandler);
+    this._element.addEventListener('submit', this._submitHandler);
 
-    element.classList.add(ASYNC_FORM_INITIALIZED_CLASS);
-
-    return {
-      name: ASYNC_FORM_UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
+    this._element.classList.add(ASYNC_FORM_INITIALIZED_CLASS);
   }
 
-  function processResponse(response) {
-    var responseElement = makeResponseElement(response.content, response.status);
-    var parentElement = element.parentElement;
+  destroy() {
+    // TODO
+  }
+
+  _processResponse(response) {
+    const responseElement = this._makeResponseElement(response.content, response.status);
+    const parentElement = this._element.parentElement;
 
     // make sure there is a delay between click and response
-    var delay = Math.max(0, ASYNC_FORM_MIN_DELAY + lastRequestTimestamp - Date.now());
+    const delay = Math.max(0, ASYNC_FORM_MIN_DELAY + this._lastRequestTimestamp - Date.now());
 
-    setTimeout(function() {
-      parentElement.insertBefore(responseElement, element);
-      element.remove();
+    setTimeout(() => {
+      parentElement.insertBefore(responseElement, this._element);
+      this._element.remove();
     }, delay);
   }
 
-  function makeResponseElement(content, status) {
-    var responseElement = document.createElement('div');
+  _makeResponseElement(content, status) {
+    const responseElement = document.createElement('div');
     status = status || 'info';
     responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS);
     responseElement.classList.add(ASYNC_FORM_RESPONSE_CLASS + '--' + status);
@@ -76,42 +62,34 @@ var asyncFormUtil = function(element, app) {
     return responseElement;
   }
 
-  function submitHandler(event) {
+  _submitHandler = (event) => {
     event.preventDefault();
 
-    element.classList.add(ASYNC_FORM_LOADING_CLASS);
-    lastRequestTimestamp = Date.now();
+    this._element.classList.add(ASYNC_FORM_LOADING_CLASS);
+    this._lastRequestTimestamp = Date.now();
 
-    var url = element.getAttribute('action');
-    var headers = { };
-    var body = new FormData(element);
+    const url = this._element.getAttribute('action');
+    const headers = { };
+    const body = new FormData(this._element);
 
-    var isModal = element.closest(MODAL_SELECTOR);
+    const isModal = this._element.closest(MODAL_SELECTOR);
     if (isModal) {
       headers[MODAL_HEADER_KEY] = MODAL_HEADER_VALUE;
     }
 
-    app.httpClient.post({
+    this._app.httpClient.post({
       url: url,
       headers: headers,
       body: body,
-    }).then(function(response) {
-      return response.json();
-    }).then(function(response) {
-      processResponse(response[0]);
-    }).catch(function() {
-      var failureMessage = app.i18n.get('asyncFormFailure');
-      processResponse({ content: failureMessage });
+    }).then(
+      (response) => response.json()
+    ).then(
+      (response) => this._processResponse(response[0])
+    ).catch(() => {
+      const failureMessage = this._app.i18n.get('asyncFormFailure');
+      this._processResponse({ content: failureMessage });
 
-      element.classList.remove(ASYNC_FORM_LOADING_CLASS);
+      this._element.classList.remove(ASYNC_FORM_LOADING_CLASS);
     });
   }
-
-  return init();
-};
-
-export default {
-  name: ASYNC_FORM_UTIL_NAME,
-  selector: ASYNC_FORM_UTIL_SELECTOR,
-  setup: asyncFormUtil,
-};
+}
diff --git a/frontend/src/utils/async-form/async-form.md b/frontend/src/utils/async-form/async-form.md
new file mode 100644
index 000000000..a5ce150e4
--- /dev/null
+++ b/frontend/src/utils/async-form/async-form.md
@@ -0,0 +1,17 @@
+# 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:
+```html
+<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 (e.g. "Oops. Something went wrong.").
diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
index 0f9f69fdc..d3da0b6f3 100644
--- a/frontend/src/utils/async-table/async-table.js
+++ b/frontend/src/utils/async-table/async-table.js
@@ -1,235 +1,227 @@
+import { Utility } from '../../core/utility';
 import { HttpClient } from '../../services/http-client/http-client';
-import './async-table.scss';
 import './async-table-filter.scss';
+import './async-table.scss';
 
-/**
- *
- * Async Table Utility
- *  makes table filters, sorting and pagination behave asynchronously via AJAX calls
- *
- * Attribute: uw-async-table
- *
- * Example usage:
-*   (regular table)
-  */
+const INPUT_DEBOUNCE = 600;
+const HEADER_HEIGHT = 80;
 
-var INPUT_DEBOUNCE = 600;
-var HEADER_HEIGHT = 80;
+const ASYNC_TABLE_LOCAL_STORAGE_KEY = 'ASYNC_TABLE';
+const ASYNC_TABLE_SCROLLTABLE_SELECTOR = '.scrolltable';
+const ASYNC_TABLE_INITIALIZED_CLASS = 'async-table--initialized';
+const ASYNC_TABLE_LOADING_CLASS = 'async-table--loading';
 
-var ASYNC_TABLE_UTIL_NAME = 'asyncTable';
-var ASYNC_TABLE_UTIL_SELECTOR = '[uw-async-table]';
+const ASYNC_TABLE_FILTER_FORM_SELECTOR = '.table-filter-form';
+const ASYNC_TABLE_FILTER_FORM_ID_SELECTOR = '[name="form-identifier"]';
 
-var ASYNC_TABLE_LOCAL_STORAGE_KEY = 'ASYNC_TABLE';
-var ASYNC_TABLE_SCROLLTABLE_SELECTOR = '.scrolltable';
-var ASYNC_TABLE_INITIALIZED_CLASS = 'async-table--initialized';
-var ASYNC_TABLE_LOADING_CLASS = 'async-table--loading';
+@Utility({
+  selector: '[uw-async-table]',
+})
+export class AsyncTable {
 
-var ASYNC_TABLE_FILTER_FORM_SELECTOR = '.table-filter-form';
-var ASYNC_TABLE_FILTER_FORM_ID_SELECTOR = '[name="form-identifier"]';
+  _element;
+  _app;
 
+  _asyncTableHeader;
+  _asyncTableId;
 
-var asyncTableUtil = function(element, app) {
-  var asyncTableHeader;
-  var asyncTableId;
+  _ths = [];
+  _pageLinks = [];
+  _pagesizeForm;
+  _scrollTable;
+  _cssIdPrefix = '';
 
-  var ths = [];
-  var pageLinks = [];
-  var pagesizeForm;
-  var scrollTable;
-  var cssIdPrefix = '';
-
-  var tableFilterInputs = {
+  _tableFilterInputs = {
     search: [],
     input: [],
     change: [],
     select: [],
   };
 
-  function init() {
+  constructor(element, app) {
     if (!element) {
       throw new Error('Async Table utility cannot be setup without an element!');
     }
 
-    if (element.classList.contains(ASYNC_TABLE_INITIALIZED_CLASS)) {
+    this._element = element;
+    this._app = app;
+
+    if (this._element.classList.contains(ASYNC_TABLE_INITIALIZED_CLASS)) {
       return false;
     }
 
     // param asyncTableDbHeader
-    if (element.dataset.asyncTableDbHeader !== undefined) {
-      asyncTableHeader = element.dataset.asyncTableDbHeader;
+    if (this._element.dataset.asyncTableDbHeader !== undefined) {
+      this._asyncTableHeader = this._element.dataset.asyncTableDbHeader;
     }
 
-    var rawTableId = element.querySelector('table').id;
-    cssIdPrefix = findCssIdPrefix(rawTableId);
-    asyncTableId = rawTableId.replace(cssIdPrefix, '');
+    const rawTableId = this._element.querySelector('table').id;
+    this._cssIdPrefix = findCssIdPrefix(rawTableId);
+    this._asyncTableId = rawTableId.replace(this._cssIdPrefix, '');
 
     // find scrolltable wrapper
-    scrollTable = element.querySelector(ASYNC_TABLE_SCROLLTABLE_SELECTOR);
-    if (!scrollTable) {
+    this._scrollTable = this._element.querySelector(ASYNC_TABLE_SCROLLTABLE_SELECTOR);
+    if (!this._scrollTable) {
       throw new Error('Async Table cannot be set up without a scrolltable element!');
     }
 
-    setupSortableHeaders();
-    setupPagination();
-    setupPageSizeSelect();
-    setupTableFilter();
+    this._setupSortableHeaders();
+    this._setupPagination();
+    this._setupPageSizeSelect();
+    this._setupTableFilter();
 
-    processLocalStorage();
+    this._processLocalStorage();
 
     // clear currentTableUrl from previous requests
     setLocalStorageParameter('currentTableUrl', null);
 
     // mark initialized
-    element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
-
-    return {
-      name: ASYNC_TABLE_UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
+    this._element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
   }
 
-  function setupSortableHeaders() {
-    ths = Array.from(scrollTable.querySelectorAll('th.sortable')).map(function(th) {
-      return { element: th };
-    });
+  destroy() {
+    console.log('TBD: Destroy AsyncTable');
+  }
 
-    ths.forEach(function(th) {
-      th.clickHandler = function(event) {
-        setLocalStorageParameter('horizPos', (scrollTable || {}).scrollLeft);
-        linkClickHandler(event);
+  _setupSortableHeaders() {
+    this._ths = Array.from(this._scrollTable.querySelectorAll('th.sortable'))
+      .map((th) => ({ element: th }));
+
+    this._ths.forEach((th) => {
+      th.clickHandler = (event) => {
+        setLocalStorageParameter('horizPos', (this._scrollTable || {}).scrollLeft);
+        this._linkClickHandler(event);
       };
       th.element.addEventListener('click', th.clickHandler);
     });
   }
 
-  function setupPagination() {
-    var pagination = element.querySelector('#' + cssIdPrefix + asyncTableId + '-pagination');
+  _setupPagination() {
+    const pagination = this._element.querySelector('#' + this._cssIdPrefix + this._asyncTableId + '-pagination');
     if (pagination) {
-      pageLinks = Array.from(pagination.querySelectorAll('.page-link')).map(function(link) {
-        return { element: link };
-      });
+      this._pageLinks = Array.from(pagination.querySelectorAll('.page-link'))
+        .map((link) => ({ element: link }));
 
-      pageLinks.forEach(function(link) {
-        link.clickHandler = function(event) {
-          var tableBoundingRect = scrollTable.getBoundingClientRect();
+      this._pageLinks.forEach((link) => {
+        link.clickHandler = (event) => {
+          const tableBoundingRect = this._scrollTable.getBoundingClientRect();
           if (tableBoundingRect.top < HEADER_HEIGHT) {
-            var scrollTo = {
-              top: (scrollTable.offsetTop || 0) - HEADER_HEIGHT,
-              left: scrollTable.offsetLeft || 0,
+            const scrollTo = {
+              top: (this._scrollTable.offsetTop || 0) - HEADER_HEIGHT,
+              left: this._scrollTable.offsetLeft || 0,
               behavior: 'smooth',
             };
             setLocalStorageParameter('scrollTo', scrollTo);
           }
-          linkClickHandler(event);
+          this._linkClickHandler(event);
         };
         link.element.addEventListener('click', link.clickHandler);
       });
     }
   }
 
-  function setupPageSizeSelect() {
+  _setupPageSizeSelect() {
     // pagesize form
-    pagesizeForm = element.querySelector('#' + cssIdPrefix + asyncTableId + '-pagesize-form');
+    this._pagesizeForm = this._element.querySelector('#' + this._cssIdPrefix + this._asyncTableId + '-pagesize-form');
 
-    if (pagesizeForm) {
-      var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
-      pagesizeSelect.addEventListener('change', changePagesizeHandler);
+    if (this._pagesizeForm) {
+      const pagesizeSelect = this._pagesizeForm.querySelector('[name=' + this._asyncTableId + '-pagesize]');
+      pagesizeSelect.addEventListener('change', this._changePagesizeHandler);
     }
   }
 
-  function setupTableFilter() {
-    var tableFilterForm = element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
+  _setupTableFilter() {
+    const tableFilterForm = this._element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
 
     if (tableFilterForm) {
-      gatherTableFilterInputs(tableFilterForm);
-      addTableFilterEventListeners(tableFilterForm);
+      this._gatherTableFilterInputs(tableFilterForm);
+      this._addTableFilterEventListeners(tableFilterForm);
     }
   }
 
-  function gatherTableFilterInputs(tableFilterForm) {
+  _gatherTableFilterInputs(tableFilterForm) {
     Array.from(tableFilterForm.querySelectorAll('input[type="search"]')).forEach(function(input) {
-      tableFilterInputs.search.push(input);
+      this._tableFilterInputs.search.push(input);
     });
 
     Array.from(tableFilterForm.querySelectorAll('input[type="text"]')).forEach(function(input) {
-      tableFilterInputs.input.push(input);
+      this._tableFilterInputs.input.push(input);
     });
 
     Array.from(tableFilterForm.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
-      tableFilterInputs.change.push(input);
+      this._tableFilterInputs.change.push(input);
     });
 
     Array.from(tableFilterForm.querySelectorAll('select')).forEach(function(input) {
-      tableFilterInputs.select.push(input);
+      this._tableFilterInputs.select.push(input);
     });
   }
 
-  function addTableFilterEventListeners(tableFilterForm) {
-    tableFilterInputs.search.forEach(function(input) {
-      var debouncedInput = debounce(function() {
+  _addTableFilterEventListeners(tableFilterForm) {
+    this._tableFilterInputs.search.forEach(function(input) {
+      const debouncedInput = debounce(function() {
         if (input.value.length === 0 || input.value.length > 2) {
-          updateFromTableFilter(tableFilterForm);
+          this.updateFromTableFilter(tableFilterForm);
         }
       }, INPUT_DEBOUNCE);
       input.addEventListener('input', debouncedInput);
     });
 
-    tableFilterInputs.input.forEach(function(input) {
-      var debouncedInput = debounce(function() {
+    this._tableFilterInputs.input.forEach(function(input) {
+      const debouncedInput = debounce(function() {
         if (input.value.length === 0 || input.value.length > 2) {
-          updateFromTableFilter(tableFilterForm);
+          this.updateFromTableFilter(tableFilterForm);
         }
       }, INPUT_DEBOUNCE);
       input.addEventListener('input', debouncedInput);
     });
 
-    tableFilterInputs.change.forEach(function(input) {
+    this._tableFilterInputs.change.forEach(function(input) {
       input.addEventListener('change', function() {
-        updateFromTableFilter(tableFilterForm);
+        this.updateFromTableFilter(tableFilterForm);
       });
     });
 
-    tableFilterInputs.select.forEach(function(input) {
+    this._tableFilterInputs.select.forEach(function(input) {
       input.addEventListener('change', function() {
-        updateFromTableFilter(tableFilterForm);
+        this.updateFromTableFilter(tableFilterForm);
       });
     });
 
     tableFilterForm.addEventListener('submit', function(event) {
       event.preventDefault();
-      updateFromTableFilter(tableFilterForm);
+      this.updateFromTableFilter(tableFilterForm);
     });
   }
 
-  function updateFromTableFilter(tableFilterForm) {
-    var url = serializeTableFilterToURL();
-    var callback = null;
+  _updateFromTableFilter(tableFilterForm) {
+    const url = this.serializeTableFilterToURL();
+    let callback = null;
 
-    var focusedInput = tableFilterForm.querySelector(':focus, :active');
+    const focusedInput = tableFilterForm.querySelector(':focus, :active');
     // focus previously focused input
     if (focusedInput && focusedInput.selectionStart !== null) {
-      var selectionStart = focusedInput.selectionStart;
+      const selectionStart = focusedInput.selectionStart;
       // remove the following part of the id to get rid of the random
       // (yet somewhat structured) prefix we got from nudging.
-      var prefix = findCssIdPrefix(focusedInput.id);
-      var focusId = focusedInput.id.replace(prefix, '');
+      const prefix = findCssIdPrefix(focusedInput.id);
+      const focusId = focusedInput.id.replace(prefix, '');
       callback = function(wrapper) {
-        var idPrefix = getLocalStorageParameter('cssIdPrefix');
-        var toBeFocused = wrapper.querySelector('#' + idPrefix + focusId);
+        const idPrefix = getLocalStorageParameter('cssIdPrefix');
+        const toBeFocused = wrapper.querySelector('#' + idPrefix + focusId);
         if (toBeFocused) {
           toBeFocused.focus();
           toBeFocused.selectionStart = selectionStart;
         }
       };
     }
-    updateTableFrom(url, callback);
+    this._updateTableFrom(url, callback);
   }
 
-  function serializeTableFilterToURL() {
-    var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
+  serializeTableFilterToURL() {
+    const url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
 
-    var formIdElement = element.querySelector(ASYNC_TABLE_FILTER_FORM_ID_SELECTOR);
+    const formIdElement = this._element.querySelector(ASYNC_TABLE_FILTER_FORM_ID_SELECTOR);
     if (!formIdElement) {
       // cannot serialize the filter form without an identifier
       return;
@@ -237,25 +229,25 @@ var asyncTableUtil = function(element, app) {
 
     url.searchParams.set('form-identifier', formIdElement.value);
     url.searchParams.set('_hasdata', 'true');
-    url.searchParams.set(asyncTableId + '-page', '0');
+    url.searchParams.set(this._asyncTableId + '-page', '0');
 
-    tableFilterInputs.search.forEach(function(input) {
+    this._tableFilterInputs.search.forEach(function(input) {
       url.searchParams.set(input.name, input.value);
     });
 
-    tableFilterInputs.input.forEach(function(input) {
+    this._tableFilterInputs.input.forEach(function(input) {
       url.searchParams.set(input.name, input.value);
     });
 
-    tableFilterInputs.change.forEach(function(input) {
+    this._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; });
+    this._tableFilterInputs.select.forEach(function(select) {
+      const options = Array.from(select.querySelectorAll('option'));
+      const selected = options.find((option) => option.selected);
       if (selected) {
         url.searchParams.set(select.name, selected.value);
       }
@@ -264,119 +256,114 @@ var asyncTableUtil = function(element, app) {
     return url;
   }
 
-  function processLocalStorage() {
-    var scrollTo = getLocalStorageParameter('scrollTo');
-    if (scrollTo && scrollTable) {
+  _processLocalStorage() {
+    const scrollTo = getLocalStorageParameter('scrollTo');
+    if (scrollTo && this._scrollTable) {
       window.scrollTo(scrollTo);
     }
     setLocalStorageParameter('scrollTo', null);
 
-    var horizPos = getLocalStorageParameter('horizPos');
-    if (horizPos && scrollTable) {
-      scrollTable.scrollLeft = horizPos;
+    const horizPos = getLocalStorageParameter('horizPos');
+    if (horizPos && this._scrollTable) {
+      this._scrollTable.scrollLeft = horizPos;
     }
     setLocalStorageParameter('horizPos', null);
   }
 
-  function removeListeners() {
-    ths.forEach(function(th) {
+  _removeListeners() {
+    this._ths.forEach(function(th) {
       th.element.removeEventListener('click', th.clickHandler);
     });
 
-    pageLinks.forEach(function(link) {
+    this._pageLinks.forEach(function(link) {
       link.element.removeEventListener('click', link.clickHandler);
     });
 
-    if (pagesizeForm) {
-      var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
-      pagesizeSelect.removeEventListener('change', changePagesizeHandler);
+    if (this._pagesizeForm) {
+      const pagesizeSelect = this._pagesizeForm.querySelector('[name=' + this._asyncTableId + '-pagesize]');
+      pagesizeSelect.removeEventListener('change', this._changePagesizeHandler);
     }
   }
 
-  function linkClickHandler(event) {
+  _linkClickHandler = (event) => {
     event.preventDefault();
-    var url = getClickDestination(event.target);
+    let url = this._getClickDestination(event.target);
     if (!url.match(/^http/)) {
       url = window.location.origin + window.location.pathname + url;
     }
-    updateTableFrom(url);
+    this._updateTableFrom(url);
   }
 
-  function getClickDestination(el) {
+  _getClickDestination(el) {
     if (!el.matches('a') && !el.querySelector('a')) {
       return '';
     }
     return el.getAttribute('href') || el.querySelector('a').getAttribute('href');
   }
 
-  function changePagesizeHandler(event) {
-    var paginationParamKey = asyncTableId + '-pagination';
-    var pagesizeParamKey = asyncTableId + '-pagesize';
-    var pageParamKey = asyncTableId + '-page';
+  _changePagesizeHandler = (event) => {
+    const paginationParamKey = this._asyncTableId + '-pagination';
+    const pagesizeParamKey = this._asyncTableId + '-pagesize';
+    const pageParamKey = this._asyncTableId + '-page';
 
-    var paginationParamEl = pagesizeForm.querySelector('[name="' + paginationParamKey + '"]');
-    var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
+    const paginationParamEl = this._pagesizeForm.querySelector('[name="' + paginationParamKey + '"]');
+    const url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
     url.searchParams.set(pagesizeParamKey, event.target.value);
     url.searchParams.set(pageParamKey, 0);
 
     if (paginationParamEl) {
-      var encodedValue = encodeURIComponent(paginationParamEl.value);
+      const encodedValue = encodeURIComponent(paginationParamEl.value);
       url.searchParams.set(paginationParamKey, encodedValue);
     }
-    updateTableFrom(url.href);
+    this._updateTableFrom(url.href);
   }
 
   // fetches new sorted element from url with params and replaces contents of current element
-  function updateTableFrom(url, callback) {
-    element.classList.add(ASYNC_TABLE_LOADING_CLASS);
+  _updateTableFrom(url, callback) {
+    this._element.classList.add(ASYNC_TABLE_LOADING_CLASS);
 
-    var headers = {
+    const headers = {
       'Accept': HttpClient.ACCEPT.TEXT_HTML,
-      [asyncTableHeader]: asyncTableId,
+      [this._asyncTableHeader]: this._asyncTableId,
     };
 
-    app.httpClient.get({
+    this._app.httpClient.get({
       url: url,
       headers: headers,
-    }).then(function(response) {
-      return app.htmlHelpers.parseResponse(response);
-    }).then(function(response) {
+    }).then(
+      (response) => this._app.htmlHelpers.parseResponse(response)
+    ).then((response) => {
       setLocalStorageParameter('currentTableUrl', url.href);
       // reset table
-      removeListeners();
-      element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
+      this._removeListeners();
+      this._element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
       // update table with new
-      updateWrapperContents(response);
+      this._updateWrapperContents(response);
 
-      app.utilRegistry.setupAll(element);
+      this._app.utilRegistry.setupAll(this._element);
 
       if (callback && typeof callback === 'function') {
         setLocalStorageParameter('cssIdPrefix', response.idPrefix);
-        callback(element);
+        callback(this._element);
         setLocalStorageParameter('cssIdPrefix', '');
       }
-    }).catch(function(err) {
-      console.error(err);
-    }).finally(function() {
-      element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
-    });
+    }).catch((err) => console.error(err)
+    ).finally(() => this._element.classList.remove(ASYNC_TABLE_LOADING_CLASS));
   }
 
-  function updateWrapperContents(response) {
-    var newPage = document.createElement('div');
+  _updateWrapperContents(response) {
+    const newPage = document.createElement('div');
     newPage.appendChild(response.element);
-    var newWrapperContents = newPage.querySelector('#' + response.idPrefix + element.id);
-    element.innerHTML = newWrapperContents.innerHTML;
+    const newWrapperContents = newPage.querySelector('#' + response.idPrefix + this._element.id);
+    this._element.innerHTML = newWrapperContents.innerHTML;
   }
-
-  return init();
-};
+}
 
 
 // returns any random nudged prefix found in the given id
 function findCssIdPrefix(id) {
-  var matcher = /r\d*?__/;
-  var maybePrefix = id.match(matcher);
+  const matcher = /r\d*?__/;
+  const maybePrefix = id.match(matcher);
   if (maybePrefix && maybePrefix[0]) {
     return maybePrefix[0];
   }
@@ -384,7 +371,7 @@ function findCssIdPrefix(id) {
 }
 
 function setLocalStorageParameter(key, value) {
-  var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
+  const currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
   if (value !== null) {
     currentLSState[key] = value;
   } else {
@@ -392,30 +379,23 @@ function setLocalStorageParameter(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)) || {};
+  const 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;
+  let timeout;
   return function() {
-    var context = this, args = arguments;
-    var later = function() {
+    const context = this, args = arguments;
+    const later = function() {
       timeout = null;
       if (!immediate) func.apply(context, args);
     };
-    var callNow = immediate && !timeout;
+    const callNow = immediate && !timeout;
     clearTimeout(timeout);
     timeout = setTimeout(later, wait);
     if (callNow) func.apply(context, args);
   };
 }
-
-export default {
-  name: ASYNC_TABLE_UTIL_NAME,
-  selector: ASYNC_TABLE_UTIL_SELECTOR,
-  setup: asyncTableUtil,
-};
diff --git a/frontend/src/utils/async-table/async-table.md b/frontend/src/utils/async-table/async-table.md
new file mode 100644
index 000000000..60ed1a188
--- /dev/null
+++ b/frontend/src/utils/async-table/async-table.md
@@ -0,0 +1,7 @@
+# Async Table Utility
+Makes table filters, sorting and pagination behave asynchronously via AJAX calls.
+
+## Attribute: `uw-async-table`
+
+## Example usage:
+(any regular table)
diff --git a/frontend/src/utils/check-all/check-all.js b/frontend/src/utils/check-all/check-all.js
index bc88f8904..d5fa39719 100644
--- a/frontend/src/utils/check-all/check-all.js
+++ b/frontend/src/utils/check-all/check-all.js
@@ -1,58 +1,53 @@
-/**
- *
- * 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)
- */
+import { Utility } from "../../core/utility";
 
-var CHECK_ALL_UTIL_NAME = 'checkAll';
-var CHECK_ALL_UTIL_SELECTOR = 'table';
+const CHECKBOX_SELECTOR    = '[type="checkbox"]';
 
-var CHECKBOX_SELECTOR    = '[type="checkbox"]';
+const CHECK_ALL_INITIALIZED_CLASS = 'check-all--initialized';
 
-var CHECK_ALL_INITIALIZED_CLASS = 'check-all--initialized';
+@Utility({
+  selector: 'table',
+})
+export class CheckAll {
 
-var checkAllUtil = function(element, app) {
-  var columns = [];
-  var checkboxColumn = [];
-  var checkAllCheckbox = null;
+  _element;
+  _app;
 
-  function init() {
+  _columns = [];
+  _checkboxColumn = [];
+  _checkAllCheckbox = null;
+
+  constructor(element, app) {
     if (!element) {
       throw new Error('Check All utility cannot be setup without an element!');
     }
 
-    if (element.classList.contains(CHECK_ALL_INITIALIZED_CLASS)) {
+    this._element = element;
+    this._app = app;
+
+    if (this._element.classList.contains(CHECK_ALL_INITIALIZED_CLASS)) {
       return false;
     }
 
-    gatherColumns();
-    setupCheckAllCheckbox();
+    this._gatherColumns();
+    this._setupCheckAllCheckbox();
 
     // mark initialized
-    element.classList.add(CHECK_ALL_INITIALIZED_CLASS);
-
-    return {
-      name: CHECK_ALL_UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
+    this._element.classList.add(CHECK_ALL_INITIALIZED_CLASS);
   }
 
-  function getCheckboxId() {
+  destroy() {
+    console.log('TBD: Destroy CheckAll');
+  }
+
+  _getCheckboxId() {
     return 'check-all-checkbox-' + Math.floor(Math.random() * 100000);
   }
 
-  function gatherColumns() {
-    var rows = Array.from(element.querySelectorAll('tr'));
-    var cols = [];
+  _gatherColumns() {
+    const rows = Array.from(this._element.querySelectorAll('tr'));
+    const cols = [];
     rows.forEach(function(tr) {
-      var cells = Array.from(tr.querySelectorAll('td'));
+      const cells = Array.from(tr.querySelectorAll('td'));
       cells.forEach(function(cell, cellIndex) {
         if (!cols[cellIndex]) {
           cols[cellIndex] = [];
@@ -60,21 +55,21 @@ var checkAllUtil = function(element, app) {
         cols[cellIndex].push(cell);
       });
     });
-    columns = cols;
+    this._columns = cols;
   }
 
-  function findCheckboxColumn(columns) {
-    var checkboxColumnId = null;
+  _findCheckboxColumn(columns) {
+    let checkboxColumnId = null;
     columns.forEach(function(col, i) {
-      if (isCheckboxColumn(col)) {
+      if (this.isCheckboxColumn(col)) {
         checkboxColumnId = i;
       }
     });
     return checkboxColumnId;
   }
 
-  function isCheckboxColumn(col) {
-    var onlyCheckboxes = true;
+  _isCheckboxColumn(col) {
+    let onlyCheckboxes = true;
     col.forEach(function(cell) {
       if (onlyCheckboxes && !cell.querySelector(CHECKBOX_SELECTOR)) {
         onlyCheckboxes = false;
@@ -83,59 +78,50 @@ var checkAllUtil = function(element, app) {
     return onlyCheckboxes;
   }
 
-  function setupCheckAllCheckbox() {
-    var checkboxColumnId = findCheckboxColumn(columns);
+  _setupCheckAllCheckbox() {
+    const checkboxColumnId = this._findCheckboxColumn(this._columns);
     if (checkboxColumnId === null) {
       return;
     }
 
-    checkboxColumn = columns[checkboxColumnId];
-    var firstRow = element.querySelector('tr');
-    var th = Array.from(firstRow.querySelectorAll('th, td'))[checkboxColumnId];
-    checkAllCheckbox = document.createElement('input');
-    checkAllCheckbox.setAttribute('type', 'checkbox');
-    checkAllCheckbox.setAttribute('id', getCheckboxId());
-    th.insertBefore(checkAllCheckbox, th.firstChild);
+    this._checkboxColumn = this._columns[checkboxColumnId];
+    const firstRow = this._element.querySelector('tr');
+    const th = Array.from(firstRow.querySelectorAll('th, td'))[checkboxColumnId];
+    this._checkAllCheckbox = document.createElement('input');
+    this._checkAllCheckbox.setAttribute('type', 'checkbox');
+    this._checkAllCheckbox.setAttribute('id', this._getCheckboxId());
+    th.insertBefore(this._checkAllCheckbox, th.firstChild);
 
     // manually set up new checkbox
-    app.utilRegistry.setup(app.utilRegistry.find('checkbox'), th);
+    this._app.utilRegistry.setup(this._app.utilRegistry.find('checkbox'), th);
 
-    checkAllCheckbox.addEventListener('input', onCheckAllCheckboxInput);
-    setupCheckboxListeners();
+    this._checkAllCheckbox.addEventListener('input', this._onCheckAllCheckboxInput);
+    this._setupCheckboxListeners();
   }
 
-  function onCheckAllCheckboxInput() {
-    toggleAll(checkAllCheckbox.checked);
+  _onCheckAllCheckboxInput() {
+    this._toggleAll(this._checkAllCheckbox.checked);
   }
 
-  function setupCheckboxListeners() {
-    checkboxColumn
-      .map(function(cell) {
+  _setupCheckboxListeners() {
+    this._checkboxColumn.map(function(cell) {
         return cell.querySelector(CHECKBOX_SELECTOR);
       })
       .forEach(function(checkbox) {
-        checkbox.addEventListener('input', updateCheckAllCheckboxState);
+        checkbox.addEventListener('input', this.updateCheckAllCheckboxState);
       });
   }
 
-  function updateCheckAllCheckboxState() {
-    var allChecked = checkboxColumn.every(function(cell) {
+  _updateCheckAllCheckboxState() {
+    const allChecked = this._checkboxColumn.every(function(cell) {
       return cell.querySelector(CHECKBOX_SELECTOR).checked;
     });
-    checkAllCheckbox.checked = allChecked;
+    this._checkAllCheckbox.checked = allChecked;
   }
 
-  function toggleAll(checked) {
-    checkboxColumn.forEach(function(cell) {
+  _toggleAll(checked) {
+    this._checkboxColumn.forEach(function(cell) {
       cell.querySelector(CHECKBOX_SELECTOR).checked = checked;
     });
   }
-
-  return init();
-};
-
-export default {
-  name: CHECK_ALL_UTIL_NAME,
-  selector: CHECK_ALL_UTIL_SELECTOR,
-  setup: checkAllUtil,
-};
+}
diff --git a/frontend/src/utils/check-all/check-all.md b/frontend/src/utils/check-all/check-all.md
new file mode 100644
index 000000000..c48d01146
--- /dev/null
+++ b/frontend/src/utils/check-all/check-all.md
@@ -0,0 +1,9 @@
+# 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 exactly one column thats only checkboxes)
+
diff --git a/frontend/src/utils/form/auto-submit-button.js b/frontend/src/utils/form/auto-submit-button.js
new file mode 100644
index 000000000..7081c3037
--- /dev/null
+++ b/frontend/src/utils/form/auto-submit-button.js
@@ -0,0 +1,29 @@
+import { Utility } from "../../core/utility";
+
+export const AUTO_SUBMIT_BUTTON_UTIL_SELECTOR = '[uw-auto-submit-button]';
+
+const AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS = 'auto-submit-button--initialized';
+const AUTO_SUBMIT_BUTTON_HIDDEN_CLASS = 'hidden';
+
+@Utility({
+  selector: AUTO_SUBMIT_BUTTON_UTIL_SELECTOR,
+})
+export class AutoSubmitButton {
+
+  constructor(element) {
+    if (!element) {
+      throw new Error('Auto Submit Button utility needs to be passed an element!');
+    }
+
+    if (element.classList.contains(AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // hide and mark initialized
+    element.classList.add(AUTO_SUBMIT_BUTTON_HIDDEN_CLASS, AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS);
+  }
+
+  destroy() {
+    // TODO
+  }
+}
diff --git a/frontend/src/utils/form/auto-submit-button.md b/frontend/src/utils/form/auto-submit-button.md
new file mode 100644
index 000000000..e5f5c5be3
--- /dev/null
+++ b/frontend/src/utils/form/auto-submit-button.md
@@ -0,0 +1,11 @@
+# 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:
+```html
+<button type="submit" uw-auto-submit-button>Submit
+```
+
diff --git a/frontend/src/utils/form/auto-submit-input.js b/frontend/src/utils/form/auto-submit-input.js
new file mode 100644
index 000000000..6276d2f3f
--- /dev/null
+++ b/frontend/src/utils/form/auto-submit-input.js
@@ -0,0 +1,47 @@
+import * as debounce from 'lodash.debounce';
+import { Utility } from '../../core/utility';
+
+export const AUTO_SUBMIT_INPUT_UTIL_SELECTOR = '[uw-auto-submit-input]';
+
+const AUTO_SUBMIT_INPUT_INITIALIZED_CLASS = 'auto-submit-input--initialized';
+
+@Utility({
+  selector: AUTO_SUBMIT_INPUT_UTIL_SELECTOR,
+})
+export class AutoSubmitInput {
+
+  _element;
+
+  _form;
+  _debouncedHandler;
+
+  constructor(element) {
+    if (!element) {
+      throw new Error('Auto Submit Input utility needs to be passed an element!');
+    }
+
+    this._element = element;
+
+    if (this._element.classList.contains(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    this._form = this._element.form;
+    if (!this._form) {
+      throw new Error('Could not determine associated form for auto submit input');
+    }
+
+    this._debouncedHandler = debounce(this.autoSubmit, 500);
+
+    this._element.addEventListener('input', this._debouncedHandler);
+    this._element.classList.add(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS);
+  }
+
+  destroy() {
+    this._element.removeEventListener('input', this._debouncedHandler);
+  }
+
+  autoSubmit() {
+    this._form.submit();
+  }
+}
diff --git a/frontend/src/utils/form/auto-submit-input.md b/frontend/src/utils/form/auto-submit-input.md
new file mode 100644
index 000000000..73dcd933e
--- /dev/null
+++ b/frontend/src/utils/form/auto-submit-input.md
@@ -0,0 +1,9 @@
+# Auto Submit Input Utility
+Programmatically submits forms when a certain input changes value
+
+## Attribute: `uw-auto-submit-input`
+
+## Example usage:
+```html
+<input type="text" uw-auto-submit-input />
+```
diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
new file mode 100644
index 000000000..7f4c1b85a
--- /dev/null
+++ b/frontend/src/utils/form/datepicker.js
@@ -0,0 +1,62 @@
+import flatpickr from "flatpickr";
+import { Utility } from "../../core/utility";
+
+const DATEPICKER_UTIL_SELECTOR = 'input[type="date"], input[type="time"], input[type="datetime-local"]';
+
+const DATEPICKER_INITIALIZED_CLASS = 'datepicker--initialized';
+
+const 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,
+  },
+};
+
+@Utility({
+  selector: DATEPICKER_UTIL_SELECTOR,
+})
+export class Datepicker {
+
+  flatpickrInstance;
+
+  constructor(element) {
+    if (!element) {
+      throw new Error('Datepicker utility needs to be passed an element!');
+    }
+
+    if (element.classList.contains(DATEPICKER_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    const flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute("type")];
+
+    if (!flatpickrConfig) {
+      throw new Error('Datepicker utility called on unsupported element!');
+    }
+
+    this.flatpickrInstance = flatpickr(element, flatpickrConfig);
+
+    // mark initialized
+    element.classList.add(DATEPICKER_INITIALIZED_CLASS);
+  }
+
+  destroy() {
+    this.flatpickrInstance.destroy();
+  }
+}
diff --git a/frontend/src/utils/form/datepicker.md b/frontend/src/utils/form/datepicker.md
new file mode 100644
index 000000000..dfee3b3fa
--- /dev/null
+++ b/frontend/src/utils/form/datepicker.md
@@ -0,0 +1,8 @@
+# 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)
diff --git a/frontend/src/utils/form/form-error-remover.js b/frontend/src/utils/form/form-error-remover.js
new file mode 100644
index 000000000..08aed0598
--- /dev/null
+++ b/frontend/src/utils/form/form-error-remover.js
@@ -0,0 +1,46 @@
+import { Utility } from "../../core/utility";
+
+const FORM_ERROR_REMOVER_INITIALIZED_CLASS = 'form-error-remover--initialized';
+const FORM_ERROR_REMOVER_INPUTS_SELECTOR = 'input:not([type="hidden"]), textarea, select';
+
+const FORM_GROUP_SELECTOR = '.form-group';
+const FORM_GROUP_WITH_ERRORS_CLASS = 'form-group--has-error';
+
+@Utility({
+  selector: 'form',
+})
+export class FormErrorRemover {
+
+  constructor(element) {
+    if (!element) {
+      throw new Error('Form Error Remover utility needs to be passed an element!');
+    }
+
+    if (element.classList.contains(FORM_ERROR_REMOVER_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // find form groups
+    const formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
+
+    formGroups.forEach(function(formGroup) {
+      if (!formGroup.classList.contains(FORM_GROUP_WITH_ERRORS_CLASS)) {
+        return;
+      }
+
+      const 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);
+  }
+}
diff --git a/frontend/src/utils/form/form-error-remover.md b/frontend/src/utils/form/form-error-remover.md
new file mode 100644
index 000000000..fb2a8dd5f
--- /dev/null
+++ b/frontend/src/utils/form/form-error-remover.md
@@ -0,0 +1,8 @@
+# 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)
diff --git a/frontend/src/utils/form/form.js b/frontend/src/utils/form/form.js
index c3432dcc6..1e8fb6d3a 100644
--- a/frontend/src/utils/form/form.js
+++ b/frontend/src/utils/form/form.js
@@ -1,600 +1,17 @@
-import flatpickr from 'flatpickr';
 import './form.scss';
-
-/**
- *
- * 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: [none]
- *  (automatically setup on all form tags)
- *
- * 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>
- */
-
-var REACTIVE_SUBMIT_BUTTON_UTIL_NAME = 'reactiveSubmitButton';
-// var REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR = 'form';
-
-var REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS = 'reactive-submit-button--initialized';
-
-/* eslint-disable-next-line */
-var reactiveSubmitButtonUtil = 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)) {
-      return false;
-    }
-
-    // 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 || !submitButtons.length) {
-      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() {},
-    };
-  }
-
-  function setupInputs() {
-    requiredInputs.forEach(function(el) {
-      var checkbox = el.getAttribute('type') === 'checkbox';
-      var eventType = checkbox ? 'change' : 'input';
-      el.addEventListener(eventType, function() {
-        updateButtonState();
-      });
-    });
-  }
-
-  function updateButtonState() {
-    if (inputsValid()) {
-      submitButton.removeAttribute('disabled');
-    } else {
-      submitButton.setAttribute('disabled', 'true');
-    }
-  }
-
-  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();
-};
-
-// 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
-// eport const reactiveSubmitButton = {
-//   name: REACTIVE_SUBMIT_BUTTON_UTIL_NAME,
-//   selector: REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR,
-//   setup: reactiveSubmitButtonUtil,
-// };
-
-/**
- *
- * 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
- *    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>
- * ## 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>
- * ## 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';
-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 INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled])';
-
-var interactiveFieldsetUtil = function(element) {
-  var conditionalInput;
-  var conditionalValue;
-  var target;
-  var childInputs;
-
-  function init() {
-    if (!element) {
-      throw new Error('Interactive Fieldset utility cannot be setup without an element!');
-    }
-
-    if (element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) {
-      return false;
-    }
-
-    // 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.');
-    }
-
-    // param conditionalValue
-    if (!element.dataset.conditionalValue && !isCheckbox()) {
-      throw new Error('Interactive Fieldset needs a conditional value!');
-    }
-    conditionalValue = element.dataset.conditionalValue;
-
-    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));
-
-    // add event listener
-    var observer = new MutationObserver(() => updateVisibility());
-    observer.observe(conditionalInput, { attributes: true, attributeFilter: ['disabled'] });
-    conditionalInput.addEventListener('input', updateVisibility);
-
-    // initial visibility update
-    updateVisibility();
-
-    // mark as initialized
-    element.classList.add(INTERACTIVE_FIELDSET_INITIALIZED_CLASS);
-
-    return {
-      name: INTERACTIVE_FIELDSET_UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
-  }
-
-  function updateVisibility() {
-    var active = matchesConditionalValue() && !conditionalInput.disabled;
-
-    target.classList.toggle('hidden', !active);
-
-    childInputs.forEach(function(el) {
-      el.disabled = !active;
-      if (el._flatpickr) {
-        el._flatpickr.altInput.disabled = !active;
-      }
-    });
-  }
-
-  function matchesConditionalValue() {
-    if (isCheckbox()) {
-      return conditionalInput.checked === true;
-    }
-
-    return conditionalInput.value === conditionalValue;
-  }
-
-  function isCheckbox() {
-    return conditionalInput.getAttribute('type') === 'checkbox';
-  }
-
-  return init();
-};
-
-export const interactiveFieldset = {
-  name: INTERACTIVE_FIELDSET_UTIL_NAME,
-  selector: INTERACTIVE_FIELDSET_UTIL_SELECTOR,
-  setup: interactiveFieldsetUtil,
-};
-
-/**
- *
- * Navigate Away Prompt Utility
- *  This utility asks the user if (s)he really wants to navigate away
- *  from a page containing a form if (s)he already touched an input.
- *  Form-Submits will not trigger the prompt.
- *  Utility will ignore forms that contain auto submit elements (buttons, inputs).
- *
- * Attribute: [none]
- *  (automatically setup on all form tags that dont automatically submit, see AutoSubmitButtonUtil)
- *
- * Example usage:
- *  (any page with a form)
- */
-
-var NAVIGATE_AWAY_PROMPT_UTIL_NAME = 'navigateAwayPrompt';
-var NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR = 'form';
-
-var NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS = 'navigate-away-prompt--initialized';
-
-var navigateAwayPromptUtil = function(element) {
-  var touched = false;
-  var unloadDueToSubmit = false;
-
-  function init() {
-    if (!element) {
-      throw new Error('Navigate Away Prompt utility needs to be passed an element!');
-    }
-
-    if (element.classList.contains(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS)) {
-      return false;
-    }
-
-    // ignore forms that get submitted automatically
-    if (element.querySelector(AUTO_SUBMIT_BUTTON_UTIL_SELECTOR) || element.querySelector(AUTO_SUBMIT_INPUT_UTIL_SELECTOR)) {
-      return false;
-    }
-
-    window.addEventListener('beforeunload', beforeUnloadHandler);
-
-    element.addEventListener('submit', function() {
-      unloadDueToSubmit = true;
-    });
-    element.addEventListener('change', function() {
-      touched = true;
-      unloadDueToSubmit = false;
-    });
-
-    // mark initialized
-    element.classList.add(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS);
-
-    return {
-      name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
-      element: element,
-      destroy: function() {
-        window.removeEventListener('beforeunload', beforeUnloadHandler);
-      },
-    };
-  }
-
-  function beforeUnloadHandler(event) {
-    // allow the event to happen if the form was not touched by the
-    // user or the unload event was initiated by a form submit
-    if (!touched || unloadDueToSubmit) {
-      return false;
-    }
-
-    // cancel the unload event. This is the standard to force the prompt to appear.
-    event.preventDefault();
-    // for all non standard compliant browsers we return a truthy value to activate the prompt.
-    return true;
-  }
-
-  return init();
-};
-
-export const navigateAwayPrompt = {
-  name: NAVIGATE_AWAY_PROMPT_UTIL_NAME,
-  selector: NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR,
-  setup: navigateAwayPromptUtil,
-};
-
-/**
- *
- * 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
- */
-
-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!');
-  }
-
-  if (element.classList.contains(AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
-    return false;
-  }
-
-  // hide and mark initialized
-  element.classList.add(AUTO_SUBMIT_BUTTON_HIDDEN_CLASS, AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS);
-
-  return {
-    name: AUTO_SUBMIT_BUTTON_UTIL_NAME,
-    element: element,
-    destroy: function() {},
-  };
-};
-
-export const autoSubmitButton = {
-  name: AUTO_SUBMIT_BUTTON_UTIL_NAME,
-  selector: AUTO_SUBMIT_BUTTON_UTIL_SELECTOR,
-  setup: autoSubmitButtonUtil,
-};
-
-/**
- *
- * Auto Submit Input Utility
- *  Programmatically submits forms when a certain input changes value
- *
- * Attribute: uw-auto-submit-input
- *
- * Example usage:
- *  <input type="text" uw-auto-submit-input />
- */
-
-var AUTO_SUBMIT_INPUT_UTIL_NAME = 'autoSubmitInput';
-var AUTO_SUBMIT_INPUT_UTIL_SELECTOR = '[uw-auto-submit-input]';
-
-var AUTO_SUBMIT_INPUT_INITIALIZED_CLASS = 'auto-submit-input--initialized';
-
-var autoSubmitInputUtil = function(element) {
-  var form;
-  var debouncedHandler;
-
-  function autoSubmit() {
-    form.submit();
-  }
-
-  function init() {
-    if (!element) {
-      throw new Error('Auto Submit Input utility needs to be passed an element!');
-    }
-
-    if (element.classList.contains(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS)) {
-      return false;
-    }
-
-    form = element.form;
-    if (!form) {
-      throw new Error('Could not determine associated form for auto submit input');
-    }
-
-    debouncedHandler = debounce(autoSubmit, 500);
-
-    element.addEventListener('input', debouncedHandler);
-
-    element.classList.add(AUTO_SUBMIT_INPUT_INITIALIZED_CLASS);
-
-    return {
-      name: AUTO_SUBMIT_INPUT_UTIL_NAME,
-      element: element,
-      destroy: function() {
-        element.removeEventListener('input', debouncedHandler);
-      },
-    };
-  }
-
-  return init();
-};
-
-export const autoSubmitInput = {
-  name: AUTO_SUBMIT_INPUT_UTIL_NAME,
-  selector: AUTO_SUBMIT_INPUT_UTIL_SELECTOR,
-  setup: autoSubmitInputUtil,
-};
-
-/**
- *
- * 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)
- */
-
-var FORM_ERROR_REMOVER_UTIL_NAME = 'formErrorRemover';
-var FORM_ERROR_REMOVER_UTIL_SELECTOR = 'form';
-
-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!');
-    }
-
-    if (element.classList.contains(FORM_ERROR_REMOVER_INITIALIZED_CLASS)) {
-      return false;
-    }
-
-    // find form groups
-    formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
-
-    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 {
-      name: FORM_ERROR_REMOVER_UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
-  }
-
-  return init();
-};
-
-export const formErrorRemover = {
-  name: FORM_ERROR_REMOVER_UTIL_NAME,
-  selector: FORM_ERROR_REMOVER_UTIL_SELECTOR,
-  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_INITIALIZED_CLASS = 'datepicker--initialized';
-
-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!');
-    }
-
-    if (element.classList.contains(DATEPICKER_INITIALIZED_CLASS)) {
-      return false;
-    }
-
-    var flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute("type")];
-
-    if (!flatpickrConfig) {
-      throw new Error('Datepicker utility called on unsupported element!');
-    }
-
-    flatpickrInstance = flatpickr(element, flatpickrConfig);
-
-    // mark initialized
-    element.classList.add(DATEPICKER_INITIALIZED_CLASS);
-
-    return {
-      name: DATEPICKER_UTIL_NAME,
-      element: element,
-      destroy: function() { flatpickrInstance.destroy(); },
-    };
-  }
-
-  return init();
-};
-
-export const datepicker = {
-  name: DATEPICKER_UTIL_NAME,
-  selector: DATEPICKER_UTIL_SELECTOR,
-  setup: datepickerUtil,
-};
-
-// 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);
-  };
-}
+import { AutoSubmitButton } from './auto-submit-button';
+import { AutoSubmitInput } from './auto-submit-input';
+import { Datepicker } from './datepicker';
+import { FormErrorRemover } from './form-error-remover';
+import { InteractiveFieldset } from './interactive-fieldset';
+import { NavigateAwayPrompt } from './navigate-away-prompt';
+
+export const FormUtils = [
+  AutoSubmitButton,
+  AutoSubmitInput,
+  Datepicker,
+  FormErrorRemover,
+  InteractiveFieldset,
+  NavigateAwayPrompt,
+  // ReactiveSubmitButton // not used currently
+];
diff --git a/frontend/src/utils/form/interactive-fieldset.js b/frontend/src/utils/form/interactive-fieldset.js
new file mode 100644
index 000000000..79226e67f
--- /dev/null
+++ b/frontend/src/utils/form/interactive-fieldset.js
@@ -0,0 +1,97 @@
+import { Utility } from "../../core/utility";
+
+const INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR = '.interactive-fieldset__target';
+
+const INTERACTIVE_FIELDSET_INITIALIZED_CLASS = 'interactive-fieldset--initialized';
+const INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled])';
+
+@Utility({
+  selector: '[uw-interactive-fieldset]',
+})
+export class InteractiveFieldset {
+
+  _element;
+
+  conditionalInput;
+  conditionalValue;
+  target;
+  childInputs;
+
+  constructor(element) {
+    if (!element) {
+      throw new Error('Interactive Fieldset utility cannot be setup without an element!');
+    }
+
+    this._element = element;
+
+    if (this._element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // param conditionalInput
+    if (!this._element.dataset.conditionalInput) {
+      throw new Error('Interactive Fieldset needs a selector for a conditional input!');
+    }
+    this.conditionalInput = document.querySelector('#' + this._element.dataset.conditionalInput);
+    if (!this.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 (!this._element.dataset.conditionalValue && !this._isCheckbox()) {
+      throw new Error('Interactive Fieldset needs a conditional value!');
+    }
+    this.conditionalValue = this._element.dataset.conditionalValue;
+
+    this.target = this._element.closest(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR);
+    if (!this.target || this._element.matches(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR)) {
+      this.target = this._element;
+    }
+
+    this.childInputs = Array.from(this._element.querySelectorAll(INTERACTIVE_FIELDSET_CHILD_SELECTOR));
+
+    // add event listener
+    const observer = new MutationObserver(() => this._updateVisibility());
+    observer.observe(this.conditionalInput, { attributes: true, attributeFilter: ['disabled'] });
+    this.conditionalInput.addEventListener('input', () => this._updateVisibility());
+
+    // initial visibility update
+    this._updateVisibility();
+
+    // mark as initialized
+    this._element.classList.add(INTERACTIVE_FIELDSET_INITIALIZED_CLASS);
+
+  }
+
+  destroy() {
+    // TODO
+  }
+
+  _updateVisibility() {
+    const active = this._matchesConditionalValue() && !this.conditionalInput.disabled;
+
+    this.target.classList.toggle('hidden', !active);
+
+    this.childInputs.forEach(function(el) {
+      el.disabled = !active;
+
+      // disable input for flatpickrs added input as well if exists
+      if (el._flatpickr) {
+        el._flatpickr.altInput.disabled = !active;
+      }
+    });
+  }
+
+  _matchesConditionalValue() {
+    if (this._isCheckbox()) {
+      return this.conditionalInput.checked === true;
+    }
+
+    return this.conditionalInput.value === this.conditionalValue;
+  }
+
+  _isCheckbox() {
+    return this.conditionalInput.getAttribute('type') === 'checkbox';
+  }
+}
diff --git a/frontend/src/utils/form/interactive-fieldset.md b/frontend/src/utils/form/interactive-fieldset.md
new file mode 100644
index 000000000..6e35b8aec
--- /dev/null
+++ b/frontend/src/utils/form/interactive-fieldset.md
@@ -0,0 +1,35 @@
+# 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. Can be omitted if conditionalInput is a checkbox
+
+## Example usage:
+### example with text input
+```html
+<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>`
+```html
+<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>
+```
+
+### example with checkbox
+```html
+<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>
+```
diff --git a/frontend/src/utils/form/navigate-away-prompt.js b/frontend/src/utils/form/navigate-away-prompt.js
new file mode 100644
index 000000000..013074981
--- /dev/null
+++ b/frontend/src/utils/form/navigate-away-prompt.js
@@ -0,0 +1,64 @@
+import { Utility } from "../../core/utility";
+import { AUTO_SUBMIT_BUTTON_UTIL_SELECTOR } from "./auto-submit-button";
+import { AUTO_SUBMIT_INPUT_UTIL_SELECTOR } from "./auto-submit-input";
+
+const NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS = 'navigate-away-prompt--initialized';
+
+@Utility({
+  selector: 'form',
+})
+export class NavigateAwayPrompt {
+
+  _element;
+
+  _touched = false;
+  _unloadDueToSubmit = false;
+
+  constructor(element) {
+    if (!element) {
+      throw new Error('Navigate Away Prompt utility needs to be passed an element!');
+    }
+
+    this._element = element;
+
+    if (this._element.classList.contains(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // ignore forms that get submitted automatically
+    if (this._element.querySelector(AUTO_SUBMIT_BUTTON_UTIL_SELECTOR) || this._element.querySelector(AUTO_SUBMIT_INPUT_UTIL_SELECTOR)) {
+      return false;
+    }
+
+    window.addEventListener('beforeunload', this._beforeUnloadHandler);
+
+    this._element.addEventListener('submit', function() {
+      this.unloadDueToSubmit = true;
+    });
+    this._element.addEventListener('change', function() {
+      this.touched = true;
+      this.unloadDueToSubmit = false;
+    });
+
+    // mark initialized
+    this._element.classList.add(NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS);
+
+  }
+
+  destroy() {
+    window.removeEventListener('beforeunload', this._beforeUnloadHandler);
+  }
+
+  _beforeUnloadHandler(event) {
+    // allow the event to happen if the form was not touched by the
+    // user or the unload event was initiated by a form submit
+    if (!this._touched || this._unloadDueToSubmit) {
+      return false;
+    }
+
+    // cancel the unload event. This is the standard to force the prompt to appear.
+    event.preventDefault();
+    // for all non standard compliant browsers we return a truthy value to activate the prompt.
+    return true;
+  }
+}
diff --git a/frontend/src/utils/form/navigate-away-prompt.md b/frontend/src/utils/form/navigate-away-prompt.md
new file mode 100644
index 000000000..627429023
--- /dev/null
+++ b/frontend/src/utils/form/navigate-away-prompt.md
@@ -0,0 +1,11 @@
+# Navigate Away Prompt Utility
+This utility asks the user if (s)he really wants to navigate away from a page containing a form if (s)he already touched an input.
+
+- Form-Submits will not trigger the prompt.
+- Utility will ignore forms that contain auto submit elements (buttons, inputs).
+
+## Attribute: (none)
+(automatically setup on all form tags that dont automatically submit, see AutoSubmitButtonUtil)
+
+## Example usage:
+(any page with a form)
diff --git a/frontend/src/utils/form/reactive-submit-button.js b/frontend/src/utils/form/reactive-submit-button.js
new file mode 100644
index 000000000..d26477517
--- /dev/null
+++ b/frontend/src/utils/form/reactive-submit-button.js
@@ -0,0 +1,85 @@
+import { Utility } from "../../core/utility";
+
+var REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS = 'reactive-submit-button--initialized';
+
+@Utility({
+  selector: 'form',
+})
+export class ReactiveSubmitButton {
+
+  _element;
+
+  _requiredInputs;
+  _submitButton;
+
+  constructor(element) {
+    if (!element) {
+      throw new Error('Reactive Submit Button utility cannot be setup without an element!');
+    }
+
+    this._element = element;
+
+    if (this._element.classList.contains(REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
+      return false;
+    }
+
+    // abort if form has param data-formnorequired
+    if (this._element.dataset.formnorequired !== undefined) {
+      throw new Error('Form has formnorequired data attribute. Will skip setup of reactive submit button.');
+    }
+
+    this._requiredInputs = Array.from(this._element.querySelectorAll('[required]'));
+    if (!this._requiredInputs) {
+      // abort if form has no required inputs
+      throw new Error('Submit button has formnorequired data attribute. Will skip setup of reactive submit button.');
+    }
+
+    const submitButtons = Array.from(this._element.querySelectorAll('[type="submit"]'));
+    if (!submitButtons || !submitButtons.length) {
+      throw new Error('Reactive Submit Button utility couldn\'t find any submit buttons!');
+    }
+    this._submitButton = submitButtons.reverse()[0];
+    // abort if form has param data-formnorequired
+    if (this._submitButton.dataset.formnorequired !== undefined) {
+      return false;
+    }
+
+    this.setupInputs();
+    this.updateButtonState();
+
+    this._element.classList.add(REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS);
+  }
+
+  destroy() {
+    // TODO
+  }
+
+  setupInputs() {
+    this._requiredInputs.forEach(function(el) {
+      var checkbox = el.getAttribute('type') === 'checkbox';
+      var eventType = checkbox ? 'change' : 'input';
+      el.addEventListener(eventType, function() {
+        this.updateButtonState();
+      });
+    });
+  }
+
+  updateButtonState() {
+    if (this.inputsValid()) {
+      this._submitButton.removeAttribute('disabled');
+    } else {
+      this._submitButton.setAttribute('disabled', 'true');
+    }
+  }
+
+  inputsValid() {
+    var done = true;
+    this._requiredInputs.forEach(function(inp) {
+      var len = inp.value.trim().length;
+      if (done && len === 0) {
+        done = false;
+      }
+    });
+    return done;
+  }
+}
diff --git a/frontend/src/utils/form/reactive-submit-button.md b/frontend/src/utils/form/reactive-submit-button.md
new file mode 100644
index 000000000..69e65ebbb
--- /dev/null
+++ b/frontend/src/utils/form/reactive-submit-button.md
@@ -0,0 +1,17 @@
+# 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: (none)
+(automatically setup on all form tags)
+
+## Params:
+- `data-formnorequired: string`\
+  If present the submit button will never get disabled
+
+## Example usage:
+```html
+<form uw-reactive-submit-button>
+  <input type="text" required>
+  <button type="submit">
+```
diff --git a/frontend/src/utils/inputs/checkbox.js b/frontend/src/utils/inputs/checkbox.js
new file mode 100644
index 000000000..d4993852d
--- /dev/null
+++ b/frontend/src/utils/inputs/checkbox.js
@@ -0,0 +1,43 @@
+import { Utility } from "../../core/utility";
+import './checkbox.scss';
+
+var CHECKBOX_CLASS = 'checkbox';
+var CHECKBOX_INITIALIZED_CLASS = 'checkbox--initialized';
+
+@Utility({
+  selector: 'input[type="checkbox"]',
+})
+export class Checkbox {
+
+  constructor(element) {
+    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!');
+      return false;
+    }
+
+    if (element.parentElement.classList.contains(CHECKBOX_CLASS)) {
+      // throw new Error('Checkbox element\'s wrapper already has class "' + CHECKBOX_CLASS + '"!');
+      return false;
+    }
+
+    var siblingEl = element.nextSibling;
+    var parentEl = element.parentElement;
+
+    var wrapperEl = document.createElement('div');
+    wrapperEl.classList.add(CHECKBOX_CLASS);
+
+    var labelEl = document.createElement('label');
+    labelEl.setAttribute('for', element.id);
+
+    wrapperEl.appendChild(element);
+    wrapperEl.appendChild(labelEl);
+
+    parentEl.insertBefore(wrapperEl, siblingEl);
+
+    element.classList.add(CHECKBOX_INITIALIZED_CLASS);
+  }
+}
diff --git a/frontend/src/utils/inputs/checkbox.md b/frontend/src/utils/inputs/checkbox.md
new file mode 100644
index 000000000..b2763c634
--- /dev/null
+++ b/frontend/src/utils/inputs/checkbox.md
@@ -0,0 +1,10 @@
+# Checkbox Utility
+Wraps native checkbox
+
+## Attribute: (none)
+(element must be an input of type="checkbox")
+
+## Example usage:
+```html
+<input type="checkbox">
+```
diff --git a/frontend/src/utils/inputs/file-input.js b/frontend/src/utils/inputs/file-input.js
new file mode 100644
index 000000000..1b9f9acd0
--- /dev/null
+++ b/frontend/src/utils/inputs/file-input.js
@@ -0,0 +1,99 @@
+import { Utility } from "../../core/utility";
+
+const FILE_INPUT_CLASS = 'file-input';
+const FILE_INPUT_INITIALIZED_CLASS = 'file-input--initialized';
+const FILE_INPUT_LIST_CLASS = 'file-input__list';
+const FILE_INPUT_UNPACK_CHECKBOX_CLASS = 'file-input__unpack';
+const FILE_INPUT_LABEL_CLASS = 'file-input__label';
+
+@Utility({
+  selector: 'input[type="file"][uw-file-input]',
+})
+export class FileInput {
+
+  _element;
+  _app;
+
+  _isMultiFileInput = false;
+  _fileList;
+  _label;
+
+  constructor(element, app) {
+    if (!element) {
+      throw new Error('FileInput utility cannot be setup without an element!');
+    }
+
+    this._element = element;
+    this._app = app;
+
+    if (this._element.classList.contains(FILE_INPUT_INITIALIZED_CLASS)) {
+      throw new Error('FileInput utility already initialized!');
+    }
+
+    // check if is multi-file input
+    this._isMultiFileInput = this._element.hasAttribute('multiple');
+    if (this._isMultiFileInput) {
+      this._fileList = this._createFileList();
+    }
+
+    this._label = this._createFileLabel();
+    this._updateLabel();
+
+    // add change listener
+    this._element.addEventListener('change', function() {
+      this.updateLabel();
+      this.renderFileList();
+    });
+
+    // add util class for styling and mark as initialized
+    this._element.classList.add(FILE_INPUT_CLASS);
+    this._element.classList.add(FILE_INPUT_INITIALIZED_CLASS);
+  }
+
+  destroy() {
+    // TODO
+  }
+
+  _renderFileList() {
+    if (!this._fileList) {
+      return;
+    }
+
+    const files = this._element.files;
+    this._fileList.innerHTML = '';
+    Array.from(files).forEach(function(file) {
+      const fileDisplayEl = document.createElement('li');
+      fileDisplayEl.innerHTML = file.name;
+      this.fileList.appendChild(fileDisplayEl);
+    });
+  }
+
+  _createFileList() {
+    const list = document.createElement('ol');
+    list.classList.add(FILE_INPUT_LIST_CLASS);
+    const unpackEl = this._element.parentElement.querySelector('.' + FILE_INPUT_UNPACK_CHECKBOX_CLASS);
+    if (unpackEl) {
+      this._element.parentElement.insertBefore(list, unpackEl);
+    } else {
+      this._element.parentElement.appendChild(list);
+    }
+    return list;
+  }
+
+  _createFileLabel() {
+    const label = document.createElement('label');
+    label.classList.add(FILE_INPUT_LABEL_CLASS);
+    label.setAttribute('for', this._element.id);
+    this._element.parentElement.insertBefore(label, this._element);
+    return label;
+  }
+
+  _updateLabel() {
+    const files = this._element.files;
+    if (files && files.length) {
+      this._label.innerText = this._isMultiFileInput ? files.length + ' ' + this._app.i18n.get('filesSelected') : files[0].name;
+    } else {
+      this._label.innerText = this._isMultiFileInput ? this._app.i18n.get('selectFiles') : this._app.i18n.get('selectFile');
+    }
+  }
+}
diff --git a/frontend/src/utils/inputs/file-input.md b/frontend/src/utils/inputs/file-input.md
new file mode 100644
index 000000000..3d0b5df77
--- /dev/null
+++ b/frontend/src/utils/inputs/file-input.md
@@ -0,0 +1,23 @@
+# FileInput Utility
+Wraps native file input
+
+## Attribute: `uw-file-input`
+(element must be an input of type='file')
+
+## Example usage:
+```html
+<input type='file' uw-file-input>
+```
+
+## Internationalization:
+This utility expects the following translations to be available:
+- `filesSelected`:\
+  label of multi-input button after selection\
+  *example*: "Dateien ausgewählt" (will be prepended by number of selected files)
+- `selectFile`:\
+  label of single-input button before selection\
+  *example*: "Datei auswählen"
+- `selectFiles`:\
+  label of multi-input button before selection\
+  *example*: "Datei(en) auswählen"
+
diff --git a/frontend/src/utils/inputs/inputs.js b/frontend/src/utils/inputs/inputs.js
index 53d0ebb9a..abda566a5 100644
--- a/frontend/src/utils/inputs/inputs.js
+++ b/frontend/src/utils/inputs/inputs.js
@@ -1,194 +1,10 @@
-import './checkbox.scss';
-import './radio.scss';
+import { Checkbox } from './checkbox';
+import { FileInput } from './file-input';
+
 import './inputs.scss';
+import './radio.scss';
 
-/**
- *
- * FileInput Utility
- *  wraps native file input
- *
- * Attribute: uw-file-input
- *  (element must be an input of type='file')
- *
- * Example usage:
- * <input type='file' uw-file-input>
- *
- * Internationalization:
- *  This utility expects the following translations to be available:
- *    »filesSelected«: label of multi-input button after selection
- *      example: "Dateien ausgewählt" (will be prepended by number of selected files)
- *    »selectFile«: label of single-input button before selection
- *      example: "Datei auswählen"
- *    »selectFiles«: label of multi-input button before selection
- *      example: "Datei(en) auswählen"
- *
- */
-
-var FILE_INPUT_UTIL_NAME = 'fileInput';
-var FILE_INPUT_UTIL_SELECTOR = 'input[type="file"][uw-file-input]';
-
-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 fileInputUtil = function(element, app) {
-  var isMultiFileInput = false;
-  var fileList;
-  var label;
-
-  function init() {
-    if (!element) {
-      throw new Error('FileInput utility cannot be setup without an element!');
-    }
-
-    if (element.classList.contains(FILE_INPUT_INITIALIZED_CLASS)) {
-      throw new Error('FileInput utility already initialized!');
-    }
-
-    // check if is multi-file input
-    isMultiFileInput = element.hasAttribute('multiple');
-    if (isMultiFileInput) {
-      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_INPUT_CLASS);
-    element.classList.add(FILE_INPUT_INITIALIZED_CLASS);
-
-    return {
-      name: FILE_INPUT_UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
-  }
-
-  function renderFileList() {
-    if (!fileList) {
-      return;
-    }
-
-    var files = element.files;
-    fileList.innerHTML = '';
-    Array.from(files).forEach(function(file) {
-      var fileDisplayEl = document.createElement('li');
-      fileDisplayEl.innerHTML = file.name;
-      fileList.appendChild(fileDisplayEl);
-    });
-  }
-
-  function createFileList() {
-    var list = document.createElement('ol');
-    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 {
-      element.parentElement.appendChild(list);
-    }
-    return list;
-  }
-
-  function createFileLabel() {
-    var label = document.createElement('label');
-    label.classList.add(FILE_INPUT_LABEL_CLASS);
-    label.setAttribute('for', element.id);
-    element.parentElement.insertBefore(label, element);
-    return label;
-  }
-
-  function updateLabel() {
-    var files = element.files;
-    if (files && files.length) {
-      label.innerText = isMultiFileInput ? files.length + ' ' + app.i18n.get('filesSelected') : files[0].name;
-    } else {
-      label.innerText = isMultiFileInput ? app.i18n.get('selectFiles') : app.i18n.get('selectFile');
-    }
-  }
-
-  return init();
-};
-
-export const fileInput = {
-  name: FILE_INPUT_UTIL_NAME,
-  selector: FILE_INPUT_UTIL_SELECTOR,
-  setup: fileInputUtil,
-};
-
-/**
- *
- * Checkbox Utility
- *  wraps native checkbox
- *
- * Attribute: (none)
- *  (element must be an input of type="checkbox")
- *
- * Example usage:
- * <input type="checkbox">
- *
- */
-
-var CHECKBOX_UTIL_NAME = 'checkbox';
-var CHECKBOX_UTIL_SELECTOR = 'input[type="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!');
-      return false;
-    }
-
-    if (element.parentElement.classList.contains(CHECKBOX_CLASS)) {
-      // throw new Error('Checkbox element\'s wrapper already has class "' + CHECKBOX_CLASS + '"!');
-      return false;
-    }
-
-    var siblingEl = element.nextSibling;
-    var parentEl = element.parentElement;
-
-    var wrapperEl = document.createElement('div');
-    wrapperEl.classList.add(CHECKBOX_CLASS);
-
-    var labelEl = document.createElement('label');
-    labelEl.setAttribute('for', element.id);
-
-    wrapperEl.appendChild(element);
-    wrapperEl.appendChild(labelEl);
-
-    parentEl.insertBefore(wrapperEl, siblingEl);
-
-    element.classList.add(CHECKBOX_INITIALIZED_CLASS);
-
-    return {
-      name: CHECKBOX_UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
-  }
-
-  return init();
-};
-
-export const checkbox = {
-  name: CHECKBOX_UTIL_NAME,
-  selector: CHECKBOX_UTIL_SELECTOR,
-  setup: checkboxUtil,
-};
+export const InputUtils = [
+  Checkbox,
+  FileInput,
+];
diff --git a/frontend/src/utils/mass-input/mass-input.js b/frontend/src/utils/mass-input/mass-input.js
index 33e33d30f..4d5e0f49b 100644
--- a/frontend/src/utils/mass-input/mass-input.js
+++ b/frontend/src/utils/mass-input/mass-input.js
@@ -1,176 +1,163 @@
-/**
- *
- * Mass Input Utility
- *  allows form shapes to be manipulated asynchronously:
- *  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
- *
- * Example usage:
- *  <form method="POST" action="...">
- *   <input type="text">
- *   <div uw-mass-input>
- *     <input type="text">
- *     <button type="submit">
- */
+import { Utility } from "../../core/utility";
 
-var MASS_INPUT_UTIL_NAME = 'massInput';
-var MASS_INPUT_UTIL_SELECTOR = '[uw-mass-input]';
+const MASS_INPUT_CELL_SELECTOR = '.massinput__cell';
+const MASS_INPUT_ADD_CELL_SELECTOR = '.massinput__cell--add';
+const MASS_INPUT_SUBMIT_BUTTON_CLASS = 'massinput__submit-button';
+const MASS_INPUT_INITIALIZED_CLASS = 'mass-input--initialized';
 
-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';
+@Utility({
+  selector: '[uw-mass-input]',
+})
+export class MassInput {
 
-var massInputUtil = function(element, app) {
-  var massInputId;
-  var massInputFormSubmitHandler;
-  var massInputForm;
+  _element;
+  _app;
 
-  function init() {
+  _massInputId;
+  _massInputFormSubmitHandler;
+  _massInputForm;
+
+  constructor(element, app) {
     if (!element) {
       throw new Error('Mass Input utility cannot be setup without an element!');
     }
 
-    if (element.classList.contains(MASS_INPUT_INITIALIZED_CLASS)) {
+    this._element = element;
+    this._app = app;
+
+    if (this._element.classList.contains(MASS_INPUT_INITIALIZED_CLASS)) {
       return false;
     }
 
-    massInputId = element.dataset.massInputIdent || '_';
-    massInputForm = element.closest('form');
+    this._massInputId = this._element.dataset.massInputIdent || '_';
+    this._massInputForm = this._element.closest('form');
 
-    if (!massInputForm) {
+    if (!this._massInputForm) {
       throw new Error('Mass Input utility cannot be setup without being wrapped in a <form>!');
     }
 
-    massInputFormSubmitHandler = makeSubmitHandler();
+    this._massInputFormSubmitHandler = this._makeSubmitHandler();
 
     // setup submit buttons inside this massinput so browser
     // uses correct submit button for form submission.
-    var buttons = getMassInputSubmitButtons();
+    const buttons = this._getMassInputSubmitButtons();
     buttons.forEach(function(button) {
-      setupSubmitButton(button);
+      this.setupSubmitButton(button);
     });
 
-    massInputForm.addEventListener('submit', massInputFormSubmitHandler);
-    massInputForm.addEventListener('keypress', keypressHandler);
+    this._massInputForm.addEventListener('submit', this._massInputFormSubmitHandler);
+    this._massInputForm.addEventListener('keypress', this._keypressHandler);
 
     // mark initialized
-    element.classList.add(MASS_INPUT_INITIALIZED_CLASS);
-
-    return {
-      name: MASS_INPUT_UTIL_NAME,
-      element: element,
-      destroy: function() {
-        reset();
-      },
-    };
+    this._element.classList.add(MASS_INPUT_INITIALIZED_CLASS);
   }
 
-  function makeSubmitHandler() {
-    var method = massInputForm.getAttribute('method') || 'POST';
-    var url = massInputForm.getAttribute('action') || window.location.href;
-    var enctype = massInputForm.getAttribute('enctype') || 'application/json';
+  destroy() {
+    this._reset();
+  }
 
-    var requestFn;
-    if (app.httpClient[method.toLowerCase()]) {
-      requestFn = app.httpClient[method.toLowerCase()].bind(app.httpClient);
+  _makeSubmitHandler() {
+    const method = this._massInputForm.getAttribute('method') || 'POST';
+    const url = this._massInputForm.getAttribute('action') || window.location.href;
+    const enctype = this._massInputForm.getAttribute('enctype') || 'application/json';
+
+    let requestFn;
+    if (this._app.httpClient[method.toLowerCase()]) {
+      requestFn = this._app.httpClient[method.toLowerCase()].bind(this._app.httpClient);
     }
 
     return function(event) {
-      var activeElement;
+      let activeElement;
 
       // check if event occured from either a mass input add/delete button or
       // from inside one of massinput's inputs (i.e. a child is focused/active)
-      activeElement = element.querySelector(':focus, :active');
+      activeElement = this._element.querySelector(':focus, :active');
 
       if (!activeElement) {
         return false;
       }
 
       // find the according massinput cell thats hosts the element that triggered the submit
-      var massInputCell = activeElement.closest(MASS_INPUT_CELL_SELECTOR);
+      const massInputCell = activeElement.closest(MASS_INPUT_CELL_SELECTOR);
       if (!massInputCell) {
         return false;
       }
 
-      var submitButton = massInputCell.querySelector('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS);
+      const submitButton = massInputCell.querySelector('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS);
       if (!submitButton) {
         return false;
       }
 
-      var isAddCell = massInputCell.matches(MASS_INPUT_ADD_CELL_SELECTOR);
-      var submitButtonIsActive = submitButton.matches(':focus, :active');
+      const isAddCell = massInputCell.matches(MASS_INPUT_ADD_CELL_SELECTOR);
+      const 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(submitButton, enctype);
+      const requestBody = this.serializeForm(submitButton, enctype);
 
       if (requestFn && requestBody) {
-        var headers = {'Mass-Input-Shortcircuit': massInputId};
+        const headers = {'Mass-Input-Shortcircuit': this.massInputId};
 
-        if (enctype !== 'multipart/form-data')
+        if (enctype !== 'multipart/form-data') {
           headers['Content-Type'] = enctype;
+        }
 
         requestFn({
           url: url,
           headers: headers,
           body: requestBody,
         }).then(function(response) {
-          return app.htmlHelpers.parseResponse(response);
+          return this._app.htmlHelpers.parseResponse(response);
         }).then(function(response) {
-            processResponse(response.element);
+            this.processResponse(response.element);
             if (isAddCell) {
-              reFocusAddCell();
+              this.reFocusAddCell();
             }
           });
       }
     };
   }
 
-  function keypressHandler(event) {
+  _keypressHandler(event) {
     if (event.keyCode !== 13) {
       return false;
     }
 
-    if (massInputFormSubmitHandler) {
-      return massInputFormSubmitHandler(event);
+    if (this._massInputFormSubmitHandler) {
+      return this._massInputFormSubmitHandler(event);
     }
   }
 
-  function getMassInputSubmitButtons() {
-    return Array.from(element.querySelectorAll('button[type="submit"][name][value], .' + MASS_INPUT_SUBMIT_BUTTON_CLASS));
+  _getMassInputSubmitButtons() {
+    return Array.from(this._element.querySelectorAll('button[type="submit"][name][value], .' + MASS_INPUT_SUBMIT_BUTTON_CLASS));
   }
 
-  function setupSubmitButton(button) {
+  _setupSubmitButton(button) {
     button.setAttribute('type', 'button');
     button.classList.add(MASS_INPUT_SUBMIT_BUTTON_CLASS);
-    button.addEventListener('click', massInputFormSubmitHandler);
+    button.addEventListener('click', this._massInputFormSubmitHandler);
   }
 
-  function resetSubmitButton(button) {
+  _resetSubmitButton(button) {
     button.setAttribute('type', 'submit');
     button.classList.remove(MASS_INPUT_SUBMIT_BUTTON_CLASS);
-    button.removeEventListener('click', massInputFormSubmitHandler);
+    button.removeEventListener('click', this._massInputFormSubmitHandler);
   }
 
-  function processResponse(responseElement) {
-    element.innerHTML = "";
-    element.appendChild(responseElement);
+  _processResponse(responseElement) {
+    this._element.innerHTML = "";
+    this._element.appendChild(responseElement);
 
-    reset();
+    this._reset();
 
-    app.utilRegistry.setupAll(element);
+    this._app.utilRegistry.setupAll(this._element);
   }
 
-  function serializeForm(submitButton, enctype) {
-    var formData = new FormData(massInputForm);
+  _serializeForm(submitButton, enctype) {
+    const formData = new FormData(this._massInputForm);
 
     // manually add name and value of submit button to formData
     formData.append(submitButton.name, submitButton.value);
@@ -184,35 +171,27 @@ var massInputUtil = function(element, app) {
     }
   }
 
-  function reFocusAddCell() {
-    var addCell = element.querySelector(MASS_INPUT_ADD_CELL_SELECTOR);
+  _reFocusAddCell() {
+    const addCell = this._element.querySelector(MASS_INPUT_ADD_CELL_SELECTOR);
     if (!addCell) {
       return false;
     }
 
-    var addCellInput = addCell.querySelector('input:not([type="hidden"])');
+    const addCellInput = addCell.querySelector('input:not([type="hidden"])');
     if (addCellInput) {
       // Clearing of add-inputs is done in the backend
       addCellInput.focus();
     }
   }
 
-  function reset() {
-    element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
-    massInputForm.removeEventListener('submit', massInputFormSubmitHandler);
-    massInputForm.removeEventListener('keypress', keypressHandler);
+  _reset() {
+    this._element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
+    this._massInputForm.removeEventListener('submit', this._massInputFormSubmitHandler);
+    this._massInputForm.removeEventListener('keypress', this._keypressHandler);
 
-    var buttons = getMassInputSubmitButtons();
+    const buttons = this._getMassInputSubmitButtons();
     buttons.forEach(function(button) {
-      resetSubmitButton(button);
+      this.resetSubmitButton(button);
     });
   }
-
-  return init();
-};
-
-export default {
-  name: MASS_INPUT_UTIL_NAME,
-  selector: MASS_INPUT_UTIL_SELECTOR,
-  setup: massInputUtil,
-};
+}
diff --git a/frontend/src/utils/mass-input/mass-input.md b/frontend/src/utils/mass-input/mass-input.md
new file mode 100644
index 000000000..7561b5514
--- /dev/null
+++ b/frontend/src/utils/mass-input/mass-input.md
@@ -0,0 +1,17 @@
+# Mass Input Utility
+Allows form shapes to be manipulated asynchronously.
+
+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`
+
+## Example usage:
+```html
+<form method="POST" action="...">
+  <input type="text">
+  <div uw-mass-input>
+    <input type="text">
+    <button type="submit">
+```
diff --git a/frontend/src/utils/modal/modal.js b/frontend/src/utils/modal/modal.js
index 431199a8f..3958d6c2c 100644
--- a/frontend/src/utils/modal/modal.js
+++ b/frontend/src/utils/modal/modal.js
@@ -1,203 +1,182 @@
+import { Utility } from '../../core/utility';
 import './modal.scss';
 
-/**
- *
- * 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 MODAL_HEADERS = {
+const MODAL_HEADERS = {
   'Is-Modal': 'True',
 };
 
-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';
+const MODAL_INITIALIZED_CLASS = 'modal--initialized';
+const MODAL_CLASS = 'modal';
+const MODAL_OPEN_CLASS = 'modal--open';
+const MODAL_TRIGGER_CLASS = 'modal__trigger';
+const MODAL_CONTENT_CLASS = 'modal__content';
+const MODAL_OVERLAY_CLASS = 'modal__overlay';
+const MODAL_OVERLAY_OPEN_CLASS = 'modal__overlay--open';
+const MODAL_CLOSER_CLASS = 'modal__closer';
 
-var MAIN_CONTENT_CLASS = 'main__content-body';
+const 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';
+const MODALS_WRAPPER_CLASS = 'modals-wrapper';
+const MODALS_WRAPPER_SELECTOR = '.' + MODALS_WRAPPER_CLASS;
+const MODALS_WRAPPER_OPEN_CLASS = 'modals-wrapper--open';
 
-var modalUtil = function(element, app) {
+@Utility({
+  selector: '[uw-modal]',
+})
+export class Modal {
 
-  var modalsWrapper;
-  var modalOverlay;
-  var modalUrl;
+  _element;
+  _app;
 
-  function _init() {
+  _modalsWrapper;
+  _modalOverlay;
+  _modalUrl;
+
+  constructor(element, app) {
     if (!element) {
       throw new Error('Modal utility cannot be setup without an element!');
     }
 
-    if (element.classList.contains(MODAL_INITIALIZED_CLASS)) {
+    this._element = element;
+    this._app = app;
+
+    if (this._element.classList.contains(MODAL_INITIALIZED_CLASS)) {
       return false;
     }
 
-    ensureModalWrapper();
+    this._ensureModalWrapper();
 
     // param modalTrigger
-    if (!element.dataset.modalTrigger) {
+    if (!this._element.dataset.modalTrigger) {
       throw new Error('Modal utility cannot be setup without a trigger element!');
     } else {
-      setupTrigger();
+      this._setupTrigger();
     }
 
     // param modalCloseable
-    if (element.dataset.modalCloseable !== undefined) {
-      setupCloser();
+    if (this._element.dataset.modalCloseable !== undefined) {
+      this._setupCloser();
     }
 
     // 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() {},
-    };
+    this._element.classList.add(MODAL_INITIALIZED_CLASS, MODAL_CLASS);
   }
 
-  function ensureModalWrapper() {
-    modalsWrapper = document.querySelector(MODALS_WRAPPER_SELECTOR);
-    if (!modalsWrapper) {
+  destroy() {
+    // TODO
+  }
+
+  _ensureModalWrapper() {
+    this._modalsWrapper = document.querySelector(MODALS_WRAPPER_SELECTOR);
+    if (!this._modalsWrapper) {
       // create modal wrapper
-      modalsWrapper = document.createElement('div');
-      modalsWrapper.classList.add(MODALS_WRAPPER_CLASS);
-      document.body.appendChild(modalsWrapper);
+      this._modalsWrapper = document.createElement('div');
+      this._modalsWrapper.classList.add(MODALS_WRAPPER_CLASS);
+      document.body.appendChild(this._modalsWrapper);
     }
 
-    modalOverlay = modalsWrapper.querySelector('.' + MODAL_OVERLAY_CLASS);
-    if (!modalOverlay) {
+    this._modalOverlay = this._modalsWrapper.querySelector('.' + MODAL_OVERLAY_CLASS);
+    if (!this._modalOverlay) {
       // create modal overlay
-      modalOverlay = document.createElement('div');
-      modalOverlay.classList.add(MODAL_OVERLAY_CLASS);
-      modalsWrapper.appendChild(modalOverlay);
+      this._modalOverlay = document.createElement('div');
+      this._modalOverlay.classList.add(MODAL_OVERLAY_CLASS);
+      this._modalsWrapper.appendChild(this._modalOverlay);
     }
   }
 
-  function setupTrigger() {
-    var triggerSelector = element.dataset.modalTrigger;
+  _setupTrigger() {
+    let triggerSelector = this._element.dataset.modalTrigger;
     if (!triggerSelector.startsWith('#')) {
       triggerSelector = '#' + triggerSelector;
     }
-    var triggerElement = document.querySelector(triggerSelector);
+    const triggerElement = document.querySelector(triggerSelector);
 
     if (!triggerElement) {
       throw new Error('Trigger element for Modal not found: "' + triggerSelector + '"');
     }
 
     triggerElement.classList.add(MODAL_TRIGGER_CLASS);
-    triggerElement.addEventListener('click', onTriggerClicked, false);
-    modalUrl = triggerElement.getAttribute('href');
+    triggerElement.addEventListener('click', this._onTriggerClicked, false);
+    this._modalUrl = triggerElement.getAttribute('href');
   }
 
-  function setupCloser() {
-    var closerElement = document.createElement('div');
-    element.insertBefore(closerElement, null);
+  _setupCloser() {
+    const closerElement = document.createElement('div');
+    this._element.insertBefore(closerElement, null);
     closerElement.classList.add(MODAL_CLOSER_CLASS);
-    closerElement.addEventListener('click', onCloseClicked, false);
-    modalOverlay.addEventListener('click', onCloseClicked, false);
+    closerElement.addEventListener('click', this._onCloseClicked, false);
+    this._modalOverlay.addEventListener('click', this._onCloseClicked, false);
   }
 
-  function onTriggerClicked(event) {
+  _onTriggerClicked = (event) => {
     event.preventDefault();
-    open();
+    this._open();
   }
 
-  function onCloseClicked(event) {
+  _onCloseClicked = (event) => {
     event.preventDefault();
-    close();
+    this._close();
   }
 
-  function onKeyUp(event) {
+  _onKeyUp = (event) => {
     if (event.key === 'Escape') {
-      close();
+      this._close();
     }
   }
 
-  function open() {
-    element.classList.add(MODAL_OPEN_CLASS);
-    modalOverlay.classList.add(MODAL_OVERLAY_OPEN_CLASS);
-    modalsWrapper.classList.add(MODALS_WRAPPER_OPEN_CLASS);
-    modalsWrapper.appendChild(element);
+  _open() {
+    this._element.classList.add(MODAL_OPEN_CLASS);
+    this._modalOverlay.classList.add(MODAL_OVERLAY_OPEN_CLASS);
+    this._modalsWrapper.classList.add(MODALS_WRAPPER_OPEN_CLASS);
+    this._modalsWrapper.appendChild(this._element);
 
-    if (modalUrl) {
-      fillModal(modalUrl);
+    if (this._modalUrl) {
+      this._fillModal(this._modalUrl);
     }
 
-    document.addEventListener('keyup', onKeyUp);
+    document.addEventListener('keyup', this._onKeyUp);
   }
 
-  function close() {
-    modalOverlay.classList.remove(MODAL_OVERLAY_OPEN_CLASS);
-    element.classList.remove(MODAL_OPEN_CLASS);
-    modalsWrapper.classList.remove(MODALS_WRAPPER_OPEN_CLASS);
+  _close() {
+    this._modalOverlay.classList.remove(MODAL_OVERLAY_OPEN_CLASS);
+    this._element.classList.remove(MODAL_OPEN_CLASS);
+    this._modalsWrapper.classList.remove(MODALS_WRAPPER_OPEN_CLASS);
 
-    document.removeEventListener('keyup', onKeyUp);
+    document.removeEventListener('keyup', this._onKeyUp);
   };
 
-  function fillModal(url) {
-    app.httpClient.get({
+  _fillModal(url) {
+    this._app.httpClient.get({
       url: url,
       headers: MODAL_HEADERS,
-    }).then(function(response) {
-      return app.htmlHelpers.parseResponse(response);
-    }).then(function(response) {
-      processResponse(response.element);
-    });
+    }).then(
+      (response) => this._app.htmlHelpers.parseResponse(response)
+    ).then(
+      (response) => this._processResponse(response.element)
+    );
   }
 
-  function processResponse(responseElement) {
-    var modalContent = document.createElement('div');
+  _processResponse(responseElement) {
+    const modalContent = document.createElement('div');
     modalContent.classList.add(MODAL_CONTENT_CLASS);
 
-    var contentBody = responseElement.querySelector('.' + MAIN_CONTENT_CLASS);
+    const contentBody = responseElement.querySelector('.' + MAIN_CONTENT_CLASS);
 
     if (contentBody) {
       modalContent.innerHTML = contentBody.innerHTML;
     }
 
-    var previousModalContent = element.querySelector('.' + MODAL_CONTENT_CLASS);
+    const previousModalContent = this._element.querySelector('.' + MODAL_CONTENT_CLASS);
     if (previousModalContent) {
       previousModalContent.remove();
     }
 
-    element.insertBefore(modalContent, null);
+    this._element.insertBefore(modalContent, null);
 
     // setup any newly arrived utils
-    app.utilRegistry.setupAll(element);
+    this._app.utilRegistry.setupAll(this._element);
   }
-
-  return _init();
-};
-
-export default {
-  name: MODAL_UTIL_NAME,
-  selector: MODAL_UTIL_SELECTOR,
-  setup: modalUtil,
-};
+}
diff --git a/frontend/src/utils/modal/modal.md b/frontend/src/utils/modal/modal.md
new file mode 100644
index 000000000..c17c40015
--- /dev/null
+++ b/frontend/src/utils/modal/modal.md
@@ -0,0 +1,16 @@
+# 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`\
+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:
+```html
+<div uw-modal data-modal-trigger='#trigger' data-modal-closeable>This is the modal content
+<div id='trigger'>Click me to open the modal
+```
diff --git a/frontend/src/utils/show-hide/show-hide.js b/frontend/src/utils/show-hide/show-hide.js
index 1566aa940..1fc1925e5 100644
--- a/frontend/src/utils/show-hide/show-hide.js
+++ b/frontend/src/utils/show-hide/show-hide.js
@@ -1,109 +1,91 @@
+import { Utility } from '../../core/utility';
 import './show-hide.scss';
 
-var SHOW_HIDE_UTIL_NAME = 'showHide';
-var SHOW_HIDE_UTIL_SELECTOR = '[uw-show-hide]';
+const SHOW_HIDE_LOCAL_STORAGE_KEY = 'SHOW_HIDE';
+const SHOW_HIDE_INITIALIZED_CLASS = 'show-hide--initialized';
+const SHOW_HIDE_COLLAPSED_CLASS = 'show-hide--collapsed';
+const SHOW_HIDE_TOGGLE_CLASS = 'show-hide__toggle';
+const SHOW_HIDE_TOGGLE_RIGHT_CLASS = 'show-hide__toggle--right';
 
-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';
+@Utility({
+  selector: '[uw-show-hide]',
+})
+export class ShowHide {
 
-/**
- *
- * 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>Click me
- *   <div>This will be toggled
- *   <div>This will be toggled as well
- */
-var showHideUtil = function(element) {
+  _showHideId;
+  _element;
 
-  var showHideId;
-
-  function init() {
+  constructor(element) {
     if (!element) {
       throw new Error('ShowHide utility cannot be setup without an element!');
     }
 
-    if (element.classList.contains(SHOW_HIDE_INITIALIZED_CLASS)) {
+    this._element = element;
+
+    if (this._element.classList.contains(SHOW_HIDE_INITIALIZED_CLASS)) {
       return false;
     }
 
     // register click listener
-    addClickListener();
+    this._addClickListener();
 
     // param showHideId
-    if (element.dataset.showHideId) {
-      showHideId = element.dataset.showHideId;
+    if (this._element.dataset.showHideId) {
+      this._showHideId = this._element.dataset.showHideId;
     }
 
     // param showHideCollapsed
-    var collapsed = false;
-    if (element.dataset.showHideCollapsed !== undefined) {
+    let collapsed = false;
+    if (this._element.dataset.showHideCollapsed !== undefined) {
       collapsed = true;
     }
-    if (showHideId) {
-      var localStorageCollapsed = getLocalStorage()[showHideId];
+
+    if (this._showHideId) {
+      let localStorageCollapsed = this._getLocalStorage()[this._showHideId];
       if (typeof localStorageCollapsed !== 'undefined') {
         collapsed = localStorageCollapsed;
       }
     }
-    element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS, collapsed);
+    this._element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS, collapsed);
 
     // param showHideAlign
-    var alignment = element.dataset.showHideAlign;
+    const alignment = this._element.dataset.showHideAlign;
     if (alignment === 'right') {
-      element.classList.add(SHOW_HIDE_TOGGLE_RIGHT_CLASS);
+      this._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() {},
-    };
+    this._element.classList.add(SHOW_HIDE_INITIALIZED_CLASS, SHOW_HIDE_TOGGLE_CLASS);
   }
 
-  function addClickListener() {
-    element.addEventListener('click', function clickListener() {
-      var newState = element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
-
-      if (showHideId) {
-        setLocalStorage(showHideId, newState);
-      }
-    });
+  destroy() {
+    this._removeClickListener();
   }
 
-  function setLocalStorage(id, state) {
-    var lsData = getLocalStorage();
+  _removeClickListener() {
+    this._element.removeEventListener('click', this._clickHandler);
+  }
+
+  _addClickListener() {
+    this._element.addEventListener('click', this._clickHandler);
+  }
+
+  _clickHandler = () => {
+    const newState = this._element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
+
+    if (this.__showHideId) {
+      this._setLocalStorage(this.__showHideId, newState);
+    }
+  }
+
+  // maybe move these to a LocalStorageHelper?
+  _setLocalStorage(id, state) {
+    const lsData = this._getLocalStorage();
     lsData[id] = state;
     window.localStorage.setItem(SHOW_HIDE_LOCAL_STORAGE_KEY, JSON.stringify(lsData));
   }
 
-  function getLocalStorage() {
+  _getLocalStorage() {
     return JSON.parse(window.localStorage.getItem(SHOW_HIDE_LOCAL_STORAGE_KEY)) || {};
   }
-
-  return init();
-};
-
-export default {
-  name: SHOW_HIDE_UTIL_NAME,
-  selector: SHOW_HIDE_UTIL_SELECTOR,
-  setup: showHideUtil,
-};
+}
diff --git a/frontend/src/utils/show-hide/show-hide.md b/frontend/src/utils/show-hide/show-hide.md
new file mode 100644
index 000000000..bf16f04da
--- /dev/null
+++ b/frontend/src/utils/show-hide/show-hide.md
@@ -0,0 +1,21 @@
+# ShowHide
+
+Allows to toggle the visibilty of an element by clicking another element.
+
+## Attribute: `uw-show-hide`
+
+## Params:
+- `data-show-hide-id: string` (optional)\
+If this param is given the state of the utility will be persisted in the clients local storage.
+- `data-show-hide-collapsed: boolean` (optional)\
+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'` (optional)\
+Where to put the arrow that marks the element as a ShowHide toggle. Left of toggle by default.
+
+## Example usage:
+```html
+<div>
+  <div uw-show-hide>Click me
+  <div>This will be toggled
+  <div>This will be toggled as well
+```
diff --git a/frontend/src/utils/tooltips/tooltips.js b/frontend/src/utils/tooltips/tooltips.js
index 1bf275e43..6669e5d70 100644
--- a/frontend/src/utils/tooltips/tooltips.js
+++ b/frontend/src/utils/tooltips/tooltips.js
@@ -1,7 +1,10 @@
+import { Utility } from '../../core/utility';
 import './tooltips.scss';
 
-export default {
-  name: 'tooltips',
+// empty shell to be able to load styles
+@Utility({
   selector: '[not-something-that-would-be-found]',
-  setup: () => {},
+})
+export class Tooltip {
+  destroy() {}
 };
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index 05c430456..cfa9bbbee 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -1,38 +1,26 @@
-import alerts from './alerts/alerts';
-import asidenav from './asidenav/asidenav';
-import asyncForm from './async-form/async-form';
-import asyncTable from './async-table/async-table';
-import checkAll from './check-all/check-all';
-import massInput from './mass-input/mass-input';
-import { fileInput, checkbox } from './inputs/inputs';
-import modal from './modal/modal';
-import showHide from './show-hide/show-hide';
-import {
-  interactiveFieldset,
-  navigateAwayPrompt,
-  autoSubmitButton,
-  autoSubmitInput,
-  formErrorRemover,
-  datepicker,
-} from './form/form';
-import tooltips from './tooltips/tooltips';
+import { Alerts } from "./alerts/alerts";
+import { Asidenav } from "./asidenav/asidenav";
+import { AsyncForm } from "./async-form/async-form";
+import { ShowHide } from "./show-hide/show-hide";
+import { AsyncTable } from "./async-table/async-table";
+import { CheckAll } from "./check-all/check-all";
+import { FormUtils } from "./form/form";
+import { InputUtils } from "./inputs/inputs";
+import { MassInput } from "./mass-input/mass-input";
+import { Modal } from "./modal/modal";
+import { Tooltip } from "./tooltips/tooltips";
 
 export const Utils = [
-  alerts,
-  asidenav,
-  asyncForm,
-  asyncTable,
-  checkAll,
-  massInput,
-  fileInput,
-  checkbox,
-  modal,
-  showHide,
-  interactiveFieldset,
-  navigateAwayPrompt,
-  autoSubmitButton,
-  autoSubmitInput,
-  formErrorRemover,
-  datepicker,
-  tooltips,
+  Alerts,
+  Asidenav,
+  AsyncForm,
+  AsyncTable,
+  CheckAll,
+  ShowHide,
+  ...FormUtils,
+  ...InputUtils,
+  MassInput,
+  Modal,
+  ShowHide,
+  Tooltip,
 ];

From c105e0c627698155e1e9f44ab06f03bbf837b3c7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 28 May 2019 18:23:17 +0200
Subject: [PATCH 411/519] Explicit opt-out for navigate-away-prompt

Fixes #395
---
 src/Auth/Dummy.hs       | 2 +-
 src/Auth/LDAP.hs        | 2 +-
 src/Auth/PWHash.hs      | 2 +-
 static/js/utils/form.js | 6 ++++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Auth/Dummy.hs b/src/Auth/Dummy.hs
index 2edb89350..5987caa4f 100644
--- a/src/Auth/Dummy.hs
+++ b/src/Auth/Dummy.hs
@@ -57,7 +57,7 @@ dummyLogin = AuthPlugin{..}
             { formMethod = POST
             , formAction = Just . SomeRoute . toMaster $ PluginR "dummy" []
             , formEncoding = loginEnctype
-            , formAttrs = []
+            , formAttrs = [("uw-no-navigate-away-prompt","")]
             , formSubmit = FormSubmit
             , formAnchor = Just "login--dummy" :: Maybe Text
             }
diff --git a/src/Auth/LDAP.hs b/src/Auth/LDAP.hs
index e4c5aee74..9ea9d02e5 100644
--- a/src/Auth/LDAP.hs
+++ b/src/Auth/LDAP.hs
@@ -117,7 +117,7 @@ campusLogin conf@LdapConf{..} pool = AuthPlugin{..}
             { formMethod = POST
             , formAction = Just . SomeRoute . toMaster $ PluginR "LDAP" []
             , formEncoding = loginEnctype
-            , formAttrs = []
+            , formAttrs = [("uw-no-navigate-away-prompt","")]
             , formSubmit = FormSubmit
             , formAnchor = Just "login--campus" :: Maybe Text
             }
diff --git a/src/Auth/PWHash.hs b/src/Auth/PWHash.hs
index cc50b9415..a4eb42057 100644
--- a/src/Auth/PWHash.hs
+++ b/src/Auth/PWHash.hs
@@ -93,7 +93,7 @@ hashLogin pwHashAlgo = AuthPlugin{..}
             { formMethod = POST
             , formAction = Just . SomeRoute . toMaster $ PluginR "PWHash" []
             , formEncoding = loginEnctype
-            , formAttrs = []
+            , formAttrs = [("uw-no-navigate-away-prompt","")]
             , formSubmit = FormSubmit
             , formAnchor = Just "login--hash" :: Maybe Text
             }
diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index ed8b0fa9a..c545caa93 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -257,6 +257,7 @@
    *
    * Attribute: [none]
    *  (automatically setup on all form tags that dont automatically submit, see AutoSubmitButtonUtil)
+   *  Does not setup on forms that have uw-no-navigate-away-prompt
    *
    * Example usage:
    *  (any page with a form)
@@ -264,6 +265,7 @@
 
   var NAVIGATE_AWAY_PROMPT_UTIL_NAME = 'navigateAwayPrompt';
   var NAVIGATE_AWAY_PROMPT_UTIL_SELECTOR = 'form';
+  var NAVIGATE_AWAY_PROMPT_UTIL_OPTOUT = '[uw-no-navigate-away-prompt]';
 
   var NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS = 'navigate-away-prompt--initialized';
 
@@ -285,6 +287,10 @@
         return false;
       }
 
+      if (element.matches(NAVIGATE_AWAY_PROMPT_UTIL_OPTOUT)) {
+        return false;
+      }
+
       window.addEventListener('beforeunload', beforeUnloadHandler);
 
       element.addEventListener('submit', function() {

From 0fc9c326b9b82f59bed9dad4ef2631d633238610 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 28 May 2019 19:22:14 +0200
Subject: [PATCH 412/519] fixes #394

---
 src/Handler/Utils/Submission.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index be6745a6a..7356e17b0 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -129,7 +129,7 @@ assignSubmissions sid restriction = do
         (E.Value sheetId, Entity subId Submission{..}, _) <- submissionDataRaw
         guard $ sheetId == sid
         case restriction of
-          Just restriction' -> 
+          Just restriction' ->
             guard $ subId `Set.member` restriction'
           Nothing ->
             guard $ is _Nothing submissionRatingBy
@@ -146,7 +146,7 @@ assignSubmissions sid restriction = do
                          => (Map SubmissionId a -> b)
                          -> m b
       withSubmissionData f = f <$> (mappend <$> ask <*> State.get)
-      
+
       -- | How many additional submission should the given corrector be assigned, if possible?
       calculateDeficit :: UserId -> Map SubmissionId (Maybe UserId, Map UserId _, SheetId) -> Rational
       calculateDeficit corrector submissionState = getSum $ foldMap Sum deficitBySheet
@@ -178,7 +178,7 @@ assignSubmissions sid restriction = do
                     , fromMaybe 0 $ do
                         guard $ corrState /= CorrectorExcused
                         return . negate $ (byProportion / proportionSum) * fromIntegral sheetSize
-                    ] 
+                    ]
                   | otherwise
                   = assigned
             return $ negate extra
@@ -257,6 +257,7 @@ submissionMultiArchive (Set.toList -> ids) = do
         execWriter . forM ratedSubmissions $ \(_rating,_submission,(shn,csh,ssh,tid)) ->
           tell (Set.singleton shn, Set.singleton csh, Set.singleton ssh, Set.singleton tid)
 
+  setContentDisposition' $ Just "submissions.zip"
   (<* cleanup) . respondSource "application/zip" . transPipe (runDBRunner dbrunner) $ do
     let
       fileEntitySource' :: (Rating, Entity Submission, (SheetName,CourseShorthand,SchoolId,TermId)) -> Source (YesodDB UniWorX) File

From c0b07e540183bd85c7d6cc9e7335823ad374cd37 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 28 May 2019 20:56:00 +0200
Subject: [PATCH 413/519] fix navigate-away-prompt js utility in chrome

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

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index c545caa93..fadcbb7a4 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -322,7 +322,9 @@
 
       // cancel the unload event. This is the standard to force the prompt to appear.
       event.preventDefault();
-      // for all non standard compliant browsers we return a truthy value to activate the prompt.
+      // chrome apparently does not comply to standards. We need to set the events' returnValue as well.
+      event.returnValue = true;
+      // for all other non standard compliant browsers we return a truthy value to activate the prompt.
       return true;
     }
 

From fa9c67a918f8d657f2943aae3ff5b385b38a6721 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 28 May 2019 22:07:52 +0200
Subject: [PATCH 414/519] =?UTF-8?q?all=20js=20utilities=20starting=20with?=
 =?UTF-8?q?=20=C2=BBa=C2=AB=20are=20checked=20and=20working?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/core/utility.js                  |  2 +-
 frontend/src/utils/asidenav/asidenav.js       | 17 +++---
 frontend/src/utils/async-table/async-table.js | 58 +++++++------------
 frontend/src/utils/check-all/check-all.js     | 18 +++---
 4 files changed, 41 insertions(+), 54 deletions(-)

diff --git a/frontend/src/core/utility.js b/frontend/src/core/utility.js
index 6b74920dd..dba52923a 100644
--- a/frontend/src/core/utility.js
+++ b/frontend/src/core/utility.js
@@ -3,7 +3,7 @@ export function isValidUtility(utility) {
     return false;
   }
 
-  if (Utility.selector) {
+  if (!utility.selector) {
     return false;
   }
 
diff --git a/frontend/src/utils/asidenav/asidenav.js b/frontend/src/utils/asidenav/asidenav.js
index 09d295063..3b5c048ff 100644
--- a/frontend/src/utils/asidenav/asidenav.js
+++ b/frontend/src/utils/asidenav/asidenav.js
@@ -14,6 +14,7 @@ const ASIDENAV_SUBMENU_CLASS = 'asidenav__nested-list-wrapper';
 export class Asidenav {
 
   _element;
+  _asidenavSubmenus;
 
   constructor(element) {
     if (!element) {
@@ -34,12 +35,14 @@ export class Asidenav {
   }
 
   destroy() {
-    console.log('TBD: Destroy Asidenav');
+    this._asidenavSubmenus.forEach((union) => {
+      union.listItem.removeEventListener(union.hoverHandler);
+    });
   }
 
   _initFavoritesButton() {
     const favoritesBtn = document.querySelector('.' + FAVORITES_BTN_CLASS);
-    favoritesBtn.addEventListener('click', function(event) {
+    favoritesBtn.addEventListener('click', (event) => {
       favoritesBtn.classList.toggle(FAVORITES_BTN_ACTIVE_CLASS);
       this._element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
       event.preventDefault();
@@ -47,7 +50,7 @@ export class Asidenav {
   }
 
   _initAsidenavSubmenus() {
-    const asidenavLinksWithSubmenus = Array.from(this._element.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
+    this._asidenavSubmenus = Array.from(this._element.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
       .map(function(listItem) {
         const submenu = listItem.querySelector('.' + ASIDENAV_SUBMENU_CLASS);
         return { listItem, submenu };
@@ -55,13 +58,14 @@ export class Asidenav {
         return union.submenu !== null;
       });
 
-    asidenavLinksWithSubmenus.forEach(function(union) {
-      union.listItem.addEventListener('mouseover', this.createMouseoverHandler(union));
+    this._asidenavSubmenus.forEach((union) => {
+      union.hoverHandler = this._createMouseoverHandler(union);
+      union.listItem.addEventListener('mouseover', union.hoverHandler);
     });
   }
 
   _createMouseoverHandler(union) {
-    return function mouseoverHandler() {
+    return () => {
       const rectListItem = union.listItem.getBoundingClientRect();
       const rectSubMenu = union.submenu.getBoundingClientRect();
 
@@ -71,7 +75,6 @@ export class Asidenav {
       } else {
         union.submenu.style.top = rectListItem.top + 'px';
       }
-
     };
   }
 }
diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
index d3da0b6f3..f32f8df33 100644
--- a/frontend/src/utils/async-table/async-table.js
+++ b/frontend/src/utils/async-table/async-table.js
@@ -1,5 +1,6 @@
 import { Utility } from '../../core/utility';
 import { HttpClient } from '../../services/http-client/http-client';
+import * as debounce from 'lodash.debounce';
 import './async-table-filter.scss';
 import './async-table.scss';
 
@@ -132,7 +133,6 @@ export class AsyncTable {
 
   _setupTableFilter() {
     const tableFilterForm = this._element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
-
     if (tableFilterForm) {
       this._gatherTableFilterInputs(tableFilterForm);
       this._addTableFilterEventListeners(tableFilterForm);
@@ -140,62 +140,62 @@ export class AsyncTable {
   }
 
   _gatherTableFilterInputs(tableFilterForm) {
-    Array.from(tableFilterForm.querySelectorAll('input[type="search"]')).forEach(function(input) {
+    Array.from(tableFilterForm.querySelectorAll('input[type="search"]')).forEach((input) => {
       this._tableFilterInputs.search.push(input);
     });
 
-    Array.from(tableFilterForm.querySelectorAll('input[type="text"]')).forEach(function(input) {
+    Array.from(tableFilterForm.querySelectorAll('input[type="text"]')).forEach((input) => {
       this._tableFilterInputs.input.push(input);
     });
 
-    Array.from(tableFilterForm.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
+    Array.from(tableFilterForm.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach((input) => {
       this._tableFilterInputs.change.push(input);
     });
 
-    Array.from(tableFilterForm.querySelectorAll('select')).forEach(function(input) {
+    Array.from(tableFilterForm.querySelectorAll('select')).forEach((input) => {
       this._tableFilterInputs.select.push(input);
     });
   }
 
   _addTableFilterEventListeners(tableFilterForm) {
-    this._tableFilterInputs.search.forEach(function(input) {
-      const debouncedInput = debounce(function() {
+    this._tableFilterInputs.search.forEach((input) => {
+      const debouncedInput = debounce(() => {
         if (input.value.length === 0 || input.value.length > 2) {
-          this.updateFromTableFilter(tableFilterForm);
+          this._updateFromTableFilter(tableFilterForm);
         }
       }, INPUT_DEBOUNCE);
       input.addEventListener('input', debouncedInput);
     });
 
-    this._tableFilterInputs.input.forEach(function(input) {
-      const debouncedInput = debounce(function() {
+    this._tableFilterInputs.input.forEach((input) => {
+      const debouncedInput = debounce(() => {
         if (input.value.length === 0 || input.value.length > 2) {
-          this.updateFromTableFilter(tableFilterForm);
+          this._updateFromTableFilter(tableFilterForm);
         }
       }, INPUT_DEBOUNCE);
       input.addEventListener('input', debouncedInput);
     });
 
-    this._tableFilterInputs.change.forEach(function(input) {
-      input.addEventListener('change', function() {
-        this.updateFromTableFilter(tableFilterForm);
+    this._tableFilterInputs.change.forEach((input) => {
+      input.addEventListener('change', () => {
+        this._updateFromTableFilter(tableFilterForm);
       });
     });
 
-    this._tableFilterInputs.select.forEach(function(input) {
-      input.addEventListener('change', function() {
-        this.updateFromTableFilter(tableFilterForm);
+    this._tableFilterInputs.select.forEach((input) => {
+      input.addEventListener('change', () => {
+        this._updateFromTableFilter(tableFilterForm);
       });
     });
 
-    tableFilterForm.addEventListener('submit', function(event) {
+    tableFilterForm.addEventListener('submit', (event) =>{
       event.preventDefault();
-      this.updateFromTableFilter(tableFilterForm);
+      this._updateFromTableFilter(tableFilterForm);
     });
   }
 
   _updateFromTableFilter(tableFilterForm) {
-    const url = this.serializeTableFilterToURL();
+    const url = this._serializeTableFilterToURL();
     let callback = null;
 
     const focusedInput = tableFilterForm.querySelector(':focus, :active');
@@ -218,7 +218,7 @@ export class AsyncTable {
     this._updateTableFrom(url, callback);
   }
 
-  serializeTableFilterToURL() {
+  _serializeTableFilterToURL() {
     const url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
 
     const formIdElement = this._element.querySelector(ASYNC_TABLE_FILTER_FORM_ID_SELECTOR);
@@ -383,19 +383,3 @@ function getLocalStorageParameter(key) {
   const 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) {
-  let timeout;
-  return function() {
-    const context = this, args = arguments;
-    const later = function() {
-      timeout = null;
-      if (!immediate) func.apply(context, args);
-    };
-    const callNow = immediate && !timeout;
-    clearTimeout(timeout);
-    timeout = setTimeout(later, wait);
-    if (callNow) func.apply(context, args);
-  };
-}
diff --git a/frontend/src/utils/check-all/check-all.js b/frontend/src/utils/check-all/check-all.js
index d5fa39719..5c1a754db 100644
--- a/frontend/src/utils/check-all/check-all.js
+++ b/frontend/src/utils/check-all/check-all.js
@@ -46,9 +46,9 @@ export class CheckAll {
   _gatherColumns() {
     const rows = Array.from(this._element.querySelectorAll('tr'));
     const cols = [];
-    rows.forEach(function(tr) {
+    rows.forEach((tr) => {
       const cells = Array.from(tr.querySelectorAll('td'));
-      cells.forEach(function(cell, cellIndex) {
+      cells.forEach((cell, cellIndex) => {
         if (!cols[cellIndex]) {
           cols[cellIndex] = [];
         }
@@ -60,8 +60,8 @@ export class CheckAll {
 
   _findCheckboxColumn(columns) {
     let checkboxColumnId = null;
-    columns.forEach(function(col, i) {
-      if (this.isCheckboxColumn(col)) {
+    columns.forEach((col, i) => {
+      if (this._isCheckboxColumn(col)) {
         checkboxColumnId = i;
       }
     });
@@ -70,7 +70,7 @@ export class CheckAll {
 
   _isCheckboxColumn(col) {
     let onlyCheckboxes = true;
-    col.forEach(function(cell) {
+    col.forEach((cell) => {
       if (onlyCheckboxes && !cell.querySelector(CHECKBOX_SELECTOR)) {
         onlyCheckboxes = false;
       }
@@ -104,23 +104,23 @@ export class CheckAll {
   }
 
   _setupCheckboxListeners() {
-    this._checkboxColumn.map(function(cell) {
+    this._checkboxColumn.map((cell) => {
         return cell.querySelector(CHECKBOX_SELECTOR);
       })
-      .forEach(function(checkbox) {
+      .forEach((checkbox) => {
         checkbox.addEventListener('input', this.updateCheckAllCheckboxState);
       });
   }
 
   _updateCheckAllCheckboxState() {
-    const allChecked = this._checkboxColumn.every(function(cell) {
+    const allChecked = this._checkboxColumn.every((cell) => {
       return cell.querySelector(CHECKBOX_SELECTOR).checked;
     });
     this._checkAllCheckbox.checked = allChecked;
   }
 
   _toggleAll(checked) {
-    this._checkboxColumn.forEach(function(cell) {
+    this._checkboxColumn.forEach((cell) => {
       cell.querySelector(CHECKBOX_SELECTOR).checked = checked;
     });
   }

From c2ab196b92440758d3092a4256e40cc5e86aed18 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 28 May 2019 22:30:38 +0200
Subject: [PATCH 415/519] Fix handling of suggested UploadSpecificFiles

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

diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 12fdc847c..0b661e87e 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -420,8 +420,8 @@ uploadModeForm prev = multiActionA actions (fslI MsgSheetUploadMode) (classifyUp
                 let iStart = maybe 0 (succ . fst) $ Map.lookupMax oldRess
                  in pure $ Map.singleton iStart fileRes
           return (addRes', formWidget')
-        miCell _ initFile initFile' nudge csrf =
-          sFileForm nudge (Just $ fromMaybe initFile initFile') csrf
+        miCell _ initFile _ nudge csrf =
+          sFileForm nudge (Just initFile) csrf
         miDelete = miDeleteList
         miAllowAdd _ _ _ = True
         miAddEmpty _ _ _ = Set.empty

From c72335c13f445b02161e77bd4de419cb17e26bd6 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 28 May 2019 23:18:47 +0200
Subject: [PATCH 416/519] checked and refined remaining ported js utils

---
 frontend/src/utils/form/auto-submit-input.js  |  2 +-
 frontend/src/utils/form/form-error-remover.js |  6 ++---
 .../src/utils/form/interactive-fieldset.js    |  2 +-
 .../src/utils/form/navigate-away-prompt.js    | 14 ++++++-----
 .../src/utils/form/reactive-submit-button.js  |  6 ++---
 frontend/src/utils/inputs/file-input.js       |  4 ++--
 frontend/src/utils/mass-input/mass-input.js   | 24 +++++++++----------
 frontend/src/utils/show-hide/show-hide.js     |  8 ++-----
 frontend/src/utils/tooltips/tooltips.js       |  2 +-
 9 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/frontend/src/utils/form/auto-submit-input.js b/frontend/src/utils/form/auto-submit-input.js
index 6276d2f3f..f442f2960 100644
--- a/frontend/src/utils/form/auto-submit-input.js
+++ b/frontend/src/utils/form/auto-submit-input.js
@@ -41,7 +41,7 @@ export class AutoSubmitInput {
     this._element.removeEventListener('input', this._debouncedHandler);
   }
 
-  autoSubmit() {
+  autoSubmit = () => {
     this._form.submit();
   }
 }
diff --git a/frontend/src/utils/form/form-error-remover.js b/frontend/src/utils/form/form-error-remover.js
index 08aed0598..af25d4bc1 100644
--- a/frontend/src/utils/form/form-error-remover.js
+++ b/frontend/src/utils/form/form-error-remover.js
@@ -23,7 +23,7 @@ export class FormErrorRemover {
     // find form groups
     const formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
 
-    formGroups.forEach(function(formGroup) {
+    formGroups.forEach((formGroup) => {
       if (!formGroup.classList.contains(FORM_GROUP_WITH_ERRORS_CLASS)) {
         return;
       }
@@ -33,8 +33,8 @@ export class FormErrorRemover {
         return false;
       }
 
-      inputElements.forEach(function(inputElement) {
-        inputElement.addEventListener('input', function() {
+      inputElements.forEach((inputElement) => {
+        inputElement.addEventListener('input', () => {
           formGroup.classList.remove(FORM_GROUP_WITH_ERRORS_CLASS);
         });
       });
diff --git a/frontend/src/utils/form/interactive-fieldset.js b/frontend/src/utils/form/interactive-fieldset.js
index 79226e67f..0551ce289 100644
--- a/frontend/src/utils/form/interactive-fieldset.js
+++ b/frontend/src/utils/form/interactive-fieldset.js
@@ -73,7 +73,7 @@ export class InteractiveFieldset {
 
     this.target.classList.toggle('hidden', !active);
 
-    this.childInputs.forEach(function(el) {
+    this.childInputs.forEach((el) => {
       el.disabled = !active;
 
       // disable input for flatpickrs added input as well if exists
diff --git a/frontend/src/utils/form/navigate-away-prompt.js b/frontend/src/utils/form/navigate-away-prompt.js
index 013074981..151da8e5b 100644
--- a/frontend/src/utils/form/navigate-away-prompt.js
+++ b/frontend/src/utils/form/navigate-away-prompt.js
@@ -32,12 +32,12 @@ export class NavigateAwayPrompt {
 
     window.addEventListener('beforeunload', this._beforeUnloadHandler);
 
-    this._element.addEventListener('submit', function() {
-      this.unloadDueToSubmit = true;
+    this._element.addEventListener('submit', () => {
+      this._unloadDueToSubmit = true;
     });
-    this._element.addEventListener('change', function() {
-      this.touched = true;
-      this.unloadDueToSubmit = false;
+    this._element.addEventListener('change', () => {
+      this._touched = true;
+      this._unloadDueToSubmit = false;
     });
 
     // mark initialized
@@ -49,7 +49,7 @@ export class NavigateAwayPrompt {
     window.removeEventListener('beforeunload', this._beforeUnloadHandler);
   }
 
-  _beforeUnloadHandler(event) {
+  _beforeUnloadHandler = (event) => {
     // allow the event to happen if the form was not touched by the
     // user or the unload event was initiated by a form submit
     if (!this._touched || this._unloadDueToSubmit) {
@@ -58,6 +58,8 @@ export class NavigateAwayPrompt {
 
     // cancel the unload event. This is the standard to force the prompt to appear.
     event.preventDefault();
+    // chrome
+    event.returnValue = true;
     // for all non standard compliant browsers we return a truthy value to activate the prompt.
     return true;
   }
diff --git a/frontend/src/utils/form/reactive-submit-button.js b/frontend/src/utils/form/reactive-submit-button.js
index d26477517..a684a0ee9 100644
--- a/frontend/src/utils/form/reactive-submit-button.js
+++ b/frontend/src/utils/form/reactive-submit-button.js
@@ -55,10 +55,10 @@ export class ReactiveSubmitButton {
   }
 
   setupInputs() {
-    this._requiredInputs.forEach(function(el) {
+    this._requiredInputs.forEach((el) => {
       var checkbox = el.getAttribute('type') === 'checkbox';
       var eventType = checkbox ? 'change' : 'input';
-      el.addEventListener(eventType, function() {
+      el.addEventListener(eventType, () => {
         this.updateButtonState();
       });
     });
@@ -74,7 +74,7 @@ export class ReactiveSubmitButton {
 
   inputsValid() {
     var done = true;
-    this._requiredInputs.forEach(function(inp) {
+    this._requiredInputs.forEach((inp) => {
       var len = inp.value.trim().length;
       if (done && len === 0) {
         done = false;
diff --git a/frontend/src/utils/inputs/file-input.js b/frontend/src/utils/inputs/file-input.js
index 1b9f9acd0..f54563884 100644
--- a/frontend/src/utils/inputs/file-input.js
+++ b/frontend/src/utils/inputs/file-input.js
@@ -40,7 +40,7 @@ export class FileInput {
     this._updateLabel();
 
     // add change listener
-    this._element.addEventListener('change', function() {
+    this._element.addEventListener('change', () => {
       this.updateLabel();
       this.renderFileList();
     });
@@ -61,7 +61,7 @@ export class FileInput {
 
     const files = this._element.files;
     this._fileList.innerHTML = '';
-    Array.from(files).forEach(function(file) {
+    Array.from(files).forEach((file) => {
       const fileDisplayEl = document.createElement('li');
       fileDisplayEl.innerHTML = file.name;
       this.fileList.appendChild(fileDisplayEl);
diff --git a/frontend/src/utils/mass-input/mass-input.js b/frontend/src/utils/mass-input/mass-input.js
index 4d5e0f49b..fbde37f6c 100644
--- a/frontend/src/utils/mass-input/mass-input.js
+++ b/frontend/src/utils/mass-input/mass-input.js
@@ -41,8 +41,8 @@ export class MassInput {
     // setup submit buttons inside this massinput so browser
     // uses correct submit button for form submission.
     const buttons = this._getMassInputSubmitButtons();
-    buttons.forEach(function(button) {
-      this.setupSubmitButton(button);
+    buttons.forEach((button) => {
+      this._setupSubmitButton(button);
     });
 
     this._massInputForm.addEventListener('submit', this._massInputFormSubmitHandler);
@@ -66,7 +66,7 @@ export class MassInput {
       requestFn = this._app.httpClient[method.toLowerCase()].bind(this._app.httpClient);
     }
 
-    return function(event) {
+    return (event) => {
       let activeElement;
 
       // check if event occured from either a mass input add/delete button or
@@ -96,10 +96,10 @@ export class MassInput {
       }
 
       event.preventDefault();
-      const requestBody = this.serializeForm(submitButton, enctype);
+      const requestBody = this._serializeForm(submitButton, enctype);
 
       if (requestFn && requestBody) {
-        const headers = {'Mass-Input-Shortcircuit': this.massInputId};
+        const headers = {'Mass-Input-Shortcircuit': this._massInputId};
 
         if (enctype !== 'multipart/form-data') {
           headers['Content-Type'] = enctype;
@@ -109,19 +109,19 @@ export class MassInput {
           url: url,
           headers: headers,
           body: requestBody,
-        }).then(function(response) {
+        }).then((response) => {
           return this._app.htmlHelpers.parseResponse(response);
-        }).then(function(response) {
-            this.processResponse(response.element);
+        }).then((response) => {
+            this._processResponse(response.element);
             if (isAddCell) {
-              this.reFocusAddCell();
+              this._reFocusAddCell();
             }
           });
       }
     };
   }
 
-  _keypressHandler(event) {
+  _keypressHandler = (event) => {
     if (event.keyCode !== 13) {
       return false;
     }
@@ -190,8 +190,8 @@ export class MassInput {
     this._massInputForm.removeEventListener('keypress', this._keypressHandler);
 
     const buttons = this._getMassInputSubmitButtons();
-    buttons.forEach(function(button) {
-      this.resetSubmitButton(button);
+    buttons.forEach((button) => {
+      this._resetSubmitButton(button);
     });
   }
 }
diff --git a/frontend/src/utils/show-hide/show-hide.js b/frontend/src/utils/show-hide/show-hide.js
index 1fc1925e5..0780a465d 100644
--- a/frontend/src/utils/show-hide/show-hide.js
+++ b/frontend/src/utils/show-hide/show-hide.js
@@ -59,10 +59,6 @@ export class ShowHide {
   }
 
   destroy() {
-    this._removeClickListener();
-  }
-
-  _removeClickListener() {
     this._element.removeEventListener('click', this._clickHandler);
   }
 
@@ -73,8 +69,8 @@ export class ShowHide {
   _clickHandler = () => {
     const newState = this._element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
 
-    if (this.__showHideId) {
-      this._setLocalStorage(this.__showHideId, newState);
+    if (this._showHideId) {
+      this._setLocalStorage(this._showHideId, newState);
     }
   }
 
diff --git a/frontend/src/utils/tooltips/tooltips.js b/frontend/src/utils/tooltips/tooltips.js
index 6669e5d70..97a2e299f 100644
--- a/frontend/src/utils/tooltips/tooltips.js
+++ b/frontend/src/utils/tooltips/tooltips.js
@@ -1,7 +1,7 @@
 import { Utility } from '../../core/utility';
 import './tooltips.scss';
 
-// empty shell to be able to load styles
+// empty "shell" to be able to load styles
 @Utility({
   selector: '[not-something-that-would-be-found]',
 })

From 15660fece10b6d68af42ea74cf034c83fe09feba Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 28 May 2019 23:24:27 +0200
Subject: [PATCH 417/519] removed obsolete static js file for asyncTable
 (re-appeared by accident)

---
 static/js/utils/asyncTable.js | 430 ----------------------------------
 1 file changed, 430 deletions(-)
 delete mode 100644 static/js/utils/asyncTable.js

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
deleted file mode 100644
index ccc441038..000000000
--- a/static/js/utils/asyncTable.js
+++ /dev/null
@@ -1,430 +0,0 @@
-(function collonadeClosure() {
-  'use strict';
-
-  /**
-   *
-   * Async Table Utility
-   *  makes table filters, sorting and pagination behave asynchronously via AJAX calls
-   *
-   * Attribute: uw-async-table
-   *
-   * Example usage:
-  *   (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 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;
-
-    var ths = [];
-    var pageLinks = [];
-    var pagesizeForm;
-    var scrollTable;
-    var cssIdPrefix = '';
-
-    var tableFilterInputs = {
-      search: [],
-      input: [],
-      change: [],
-      select: [],
-    }
-
-    function init() {
-      if (!element) {
-        throw new Error('Async Table utility cannot be setup without an element!');
-      }
-
-      if (element.classList.contains(ASYNC_TABLE_INITIALIZED_CLASS)) {
-        return false;
-      }
-
-      // param asyncTableDbHeader
-      if (element.dataset.asyncTableDbHeader !== undefined) {
-        asyncTableHeader = element.dataset.asyncTableDbHeader;
-      }
-
-      var rawTableId = element.querySelector('table').id;
-      cssIdPrefix = findCssIdPrefix(rawTableId);
-      asyncTableId = rawTableId.replace(cssIdPrefix, '');
-
-      // find scrolltable wrapper
-      scrollTable = element.querySelector(ASYNC_TABLE_SCROLLTABLE_SELECTOR);
-      if (!scrollTable) {
-        throw new Error('Async Table cannot be set up without a scrolltable element!');
-      }
-
-      setupSortableHeaders();
-      setupPagination();
-      setupPageSizeSelect();
-      setupTableFilter();
-
-      processLocalStorage();
-
-      // clear currentTableUrl from previous requests
-      setLocalStorageParameter('currentTableUrl', null);
-
-      // mark initialized
-      element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
-
-      return {
-        name: ASYNC_TABLE_UTIL_NAME,
-        element: element,
-        destroy: function() {},
-      };
-    }
-
-    function setupSortableHeaders() {
-      ths = Array.from(scrollTable.querySelectorAll('th.sortable')).map(function(th) {
-        return { element: th };
-      });
-
-      ths.forEach(function(th) {
-        th.clickHandler = function(event) {
-          setLocalStorageParameter('horizPos', (scrollTable || {}).scrollLeft);
-          linkClickHandler(event);
-        };
-        th.element.addEventListener('click', th.clickHandler);
-      });
-    }
-
-    function setupPagination() {
-      var pagination = element.querySelector('#' + cssIdPrefix + 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);
-            }
-            linkClickHandler(event);
-          }
-          link.element.addEventListener('click', link.clickHandler);
-        });
-      }
-    }
-
-    function setupPageSizeSelect() {
-      // pagesize form
-      pagesizeForm = element.querySelector('#' + cssIdPrefix + asyncTableId + '-pagesize-form');
-
-      if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
-        pagesizeSelect.addEventListener('change', changePagesizeHandler);
-      }
-    }
-
-    function setupTableFilter() {
-      var tableFilterForm = element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
-
-      if (tableFilterForm) {
-        gatherTableFilterInputs(tableFilterForm);
-        addTableFilterEventListeners(tableFilterForm);
-      }
-    }
-
-    function gatherTableFilterInputs(tableFilterForm) {
-      Array.from(tableFilterForm.querySelectorAll('input[type="search"]')).forEach(function(input) {
-        tableFilterInputs.search.push(input);
-      });
-
-      Array.from(tableFilterForm.querySelectorAll('input[type="text"]')).forEach(function(input) {
-        tableFilterInputs.input.push(input);
-      });
-
-      Array.from(tableFilterForm.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
-        tableFilterInputs.change.push(input);
-      });
-
-      Array.from(tableFilterForm.querySelectorAll('select')).forEach(function(input) {
-        tableFilterInputs.select.push(input);
-      });
-    }
-
-    function addTableFilterEventListeners(tableFilterForm) {
-      tableFilterInputs.search.forEach(function(input) {
-        var debouncedInput = debounce(function() {
-          if (input.value.length === 0 || input.value.length > 2) {
-            updateFromTableFilter(tableFilterForm);
-          }
-        }, 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(tableFilterForm);
-          }
-        }, INPUT_DEBOUNCE);
-        input.addEventListener('input', debouncedInput);
-      });
-
-      tableFilterInputs.change.forEach(function(input) {
-        input.addEventListener('change', function() {
-          updateFromTableFilter(tableFilterForm);
-        });
-      });
-
-      tableFilterInputs.select.forEach(function(input) {
-        input.addEventListener('change', function() {
-          updateFromTableFilter(tableFilterForm);
-        });
-      });
-
-      tableFilterForm.addEventListener('submit', function(event) {
-        event.preventDefault();
-        updateFromTableFilter(tableFilterForm);
-      });
-    }
-
-    function updateFromTableFilter(tableFilterForm) {
-      var url = serializeTableFilterToURL();
-      var callback = null;
-
-      var focusedInput = tableFilterForm.querySelector(':focus, :active');
-      // focus previously focused input
-      if (focusedInput && focusedInput.selectionStart !== null) {
-        var selectionStart = focusedInput.selectionStart;
-        // remove the following part of the id to get rid of the random
-        // (yet somewhat structured) prefix we got from nudging.
-        var prefix = findCssIdPrefix(focusedInput.id);
-        var focusId = focusedInput.id.replace(prefix, '');
-        callback = function(wrapper) {
-          var idPrefix = getLocalStorageParameter('cssIdPrefix');
-          var toBeFocused = wrapper.querySelector('#' + idPrefix + focusId);
-          if (toBeFocused) {
-            toBeFocused.focus();
-            toBeFocused.selectionStart = selectionStart;
-          }
-        };
-      }
-      updateTableFrom(url, callback);
-    }
-
-    function serializeTableFilterToURL() {
-      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
-
-      var formIdElement = element.querySelector(ASYNC_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 processLocalStorage() {
-      var scrollTo = getLocalStorageParameter('scrollTo');
-      if (scrollTo && scrollTable) {
-        window.scrollTo(scrollTo);
-      }
-      setLocalStorageParameter('scrollTo', null);
-
-      var horizPos = getLocalStorageParameter('horizPos');
-      if (horizPos && scrollTable) {
-        scrollTable.scrollLeft = horizPos;
-      }
-      setLocalStorageParameter('horizPos', null);
-    }
-
-    function removeListeners() {
-      ths.forEach(function(th) {
-        th.element.removeEventListener('click', th.clickHandler);
-      });
-
-      pageLinks.forEach(function(link) {
-        link.element.removeEventListener('click', link.clickHandler);
-      });
-
-      if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]')
-        pagesizeSelect.removeEventListener('change', changePagesizeHandler);
-      }
-    }
-
-    function linkClickHandler(event) {
-      event.preventDefault();
-      var url = getClickDestination(event.target);
-      if (!url.match(/^http/)) {
-        url = window.location.origin + window.location.pathname + url;
-      }
-      updateTableFrom(url);
-    }
-
-    function getClickDestination(el) {
-      if (!el.matches('a') && !el.querySelector('a')) {
-        return '';
-      }
-      return el.getAttribute('href') || el.querySelector('a').getAttribute('href');
-    }
-
-    function changePagesizeHandler(event) {
-      var paginationParamKey = asyncTableId + '-pagination';
-      var pagesizeParamKey = asyncTableId + '-pagesize';
-      var pageParamKey = asyncTableId + '-page';
-
-      var paginationParamEl = pagesizeForm.querySelector('[name="' + paginationParamKey + '"]');
-      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
-      url.searchParams.set(pagesizeParamKey, event.target.value);
-      url.searchParams.set(pageParamKey, 0);
-
-      if (paginationParamEl) {
-        var encodedValue = encodeURIComponent(paginationParamEl.value);
-        url.searchParams.set(paginationParamKey, encodedValue);
-      }
-      updateTableFrom(url.href);
-    }
-
-    // fetches new sorted element from url with params and replaces contents of current element
-    function updateTableFrom(url, callback) {
-      if (!HttpClient) {
-        throw new Error('HttpClient not found!');
-      }
-
-      element.classList.add(ASYNC_TABLE_LOADING_CLASS);
-
-      var headers = {
-        'Accept': 'text/html',
-        [asyncTableHeader]: asyncTableId
-      };
-
-      HttpClient.get({
-        url: url,
-        headers: headers,
-        accept: HttpClient.ACCEPT.TEXT_HTML,
-      }).then(function(response) {
-        return HtmlHelpers.parseResponse(response);
-      }).then(function(response) {
-        setLocalStorageParameter('currentTableUrl', url.href);
-        // reset table
-        removeListeners();
-        element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
-        // update table with new
-        updateWrapperContents(response);
-
-        if (UtilRegistry) {
-          UtilRegistry.setupAll(element);
-        }
-
-        if (callback && typeof callback === 'function') {
-          setLocalStorageParameter('cssIdPrefix', response.idPrefix);
-          callback(element);
-          setLocalStorageParameter('cssIdPrefix', '');
-        }
-      }).catch(function(err) {
-        console.error(err);
-      }).finally(function() {
-        element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
-      });
-    }
-
-    function updateWrapperContents(response) {
-      var newPage = document.createElement('div');
-      newPage.appendChild(response.element);
-      var newWrapperContents = newPage.querySelector('#' + response.idPrefix + element.id);
-      element.innerHTML = newWrapperContents.innerHTML;
-    }
-
-    return init();
-  };
-
-  // returns any random nudged prefix found in the given id
-  function findCssIdPrefix(id) {
-    var matcher = /r\d*?__/;
-    var maybePrefix = id.match(matcher);
-    if (maybePrefix && maybePrefix[0]) {
-      return maybePrefix[0]
-    }
-    return '';
-  }
-
-  function setLocalStorageParameter(key, value) {
-    var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
-    if (value !== null) {
-      currentLSState[key] = value;
-    } else {
-      delete currentLSState[key];
-    }
-    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,
-    });
-  }
-})();

From ceace36abdaa9cc065ada8be54de02d7a7fe9b9a Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 29 May 2019 10:33:14 +0200
Subject: [PATCH 418/519] MaterialVisible has an icon now and no more alert

---
 .vscode/tasks.json               |  5 +++++
 messages/uniworx/de.msg          |  1 -
 src/Handler/Material.hs          |  8 ++------
 src/Handler/Utils.hs             | 20 +++++++++++++++++++-
 src/Handler/Utils/Table/Cells.hs |  4 +++-
 templates/material-show.hamlet   |  6 +++---
 6 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 8b60430d0..9c9d0aef8 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -43,6 +43,11 @@
         "panel": "dedicated",
         "showReuseMessage": false
       }
+    },
+    {
+      "type": "npm",
+      "script": "yesod:lint",
+      "problemMatcher": []
     }
   ]
 }
\ No newline at end of file
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index d7a6a484b..8513fc2db 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -239,7 +239,6 @@ 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
 MaterialVisibleFromEditWarning: Das Datum der Veröffentlichung liegt in der Vergangenheit und sollte nicht mehr verändert werden, da dies die Benutzer verwirren könnte.
 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
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 119fa5027..dbf6c8bad 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -222,12 +222,8 @@ getMShowR tid ssh csh mnm = do
       }
     return (matEnt,fileTable')
 
-  let matVisFro = materialVisibleFrom material
-  now <- liftIO getCurrentTime
-  materialLastEdit    <-           formatTime SelFormatDateTime  $ materialLastEdit    material
-  materialVisibleFrom <- traverse (formatTime SelFormatDateTime) matVisFro
-  when (NTop matVisFro >= NTop (Just now)) $ addMessageI Warning $
-    maybe MsgMaterialInvisible MsgMaterialInvisibleUntil materialVisibleFrom
+  let matLastEdit      = formatTimeW    SelFormatDateTime  $  materialLastEdit    material
+  let matVisibleFromMB = visibleUTCTime SelFormatDateTime <$> materialVisibleFrom material
 
   let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialHeading mnm
       headingShort = prependCourseTitle tid ssh csh $ SomeMessage mnm
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index e1aea383f..0384c83e5 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -80,7 +80,7 @@ serveSomeFiles archiveName source = do
   results <- runDB . runConduit $ source .| peekN 2
 
   $logDebugS "serveSomeFiles" . tshow $ length results
-  
+
   case results of
     []         -> notFound
     [file]     -> sendThisFile file
@@ -91,9 +91,27 @@ serveSomeFiles archiveName source = do
         source .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
 
 
+
+---------
+-- Simple utilities for consistent display
+-- Please use these throughout, to ensure that users have a consistent experience
+
 tidFromText :: Text -> Maybe TermId
 tidFromText = fmap TermKey . maybeRight . termFromText
 
+-- | Display given UTCTime and maybe an invisible icon if it is in the future
+--
+--   Also see `Handler.Utils.Table.Cells.dateTimeCellVisible` for a similar function (in case of refactoring)
+visibleUTCTime :: SelDateTimeFormat -> UTCTime -> Widget
+visibleUTCTime dtf t = do
+    let timeStampWgt = formatTimeW dtf t
+    now <- liftIO getCurrentTime
+    if now >= t
+      then timeStampWgt
+      else $(widgetFile "widgets/date-time/yet-invisible")
+
+
+-- | Simple link to a known route
 simpleLink :: Widget -> Route UniWorX -> Widget
 simpleLink lbl url = [whamlet|<a href=@{url}>^{lbl}|]
 
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 5ec84c9fe..620e6776b 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -131,7 +131,9 @@ dateCell t = cell $ formatTime SelFormatDate t >>= toWidget
 dateTimeCell :: IsDBTable m a => UTCTime -> DBCell m a
 dateTimeCell t = cell $ formatTime SelFormatDateTime t >>= toWidget
 
--- | Show a date, and highlight date earlier than given watershed with an icon
+-- | Show a date, and highlight date earlier than given watershed with an icon and cell class Warning
+--
+--   Cannot use `Handler.Utils.visibleUTCTime`, since setting the UrgencyClass must be done outside the monad, hence the watershed argument.
 dateTimeCellVisible :: IsDBTable m a => UTCTime -> UTCTime -> DBCell m a
 dateTimeCellVisible watershed t
     | watershed < t = cell $(widgetFile "widgets/date-time/yet-invisible") & addUrgencyClass
diff --git a/templates/material-show.hamlet b/templates/material-show.hamlet
index c3e00bc22..e31b5c9c0 100644
--- a/templates/material-show.hamlet
+++ b/templates/material-show.hamlet
@@ -10,11 +10,11 @@ $maybe descr <- materialDescription
     $maybe matKind <- materialType
       <dt .deflist__dt>_{MsgMaterialType}
       <dd .deflist__dd>#{matKind}
-    $maybe matVisible <- materialVisibleFrom
+    $maybe matVisibleFromWgt <- matVisibleFromMB
       <dt .deflist__dt>_{MsgVisibleFrom}
-      <dd .deflist__dd>#{matVisible}
+      <dd .deflist__dd>^{matVisibleFromWgt}
     <dt .deflist__dt>_{MsgFileModified}
-    <dd .deflist__dd>#{materialLastEdit}
+    <dd .deflist__dd>^{matLastEdit}
 
 $if hasFiles
   <section>

From 7a4f1cb76efebd298030ab175b69bb87d994e2aa Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 29 May 2019 13:27:04 +0200
Subject: [PATCH 419/519] massInputAccumEdit

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

diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index dab7f1d51..ae87527bf 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -9,6 +9,7 @@ module Handler.Utils.Form.MassInput
   , massInputA, massInputW
   , massInputList
   , massInputAccum, massInputAccumA, massInputAccumW
+  , massInputAccumEdit, massInputAccumEditA, massInputAccumEditW
   , ListLength(..), ListPosition(..), miDeleteList
   , EnumLiveliness(..), EnumPosition(..)
   , MapLiveliness(..)
@@ -564,6 +565,83 @@ massInputAccumW :: forall handler cellData ident.
 massInputAccumW miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev
   = mFormToWForm $ massInputAccum miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev mempty
 
+  
+-- | Wrapper around `massInput` for the common case, that we just want a list of data with existing data modified the same way as new data is added
+massInputAccumEdit :: 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)))
+                   -> ((Text -> Text) -> cellData          -> (Markup -> MForm handler (FormResult cellData, Widget)))
+                   -> (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX))
+                   -> MassInputLayout ListLength cellData cellData
+                   -> ident
+                   -> FieldSettings UniWorX
+                   -> Bool
+                   -> Maybe [cellData]
+                   -> (Markup -> MForm handler (FormResult [cellData], FieldView UniWorX))
+massInputAccumEdit miAdd' miCell' miButtonAction miLayout miIdent fSettings fRequired mPrev csrf
+  = over (_1 . mapped) (map snd . Map.elems) <$> massInput MassInput{..} fSettings fRequired (Map.fromList . zip [0..] . map (\x -> (x, x)) <$> 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 cellData -> (Text -> Text)
+           -> (Markup -> MForm handler (FormResult cellData, Widget))
+    miCell _pos dat _mPrev nudge = miCell' nudge dat
+
+    miDelete = miDeleteList
+
+    miAllowAdd _ _ _ = True
+
+    miAddEmpty _ _ _ = Set.empty
+
+massInputAccumEditA :: 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)))
+                    -> ((Text -> Text) -> cellData          -> (Markup -> MForm handler (FormResult cellData, Widget)))
+                    -> (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX))
+                    -> MassInputLayout ListLength cellData cellData
+                    -> ident
+                    -> FieldSettings UniWorX
+                    -> Bool
+                    -> Maybe [cellData]
+                    -> AForm handler [cellData]
+massInputAccumEditA miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev
+  = formToAForm $ over _2 pure <$> massInputAccumEdit miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev mempty
+
+massInputAccumEditW :: 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)))
+                    -> ((Text -> Text) -> cellData          -> (Markup -> MForm handler (FormResult cellData, Widget)))
+                    -> (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX))
+                    -> MassInputLayout ListLength cellData cellData
+                    -> ident
+                    -> FieldSettings UniWorX
+                    -> Bool
+                    -> Maybe [cellData]
+                    -> WForm handler (FormResult [cellData])
+massInputAccumEditW miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev
+  = mFormToWForm $ massInputAccumEdit miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev mempty
+
 
 massInputA :: forall handler cellData cellResult liveliness.
            ( MonadHandler handler, HandlerSite handler ~ UniWorX

From 8f33d1590cf61eef6830f72f0f7314da6d05970d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 29 May 2019 13:36:11 +0200
Subject: [PATCH 420/519] defaultPagesize

---
 src/Handler/Utils/Table/Pagination.hs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 063b06fd6..52c1b3ec8 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -13,6 +13,7 @@ module Handler.Utils.Table.Pagination
   , PagesizeLimit(..)
   , PaginationSettings(..), PaginationInput(..), piIsUnset
   , PSValidator(..)
+  , defaultPagesize
   , defaultFilter, defaultSorting
   , restrictFilter, restrictSorting
   , ToSortable(..), Sortable(..)
@@ -314,6 +315,13 @@ defaultSorting psSorting (runPSValidator -> f) = PSValidator $ \dbTable' -> inje
       Just _  -> id
       Nothing -> set (_2._psSorting) psSorting
 
+defaultPagesize :: PagesizeLimit -> PSValidator m x -> PSValidator m x
+defaultPagesize psLimit (runPSValidator -> f) = PSValidator $ \dbTable' -> injectDefault <*> f dbTable'
+  where
+    injectDefault x = case x >>= piLimit of
+      Just _  -> id
+      Nothing -> set (_2._psLimit) psLimit
+
 restrictFilter :: (FilterKey -> [Text] -> Bool) -> PSValidator m x -> PSValidator m x
 restrictFilter restrict (runPSValidator -> f) = PSValidator $ \dbTable' ps -> over _2 restrict' $ f dbTable' ps
   where

From 669c803105a8e06d55a02bcddde6e5325b5a29b9 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 29 May 2019 14:09:29 +0200
Subject: [PATCH 421/519] FilterUI for Submission (Part 1)

---
 .vscode/tasks.json                 |  5 +++++
 src/Handler/Corrections.hs         | 34 ++++++++++++++++++++++++++----
 src/Handler/Utils/Table/Columns.hs |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 9c9d0aef8..27205f38c 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -48,6 +48,11 @@
       "type": "npm",
       "script": "yesod:lint",
       "problemMatcher": []
+    },
+    {
+      "type": "npm",
+      "script": "yesod:start",
+      "problemMatcher": []
     }
   ]
 }
\ No newline at end of file
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index ca358a335..681580f68 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -35,7 +35,9 @@ import Data.Monoid (All(..))
 -- import qualified Data.UUID.Cryptographic as UUID
 -- import qualified Data.Conduit.List as C
 
+import Database.Esqueleto.Utils.TH
 import qualified Database.Esqueleto as E
+import qualified Database.Esqueleto.Utils as E
 import qualified Database.Esqueleto.Internal.Language (From)
 -- import qualified Database.Esqueleto.Internal.Sql as E
 
@@ -77,6 +79,9 @@ lastEditQuery submission = E.sub_select $ E.from $ \edit -> do
   E.where_ $ edit E.^. SubmissionEditSubmission E.==. submission E.^. SubmissionId
   return $ E.max_ $ edit E.^. SubmissionEditTime
 
+querySubmission :: CorrectionTableExpr -> E.SqlExpr (Entity Submission)
+querySubmission =  $(sqlIJproj 3 3) . $(sqlLOJproj 2 1)
+
 -- Where Clauses
 ratedBy :: UserId -> CorrectionTableWhere
 ratedBy uid   ((_course `E.InnerJoin` _sheet `E.InnerJoin`  submission) `E.LeftOuterJoin` _corrector) = submission E.^. SubmissionRatingBy E.==. E.just (E.val uid)
@@ -325,6 +330,16 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
             Just True -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingTime
             Just False-> E.isNothing $ submission E.^. SubmissionRatingTime
         )
+      , ( "user-name-email"
+        , FilterColumn $ E.mkExistsFilter $ \table needle -> E.from $ \(submissionUser `E.InnerJoin` user) -> do
+              E.on $ submissionUser E.^. SubmissionUserUser E.==. user E.^. UserId
+              E.where_ $ querySubmission table E.^. SubmissionId E.==. submissionUser E.^. SubmissionUserSubmission
+              E.where_ $ (\f -> f user $ Set.singleton needle) $ E.anyFilter
+                [ E.mkContainsFilter (E.^. UserSurname)
+                , E.mkContainsFilter (E.^. UserDisplayName)
+                , E.mkContainsFilter (E.^. UserEmail)
+                ]
+        )
       ]
     , dbtFilterUI  = fromMaybe mempty dbtFilterUI
     , dbtStyle     = def { dbsFilterLayout = maybe (\_ _ _ -> id) (\_ -> defaultDBSFilterLayout) dbtFilterUI }
@@ -442,7 +457,7 @@ correctionsR whereClause displayColumns dbtFilterUI psValidator actions = do
                 [whamlet|_{MsgAssignSubmissionExceptionSubmissionsNotFound (length subCIDs)}|]
                 (Right $(widgetFile "messages/submissionsAssignNotFound"))
           addMessageWidget Error errorModal
-                
+
       handle assignExceptions . runDB $ do
         alreadyAssigned <- selectList [SubmissionId <-. subs, SubmissionRatingBy !=. Nothing] []
         unless (null alreadyAssigned) $ do
@@ -583,8 +598,19 @@ postCCorrectionsR tid ssh csh = do
         , colCorrector
         , colAssigned
         ] -- Continue here
-      psValidator = def
-  correctionsR whereClause colonnade Nothing psValidator $ Map.fromList
+      filterUI = Just $ \mPrev -> mconcat
+        [ -- "name"
+          -- "matrikel"
+          -- "corrector"
+          -- "pseudonym" TODO
+          prismAForm (singletonFilter "user-name-email") mPrev $ aopt textField (fslI MsgCourseMembers)
+        , Map.singleton "sheet-search" . maybeToList <$> aopt textField (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
+        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField             (fslI MsgRatingTime)
+        ]
+
+
+      psValidator = def & defaultPagesize PagesizeAll
+  correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
     [ downloadAction
     , assignAction (Left cid)
     , deleteAction
@@ -607,7 +633,7 @@ postSSubsR tid ssh csh shn = do
         , colCorrector
         , colAssigned
         ]
-      psValidator = def
+      psValidator = def & defaultPagesize PagesizeAll
   correctionsR whereClause colonnade Nothing psValidator $ Map.fromList
     [ downloadAction
     , assignAction (Right shid)
diff --git a/src/Handler/Utils/Table/Columns.hs b/src/Handler/Utils/Table/Columns.hs
index c4e4d7081..09db6649d 100644
--- a/src/Handler/Utils/Table/Columns.hs
+++ b/src/Handler/Utils/Table/Columns.hs
@@ -151,7 +151,7 @@ fltrUserDisplayName :: (IsFilterColumn t (a -> Set Text -> E.SqlExpr (E.Value Bo
   -> (d, FilterColumn t)
 fltrUserDisplayName queryUser = ( "user-display-name", FilterColumn $ mkContainsFilter $ queryUser >>> (E.^. UserDisplayName))
 
--- | Searche all names, i.e. DisplayName, Surname, EMail
+-- | Search all names, i.e. DisplayName, Surname, EMail
 fltrUserNameEmail :: (IsFilterColumn t (a -> Set Text -> E.SqlExpr (E.Value Bool)), IsString d)
    => (a -> E.SqlExpr (Entity User))
    -> (d, FilterColumn t)

From 745feeac832ec6d5ce6cb508f7580aa15a35c308 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 29 May 2019 20:59:58 +0200
Subject: [PATCH 422/519] FilterUI for Submission (Part2)

---
 src/Handler/Corrections.hs | 54 ++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 681580f68..aef00e033 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -79,8 +79,17 @@ lastEditQuery submission = E.sub_select $ E.from $ \edit -> do
   E.where_ $ edit E.^. SubmissionEditSubmission E.==. submission E.^. SubmissionId
   return $ E.max_ $ edit E.^. SubmissionEditTime
 
+queryCourse :: CorrectionTableExpr -> E.SqlExpr (Entity Course)
+queryCourse = $(sqlIJproj 3 1) . $(sqlLOJproj 2 1)
+
+querySheet :: CorrectionTableExpr -> E.SqlExpr (Entity Sheet)
+querySheet = $(sqlIJproj 3 2) . $(sqlLOJproj 2 1)
+
 querySubmission :: CorrectionTableExpr -> E.SqlExpr (Entity Submission)
-querySubmission =  $(sqlIJproj 3 3) . $(sqlLOJproj 2 1)
+querySubmission = $(sqlIJproj 3 3) . $(sqlLOJproj 2 1)
+
+queryCorrector :: CorrectionTableExpr -> E.SqlExpr (Maybe (Entity User))
+queryCorrector = $(sqlLOJproj 2 2)
 
 -- Where Clauses
 ratedBy :: UserId -> CorrectionTableWhere
@@ -330,6 +339,13 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
             Just True -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingTime
             Just False-> E.isNothing $ submission E.^. SubmissionRatingTime
         )
+      , ( "corrector-name-email" -- corrector filter does not work for text-filtering
+        , FilterColumn $ E.anyFilter
+            [ E.mkContainsFilter $ queryCorrector >>> (E.?. UserSurname)
+            , E.mkContainsFilter $ queryCorrector >>> (E.?. UserDisplayName)
+            , E.mkContainsFilter $ queryCorrector >>> (E.?. UserEmail)
+            ]
+        )
       , ( "user-name-email"
         , FilterColumn $ E.mkExistsFilter $ \table needle -> E.from $ \(submissionUser `E.InnerJoin` user) -> do
               E.on $ submissionUser E.^. SubmissionUserUser E.==. user E.^. UserId
@@ -340,6 +356,18 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
                 , E.mkContainsFilter (E.^. UserEmail)
                 ]
         )
+      , ( "user-matriclenumber"
+        , FilterColumn $ E.mkExistsFilter $ \table needle -> E.from $ \(submissionUser `E.InnerJoin` user) -> do
+              E.on $ submissionUser E.^. SubmissionUserUser E.==. user E.^. UserId
+              E.where_ $ querySubmission table E.^. SubmissionId E.==. submissionUser E.^. SubmissionUserSubmission
+              E.where_ $ (\f -> f user $ Set.singleton needle) $
+                E.mkContainsFilter (E.^. UserMatrikelnummer)
+        )
+      -- , ( "pseudonym"
+      --   , FilterColumn $ E.mkExistsFilter $ \table needle -> E.from $ \(pseudonym) -> do
+      --       E.where_ $ querySheet table E.^. SheetId E.==. pseudonym E.^. SheetPseudonymSheet
+      --       E.where_ $ E.mkContainsFilter -- DB only stores Pseudonym == Word24. Conversion not possible in DB.
+      --   )
       ]
     , dbtFilterUI  = fromMaybe mempty dbtFilterUI
     , dbtStyle     = def { dbsFilterLayout = maybe (\_ _ _ -> id) (\_ -> defaultDBSFilterLayout) dbtFilterUI }
@@ -599,17 +627,14 @@ postCCorrectionsR tid ssh csh = do
         , colAssigned
         ] -- Continue here
       filterUI = Just $ \mPrev -> mconcat
-        [ -- "name"
-          -- "matrikel"
-          -- "corrector"
-          -- "pseudonym" TODO
-          prismAForm (singletonFilter "user-name-email") mPrev $ aopt textField (fslI MsgCourseMembers)
+        [ prismAForm (singletonFilter "user-name-email")      mPrev $ aopt textField (fslI MsgCourseMembers)
+        , prismAForm (singletonFilter "user-matriclenumber")  mPrev $ aopt textField (fslI MsgMatrikelNr)
+        , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
+          -- "pseudonym" TODO DB only stores Word24
         , Map.singleton "sheet-search" . maybeToList <$> aopt textField (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
         , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField             (fslI MsgRatingTime)
         ]
-
-
-      psValidator = def & defaultPagesize PagesizeAll
+      psValidator = def & defaultPagesize PagesizeAll -- Assisstant always want to see them all at once anyway
   correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
     [ downloadAction
     , assignAction (Left cid)
@@ -633,8 +658,15 @@ postSSubsR tid ssh csh shn = do
         , colCorrector
         , colAssigned
         ]
-      psValidator = def & defaultPagesize PagesizeAll
-  correctionsR whereClause colonnade Nothing psValidator $ Map.fromList
+      filterUI = Just $ \mPrev -> mconcat
+        [ prismAForm (singletonFilter "user-name-email")      mPrev $ aopt textField (fslI MsgCourseMembers)
+        , prismAForm (singletonFilter "user-matriclenumber")  mPrev $ aopt textField (fslI MsgMatrikelNr)
+        , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
+          -- "pseudonym" TODO DB only stores Word24
+        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField             (fslI MsgRatingTime)
+        ]
+      psValidator = def & defaultPagesize PagesizeAll -- Assisstant always want to see them all at once anyway
+  correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
     [ downloadAction
     , assignAction (Right shid)
     , autoAssignAction shid

From 3dc66c48170e2131908fdeaea935f28fede839e6 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 30 May 2019 21:57:23 +0200
Subject: [PATCH 423/519] Aggressive caching of AuthTag-Evaluation

---
 src/Data/CaseInsensitive/Instances.hs |  9 +++-
 src/Foundation.hs                     | 70 +++++++++++++++++----------
 src/Import/NoModel.hs                 |  2 +-
 src/Utils.hs                          | 11 ++++-
 src/Yesod/Core/Types/Instances.hs     | 29 ++++++++---
 5 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/src/Data/CaseInsensitive/Instances.hs b/src/Data/CaseInsensitive/Instances.hs
index 3986e3cc7..b6b69fa02 100644
--- a/src/Data/CaseInsensitive/Instances.hs
+++ b/src/Data/CaseInsensitive/Instances.hs
@@ -26,6 +26,9 @@ import qualified Database.Esqueleto as E
 
 import Web.HttpApiData
 
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
 
 instance PersistField (CI Text) where
   toPersistValue ciText = PersistDbSpecific . Text.encodeUtf8 $ CI.original ciText
@@ -92,5 +95,9 @@ instance FromHttpApiData (CI Text) where
 
 instance (CI.FoldCase s, PathMultiPiece s) => PathMultiPiece (CI s) where
   fromPathMultiPiece = fmap CI.mk . fromPathMultiPiece
-  toPathMultiPiece = toPathMultiPiece . CI.foldedCase
+  toPathMultiPiece = toPathMultiPiece . CI.original
 
+instance (CI.FoldCase s, Binary s) => Binary (CI s) where
+  get = CI.mk <$> Binary.get
+  put = Binary.put . CI.original
+  putList = Binary.putList . map CI.original
diff --git a/src/Foundation.hs b/src/Foundation.hs
index a4fc86fb5..58c077a60 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -46,7 +46,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, (!!), findIndex)
 
 import Data.Monoid (Any(..))
 
@@ -493,7 +493,7 @@ askTokenUnsafe = $cachedHere $ do
       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'
+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
@@ -524,7 +524,7 @@ tagAccessPredicate :: AuthTag -> AccessPredicate
 tagAccessPredicate AuthFree = trueAP
 tagAccessPredicate AuthAdmin = APDB $ \mAuthId route _ -> case route of
   -- Courses: access only to school admins
-  CourseR tid ssh csh _ -> exceptT return return $ do
+  CourseR tid ssh csh _ -> $cachedHereBinary (mAuthId, tid, ssh, csh) . exceptT return return $ do
     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
@@ -536,7 +536,7 @@ tagAccessPredicate AuthAdmin = APDB $ \mAuthId route _ -> case route of
     guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedSchoolAdmin)
     return Authorized
   -- other routes: access to any admin is granted here
-  _other -> exceptT return return $ do
+  _other -> $cachedHereBinary mAuthId . exceptT return return $ do
     authId <- maybeExceptT AuthenticationRequired $ return mAuthId
     adrights <- lift $ selectFirst [UserAdminUser ==. authId] []
     guardMExceptT (isJust adrights) (unauthorizedI MsgUnauthorizedSiteAdmin)
@@ -566,7 +566,7 @@ tagAccessPredicate AuthDevelopment = APHandler $ \_ r _ -> do
   return $ Unauthorized "Route under development"
 #endif
 tagAccessPredicate AuthLecturer = APDB $ \mAuthId route _ -> case route of
-  CourseR tid ssh csh _ -> exceptT return return $ do
+  CourseR tid ssh csh _ -> $cachedHereBinary (mAuthId, tid, ssh, csh) . exceptT return return $ do
      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
@@ -578,13 +578,13 @@ tagAccessPredicate AuthLecturer = APDB $ \mAuthId route _ -> case route of
      guardMExceptT (c>0) (unauthorizedI MsgUnauthorizedLecturer)
      return Authorized
   -- lecturer for any school will do
-  _ -> exceptT return return $ do
+  _ -> $cachedHereBinary mAuthId . exceptT return return $ do
      authId <- maybeExceptT AuthenticationRequired $ return mAuthId
      void . maybeMExceptT (unauthorizedI MsgUnauthorizedSchoolLecturer) $ selectFirst [UserLecturerUser ==. authId] []
      return Authorized
 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
+  resList <- $cachedHereBinary (mAuthId) . 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
     E.where_ $ sheetCorrector E.^. SheetCorrectorUser E.==. E.val authId
@@ -593,17 +593,17 @@ tagAccessPredicate AuthCorrector = APDB $ \mAuthId route _ -> exceptT return ret
     resMap :: Map CourseId (Set SheetId)
     resMap = Map.fromListWith Set.union [ (cid, Set.singleton sid) | (E.Value cid, E.Value sid) <- resList ]
   case route of
-    CSubmissionR _ _ _ _ cID _ -> maybeT (unauthorizedI MsgUnauthorizedSubmissionCorrector) $ do
+    CSubmissionR _ _ _ _ cID _ -> $cachedHereBinary (mAuthId, cID) . maybeT (unauthorizedI MsgUnauthorizedSubmissionCorrector) $ do
       sid <- catchIfMaybeT (const True :: CryptoIDError -> Bool) $ decrypt cID
       Submission{..} <- MaybeT . lift $ get sid
       guard $ maybe False (== authId) submissionRatingBy
       return Authorized
-    CSheetR tid ssh csh shn _ -> maybeT (unauthorizedI MsgUnauthorizedSheetCorrector) $ do
+    CSheetR tid ssh csh shn _ -> $cachedHereBinary (mAuthId, tid, ssh, csh, shn) . maybeT (unauthorizedI MsgUnauthorizedSheetCorrector) $ do
       Entity cid _ <- MaybeT . lift . getBy $ TermSchoolCourseShort tid ssh csh
       Entity sid _ <- MaybeT . lift . getBy $ CourseSheet cid shn
       guard $ sid `Set.member` fromMaybe Set.empty (resMap !? cid)
       return Authorized
-    CourseR tid ssh csh _ -> maybeT (unauthorizedI MsgUnauthorizedCorrector) $ do
+    CourseR tid ssh csh _ -> $cachedHereBinary (mAuthId, tid, ssh, csh) . maybeT (unauthorizedI MsgUnauthorizedCorrector) $ do
       Entity cid _ <- MaybeT . lift . getBy $ TermSchoolCourseShort tid ssh csh
       guard $ cid `Set.member` Map.keysSet resMap
       return Authorized
@@ -636,10 +636,10 @@ tagAccessPredicate AuthTutor = APDB $ \mAuthId route _ -> exceptT return return
 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
+    course <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity tutId Tutorial{..} <- $cachedHereBinary (course, tutn) . MaybeT . getBy $ UniqueTutorial course tutn
     registered <- case mAuthId of
-      Just uid -> lift . existsBy $ UniqueTutorialParticipant tutId uid
+      Just uid -> $cachedHereBinary (tutId, uid) . lift . existsBy $ UniqueTutorialParticipant tutId uid
       Nothing  -> return False
 
     if
@@ -654,8 +654,8 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
         -> mzero
 
   CSheetR tid ssh csh shn subRoute -> maybeT (unauthorizedI MsgUnauthorizedSheetTime) $ do
-    cid <- MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
-    Entity _sid Sheet{..} <- MaybeT . getBy $ CourseSheet cid shn
+    cid <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity _sid Sheet{..} <- $cachedHereBinary (cid, shn) . MaybeT . getBy $ CourseSheet cid shn
     cTime <- liftIO getCurrentTime
     let
       visible = NTop sheetVisibleFrom <= NTop (Just cTime)
@@ -684,8 +684,8 @@ 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
+    cid <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity _mid Material{materialVisibleFrom} <- $cachedHereBinary (cid, mnm) . MaybeT . getBy $ UniqueMaterial cid mnm
     cTime <- liftIO getCurrentTime
     let visible = NTop materialVisibleFrom <= NTop (Just cTime)
     guard visible
@@ -693,9 +693,9 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
 
   CourseR tid ssh csh CRegisterR -> do
     now <- liftIO getCurrentTime
-    mbc <- getBy $ TermSchoolCourseShort tid ssh csh
+    mbc <- $cachedHereBinary (tid, ssh, csh) . getBy $ TermSchoolCourseShort tid ssh csh
     registered <- case (mbc,mAuthId) of
-      (Just (Entity cid _), Just uid) -> isJust <$> (getBy $ UniqueParticipant uid cid)
+      (Just (Entity cid _), Just uid) -> $cachedHereBinary (uid, cid) $ isJust <$> (getBy $ UniqueParticipant uid cid)
       _ -> return False
     case mbc of
       (Just (Entity _ Course{courseRegisterFrom, courseRegisterTo}))
@@ -709,7 +709,7 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
 
   MessageR cID -> maybeT (unauthorizedI MsgUnauthorizedSystemMessageTime) $ do
     smId <- decrypt cID
-    SystemMessage{systemMessageFrom, systemMessageTo} <- MaybeT $ get smId
+    SystemMessage{systemMessageFrom, systemMessageTo} <- $cachedHereBinary smId . MaybeT $ get smId
     cTime <- (NTop . Just) <$> liftIO getCurrentTime
     guard $ NTop systemMessageFrom <= cTime
          && NTop systemMessageTo   >= cTime
@@ -865,21 +865,21 @@ tagAccessPredicate AuthMaterials = APDB $ \_ route _ -> case route of
     return Authorized
   r -> $unsupportedAuthPredicate AuthMaterials r
 tagAccessPredicate AuthOwner = APDB $ \mAuthId route _ -> case route of
-  CSubmissionR _ _ _ _ cID _ -> exceptT return return $ do
+  CSubmissionR _ _ _ _ cID _ -> $cachedHereBinary (mAuthId, cID) . exceptT return return $ do
     sid <- catchIfMExceptT (const $ unauthorizedI MsgUnauthorizedSubmissionOwner) (const True :: CryptoIDError -> Bool) $ decrypt cID
     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
-  CSubmissionR _ _ _ _ cID _ -> maybeT (unauthorizedI MsgUnauthorizedSubmissionRated) $ do
+  CSubmissionR _ _ _ _ cID _ -> $cachedHereBinary 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
-  CSheetR tid ssh csh shn _ -> maybeT (unauthorizedI MsgUnauthorizedUserSubmission) $ do
+  CSheetR tid ssh csh shn _ -> $cachedHereBinary (tid, ssh, csh, shn) . maybeT (unauthorizedI MsgUnauthorizedUserSubmission) $ do
     Entity cid _ <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     Entity _ Sheet{ sheetSubmissionMode = SubmissionMode{..} } <- MaybeT . getBy $ CourseSheet cid shn
     guard $ is _Just submissionModeUser
@@ -918,6 +918,21 @@ tagAccessPredicate AuthRead = APHandler . const . const $ bool (return Authorize
 tagAccessPredicate AuthWrite = APHandler . const . const $ bool (unauthorizedI MsgUnauthorized) (return Authorized)
 
 
+authTagSpecificity :: AuthTag -> AuthTag -> Ordering
+-- ^ Heuristic for which `AuthTag`s to evaluate first
+authTagSpecificity = comparing $ NTop . flip findIndex eqClasses . elem
+  where
+    eqClasses :: [[AuthTag]]
+    -- ^ Constructors of `AuthTag` ordered (increasing) by execution order
+    eqClasses =
+      [ [ AuthFree, AuthDeprecated, AuthDevelopment ] -- Route wide
+      , [ AuthRead, AuthWrite, AuthToken ] -- Request wide
+      , [ AuthAdmin ] -- Site wide
+      , [ AuthLecturer, AuthCourseRegistered, AuthParticipant, AuthTime, AuthMaterials, AuthUserSubmissions, AuthCorrectorSubmissions, AuthCapacity, AuthEmpty ] ++ [ AuthSelf, AuthNoEscalation ] ++ [ AuthAuthentication ] -- Course/User/SystemMessage wide
+      , [ AuthCorrector ] ++ [ AuthTutor ] ++ [ AuthTutorialRegistered, AuthRegisterGroup ] -- Tutorial/Material/Sheet wide
+      , [ AuthOwner, AuthRated ] -- Submission wide
+      ]
+
 defaultAuthDNF :: AuthDNF
 defaultAuthDNF = PredDNF $ Set.fromList
   [ impureNonNull . Set.singleton $ PLVariable AuthAdmin
@@ -945,16 +960,19 @@ routeAuthTags = fmap (PredDNF . Set.mapMonotonic impureNonNull) . ofoldM partiti
 
 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 . dnfTerms -> authDNF) mAuthId route isWrite
+evalAuthTags AuthTagActive{..} (map (Set.toList . toNullable) . Set.toList . dnfTerms -> authDNF') mAuthId route isWrite
   = do
       mr <- getMsgRenderer
       let
+        authVarSpecificity = authTagSpecificity `on` plVar
+        authDNF = sortBy (authVarSpecificity `on` maximumBy authVarSpecificity . impureNonNull) $ map (sortBy authVarSpecificity) authDNF'
+        
         authTagIsInactive = not . authTagIsActive
 
         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
+        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
+            evalAccessPred' authTag' mAuthId' route' isWrite' = lift $ do
               $logDebugS "evalAccessPred" $ tshow (authTag', mAuthId', route', isWrite')
               evalAccessPred (tagAccessPredicate authTag') mAuthId' route' isWrite'
 
diff --git a/src/Import/NoModel.hs b/src/Import/NoModel.hs
index 639eca131..d2ba81705 100644
--- a/src/Import/NoModel.hs
+++ b/src/Import/NoModel.hs
@@ -14,7 +14,7 @@ import Yesod.Auth             as Import
 import Yesod.Core.Types       as Import (loggerSet)
 import Yesod.Default.Config2  as Import
 import Yesod.Core.Json        as Import (provideJson)
-import Yesod.Core.Types.Instances as Import (CachedMemoT(..))
+import Yesod.Core.Types.Instances as Import
 
 import Utils                  as Import
 import Utils.Frontend.I18n    as Import
diff --git a/src/Utils.hs b/src/Utils.hs
index 2080947ec..376817556 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -69,6 +69,7 @@ import qualified Crypto.Data.PKCS7 as PKCS7
 import Data.Fixed
 import Data.Ratio ((%))
 
+import Data.Binary (Binary)
 import qualified Data.Binary as Binary
 
 import Network.Wai (requestMethod)
@@ -914,10 +915,18 @@ encodedSecretBoxOpen ciphertext = do
 -- Caching --
 -------------
 
+cachedByBinary :: (Binary a, Typeable b, MonadHandler m) => a -> m b -> m b
+cachedByBinary k = cachedBy (toStrict $ Binary.encode k)
+
 cachedHere :: Q Exp
 cachedHere = do
   loc <- location
-  [e| cachedBy (toStrict $ Binary.encode loc) |]
+  [e| cachedByBinary loc |]
+
+cachedHereBinary :: Q Exp
+cachedHereBinary = do
+  loc <- location
+  [e| \k -> cachedByBinary (loc, k) |]
 
 hashToText :: Hashable a => a -> Text
 hashToText = decodeUtf8 . Base64.encode . toStrict . Binary.encode . hash
diff --git a/src/Yesod/Core/Types/Instances.hs b/src/Yesod/Core/Types/Instances.hs
index 5402ce3ba..2f03d0e94 100644
--- a/src/Yesod/Core/Types/Instances.hs
+++ b/src/Yesod/Core/Types/Instances.hs
@@ -2,7 +2,8 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving, UndecidableInstances #-}
 
 module Yesod.Core.Types.Instances
-  ( CachedMemoT(..)
+  ( CachedMemoT
+  , runCachedMemoT
   ) where
 
 import ClassyPrelude.Yesod
@@ -13,9 +14,15 @@ import Control.Monad.Fix
 import Control.Monad.Memo
 
 import Data.Binary (Binary)
-import qualified Data.Binary as Binary
 
 import Control.Monad.Logger (MonadLoggerIO)
+
+import Utils
+
+import Language.Haskell.TH
+
+import Control.Monad.Reader (MonadReader(..))
+import Control.Monad.Trans.Reader (ReaderT, mapReaderT, runReaderT)
   
 
 instance MonadFix m => MonadFix (HandlerT site m) where
@@ -26,23 +33,31 @@ instance MonadFix m => MonadFix (WidgetT site m) where
 
 
 -- | Type-level tags for compatability of Yesod `cached`-System with `MonadMemo`
-newtype CachedMemoT k v m a = CachedMemoT { runCachedMemoT :: m a }
+newtype CachedMemoT k v m a = CachedMemoT { runCachedMemoT' :: ReaderT Loc 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 MonadReader r m => MonadReader r (CachedMemoT k v m) where
+  reader = CachedMemoT . lift . reader
+  local f (CachedMemoT act) = CachedMemoT $ mapReaderT (local f) act
 
 instance MonadTrans (CachedMemoT k v) where
-  lift = CachedMemoT
+  lift = CachedMemoT . lift
 
 
 -- | 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
+  memo act key = do
+    loc <- CachedMemoT ask
+    cachedByBinary (loc, key) $ act key
+
+runCachedMemoT :: Q Exp
+runCachedMemoT = do
+  loc <- location
+  [e| flip runReaderT loc . runCachedMemoT' |]

From 5cfe4e049f9f776243591d58294897ed541103f3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 30 May 2019 22:08:06 +0200
Subject: [PATCH 424/519] Even more caching

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

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 58c077a60..6b5c9f508 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -612,7 +612,7 @@ tagAccessPredicate AuthCorrector = APDB $ \mAuthId route _ -> exceptT return ret
       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
+  resList <- $cachedHereBinary authId . 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
@@ -622,12 +622,12 @@ tagAccessPredicate AuthTutor = APDB $ \mAuthId route _ -> exceptT return return
     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
+      Entity cid _ <- $cachedHereBinary (tid, ssh, csh) . MaybeT . lift . getBy $ TermSchoolCourseShort tid ssh csh
+      Entity tutid _ <- $cachedHereBinary (cid, tutn) . 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
+      Entity cid _ <- $cachedHereBinary (tid, ssh, csh) . MaybeT . lift . getBy $ TermSchoolCourseShort tid ssh csh
       guard $ cid `Set.member` Map.keysSet resMap
       return Authorized
     _ -> do
@@ -719,7 +719,7 @@ tagAccessPredicate AuthTime = 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
+    [E.Value c] <- $cachedHereBinary (authId, tid, ssh, csh) . 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
            E.&&. course E.^. CourseTerm      E.==. E.val tid
@@ -732,7 +732,7 @@ tagAccessPredicate AuthCourseRegistered = APDB $ \mAuthId route _ -> case route
 tagAccessPredicate AuthTutorialRegistered = APDB $ \mAuthId route _ -> case route of
   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.Value c] <- $cachedHereBinary (authId, tid, ssh, csh, tutn) . 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
@@ -745,7 +745,7 @@ tagAccessPredicate AuthTutorialRegistered = APDB $ \mAuthId route _ -> case rout
     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.Value c] <- $cachedHereBinary (authId, tid, ssh, csh) . 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
@@ -763,14 +763,14 @@ tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
           whenExceptT ok Authorized
     participant <- decrypt cID
     -- participant is currently registered
-    authorizedIfExists $ \(course `E.InnerJoin` courseParticipant) -> do
+    $cachedHereBinary (participant, tid, ssh, csh) . authorizedIfExists $ \(course `E.InnerJoin` courseParticipant) -> do
       E.on $ course E.^. CourseId E.==. courseParticipant E.^. CourseParticipantCourse
       E.where_ $ courseParticipant E.^. CourseParticipantUser 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 has at least one submission
-    authorizedIfExists $ \(course `E.InnerJoin` sheet `E.InnerJoin` submission `E.InnerJoin` submissionUser) -> do
+    $cachedHereBinary (participant, tid, ssh, csh) . authorizedIfExists $ \(course `E.InnerJoin` sheet `E.InnerJoin` submission `E.InnerJoin` submissionUser) -> do
       E.on $ submission E.^. SubmissionId E.==. submissionUser E.^. SubmissionUserSubmission
       E.on $ sheet  E.^. SheetId   E.==. submission E.^. SubmissionSheet
       E.on $ course E.^. CourseId  E.==. sheet E.^. SheetCourse
@@ -779,7 +779,7 @@ tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
            E.&&. course E.^. CourseSchool    E.==. E.val ssh
            E.&&. course E.^. CourseShorthand E.==. E.val csh
     -- participant is member of a submissionGroup
-    authorizedIfExists $ \(course `E.InnerJoin` submissionGroup `E.InnerJoin` submissionGroupUser) -> do
+    $cachedHereBinary (participant, tid, ssh, csh) . authorizedIfExists $ \(course `E.InnerJoin` submissionGroup `E.InnerJoin` submissionGroupUser) -> do
       E.on $ submissionGroup E.^. SubmissionGroupId  E.==. submissionGroupUser E.^. SubmissionGroupUserSubmissionGroup
       E.on $ course E.^. CourseId  E.==. submissionGroup E.^. SubmissionGroupCourse
       E.where_ $ submissionGroupUser E.^. SubmissionGroupUserUser E.==. E.val participant
@@ -787,7 +787,7 @@ tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
            E.&&. course E.^. CourseSchool    E.==. E.val ssh
            E.&&. course E.^. CourseShorthand E.==. E.val csh
     -- participant is a sheet corrector
-    authorizedIfExists $ \(course `E.InnerJoin` sheet `E.InnerJoin` sheetCorrector) -> do
+    $cachedHereBinary (participant, tid, ssh, csh) . authorizedIfExists $ \(course `E.InnerJoin` sheet `E.InnerJoin` sheetCorrector) -> do
       E.on $ sheet  E.^. SheetId   E.==. sheetCorrector E.^. SheetCorrectorSheet
       E.on $ course E.^. CourseId  E.==. sheet E.^. SheetCourse
       E.where_ $ sheetCorrector E.^. SheetCorrectorUser E.==. E.val participant
@@ -795,7 +795,7 @@ tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
            E.&&. course E.^. CourseSchool    E.==. E.val ssh
            E.&&. course E.^. CourseShorthand E.==. E.val csh
     -- participant is a tutorial user
-    authorizedIfExists $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutorialUser) -> do
+    $cachedHereBinary (participant, tid, ssh, csh) . authorizedIfExists $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutorialUser) -> do
       E.on $ tutorial  E.^. TutorialId   E.==. tutorialUser E.^. TutorialParticipantTutorial
       E.on $ course E.^. CourseId  E.==. tutorial E.^. TutorialCourse
       E.where_ $ tutorialUser E.^. TutorialParticipantUser E.==. E.val participant
@@ -803,7 +803,7 @@ tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
            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 `E.InnerJoin` tutor) -> do
+    $cachedHereBinary (participant, tid, ssh, csh) . 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_ $ tutor E.^. TutorUser E.==. E.val participant
@@ -811,7 +811,7 @@ tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
            E.&&. course E.^. CourseSchool    E.==. E.val ssh
            E.&&. course E.^. CourseShorthand E.==. E.val csh
     -- participant is lecturer for this course
-    authorizedIfExists $ \(course `E.InnerJoin` lecturer) -> do
+    $cachedHereBinary (participant, tid, ssh, csh) . authorizedIfExists $ \(course `E.InnerJoin` lecturer) -> do
       E.on $ course E.^. CourseId E.==. lecturer E.^. LecturerCourse
       E.where_ $ lecturer E.^. LecturerUser E.==. E.val participant
            E.&&. course E.^. CourseTerm      E.==. E.val tid
@@ -821,26 +821,26 @@ tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
   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 ]
+    cid <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity tutId Tutorial{..} <- $cachedHereBinary (cid, tutn) . MaybeT . getBy $ UniqueTutorial cid tutn
+    registered <- $cachedHereBinary tutId . 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 ]
+    Entity cid Course{..} <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
+    registered <- $cachedHereBinary cid . 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
+    cid <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity _ Tutorial{..} <- $cachedHereBinary (cid, tutn) . 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.Value hasOther] <- $cachedHereBinary (uid, rGroup) . 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)
@@ -850,9 +850,9 @@ tagAccessPredicate AuthRegisterGroup = APDB $ \mAuthId 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
-    assertM_ (<= 0) . lift $ count [ CourseParticipantCourse ==. cid ]
-    assertM_ ((<= 0) :: Int -> Bool) . lift . fmap (E.unValue . unsafeHead) $ E.select . E.from $ \(sheet `E.InnerJoin` submission) -> do
+    cid <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    assertM_ (<= 0) . $cachedHereBinary cid . lift $ count [ CourseParticipantCourse ==. cid ]
+    assertM_ ((<= 0) :: Int -> Bool) . $cachedHereBinary cid . lift . fmap (E.unValue . unsafeHead) $ E.select . E.from $ \(sheet `E.InnerJoin` submission) -> do
       E.on $ sheet E.^. SheetId E.==. submission E.^. SubmissionSheet
       E.where_ $ sheet E.^. SheetCourse E.==. E.val cid
       return E.countRows
@@ -860,7 +860,7 @@ tagAccessPredicate AuthEmpty = APDB $ \_ route _ -> case route of
   r -> $unsupportedAuthPredicate AuthEmpty r
 tagAccessPredicate AuthMaterials = APDB $ \_ route _ -> case route of
   CourseR tid ssh csh _ -> maybeT (unauthorizedI MsgUnfreeMaterials) $ do
-    Entity _ Course{..} <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
+    Entity _ Course{..} <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     guard courseMaterialFree
     return Authorized
   r -> $unsupportedAuthPredicate AuthMaterials r
@@ -887,8 +887,8 @@ tagAccessPredicate AuthUserSubmissions = APDB $ \_ route _ -> case route of
   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 = SubmissionMode{..} } <- MaybeT . getBy $ CourseSheet cid shn
+    Entity cid _ <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
+    Entity _ Sheet{ sheetSubmissionMode = SubmissionMode{..} } <- $cachedHereBinary (cid, shn) . MaybeT . getBy $ CourseSheet cid shn
     guard submissionModeCorrector
     return Authorized
   r -> $unsupportedAuthPredicate AuthCorrectorSubmissions r
@@ -909,7 +909,7 @@ tagAccessPredicate AuthSelf = APHandler $ \mAuthId route _ -> exceptT return ret
 tagAccessPredicate AuthAuthentication = APDB $ \mAuthId route _ -> case route of
   MessageR cID -> maybeT (unauthorizedI MsgUnauthorizedSystemMessageAuth) $ do
     smId <- decrypt cID
-    SystemMessage{..} <- MaybeT $ get smId
+    SystemMessage{..} <- $cachedHereBinary smId . MaybeT $ get smId
     let isAuthenticated = isJust mAuthId
     guard $ not systemMessageAuthenticatedOnly || isAuthenticated
     return Authorized

From 98d76e30ea093ad16eae5813d927c46a66326ac2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 30 May 2019 23:37:48 +0200
Subject: [PATCH 425/519] Make calls to unsafeHandler shorter lived

---
 src/Application.hs   |   9 +--
 src/Handler/Utils.hs |  11 ++++
 src/Jobs.hs          | 131 ++++++++++++++++++++++---------------------
 3 files changed, 80 insertions(+), 71 deletions(-)

diff --git a/src/Application.hs b/src/Application.hs
index bf7927e51..ab612883c 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -36,6 +36,8 @@ import System.Log.FastLogger                ( defaultBufSize, newStderrLoggerSet
                                             , toLogStr, rmLoggerSet
                                             )
 
+import Handler.Utils                        (runAppLoggingT)
+
 import qualified Data.Map.Strict as Map
 
 import Foreign.Store
@@ -222,13 +224,6 @@ 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
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 0384c83e5..8877dc8de 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -37,6 +37,8 @@ import System.FilePath.Posix (takeBaseName, takeFileName)
 import qualified Data.List as List
 import qualified Data.List.NonEmpty as NonEmpty
 
+import Control.Monad.Logger
+
 
 -- | Check whether the user's preference for files is inline-viewing or downloading
 downloadFiles :: (MonadHandler m, HandlerSite m ~ UniWorX) => m Bool
@@ -247,3 +249,12 @@ guardAuthorizedFor :: ( HandlerSite h ~ UniWorX, MonadHandler h, MonadLogger h
   => Route UniWorX -> a -> m (ReaderT SqlBackend h) a
 guardAuthorizedFor link val =
   val <$ guardM (lift $ (== Authorized) <$> evalAccessDB link False)
+
+  
+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
+
diff --git a/src/Jobs.hs b/src/Jobs.hs
index 5ba9f1fa4..867718bab 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -7,6 +7,7 @@ module Jobs
 
 import Import
 import Utils.Lens
+import Handler.Utils
 
 import Jobs.Types as Types hiding (JobCtl(JobCtlQueue))
 import Jobs.Types (JobCtl(JobCtlQueue))
@@ -93,7 +94,7 @@ handleJobs foundation@UniWorX{..} = do
       logStart = $logDebugS ("Jobs #" <> tshow n) "Starting"
       logStop = $logDebugS ("Jobs #" <> tshow n) "Stopping"
       removeChan = atomically . modifyTVar' appJobCtl . Map.delete =<< myThreadId
-      doFork = flip forkFinally (\_ -> removeChan) . unsafeHandler foundation . bracket_ logStart logStop . flip runReaderT JobContext{..} . runConduit $ sourceTMChan chan .| handleJobs' n
+      doFork = flip forkFinally (\_ -> removeChan) . runAppLoggingT foundation . bracket_ logStart logStop . flip runReaderT JobContext{..} . runConduit $ sourceTMChan chan .| handleJobs' foundation n
     (_, tId) <- allocate (liftIO doFork) (\_ -> liftIO . atomically $ closeTMChan chan)
     atomically . modifyTVar' appJobCtl $ Map.insert tId bChan
 
@@ -101,7 +102,7 @@ handleJobs foundation@UniWorX{..} = do
   when (num > 0) $ do
     registeredCron <- liftIO newEmptyTMVarIO
     let execCrontab' = whenM (atomically $ readTMVar registeredCron) $
-          unsafeHandler foundation $ runReaderT execCrontab JobContext{..}
+          runReaderT (execCrontab foundation) JobContext{..}
         unregister = atomically . whenM (fromMaybe False <$> tryReadTMVar registeredCron) . void $ tryTakeTMVar appCronThread
     cData <- allocate (liftIO . forkFinally execCrontab' $ \_ -> unregister) (\_ -> liftIO . atomically . void $ tryTakeTMVar jobCrontab)
     registeredCron' <- atomically $ do
@@ -126,73 +127,75 @@ stopJobCtl UniWorX{appJobCtl, appCronThread} = do
     guard . none (`Map.member` wMap') $ Map.keysSet wMap
 
 
-execCrontab :: ReaderT JobContext (HandlerT UniWorX IO) ()
+execCrontab :: MonadIO m => UniWorX -> ReaderT JobContext m ()
 -- ^ Keeping a `HashMap` of the latest execution times of `JobCtl`s we have
 --   seen, wait for the time of the next job and fire it
-execCrontab = evalStateT go HashMap.empty
+execCrontab foundation = evalStateT go HashMap.empty
   where
     go = do
-      mapStateT (liftHandlerT . runDB . setSerializable) $ do
-        let
-          merge (Entity leId CronLastExec{..})
-            | Just job <- Aeson.parseMaybe parseJSON cronLastExecJob
-            = State.modify $ HashMap.insertWith (<>) (JobCtlQueue job) (Max cronLastExecTime)
-            | otherwise = lift $ delete leId
-        runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ merge
+      cont <- mapStateT (mapReaderT $ liftIO . unsafeHandler foundation) $ do
+        mapStateT (liftHandlerT . runDB . setSerializable) $ do
+          let
+            merge (Entity leId CronLastExec{..})
+              | Just job <- Aeson.parseMaybe parseJSON cronLastExecJob
+              = State.modify $ HashMap.insertWith (<>) (JobCtlQueue job) (Max cronLastExecTime)
+              | otherwise = lift $ delete leId
+          runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ merge
 
-      refT <- liftIO getCurrentTime
-      settings <- getsYesod appSettings'
-      currentState <- mapStateT (mapReaderT $ liftIO . atomically) $ do
-        crontab' <- liftBase . tryReadTMVar =<< asks jobCrontab
-        case crontab' of
-          Nothing -> return Nothing
-          Just crontab -> Just <$> do
-            State.modify . HashMap.filterWithKey $ \k _ -> HashMap.member k crontab
-            prevExec <- State.get
-            case earliestJob settings prevExec crontab refT of
-              Nothing -> liftBase retry
-              Just (_, MatchNone) -> liftBase retry
-              Just x -> return (crontab, x)
+        refT <- liftIO getCurrentTime
+        settings <- getsYesod appSettings'
+        currentState <- mapStateT (mapReaderT $ liftIO . atomically) $ do
+          crontab' <- liftBase . tryReadTMVar =<< asks jobCrontab
+          case crontab' of
+            Nothing -> return Nothing
+            Just crontab -> Just <$> do
+              State.modify . HashMap.filterWithKey $ \k _ -> HashMap.member k crontab
+              prevExec <- State.get
+              case earliestJob settings prevExec crontab refT of
+                Nothing -> liftBase retry
+                Just (_, MatchNone) -> liftBase retry
+                Just x -> return (crontab, x)
 
-      case currentState of
-        Nothing -> return ()
-        Just (currentCrontab, (jobCtl, nextMatch)) -> do
-          let doJob = mapStateT (mapReaderT $ liftHandlerT . runDBJobs . setSerializable) $ do
-                  newCrontab <- lift . lift . hoist lift $ determineCrontab'
-                  if
-                    | ((==) `on` HashMap.lookup jobCtl) newCrontab currentCrontab
-                      -> do
-                        now <- liftIO $ getCurrentTime
-                        instanceID' <- getsYesod appInstanceID
-                        State.modify $ HashMap.alter (Just . ($ Max now) . maybe id (<>)) jobCtl
-                        case jobCtl of
-                          JobCtlQueue job -> do
-                            void . lift . lift $ upsertBy
-                              (UniqueCronLastExec $ toJSON job)
-                              CronLastExec
-                                { cronLastExecJob = toJSON job
-                                , cronLastExecTime = now
-                                , cronLastExecInstance = instanceID'
-                                }
-                              [ CronLastExecTime =. now ]
-                            lift . lift $ queueDBJob job
-                          other -> writeJobCtl other
-                    | otherwise
-                      -> lift . mapReaderT (liftIO . atomically) $
-                           lift . void . flip swapTMVar newCrontab =<< asks jobCrontab
+        case currentState of
+          Nothing -> return False
+          Just (currentCrontab, (jobCtl, nextMatch)) -> do
+            let doJob = mapStateT (mapReaderT $ liftHandlerT . runDBJobs . setSerializable) $ do
+                    newCrontab <- lift . lift . hoist lift $ determineCrontab'
+                    if
+                      | ((==) `on` HashMap.lookup jobCtl) newCrontab currentCrontab
+                        -> do
+                          now <- liftIO $ getCurrentTime
+                          instanceID' <- getsYesod appInstanceID
+                          State.modify $ HashMap.alter (Just . ($ Max now) . maybe id (<>)) jobCtl
+                          case jobCtl of
+                            JobCtlQueue job -> do
+                              void . lift . lift $ upsertBy
+                                (UniqueCronLastExec $ toJSON job)
+                                CronLastExec
+                                  { cronLastExecJob = toJSON job
+                                  , cronLastExecTime = now
+                                  , cronLastExecInstance = instanceID'
+                                  }
+                                [ CronLastExecTime =. now ]
+                              lift . lift $ queueDBJob job
+                            other -> writeJobCtl other
+                      | otherwise
+                        -> lift . mapReaderT (liftIO . atomically) $
+                             lift . void . flip swapTMVar newCrontab =<< asks jobCrontab
 
-          case nextMatch of
-            MatchAsap -> doJob
-            MatchNone -> return ()
-            MatchAt nextTime -> do
-              JobContext{jobCrontab} <- ask
-              nextTime' <- applyJitter jobCtl nextTime
-              $logDebugS "Cron" [st|Waiting until #{tshow (utcToLocalTimeTZ appTZ nextTime')} to execute #{tshow jobCtl}|]
-              logFunc <- askLoggerIO
-              whenM (liftIO . flip runLoggingT logFunc $ waitUntil jobCrontab currentCrontab nextTime')
-                doJob
+            case nextMatch of
+              MatchAsap -> doJob
+              MatchNone -> return ()
+              MatchAt nextTime -> do
+                JobContext{jobCrontab} <- ask
+                nextTime' <- applyJitter jobCtl nextTime
+                $logDebugS "Cron" [st|Waiting until #{tshow (utcToLocalTimeTZ appTZ nextTime')} to execute #{tshow jobCtl}|]
+                logFunc <- askLoggerIO
+                whenM (liftIO . flip runLoggingT logFunc $ waitUntil jobCrontab currentCrontab nextTime')
+                  doJob
 
-          go
+            return True
+      when cont go
       where
         acc :: NominalDiffTime
         acc = 1e-3
@@ -244,12 +247,12 @@ execCrontab = evalStateT go HashMap.empty
                 bool (waitUntil crontabTV crontab nextTime) (return False) crontabChanged
 
 
-handleJobs' :: Natural -> Sink JobCtl (ReaderT JobContext Handler) ()
-handleJobs' wNum = C.mapM_ $ \jctl -> do
+handleJobs' :: (MonadIO m, MonadLogger m, MonadCatch m) => UniWorX -> Natural -> Sink JobCtl (ReaderT JobContext m) ()
+handleJobs' foundation wNum = C.mapM_ $ \jctl -> do
   $logDebugS logIdent $ tshow jctl
   resVars <- mapReaderT (liftIO . atomically) $
     HashMap.lookup jctl <$> (lift . readTVar =<< asks jobConfirm)
-  res <- fmap (either Just $ const Nothing) . try $ handleCmd jctl
+  res <- fmap (either Just $ const Nothing) . try . (mapReaderT $ liftIO . unsafeHandler foundation) $ handleCmd jctl
   sentRes <- liftIO . atomically $ foldrM (\resVar -> bool (tryPutTMVar resVar res) $ return True) False (maybe [] NonEmpty.toList resVars)
   case res of
     Just err

From 3e48809f0071e564228b9936a8c40be47b9d7484 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 3 Jun 2019 11:53:01 +0200
Subject: [PATCH 426/519] add eslint rule for enforced single quotes

---
 .eslintrc.json                                |  3 ++-
 frontend/src/app.spec.js                      |  2 +-
 frontend/src/main.js                          |  4 ++--
 .../src/services/html-helpers/html-helpers.js |  2 +-
 .../html-helpers/html-helpers.spec.js         |  2 +-
 .../services/http-client/http-client.spec.js  |  2 +-
 frontend/src/services/i18n/i18n.spec.js       |  2 +-
 frontend/src/utils/alerts/alerts.scss         |  6 ++---
 frontend/src/utils/alerts/alerts.spec.js      |  2 +-
 frontend/src/utils/asidenav/asidenav.md       |  2 +-
 frontend/src/utils/async-form/async-form.md   |  2 +-
 frontend/src/utils/check-all/check-all.js     |  2 +-
 frontend/src/utils/form/auto-submit-button.js |  2 +-
 frontend/src/utils/form/auto-submit-button.md |  2 +-
 frontend/src/utils/form/auto-submit-input.md  |  2 +-
 frontend/src/utils/form/datepicker.js         | 24 +++++++++----------
 frontend/src/utils/form/form-error-remover.js |  2 +-
 frontend/src/utils/form/form.scss             |  2 +-
 .../src/utils/form/interactive-fieldset.js    |  2 +-
 .../src/utils/form/interactive-fieldset.md    | 24 +++++++++----------
 .../src/utils/form/navigate-away-prompt.js    |  6 ++---
 .../src/utils/form/reactive-submit-button.js  |  2 +-
 .../src/utils/form/reactive-submit-button.md  |  4 ++--
 frontend/src/utils/inputs/checkbox.js         |  4 ++--
 frontend/src/utils/inputs/checkbox.md         |  4 ++--
 frontend/src/utils/inputs/checkbox.scss       |  4 ++--
 frontend/src/utils/inputs/file-input.js       |  2 +-
 frontend/src/utils/inputs/file-input.md       |  6 ++---
 frontend/src/utils/inputs/inputs.scss         | 24 +++++++++----------
 frontend/src/utils/inputs/radio.scss          |  2 +-
 frontend/src/utils/mass-input/mass-input.js   |  4 ++--
 frontend/src/utils/mass-input/mass-input.md   |  8 +++----
 frontend/src/utils/modal/modal.md             |  2 +-
 frontend/src/utils/tooltips/tooltips.js       |  2 +-
 frontend/src/utils/tooltips/tooltips.scss     |  2 +-
 frontend/src/utils/utils.js                   | 22 ++++++++---------
 frontend/vendor/flatpickr.css                 |  4 ++--
 frontend/vendor/fontawesome.css               |  2 +-
 38 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 06d95155c..6fcef7c27 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -22,6 +22,7 @@
         "no-console": "off",
         "no-extra-semi": "off",
         "semi": ["error", "always"],
-        "comma-dangle": ["error", "always-multiline"]
+        "comma-dangle": ["error", "always-multiline"],
+        "quotes": ["error", "single"]
     }
 }
diff --git a/frontend/src/app.spec.js b/frontend/src/app.spec.js
index 21a381a68..ab7385448 100644
--- a/frontend/src/app.spec.js
+++ b/frontend/src/app.spec.js
@@ -1,4 +1,4 @@
-import { App } from "./app";
+import { App } from './app';
 
 const TEST_UTILS = [
   { name: 'util1' },
diff --git a/frontend/src/main.js b/frontend/src/main.js
index eb76d102e..aa509bdc3 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -15,9 +15,9 @@ window.App = app;
 //     return;
 //   }
 
-//   const contentType = response.headers.get("content-type");
+//   const contentType = response.headers.get('content-type');
 //   if (!contentType.match(options.accept)) {
-//     throw new Error('Server returned with "' + contentType + '" when "' + options.accept + '" was expected');
+//     throw new Error('Server returned with '' + contentType + '' when '' + options.accept + '' was expected');
 //   }
 // }
 
diff --git a/frontend/src/services/html-helpers/html-helpers.js b/frontend/src/services/html-helpers/html-helpers.js
index 92d3168b5..8e6137b6c 100644
--- a/frontend/src/services/html-helpers/html-helpers.js
+++ b/frontend/src/services/html-helpers/html-helpers.js
@@ -3,7 +3,7 @@ export class HtmlHelpers {
   // `parseResponse` takes a raw HttpClient response and an options object.
   // Returns an object with `element` being an contextual fragment of the
   // HTML in the response and `ifPrefix` being the prefix that was used to
-  // "unique-ify" the ids of the received HTML.
+  // 'unique-ify' the ids of the received HTML.
   // Original Response IDs can optionally be kept by adding `keepIds: true`
   // to the `options` object.
   parseResponse(response, options = {}) {
diff --git a/frontend/src/services/html-helpers/html-helpers.spec.js b/frontend/src/services/html-helpers/html-helpers.spec.js
index c77015b26..f092e17fa 100644
--- a/frontend/src/services/html-helpers/html-helpers.spec.js
+++ b/frontend/src/services/html-helpers/html-helpers.spec.js
@@ -1,4 +1,4 @@
-import { HtmlHelpers } from "./html-helpers";
+import { HtmlHelpers } from './html-helpers';
 
 describe('HtmlHelpers', () => {
   let htmlHelpers;
diff --git a/frontend/src/services/http-client/http-client.spec.js b/frontend/src/services/http-client/http-client.spec.js
index e61e248f0..a0f76584d 100644
--- a/frontend/src/services/http-client/http-client.spec.js
+++ b/frontend/src/services/http-client/http-client.spec.js
@@ -1,4 +1,4 @@
-import { HttpClient } from "./http-client";
+import { HttpClient } from './http-client';
 
 const TEST_URL = 'http://example.com';
 const FAKE_RESPONSE = {
diff --git a/frontend/src/services/i18n/i18n.spec.js b/frontend/src/services/i18n/i18n.spec.js
index 76e5348c0..1b4edf3c4 100644
--- a/frontend/src/services/i18n/i18n.spec.js
+++ b/frontend/src/services/i18n/i18n.spec.js
@@ -1,4 +1,4 @@
-import { I18n } from "./i18n";
+import { I18n } from './i18n';
 
 describe('I18n', () => {
   let i18n;
diff --git a/frontend/src/utils/alerts/alerts.scss b/frontend/src/utils/alerts/alerts.scss
index cd0492f11..d2faf1b22 100644
--- a/frontend/src/utils/alerts/alerts.scss
+++ b/frontend/src/utils/alerts/alerts.scss
@@ -20,7 +20,7 @@
   &::before {
     content: '\f077';
     position: absolute;
-    font-family: "Font Awesome 5 Free";
+    font-family: 'Font Awesome 5 Free';
     left: 50%;
     top: 0;
     height: 30px;
@@ -126,7 +126,7 @@
   &::before {
     content: '\f05a';
     position: absolute;
-    font-family: "Font Awesome 5 Free";
+    font-family: 'Font Awesome 5 Free';
     font-size: 24px;
     top: 50%;
     left: 50%;
@@ -164,7 +164,7 @@
   &::before {
     content: '\f00d';
     position: absolute;
-    font-family: "Font Awesome 5 Free";
+    font-family: 'Font Awesome 5 Free';
     top: 50%;
     left: 50%;
     display: flex;
diff --git a/frontend/src/utils/alerts/alerts.spec.js b/frontend/src/utils/alerts/alerts.spec.js
index 6d0440391..c823488c6 100644
--- a/frontend/src/utils/alerts/alerts.spec.js
+++ b/frontend/src/utils/alerts/alerts.spec.js
@@ -1,4 +1,4 @@
-import { Alerts } from "./alerts";
+import { Alerts } from './alerts';
 
 const MOCK_APP = {
   httpClient: {
diff --git a/frontend/src/utils/asidenav/asidenav.md b/frontend/src/utils/asidenav/asidenav.md
index 87fda9847..0aa73b0f7 100644
--- a/frontend/src/utils/asidenav/asidenav.md
+++ b/frontend/src/utils/asidenav/asidenav.md
@@ -11,7 +11,7 @@ Correctly positions hovered asidenav submenus and handles the favorites button o
     <div .asidenav__box>
       <ul .asidenav__list.list--iconless>
         <li .asidenav__list-item>
-          <a .asidenav__link-wrapper href="#">
+          <a .asidenav__link-wrapper href='#'>
             <div .asidenav__link-shorthand>EIP
             <div .asidenav__link-label>Einführung in die Programmierung
           <div .asidenav__nested-list-wrapper>
diff --git a/frontend/src/utils/async-form/async-form.md b/frontend/src/utils/async-form/async-form.md
index a5ce150e4..914177225 100644
--- a/frontend/src/utils/async-form/async-form.md
+++ b/frontend/src/utils/async-form/async-form.md
@@ -14,4 +14,4 @@ Prevents form submissions from reloading the page but instead firing an AJAX req
 ## Internationalization:
 This utility expects the following translations to be available:
 - `asyncFormFailure`\
-text that gets shown if an async form request fails (e.g. "Oops. Something went wrong.").
+text that gets shown if an async form request fails (e.g. 'Oops. Something went wrong.').
diff --git a/frontend/src/utils/check-all/check-all.js b/frontend/src/utils/check-all/check-all.js
index 5c1a754db..c75ce2c1f 100644
--- a/frontend/src/utils/check-all/check-all.js
+++ b/frontend/src/utils/check-all/check-all.js
@@ -1,4 +1,4 @@
-import { Utility } from "../../core/utility";
+import { Utility } from '../../core/utility';
 
 const CHECKBOX_SELECTOR    = '[type="checkbox"]';
 
diff --git a/frontend/src/utils/form/auto-submit-button.js b/frontend/src/utils/form/auto-submit-button.js
index 7081c3037..bf7544d30 100644
--- a/frontend/src/utils/form/auto-submit-button.js
+++ b/frontend/src/utils/form/auto-submit-button.js
@@ -1,4 +1,4 @@
-import { Utility } from "../../core/utility";
+import { Utility } from '../../core/utility';
 
 export const AUTO_SUBMIT_BUTTON_UTIL_SELECTOR = '[uw-auto-submit-button]';
 
diff --git a/frontend/src/utils/form/auto-submit-button.md b/frontend/src/utils/form/auto-submit-button.md
index e5f5c5be3..54723e846 100644
--- a/frontend/src/utils/form/auto-submit-button.md
+++ b/frontend/src/utils/form/auto-submit-button.md
@@ -6,6 +6,6 @@ We hide the button using JavaScript so no-js users will still be able to submit
 
 ## Example usage:
 ```html
-<button type="submit" uw-auto-submit-button>Submit
+<button type='submit' uw-auto-submit-button>Submit
 ```
 
diff --git a/frontend/src/utils/form/auto-submit-input.md b/frontend/src/utils/form/auto-submit-input.md
index 73dcd933e..f32499f1e 100644
--- a/frontend/src/utils/form/auto-submit-input.md
+++ b/frontend/src/utils/form/auto-submit-input.md
@@ -5,5 +5,5 @@ Programmatically submits forms when a certain input changes value
 
 ## Example usage:
 ```html
-<input type="text" uw-auto-submit-input />
+<input type='text' uw-auto-submit-input />
 ```
diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index 7f4c1b85a..67ddea382 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -1,28 +1,28 @@
-import flatpickr from "flatpickr";
-import { Utility } from "../../core/utility";
+import flatpickr from 'flatpickr';
+import { Utility } from '../../core/utility';
 
 const DATEPICKER_UTIL_SELECTOR = 'input[type="date"], input[type="time"], input[type="datetime-local"]';
 
 const DATEPICKER_INITIALIZED_CLASS = 'datepicker--initialized';
 
 const DATEPICKER_CONFIG = {
-  "datetime-local": {
+  'datetime-local': {
     enableTime: true,
     altInput: true,
-    altFormat: "j. F Y, H:i", // maybe interpolate these formats for locale
-    dateFormat: "Y-m-dTH:i",
+    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",
+  'date': {
+    altFormat: 'j. F Y',
+    dateFormat: 'Y-m-d',
     altInput: true,
   },
-  "time": {
+  'time': {
     enableTime: true,
     noCalendar: true,
-    altFormat: "H:i",
-    dateFormat: "H:i",
+    altFormat: 'H:i',
+    dateFormat: 'H:i',
     altInput: true,
     time_24hr: true,
   },
@@ -44,7 +44,7 @@ export class Datepicker {
       return false;
     }
 
-    const flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute("type")];
+    const flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute('type')];
 
     if (!flatpickrConfig) {
       throw new Error('Datepicker utility called on unsupported element!');
diff --git a/frontend/src/utils/form/form-error-remover.js b/frontend/src/utils/form/form-error-remover.js
index af25d4bc1..6c86160b3 100644
--- a/frontend/src/utils/form/form-error-remover.js
+++ b/frontend/src/utils/form/form-error-remover.js
@@ -1,4 +1,4 @@
-import { Utility } from "../../core/utility";
+import { Utility } from '../../core/utility';
 
 const FORM_ERROR_REMOVER_INITIALIZED_CLASS = 'form-error-remover--initialized';
 const FORM_ERROR_REMOVER_INPUTS_SELECTOR = 'input:not([type="hidden"]), textarea, select';
diff --git a/frontend/src/utils/form/form.scss b/frontend/src/utils/form/form.scss
index 6612beeb1..6ec870f9e 100644
--- a/frontend/src/utils/form/form.scss
+++ b/frontend/src/utils/form/form.scss
@@ -14,7 +14,7 @@ fieldset {
   }
 }
 
-[uw-auto-submit-button][type="submit"] {
+[uw-auto-submit-button][type='submit'] {
   animation: fade-in 500ms ease-in-out backwards;
   animation-delay: 500ms;
 }
diff --git a/frontend/src/utils/form/interactive-fieldset.js b/frontend/src/utils/form/interactive-fieldset.js
index 0551ce289..916c01aa3 100644
--- a/frontend/src/utils/form/interactive-fieldset.js
+++ b/frontend/src/utils/form/interactive-fieldset.js
@@ -1,4 +1,4 @@
-import { Utility } from "../../core/utility";
+import { Utility } from '../../core/utility';
 
 const INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR = '.interactive-fieldset__target';
 
diff --git a/frontend/src/utils/form/interactive-fieldset.md b/frontend/src/utils/form/interactive-fieldset.md
index 6e35b8aec..323c26e55 100644
--- a/frontend/src/utils/form/interactive-fieldset.md
+++ b/frontend/src/utils/form/interactive-fieldset.md
@@ -12,24 +12,24 @@ Shows/hides inputs based on value of particular input
 ## Example usage:
 ### example with text input
 ```html
-<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>
+<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>`
 ```html
-<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>
+<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>
 ```
 
 ### example with checkbox
 ```html
-<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>
+<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>
 ```
diff --git a/frontend/src/utils/form/navigate-away-prompt.js b/frontend/src/utils/form/navigate-away-prompt.js
index ac9e6db49..21c4f4661 100644
--- a/frontend/src/utils/form/navigate-away-prompt.js
+++ b/frontend/src/utils/form/navigate-away-prompt.js
@@ -1,6 +1,6 @@
-import { Utility } from "../../core/utility";
-import { AUTO_SUBMIT_BUTTON_UTIL_SELECTOR } from "./auto-submit-button";
-import { AUTO_SUBMIT_INPUT_UTIL_SELECTOR } from "./auto-submit-input";
+import { Utility } from '../../core/utility';
+import { AUTO_SUBMIT_BUTTON_UTIL_SELECTOR } from './auto-submit-button';
+import { AUTO_SUBMIT_INPUT_UTIL_SELECTOR } from './auto-submit-input';
 
 const NAVIGATE_AWAY_PROMPT_INITIALIZED_CLASS = 'navigate-away-prompt--initialized';
 const NAVIGATE_AWAY_PROMPT_UTIL_OPTOUT = '[uw-no-navigate-away-prompt]';
diff --git a/frontend/src/utils/form/reactive-submit-button.js b/frontend/src/utils/form/reactive-submit-button.js
index a684a0ee9..a53b91001 100644
--- a/frontend/src/utils/form/reactive-submit-button.js
+++ b/frontend/src/utils/form/reactive-submit-button.js
@@ -1,4 +1,4 @@
-import { Utility } from "../../core/utility";
+import { Utility } from '../../core/utility';
 
 var REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS = 'reactive-submit-button--initialized';
 
diff --git a/frontend/src/utils/form/reactive-submit-button.md b/frontend/src/utils/form/reactive-submit-button.md
index 69e65ebbb..fa684fea7 100644
--- a/frontend/src/utils/form/reactive-submit-button.md
+++ b/frontend/src/utils/form/reactive-submit-button.md
@@ -12,6 +12,6 @@ Disables a forms LAST sumit button as long as the required inputs are invalid
 ## Example usage:
 ```html
 <form uw-reactive-submit-button>
-  <input type="text" required>
-  <button type="submit">
+  <input type='text' required>
+  <button type='submit'>
 ```
diff --git a/frontend/src/utils/inputs/checkbox.js b/frontend/src/utils/inputs/checkbox.js
index d4993852d..e93c88856 100644
--- a/frontend/src/utils/inputs/checkbox.js
+++ b/frontend/src/utils/inputs/checkbox.js
@@ -1,4 +1,4 @@
-import { Utility } from "../../core/utility";
+import { Utility } from '../../core/utility';
 import './checkbox.scss';
 
 var CHECKBOX_CLASS = 'checkbox';
@@ -20,7 +20,7 @@ export class Checkbox {
     }
 
     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;
     }
 
diff --git a/frontend/src/utils/inputs/checkbox.md b/frontend/src/utils/inputs/checkbox.md
index b2763c634..548d92523 100644
--- a/frontend/src/utils/inputs/checkbox.md
+++ b/frontend/src/utils/inputs/checkbox.md
@@ -2,9 +2,9 @@
 Wraps native checkbox
 
 ## Attribute: (none)
-(element must be an input of type="checkbox")
+(element must be an input of type='checkbox')
 
 ## Example usage:
 ```html
-<input type="checkbox">
+<input type='checkbox'>
 ```
diff --git a/frontend/src/utils/inputs/checkbox.scss b/frontend/src/utils/inputs/checkbox.scss
index 6db7f97e3..5dc0c9995 100644
--- a/frontend/src/utils/inputs/checkbox.scss
+++ b/frontend/src/utils/inputs/checkbox.scss
@@ -5,7 +5,7 @@
   position: relative;
   display: inline-block;
 
-  [type="checkbox"] {
+  [type='checkbox'] {
     position: fixed;
     top: -1px;
     left: -1px;
@@ -41,7 +41,7 @@
     background-color: var(--color-primary);
   }
 
-  [type="checkbox"]:focus + label {
+  [type='checkbox']:focus + label {
     border-color: #3273dc;
     box-shadow: 0 0 0 0.125em rgba(50,115,220,.25);
     outline: 0;
diff --git a/frontend/src/utils/inputs/file-input.js b/frontend/src/utils/inputs/file-input.js
index f54563884..15f330e00 100644
--- a/frontend/src/utils/inputs/file-input.js
+++ b/frontend/src/utils/inputs/file-input.js
@@ -1,4 +1,4 @@
-import { Utility } from "../../core/utility";
+import { Utility } from '../../core/utility';
 
 const FILE_INPUT_CLASS = 'file-input';
 const FILE_INPUT_INITIALIZED_CLASS = 'file-input--initialized';
diff --git a/frontend/src/utils/inputs/file-input.md b/frontend/src/utils/inputs/file-input.md
index 3d0b5df77..0a08d6bda 100644
--- a/frontend/src/utils/inputs/file-input.md
+++ b/frontend/src/utils/inputs/file-input.md
@@ -13,11 +13,11 @@ Wraps native file input
 This utility expects the following translations to be available:
 - `filesSelected`:\
   label of multi-input button after selection\
-  *example*: "Dateien ausgewählt" (will be prepended by number of selected files)
+  *example*: 'Dateien ausgewählt' (will be prepended by number of selected files)
 - `selectFile`:\
   label of single-input button before selection\
-  *example*: "Datei auswählen"
+  *example*: 'Datei auswählen'
 - `selectFiles`:\
   label of multi-input button before selection\
-  *example*: "Datei(en) auswählen"
+  *example*: 'Datei(en) auswählen'
 
diff --git a/frontend/src/utils/inputs/inputs.scss b/frontend/src/utils/inputs/inputs.scss
index 3290094d0..817534357 100644
--- a/frontend/src/utils/inputs/inputs.scss
+++ b/frontend/src/utils/inputs/inputs.scss
@@ -85,14 +85,14 @@
 }
 
 /* TEXT INPUTS */
-input[type="text"],
-input[type="search"],
-input[type="password"],
-input[type="url"],
-input[type="number"],
-input[type="email"],
-input[type*="date"],
-input[type*="time"],
+input[type='text'],
+input[type='search'],
+input[type='password'],
+input[type='url'],
+input[type='number'],
+input[type='email'],
+input[type*='date'],
+input[type*='time'],
 select {
   /* from bulma.css */
   color: #363636;
@@ -111,13 +111,13 @@ select {
   padding: 4px 13px;
 }
 
-input[type="number"] {
+input[type='number'] {
   width: 100px;
 }
 
-input[type*="date"],
-input[type*="time"],
-.flatpickr-input[type="text"] {
+input[type*='date'],
+input[type*='time'],
+.flatpickr-input[type='text'] {
   width: 50%;
   width: 250px;
 }
diff --git a/frontend/src/utils/inputs/radio.scss b/frontend/src/utils/inputs/radio.scss
index 1b26ae1ae..538d6d539 100644
--- a/frontend/src/utils/inputs/radio.scss
+++ b/frontend/src/utils/inputs/radio.scss
@@ -9,7 +9,7 @@
   position: relative;
   display: inline-block;
 
-  [type="radio"] {
+  [type='radio'] {
     position: fixed;
     top: -1px;
     left: -1px;
diff --git a/frontend/src/utils/mass-input/mass-input.js b/frontend/src/utils/mass-input/mass-input.js
index fbde37f6c..87d17c8c3 100644
--- a/frontend/src/utils/mass-input/mass-input.js
+++ b/frontend/src/utils/mass-input/mass-input.js
@@ -1,4 +1,4 @@
-import { Utility } from "../../core/utility";
+import { Utility } from '../../core/utility';
 
 const MASS_INPUT_CELL_SELECTOR = '.massinput__cell';
 const MASS_INPUT_ADD_CELL_SELECTOR = '.massinput__cell--add';
@@ -148,7 +148,7 @@ export class MassInput {
   }
 
   _processResponse(responseElement) {
-    this._element.innerHTML = "";
+    this._element.innerHTML = '';
     this._element.appendChild(responseElement);
 
     this._reset();
diff --git a/frontend/src/utils/mass-input/mass-input.md b/frontend/src/utils/mass-input/mass-input.md
index 7561b5514..1e11cd000 100644
--- a/frontend/src/utils/mass-input/mass-input.md
+++ b/frontend/src/utils/mass-input/mass-input.md
@@ -9,9 +9,9 @@ The utility will only trigger an AJAX request if the mass input element has an a
 
 ## Example usage:
 ```html
-<form method="POST" action="...">
-  <input type="text">
+<form method='POST' action='...'>
+  <input type='text'>
   <div uw-mass-input>
-    <input type="text">
-    <button type="submit">
+    <input type='text'>
+    <button type='submit'>
 ```
diff --git a/frontend/src/utils/modal/modal.md b/frontend/src/utils/modal/modal.md
index c17c40015..6302badae 100644
--- a/frontend/src/utils/modal/modal.md
+++ b/frontend/src/utils/modal/modal.md
@@ -5,7 +5,7 @@
 ## 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
+If trigger element has 'href' attribute the modal will be dynamically loaded from the referenced page
 - `data-modal-closeable: boolean`\
 If the param is present the modal will have a close-icon and can also be closed by clicking anywhere on the overlay
 
diff --git a/frontend/src/utils/tooltips/tooltips.js b/frontend/src/utils/tooltips/tooltips.js
index 97a2e299f..b773eef39 100644
--- a/frontend/src/utils/tooltips/tooltips.js
+++ b/frontend/src/utils/tooltips/tooltips.js
@@ -1,7 +1,7 @@
 import { Utility } from '../../core/utility';
 import './tooltips.scss';
 
-// empty "shell" to be able to load styles
+// empty 'shell' to be able to load styles
 @Utility({
   selector: '[not-something-that-would-be-found]',
 })
diff --git a/frontend/src/utils/tooltips/tooltips.scss b/frontend/src/utils/tooltips/tooltips.scss
index ed6b5fd5d..5e745bc5b 100644
--- a/frontend/src/utils/tooltips/tooltips.scss
+++ b/frontend/src/utils/tooltips/tooltips.scss
@@ -28,7 +28,7 @@
     position: absolute;
     top: 0;
     left: 0;
-    font-family: "Font Awesome 5 Free";
+    font-family: 'Font Awesome 5 Free';
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index cfa9bbbee..04e77ec38 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -1,14 +1,14 @@
-import { Alerts } from "./alerts/alerts";
-import { Asidenav } from "./asidenav/asidenav";
-import { AsyncForm } from "./async-form/async-form";
-import { ShowHide } from "./show-hide/show-hide";
-import { AsyncTable } from "./async-table/async-table";
-import { CheckAll } from "./check-all/check-all";
-import { FormUtils } from "./form/form";
-import { InputUtils } from "./inputs/inputs";
-import { MassInput } from "./mass-input/mass-input";
-import { Modal } from "./modal/modal";
-import { Tooltip } from "./tooltips/tooltips";
+import { Alerts } from './alerts/alerts';
+import { Asidenav } from './asidenav/asidenav';
+import { AsyncForm } from './async-form/async-form';
+import { ShowHide } from './show-hide/show-hide';
+import { AsyncTable } from './async-table/async-table';
+import { CheckAll } from './check-all/check-all';
+import { FormUtils } from './form/form';
+import { InputUtils } from './inputs/inputs';
+import { MassInput } from './mass-input/mass-input';
+import { Modal } from './modal/modal';
+import { Tooltip } from './tooltips/tooltips';
 
 export const Utils = [
   Alerts,
diff --git a/frontend/vendor/flatpickr.css b/frontend/vendor/flatpickr.css
index 2e9c517e9..64e91f696 100644
--- a/frontend/vendor/flatpickr.css
+++ b/frontend/vendor/flatpickr.css
@@ -254,7 +254,7 @@
 }
 .numInputWrapper span:after {
   display: block;
-  content: "";
+  content: '';
   position: absolute;
 }
 .numInputWrapper span.arrowUp {
@@ -628,7 +628,7 @@ span.flatpickr-weekday {
   display: flex;
 }
 .flatpickr-time:after {
-  content: "";
+  content: '';
   display: table;
   clear: both;
 }
diff --git a/frontend/vendor/fontawesome.css b/frontend/vendor/fontawesome.css
index 68b26ef9b..70c4ba2dd 100644
--- a/frontend/vendor/fontawesome.css
+++ b/frontend/vendor/fontawesome.css
@@ -2,4 +2,4 @@
  * Font Awesome Free 5.1.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
-.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:a 2s infinite linear}.fa-pulse{animation:a 1s infinite steps(8)}@keyframes a{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-balance-scale:before{content:"\f24e"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bicycle:before{content:"\f206"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blind:before{content:"\f29d"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-open:before{content:"\f518"}.fa-bookmark:before{content:"\f02e"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-certificate:before{content:"\f0a3"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-concierge-bell:before{content:"\f562"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-credit-card:before{content:"\f09d"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-deviantart:before{content:"\f1bd"}.fa-diagnoses:before{content:"\f470"}.fa-dice:before{content:"\f522"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-gift:before{content:"\f06b"}.fa-git:before{content:"\f1d3"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hashtag:before{content:"\f292"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hot-tub:before{content:"\f593"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-houzz:before{content:"\f27c"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-internet-explorer:before{content:"\f26b"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mercury:before{content:"\f223"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-motorcycle:before{content:"\f21c"}.fa-mouse-pointer:before{content:"\f245"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-nintendo-switch:before{content:"\f418"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-old-republic:before{content:"\f510"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-people-carry:before{content:"\f4ce"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-volume:before{content:"\f2a0"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poo:before{content:"\f2fe"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-r-project:before{content:"\f4f7"}.fa-random:before{content:"\f074"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-rendact:before{content:"\f3e4"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-retweet:before{content:"\f079"}.fa-ribbon:before{content:"\f4d6"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-rupee-sign:before{content:"\f156"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-sass:before{content:"\f41e"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-search:before{content:"\f002"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skull:before{content:"\f54c"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowflake:before{content:"\f2dc"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-swatchbook:before{content:"\f5c3"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toolbox:before{content:"\f552"}.fa-tooth:before{content:"\f5c9"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-train:before{content:"\f238"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-moving:before{content:"\f4df"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}
\ No newline at end of file
+.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:a 2s infinite linear}.fa-pulse{animation:a 1s infinite steps(8)}@keyframes a{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:'progid:DXImageTransform.Microsoft.BasicImage(rotation=1)';transform:rotate(90deg)}.fa-rotate-180{-ms-filter:'progid:DXImageTransform.Microsoft.BasicImage(rotation=2)';transform:rotate(180deg)}.fa-rotate-270{-ms-filter:'progid:DXImageTransform.Microsoft.BasicImage(rotation=3)';transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:'progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)';transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:'progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)'}.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:'\f26e'}.fa-accessible-icon:before{content:'\f368'}.fa-accusoft:before{content:'\f369'}.fa-address-book:before{content:'\f2b9'}.fa-address-card:before{content:'\f2bb'}.fa-adjust:before{content:'\f042'}.fa-adn:before{content:'\f170'}.fa-adversal:before{content:'\f36a'}.fa-affiliatetheme:before{content:'\f36b'}.fa-algolia:before{content:'\f36c'}.fa-align-center:before{content:'\f037'}.fa-align-justify:before{content:'\f039'}.fa-align-left:before{content:'\f036'}.fa-align-right:before{content:'\f038'}.fa-allergies:before{content:'\f461'}.fa-amazon:before{content:'\f270'}.fa-amazon-pay:before{content:'\f42c'}.fa-ambulance:before{content:'\f0f9'}.fa-american-sign-language-interpreting:before{content:'\f2a3'}.fa-amilia:before{content:'\f36d'}.fa-anchor:before{content:'\f13d'}.fa-android:before{content:'\f17b'}.fa-angellist:before{content:'\f209'}.fa-angle-double-down:before{content:'\f103'}.fa-angle-double-left:before{content:'\f100'}.fa-angle-double-right:before{content:'\f101'}.fa-angle-double-up:before{content:'\f102'}.fa-angle-down:before{content:'\f107'}.fa-angle-left:before{content:'\f104'}.fa-angle-right:before{content:'\f105'}.fa-angle-up:before{content:'\f106'}.fa-angry:before{content:'\f556'}.fa-angrycreative:before{content:'\f36e'}.fa-angular:before{content:'\f420'}.fa-app-store:before{content:'\f36f'}.fa-app-store-ios:before{content:'\f370'}.fa-apper:before{content:'\f371'}.fa-apple:before{content:'\f179'}.fa-apple-pay:before{content:'\f415'}.fa-archive:before{content:'\f187'}.fa-archway:before{content:'\f557'}.fa-arrow-alt-circle-down:before{content:'\f358'}.fa-arrow-alt-circle-left:before{content:'\f359'}.fa-arrow-alt-circle-right:before{content:'\f35a'}.fa-arrow-alt-circle-up:before{content:'\f35b'}.fa-arrow-circle-down:before{content:'\f0ab'}.fa-arrow-circle-left:before{content:'\f0a8'}.fa-arrow-circle-right:before{content:'\f0a9'}.fa-arrow-circle-up:before{content:'\f0aa'}.fa-arrow-down:before{content:'\f063'}.fa-arrow-left:before{content:'\f060'}.fa-arrow-right:before{content:'\f061'}.fa-arrow-up:before{content:'\f062'}.fa-arrows-alt:before{content:'\f0b2'}.fa-arrows-alt-h:before{content:'\f337'}.fa-arrows-alt-v:before{content:'\f338'}.fa-assistive-listening-systems:before{content:'\f2a2'}.fa-asterisk:before{content:'\f069'}.fa-asymmetrik:before{content:'\f372'}.fa-at:before{content:'\f1fa'}.fa-atlas:before{content:'\f558'}.fa-audible:before{content:'\f373'}.fa-audio-description:before{content:'\f29e'}.fa-autoprefixer:before{content:'\f41c'}.fa-avianex:before{content:'\f374'}.fa-aviato:before{content:'\f421'}.fa-award:before{content:'\f559'}.fa-aws:before{content:'\f375'}.fa-backspace:before{content:'\f55a'}.fa-backward:before{content:'\f04a'}.fa-balance-scale:before{content:'\f24e'}.fa-ban:before{content:'\f05e'}.fa-band-aid:before{content:'\f462'}.fa-bandcamp:before{content:'\f2d5'}.fa-barcode:before{content:'\f02a'}.fa-bars:before{content:'\f0c9'}.fa-baseball-ball:before{content:'\f433'}.fa-basketball-ball:before{content:'\f434'}.fa-bath:before{content:'\f2cd'}.fa-battery-empty:before{content:'\f244'}.fa-battery-full:before{content:'\f240'}.fa-battery-half:before{content:'\f242'}.fa-battery-quarter:before{content:'\f243'}.fa-battery-three-quarters:before{content:'\f241'}.fa-bed:before{content:'\f236'}.fa-beer:before{content:'\f0fc'}.fa-behance:before{content:'\f1b4'}.fa-behance-square:before{content:'\f1b5'}.fa-bell:before{content:'\f0f3'}.fa-bell-slash:before{content:'\f1f6'}.fa-bezier-curve:before{content:'\f55b'}.fa-bicycle:before{content:'\f206'}.fa-bimobject:before{content:'\f378'}.fa-binoculars:before{content:'\f1e5'}.fa-birthday-cake:before{content:'\f1fd'}.fa-bitbucket:before{content:'\f171'}.fa-bitcoin:before{content:'\f379'}.fa-bity:before{content:'\f37a'}.fa-black-tie:before{content:'\f27e'}.fa-blackberry:before{content:'\f37b'}.fa-blender:before{content:'\f517'}.fa-blind:before{content:'\f29d'}.fa-blogger:before{content:'\f37c'}.fa-blogger-b:before{content:'\f37d'}.fa-bluetooth:before{content:'\f293'}.fa-bluetooth-b:before{content:'\f294'}.fa-bold:before{content:'\f032'}.fa-bolt:before{content:'\f0e7'}.fa-bomb:before{content:'\f1e2'}.fa-bong:before{content:'\f55c'}.fa-book:before{content:'\f02d'}.fa-book-open:before{content:'\f518'}.fa-bookmark:before{content:'\f02e'}.fa-bowling-ball:before{content:'\f436'}.fa-box:before{content:'\f466'}.fa-box-open:before{content:'\f49e'}.fa-boxes:before{content:'\f468'}.fa-braille:before{content:'\f2a1'}.fa-briefcase:before{content:'\f0b1'}.fa-briefcase-medical:before{content:'\f469'}.fa-broadcast-tower:before{content:'\f519'}.fa-broom:before{content:'\f51a'}.fa-brush:before{content:'\f55d'}.fa-btc:before{content:'\f15a'}.fa-bug:before{content:'\f188'}.fa-building:before{content:'\f1ad'}.fa-bullhorn:before{content:'\f0a1'}.fa-bullseye:before{content:'\f140'}.fa-burn:before{content:'\f46a'}.fa-buromobelexperte:before{content:'\f37f'}.fa-bus:before{content:'\f207'}.fa-bus-alt:before{content:'\f55e'}.fa-buysellads:before{content:'\f20d'}.fa-calculator:before{content:'\f1ec'}.fa-calendar:before{content:'\f133'}.fa-calendar-alt:before{content:'\f073'}.fa-calendar-check:before{content:'\f274'}.fa-calendar-minus:before{content:'\f272'}.fa-calendar-plus:before{content:'\f271'}.fa-calendar-times:before{content:'\f273'}.fa-camera:before{content:'\f030'}.fa-camera-retro:before{content:'\f083'}.fa-cannabis:before{content:'\f55f'}.fa-capsules:before{content:'\f46b'}.fa-car:before{content:'\f1b9'}.fa-caret-down:before{content:'\f0d7'}.fa-caret-left:before{content:'\f0d9'}.fa-caret-right:before{content:'\f0da'}.fa-caret-square-down:before{content:'\f150'}.fa-caret-square-left:before{content:'\f191'}.fa-caret-square-right:before{content:'\f152'}.fa-caret-square-up:before{content:'\f151'}.fa-caret-up:before{content:'\f0d8'}.fa-cart-arrow-down:before{content:'\f218'}.fa-cart-plus:before{content:'\f217'}.fa-cc-amazon-pay:before{content:'\f42d'}.fa-cc-amex:before{content:'\f1f3'}.fa-cc-apple-pay:before{content:'\f416'}.fa-cc-diners-club:before{content:'\f24c'}.fa-cc-discover:before{content:'\f1f2'}.fa-cc-jcb:before{content:'\f24b'}.fa-cc-mastercard:before{content:'\f1f1'}.fa-cc-paypal:before{content:'\f1f4'}.fa-cc-stripe:before{content:'\f1f5'}.fa-cc-visa:before{content:'\f1f0'}.fa-centercode:before{content:'\f380'}.fa-certificate:before{content:'\f0a3'}.fa-chalkboard:before{content:'\f51b'}.fa-chalkboard-teacher:before{content:'\f51c'}.fa-chart-area:before{content:'\f1fe'}.fa-chart-bar:before{content:'\f080'}.fa-chart-line:before{content:'\f201'}.fa-chart-pie:before{content:'\f200'}.fa-check:before{content:'\f00c'}.fa-check-circle:before{content:'\f058'}.fa-check-double:before{content:'\f560'}.fa-check-square:before{content:'\f14a'}.fa-chess:before{content:'\f439'}.fa-chess-bishop:before{content:'\f43a'}.fa-chess-board:before{content:'\f43c'}.fa-chess-king:before{content:'\f43f'}.fa-chess-knight:before{content:'\f441'}.fa-chess-pawn:before{content:'\f443'}.fa-chess-queen:before{content:'\f445'}.fa-chess-rook:before{content:'\f447'}.fa-chevron-circle-down:before{content:'\f13a'}.fa-chevron-circle-left:before{content:'\f137'}.fa-chevron-circle-right:before{content:'\f138'}.fa-chevron-circle-up:before{content:'\f139'}.fa-chevron-down:before{content:'\f078'}.fa-chevron-left:before{content:'\f053'}.fa-chevron-right:before{content:'\f054'}.fa-chevron-up:before{content:'\f077'}.fa-child:before{content:'\f1ae'}.fa-chrome:before{content:'\f268'}.fa-church:before{content:'\f51d'}.fa-circle:before{content:'\f111'}.fa-circle-notch:before{content:'\f1ce'}.fa-clipboard:before{content:'\f328'}.fa-clipboard-check:before{content:'\f46c'}.fa-clipboard-list:before{content:'\f46d'}.fa-clock:before{content:'\f017'}.fa-clone:before{content:'\f24d'}.fa-closed-captioning:before{content:'\f20a'}.fa-cloud:before{content:'\f0c2'}.fa-cloud-download-alt:before{content:'\f381'}.fa-cloud-upload-alt:before{content:'\f382'}.fa-cloudscale:before{content:'\f383'}.fa-cloudsmith:before{content:'\f384'}.fa-cloudversify:before{content:'\f385'}.fa-cocktail:before{content:'\f561'}.fa-code:before{content:'\f121'}.fa-code-branch:before{content:'\f126'}.fa-codepen:before{content:'\f1cb'}.fa-codiepie:before{content:'\f284'}.fa-coffee:before{content:'\f0f4'}.fa-cog:before{content:'\f013'}.fa-cogs:before{content:'\f085'}.fa-coins:before{content:'\f51e'}.fa-columns:before{content:'\f0db'}.fa-comment:before{content:'\f075'}.fa-comment-alt:before{content:'\f27a'}.fa-comment-dots:before{content:'\f4ad'}.fa-comment-slash:before{content:'\f4b3'}.fa-comments:before{content:'\f086'}.fa-compact-disc:before{content:'\f51f'}.fa-compass:before{content:'\f14e'}.fa-compress:before{content:'\f066'}.fa-concierge-bell:before{content:'\f562'}.fa-connectdevelop:before{content:'\f20e'}.fa-contao:before{content:'\f26d'}.fa-cookie:before{content:'\f563'}.fa-cookie-bite:before{content:'\f564'}.fa-copy:before{content:'\f0c5'}.fa-copyright:before{content:'\f1f9'}.fa-couch:before{content:'\f4b8'}.fa-cpanel:before{content:'\f388'}.fa-creative-commons:before{content:'\f25e'}.fa-creative-commons-by:before{content:'\f4e7'}.fa-creative-commons-nc:before{content:'\f4e8'}.fa-creative-commons-nc-eu:before{content:'\f4e9'}.fa-creative-commons-nc-jp:before{content:'\f4ea'}.fa-creative-commons-nd:before{content:'\f4eb'}.fa-creative-commons-pd:before{content:'\f4ec'}.fa-creative-commons-pd-alt:before{content:'\f4ed'}.fa-creative-commons-remix:before{content:'\f4ee'}.fa-creative-commons-sa:before{content:'\f4ef'}.fa-creative-commons-sampling:before{content:'\f4f0'}.fa-creative-commons-sampling-plus:before{content:'\f4f1'}.fa-creative-commons-share:before{content:'\f4f2'}.fa-credit-card:before{content:'\f09d'}.fa-crop:before{content:'\f125'}.fa-crop-alt:before{content:'\f565'}.fa-crosshairs:before{content:'\f05b'}.fa-crow:before{content:'\f520'}.fa-crown:before{content:'\f521'}.fa-css3:before{content:'\f13c'}.fa-css3-alt:before{content:'\f38b'}.fa-cube:before{content:'\f1b2'}.fa-cubes:before{content:'\f1b3'}.fa-cut:before{content:'\f0c4'}.fa-cuttlefish:before{content:'\f38c'}.fa-d-and-d:before{content:'\f38d'}.fa-dashcube:before{content:'\f210'}.fa-database:before{content:'\f1c0'}.fa-deaf:before{content:'\f2a4'}.fa-delicious:before{content:'\f1a5'}.fa-deploydog:before{content:'\f38e'}.fa-deskpro:before{content:'\f38f'}.fa-desktop:before{content:'\f108'}.fa-deviantart:before{content:'\f1bd'}.fa-diagnoses:before{content:'\f470'}.fa-dice:before{content:'\f522'}.fa-dice-five:before{content:'\f523'}.fa-dice-four:before{content:'\f524'}.fa-dice-one:before{content:'\f525'}.fa-dice-six:before{content:'\f526'}.fa-dice-three:before{content:'\f527'}.fa-dice-two:before{content:'\f528'}.fa-digg:before{content:'\f1a6'}.fa-digital-ocean:before{content:'\f391'}.fa-digital-tachograph:before{content:'\f566'}.fa-discord:before{content:'\f392'}.fa-discourse:before{content:'\f393'}.fa-divide:before{content:'\f529'}.fa-dizzy:before{content:'\f567'}.fa-dna:before{content:'\f471'}.fa-dochub:before{content:'\f394'}.fa-docker:before{content:'\f395'}.fa-dollar-sign:before{content:'\f155'}.fa-dolly:before{content:'\f472'}.fa-dolly-flatbed:before{content:'\f474'}.fa-donate:before{content:'\f4b9'}.fa-door-closed:before{content:'\f52a'}.fa-door-open:before{content:'\f52b'}.fa-dot-circle:before{content:'\f192'}.fa-dove:before{content:'\f4ba'}.fa-download:before{content:'\f019'}.fa-draft2digital:before{content:'\f396'}.fa-drafting-compass:before{content:'\f568'}.fa-dribbble:before{content:'\f17d'}.fa-dribbble-square:before{content:'\f397'}.fa-dropbox:before{content:'\f16b'}.fa-drum:before{content:'\f569'}.fa-drum-steelpan:before{content:'\f56a'}.fa-drupal:before{content:'\f1a9'}.fa-dumbbell:before{content:'\f44b'}.fa-dyalog:before{content:'\f399'}.fa-earlybirds:before{content:'\f39a'}.fa-ebay:before{content:'\f4f4'}.fa-edge:before{content:'\f282'}.fa-edit:before{content:'\f044'}.fa-eject:before{content:'\f052'}.fa-elementor:before{content:'\f430'}.fa-ellipsis-h:before{content:'\f141'}.fa-ellipsis-v:before{content:'\f142'}.fa-ember:before{content:'\f423'}.fa-empire:before{content:'\f1d1'}.fa-envelope:before{content:'\f0e0'}.fa-envelope-open:before{content:'\f2b6'}.fa-envelope-square:before{content:'\f199'}.fa-envira:before{content:'\f299'}.fa-equals:before{content:'\f52c'}.fa-eraser:before{content:'\f12d'}.fa-erlang:before{content:'\f39d'}.fa-ethereum:before{content:'\f42e'}.fa-etsy:before{content:'\f2d7'}.fa-euro-sign:before{content:'\f153'}.fa-exchange-alt:before{content:'\f362'}.fa-exclamation:before{content:'\f12a'}.fa-exclamation-circle:before{content:'\f06a'}.fa-exclamation-triangle:before{content:'\f071'}.fa-expand:before{content:'\f065'}.fa-expand-arrows-alt:before{content:'\f31e'}.fa-expeditedssl:before{content:'\f23e'}.fa-external-link-alt:before{content:'\f35d'}.fa-external-link-square-alt:before{content:'\f360'}.fa-eye:before{content:'\f06e'}.fa-eye-dropper:before{content:'\f1fb'}.fa-eye-slash:before{content:'\f070'}.fa-facebook:before{content:'\f09a'}.fa-facebook-f:before{content:'\f39e'}.fa-facebook-messenger:before{content:'\f39f'}.fa-facebook-square:before{content:'\f082'}.fa-fast-backward:before{content:'\f049'}.fa-fast-forward:before{content:'\f050'}.fa-fax:before{content:'\f1ac'}.fa-feather:before{content:'\f52d'}.fa-feather-alt:before{content:'\f56b'}.fa-female:before{content:'\f182'}.fa-fighter-jet:before{content:'\f0fb'}.fa-file:before{content:'\f15b'}.fa-file-alt:before{content:'\f15c'}.fa-file-archive:before{content:'\f1c6'}.fa-file-audio:before{content:'\f1c7'}.fa-file-code:before{content:'\f1c9'}.fa-file-contract:before{content:'\f56c'}.fa-file-download:before{content:'\f56d'}.fa-file-excel:before{content:'\f1c3'}.fa-file-export:before{content:'\f56e'}.fa-file-image:before{content:'\f1c5'}.fa-file-import:before{content:'\f56f'}.fa-file-invoice:before{content:'\f570'}.fa-file-invoice-dollar:before{content:'\f571'}.fa-file-medical:before{content:'\f477'}.fa-file-medical-alt:before{content:'\f478'}.fa-file-pdf:before{content:'\f1c1'}.fa-file-powerpoint:before{content:'\f1c4'}.fa-file-prescription:before{content:'\f572'}.fa-file-signature:before{content:'\f573'}.fa-file-upload:before{content:'\f574'}.fa-file-video:before{content:'\f1c8'}.fa-file-word:before{content:'\f1c2'}.fa-fill:before{content:'\f575'}.fa-fill-drip:before{content:'\f576'}.fa-film:before{content:'\f008'}.fa-filter:before{content:'\f0b0'}.fa-fingerprint:before{content:'\f577'}.fa-fire:before{content:'\f06d'}.fa-fire-extinguisher:before{content:'\f134'}.fa-firefox:before{content:'\f269'}.fa-first-aid:before{content:'\f479'}.fa-first-order:before{content:'\f2b0'}.fa-first-order-alt:before{content:'\f50a'}.fa-firstdraft:before{content:'\f3a1'}.fa-fish:before{content:'\f578'}.fa-flag:before{content:'\f024'}.fa-flag-checkered:before{content:'\f11e'}.fa-flask:before{content:'\f0c3'}.fa-flickr:before{content:'\f16e'}.fa-flipboard:before{content:'\f44d'}.fa-flushed:before{content:'\f579'}.fa-fly:before{content:'\f417'}.fa-folder:before{content:'\f07b'}.fa-folder-open:before{content:'\f07c'}.fa-font:before{content:'\f031'}.fa-font-awesome:before{content:'\f2b4'}.fa-font-awesome-alt:before{content:'\f35c'}.fa-font-awesome-flag:before{content:'\f425'}.fa-font-awesome-logo-full:before{content:'\f4e6'}.fa-fonticons:before{content:'\f280'}.fa-fonticons-fi:before{content:'\f3a2'}.fa-football-ball:before{content:'\f44e'}.fa-fort-awesome:before{content:'\f286'}.fa-fort-awesome-alt:before{content:'\f3a3'}.fa-forumbee:before{content:'\f211'}.fa-forward:before{content:'\f04e'}.fa-foursquare:before{content:'\f180'}.fa-free-code-camp:before{content:'\f2c5'}.fa-freebsd:before{content:'\f3a4'}.fa-frog:before{content:'\f52e'}.fa-frown:before{content:'\f119'}.fa-frown-open:before{content:'\f57a'}.fa-fulcrum:before{content:'\f50b'}.fa-futbol:before{content:'\f1e3'}.fa-galactic-republic:before{content:'\f50c'}.fa-galactic-senate:before{content:'\f50d'}.fa-gamepad:before{content:'\f11b'}.fa-gas-pump:before{content:'\f52f'}.fa-gavel:before{content:'\f0e3'}.fa-gem:before{content:'\f3a5'}.fa-genderless:before{content:'\f22d'}.fa-get-pocket:before{content:'\f265'}.fa-gg:before{content:'\f260'}.fa-gg-circle:before{content:'\f261'}.fa-gift:before{content:'\f06b'}.fa-git:before{content:'\f1d3'}.fa-git-square:before{content:'\f1d2'}.fa-github:before{content:'\f09b'}.fa-github-alt:before{content:'\f113'}.fa-github-square:before{content:'\f092'}.fa-gitkraken:before{content:'\f3a6'}.fa-gitlab:before{content:'\f296'}.fa-gitter:before{content:'\f426'}.fa-glass-martini:before{content:'\f000'}.fa-glass-martini-alt:before{content:'\f57b'}.fa-glasses:before{content:'\f530'}.fa-glide:before{content:'\f2a5'}.fa-glide-g:before{content:'\f2a6'}.fa-globe:before{content:'\f0ac'}.fa-globe-africa:before{content:'\f57c'}.fa-globe-americas:before{content:'\f57d'}.fa-globe-asia:before{content:'\f57e'}.fa-gofore:before{content:'\f3a7'}.fa-golf-ball:before{content:'\f450'}.fa-goodreads:before{content:'\f3a8'}.fa-goodreads-g:before{content:'\f3a9'}.fa-google:before{content:'\f1a0'}.fa-google-drive:before{content:'\f3aa'}.fa-google-play:before{content:'\f3ab'}.fa-google-plus:before{content:'\f2b3'}.fa-google-plus-g:before{content:'\f0d5'}.fa-google-plus-square:before{content:'\f0d4'}.fa-google-wallet:before{content:'\f1ee'}.fa-graduation-cap:before{content:'\f19d'}.fa-gratipay:before{content:'\f184'}.fa-grav:before{content:'\f2d6'}.fa-greater-than:before{content:'\f531'}.fa-greater-than-equal:before{content:'\f532'}.fa-grimace:before{content:'\f57f'}.fa-grin:before{content:'\f580'}.fa-grin-alt:before{content:'\f581'}.fa-grin-beam:before{content:'\f582'}.fa-grin-beam-sweat:before{content:'\f583'}.fa-grin-hearts:before{content:'\f584'}.fa-grin-squint:before{content:'\f585'}.fa-grin-squint-tears:before{content:'\f586'}.fa-grin-stars:before{content:'\f587'}.fa-grin-tears:before{content:'\f588'}.fa-grin-tongue:before{content:'\f589'}.fa-grin-tongue-squint:before{content:'\f58a'}.fa-grin-tongue-wink:before{content:'\f58b'}.fa-grin-wink:before{content:'\f58c'}.fa-grip-horizontal:before{content:'\f58d'}.fa-grip-vertical:before{content:'\f58e'}.fa-gripfire:before{content:'\f3ac'}.fa-grunt:before{content:'\f3ad'}.fa-gulp:before{content:'\f3ae'}.fa-h-square:before{content:'\f0fd'}.fa-hacker-news:before{content:'\f1d4'}.fa-hacker-news-square:before{content:'\f3af'}.fa-hand-holding:before{content:'\f4bd'}.fa-hand-holding-heart:before{content:'\f4be'}.fa-hand-holding-usd:before{content:'\f4c0'}.fa-hand-lizard:before{content:'\f258'}.fa-hand-paper:before{content:'\f256'}.fa-hand-peace:before{content:'\f25b'}.fa-hand-point-down:before{content:'\f0a7'}.fa-hand-point-left:before{content:'\f0a5'}.fa-hand-point-right:before{content:'\f0a4'}.fa-hand-point-up:before{content:'\f0a6'}.fa-hand-pointer:before{content:'\f25a'}.fa-hand-rock:before{content:'\f255'}.fa-hand-scissors:before{content:'\f257'}.fa-hand-spock:before{content:'\f259'}.fa-hands:before{content:'\f4c2'}.fa-hands-helping:before{content:'\f4c4'}.fa-handshake:before{content:'\f2b5'}.fa-hashtag:before{content:'\f292'}.fa-hdd:before{content:'\f0a0'}.fa-heading:before{content:'\f1dc'}.fa-headphones:before{content:'\f025'}.fa-headphones-alt:before{content:'\f58f'}.fa-headset:before{content:'\f590'}.fa-heart:before{content:'\f004'}.fa-heartbeat:before{content:'\f21e'}.fa-helicopter:before{content:'\f533'}.fa-highlighter:before{content:'\f591'}.fa-hips:before{content:'\f452'}.fa-hire-a-helper:before{content:'\f3b0'}.fa-history:before{content:'\f1da'}.fa-hockey-puck:before{content:'\f453'}.fa-home:before{content:'\f015'}.fa-hooli:before{content:'\f427'}.fa-hornbill:before{content:'\f592'}.fa-hospital:before{content:'\f0f8'}.fa-hospital-alt:before{content:'\f47d'}.fa-hospital-symbol:before{content:'\f47e'}.fa-hot-tub:before{content:'\f593'}.fa-hotel:before{content:'\f594'}.fa-hotjar:before{content:'\f3b1'}.fa-hourglass:before{content:'\f254'}.fa-hourglass-end:before{content:'\f253'}.fa-hourglass-half:before{content:'\f252'}.fa-hourglass-start:before{content:'\f251'}.fa-houzz:before{content:'\f27c'}.fa-html5:before{content:'\f13b'}.fa-hubspot:before{content:'\f3b2'}.fa-i-cursor:before{content:'\f246'}.fa-id-badge:before{content:'\f2c1'}.fa-id-card:before{content:'\f2c2'}.fa-id-card-alt:before{content:'\f47f'}.fa-image:before{content:'\f03e'}.fa-images:before{content:'\f302'}.fa-imdb:before{content:'\f2d8'}.fa-inbox:before{content:'\f01c'}.fa-indent:before{content:'\f03c'}.fa-industry:before{content:'\f275'}.fa-infinity:before{content:'\f534'}.fa-info:before{content:'\f129'}.fa-info-circle:before{content:'\f05a'}.fa-instagram:before{content:'\f16d'}.fa-internet-explorer:before{content:'\f26b'}.fa-ioxhost:before{content:'\f208'}.fa-italic:before{content:'\f033'}.fa-itunes:before{content:'\f3b4'}.fa-itunes-note:before{content:'\f3b5'}.fa-java:before{content:'\f4e4'}.fa-jedi-order:before{content:'\f50e'}.fa-jenkins:before{content:'\f3b6'}.fa-joget:before{content:'\f3b7'}.fa-joint:before{content:'\f595'}.fa-joomla:before{content:'\f1aa'}.fa-js:before{content:'\f3b8'}.fa-js-square:before{content:'\f3b9'}.fa-jsfiddle:before{content:'\f1cc'}.fa-key:before{content:'\f084'}.fa-keybase:before{content:'\f4f5'}.fa-keyboard:before{content:'\f11c'}.fa-keycdn:before{content:'\f3ba'}.fa-kickstarter:before{content:'\f3bb'}.fa-kickstarter-k:before{content:'\f3bc'}.fa-kiss:before{content:'\f596'}.fa-kiss-beam:before{content:'\f597'}.fa-kiss-wink-heart:before{content:'\f598'}.fa-kiwi-bird:before{content:'\f535'}.fa-korvue:before{content:'\f42f'}.fa-language:before{content:'\f1ab'}.fa-laptop:before{content:'\f109'}.fa-laravel:before{content:'\f3bd'}.fa-lastfm:before{content:'\f202'}.fa-lastfm-square:before{content:'\f203'}.fa-laugh:before{content:'\f599'}.fa-laugh-beam:before{content:'\f59a'}.fa-laugh-squint:before{content:'\f59b'}.fa-laugh-wink:before{content:'\f59c'}.fa-leaf:before{content:'\f06c'}.fa-leanpub:before{content:'\f212'}.fa-lemon:before{content:'\f094'}.fa-less:before{content:'\f41d'}.fa-less-than:before{content:'\f536'}.fa-less-than-equal:before{content:'\f537'}.fa-level-down-alt:before{content:'\f3be'}.fa-level-up-alt:before{content:'\f3bf'}.fa-life-ring:before{content:'\f1cd'}.fa-lightbulb:before{content:'\f0eb'}.fa-line:before{content:'\f3c0'}.fa-link:before{content:'\f0c1'}.fa-linkedin:before{content:'\f08c'}.fa-linkedin-in:before{content:'\f0e1'}.fa-linode:before{content:'\f2b8'}.fa-linux:before{content:'\f17c'}.fa-lira-sign:before{content:'\f195'}.fa-list:before{content:'\f03a'}.fa-list-alt:before{content:'\f022'}.fa-list-ol:before{content:'\f0cb'}.fa-list-ul:before{content:'\f0ca'}.fa-location-arrow:before{content:'\f124'}.fa-lock:before{content:'\f023'}.fa-lock-open:before{content:'\f3c1'}.fa-long-arrow-alt-down:before{content:'\f309'}.fa-long-arrow-alt-left:before{content:'\f30a'}.fa-long-arrow-alt-right:before{content:'\f30b'}.fa-long-arrow-alt-up:before{content:'\f30c'}.fa-low-vision:before{content:'\f2a8'}.fa-luggage-cart:before{content:'\f59d'}.fa-lyft:before{content:'\f3c3'}.fa-magento:before{content:'\f3c4'}.fa-magic:before{content:'\f0d0'}.fa-magnet:before{content:'\f076'}.fa-mailchimp:before{content:'\f59e'}.fa-male:before{content:'\f183'}.fa-mandalorian:before{content:'\f50f'}.fa-map:before{content:'\f279'}.fa-map-marked:before{content:'\f59f'}.fa-map-marked-alt:before{content:'\f5a0'}.fa-map-marker:before{content:'\f041'}.fa-map-marker-alt:before{content:'\f3c5'}.fa-map-pin:before{content:'\f276'}.fa-map-signs:before{content:'\f277'}.fa-marker:before{content:'\f5a1'}.fa-mars:before{content:'\f222'}.fa-mars-double:before{content:'\f227'}.fa-mars-stroke:before{content:'\f229'}.fa-mars-stroke-h:before{content:'\f22b'}.fa-mars-stroke-v:before{content:'\f22a'}.fa-mastodon:before{content:'\f4f6'}.fa-maxcdn:before{content:'\f136'}.fa-medal:before{content:'\f5a2'}.fa-medapps:before{content:'\f3c6'}.fa-medium:before{content:'\f23a'}.fa-medium-m:before{content:'\f3c7'}.fa-medkit:before{content:'\f0fa'}.fa-medrt:before{content:'\f3c8'}.fa-meetup:before{content:'\f2e0'}.fa-megaport:before{content:'\f5a3'}.fa-meh:before{content:'\f11a'}.fa-meh-blank:before{content:'\f5a4'}.fa-meh-rolling-eyes:before{content:'\f5a5'}.fa-memory:before{content:'\f538'}.fa-mercury:before{content:'\f223'}.fa-microchip:before{content:'\f2db'}.fa-microphone:before{content:'\f130'}.fa-microphone-alt:before{content:'\f3c9'}.fa-microphone-alt-slash:before{content:'\f539'}.fa-microphone-slash:before{content:'\f131'}.fa-microsoft:before{content:'\f3ca'}.fa-minus:before{content:'\f068'}.fa-minus-circle:before{content:'\f056'}.fa-minus-square:before{content:'\f146'}.fa-mix:before{content:'\f3cb'}.fa-mixcloud:before{content:'\f289'}.fa-mizuni:before{content:'\f3cc'}.fa-mobile:before{content:'\f10b'}.fa-mobile-alt:before{content:'\f3cd'}.fa-modx:before{content:'\f285'}.fa-monero:before{content:'\f3d0'}.fa-money-bill:before{content:'\f0d6'}.fa-money-bill-alt:before{content:'\f3d1'}.fa-money-bill-wave:before{content:'\f53a'}.fa-money-bill-wave-alt:before{content:'\f53b'}.fa-money-check:before{content:'\f53c'}.fa-money-check-alt:before{content:'\f53d'}.fa-monument:before{content:'\f5a6'}.fa-moon:before{content:'\f186'}.fa-mortar-pestle:before{content:'\f5a7'}.fa-motorcycle:before{content:'\f21c'}.fa-mouse-pointer:before{content:'\f245'}.fa-music:before{content:'\f001'}.fa-napster:before{content:'\f3d2'}.fa-neuter:before{content:'\f22c'}.fa-newspaper:before{content:'\f1ea'}.fa-nimblr:before{content:'\f5a8'}.fa-nintendo-switch:before{content:'\f418'}.fa-node:before{content:'\f419'}.fa-node-js:before{content:'\f3d3'}.fa-not-equal:before{content:'\f53e'}.fa-notes-medical:before{content:'\f481'}.fa-npm:before{content:'\f3d4'}.fa-ns8:before{content:'\f3d5'}.fa-nutritionix:before{content:'\f3d6'}.fa-object-group:before{content:'\f247'}.fa-object-ungroup:before{content:'\f248'}.fa-odnoklassniki:before{content:'\f263'}.fa-odnoklassniki-square:before{content:'\f264'}.fa-old-republic:before{content:'\f510'}.fa-opencart:before{content:'\f23d'}.fa-openid:before{content:'\f19b'}.fa-opera:before{content:'\f26a'}.fa-optin-monster:before{content:'\f23c'}.fa-osi:before{content:'\f41a'}.fa-outdent:before{content:'\f03b'}.fa-page4:before{content:'\f3d7'}.fa-pagelines:before{content:'\f18c'}.fa-paint-brush:before{content:'\f1fc'}.fa-paint-roller:before{content:'\f5aa'}.fa-palette:before{content:'\f53f'}.fa-palfed:before{content:'\f3d8'}.fa-pallet:before{content:'\f482'}.fa-paper-plane:before{content:'\f1d8'}.fa-paperclip:before{content:'\f0c6'}.fa-parachute-box:before{content:'\f4cd'}.fa-paragraph:before{content:'\f1dd'}.fa-parking:before{content:'\f540'}.fa-passport:before{content:'\f5ab'}.fa-paste:before{content:'\f0ea'}.fa-patreon:before{content:'\f3d9'}.fa-pause:before{content:'\f04c'}.fa-pause-circle:before{content:'\f28b'}.fa-paw:before{content:'\f1b0'}.fa-paypal:before{content:'\f1ed'}.fa-pen:before{content:'\f304'}.fa-pen-alt:before{content:'\f305'}.fa-pen-fancy:before{content:'\f5ac'}.fa-pen-nib:before{content:'\f5ad'}.fa-pen-square:before{content:'\f14b'}.fa-pencil-alt:before{content:'\f303'}.fa-pencil-ruler:before{content:'\f5ae'}.fa-people-carry:before{content:'\f4ce'}.fa-percent:before{content:'\f295'}.fa-percentage:before{content:'\f541'}.fa-periscope:before{content:'\f3da'}.fa-phabricator:before{content:'\f3db'}.fa-phoenix-framework:before{content:'\f3dc'}.fa-phoenix-squadron:before{content:'\f511'}.fa-phone:before{content:'\f095'}.fa-phone-slash:before{content:'\f3dd'}.fa-phone-square:before{content:'\f098'}.fa-phone-volume:before{content:'\f2a0'}.fa-php:before{content:'\f457'}.fa-pied-piper:before{content:'\f2ae'}.fa-pied-piper-alt:before{content:'\f1a8'}.fa-pied-piper-hat:before{content:'\f4e5'}.fa-pied-piper-pp:before{content:'\f1a7'}.fa-piggy-bank:before{content:'\f4d3'}.fa-pills:before{content:'\f484'}.fa-pinterest:before{content:'\f0d2'}.fa-pinterest-p:before{content:'\f231'}.fa-pinterest-square:before{content:'\f0d3'}.fa-plane:before{content:'\f072'}.fa-plane-arrival:before{content:'\f5af'}.fa-plane-departure:before{content:'\f5b0'}.fa-play:before{content:'\f04b'}.fa-play-circle:before{content:'\f144'}.fa-playstation:before{content:'\f3df'}.fa-plug:before{content:'\f1e6'}.fa-plus:before{content:'\f067'}.fa-plus-circle:before{content:'\f055'}.fa-plus-square:before{content:'\f0fe'}.fa-podcast:before{content:'\f2ce'}.fa-poo:before{content:'\f2fe'}.fa-portrait:before{content:'\f3e0'}.fa-pound-sign:before{content:'\f154'}.fa-power-off:before{content:'\f011'}.fa-prescription:before{content:'\f5b1'}.fa-prescription-bottle:before{content:'\f485'}.fa-prescription-bottle-alt:before{content:'\f486'}.fa-print:before{content:'\f02f'}.fa-procedures:before{content:'\f487'}.fa-product-hunt:before{content:'\f288'}.fa-project-diagram:before{content:'\f542'}.fa-pushed:before{content:'\f3e1'}.fa-puzzle-piece:before{content:'\f12e'}.fa-python:before{content:'\f3e2'}.fa-qq:before{content:'\f1d6'}.fa-qrcode:before{content:'\f029'}.fa-question:before{content:'\f128'}.fa-question-circle:before{content:'\f059'}.fa-quidditch:before{content:'\f458'}.fa-quinscape:before{content:'\f459'}.fa-quora:before{content:'\f2c4'}.fa-quote-left:before{content:'\f10d'}.fa-quote-right:before{content:'\f10e'}.fa-r-project:before{content:'\f4f7'}.fa-random:before{content:'\f074'}.fa-ravelry:before{content:'\f2d9'}.fa-react:before{content:'\f41b'}.fa-readme:before{content:'\f4d5'}.fa-rebel:before{content:'\f1d0'}.fa-receipt:before{content:'\f543'}.fa-recycle:before{content:'\f1b8'}.fa-red-river:before{content:'\f3e3'}.fa-reddit:before{content:'\f1a1'}.fa-reddit-alien:before{content:'\f281'}.fa-reddit-square:before{content:'\f1a2'}.fa-redo:before{content:'\f01e'}.fa-redo-alt:before{content:'\f2f9'}.fa-registered:before{content:'\f25d'}.fa-rendact:before{content:'\f3e4'}.fa-renren:before{content:'\f18b'}.fa-reply:before{content:'\f3e5'}.fa-reply-all:before{content:'\f122'}.fa-replyd:before{content:'\f3e6'}.fa-researchgate:before{content:'\f4f8'}.fa-resolving:before{content:'\f3e7'}.fa-retweet:before{content:'\f079'}.fa-ribbon:before{content:'\f4d6'}.fa-road:before{content:'\f018'}.fa-robot:before{content:'\f544'}.fa-rocket:before{content:'\f135'}.fa-rocketchat:before{content:'\f3e8'}.fa-rockrms:before{content:'\f3e9'}.fa-rss:before{content:'\f09e'}.fa-rss-square:before{content:'\f143'}.fa-ruble-sign:before{content:'\f158'}.fa-ruler:before{content:'\f545'}.fa-ruler-combined:before{content:'\f546'}.fa-ruler-horizontal:before{content:'\f547'}.fa-ruler-vertical:before{content:'\f548'}.fa-rupee-sign:before{content:'\f156'}.fa-sad-cry:before{content:'\f5b3'}.fa-sad-tear:before{content:'\f5b4'}.fa-safari:before{content:'\f267'}.fa-sass:before{content:'\f41e'}.fa-save:before{content:'\f0c7'}.fa-schlix:before{content:'\f3ea'}.fa-school:before{content:'\f549'}.fa-screwdriver:before{content:'\f54a'}.fa-scribd:before{content:'\f28a'}.fa-search:before{content:'\f002'}.fa-search-minus:before{content:'\f010'}.fa-search-plus:before{content:'\f00e'}.fa-searchengin:before{content:'\f3eb'}.fa-seedling:before{content:'\f4d8'}.fa-sellcast:before{content:'\f2da'}.fa-sellsy:before{content:'\f213'}.fa-server:before{content:'\f233'}.fa-servicestack:before{content:'\f3ec'}.fa-share:before{content:'\f064'}.fa-share-alt:before{content:'\f1e0'}.fa-share-alt-square:before{content:'\f1e1'}.fa-share-square:before{content:'\f14d'}.fa-shekel-sign:before{content:'\f20b'}.fa-shield-alt:before{content:'\f3ed'}.fa-ship:before{content:'\f21a'}.fa-shipping-fast:before{content:'\f48b'}.fa-shirtsinbulk:before{content:'\f214'}.fa-shoe-prints:before{content:'\f54b'}.fa-shopping-bag:before{content:'\f290'}.fa-shopping-basket:before{content:'\f291'}.fa-shopping-cart:before{content:'\f07a'}.fa-shopware:before{content:'\f5b5'}.fa-shower:before{content:'\f2cc'}.fa-shuttle-van:before{content:'\f5b6'}.fa-sign:before{content:'\f4d9'}.fa-sign-in-alt:before{content:'\f2f6'}.fa-sign-language:before{content:'\f2a7'}.fa-sign-out-alt:before{content:'\f2f5'}.fa-signal:before{content:'\f012'}.fa-signature:before{content:'\f5b7'}.fa-simplybuilt:before{content:'\f215'}.fa-sistrix:before{content:'\f3ee'}.fa-sitemap:before{content:'\f0e8'}.fa-sith:before{content:'\f512'}.fa-skull:before{content:'\f54c'}.fa-skyatlas:before{content:'\f216'}.fa-skype:before{content:'\f17e'}.fa-slack:before{content:'\f198'}.fa-slack-hash:before{content:'\f3ef'}.fa-sliders-h:before{content:'\f1de'}.fa-slideshare:before{content:'\f1e7'}.fa-smile:before{content:'\f118'}.fa-smile-beam:before{content:'\f5b8'}.fa-smile-wink:before{content:'\f4da'}.fa-smoking:before{content:'\f48d'}.fa-smoking-ban:before{content:'\f54d'}.fa-snapchat:before{content:'\f2ab'}.fa-snapchat-ghost:before{content:'\f2ac'}.fa-snapchat-square:before{content:'\f2ad'}.fa-snowflake:before{content:'\f2dc'}.fa-solar-panel:before{content:'\f5ba'}.fa-sort:before{content:'\f0dc'}.fa-sort-alpha-down:before{content:'\f15d'}.fa-sort-alpha-up:before{content:'\f15e'}.fa-sort-amount-down:before{content:'\f160'}.fa-sort-amount-up:before{content:'\f161'}.fa-sort-down:before{content:'\f0dd'}.fa-sort-numeric-down:before{content:'\f162'}.fa-sort-numeric-up:before{content:'\f163'}.fa-sort-up:before{content:'\f0de'}.fa-soundcloud:before{content:'\f1be'}.fa-spa:before{content:'\f5bb'}.fa-space-shuttle:before{content:'\f197'}.fa-speakap:before{content:'\f3f3'}.fa-spinner:before{content:'\f110'}.fa-splotch:before{content:'\f5bc'}.fa-spotify:before{content:'\f1bc'}.fa-spray-can:before{content:'\f5bd'}.fa-square:before{content:'\f0c8'}.fa-square-full:before{content:'\f45c'}.fa-squarespace:before{content:'\f5be'}.fa-stack-exchange:before{content:'\f18d'}.fa-stack-overflow:before{content:'\f16c'}.fa-stamp:before{content:'\f5bf'}.fa-star:before{content:'\f005'}.fa-star-half:before{content:'\f089'}.fa-star-half-alt:before{content:'\f5c0'}.fa-staylinked:before{content:'\f3f5'}.fa-steam:before{content:'\f1b6'}.fa-steam-square:before{content:'\f1b7'}.fa-steam-symbol:before{content:'\f3f6'}.fa-step-backward:before{content:'\f048'}.fa-step-forward:before{content:'\f051'}.fa-stethoscope:before{content:'\f0f1'}.fa-sticker-mule:before{content:'\f3f7'}.fa-sticky-note:before{content:'\f249'}.fa-stop:before{content:'\f04d'}.fa-stop-circle:before{content:'\f28d'}.fa-stopwatch:before{content:'\f2f2'}.fa-store:before{content:'\f54e'}.fa-store-alt:before{content:'\f54f'}.fa-strava:before{content:'\f428'}.fa-stream:before{content:'\f550'}.fa-street-view:before{content:'\f21d'}.fa-strikethrough:before{content:'\f0cc'}.fa-stripe:before{content:'\f429'}.fa-stripe-s:before{content:'\f42a'}.fa-stroopwafel:before{content:'\f551'}.fa-studiovinari:before{content:'\f3f8'}.fa-stumbleupon:before{content:'\f1a4'}.fa-stumbleupon-circle:before{content:'\f1a3'}.fa-subscript:before{content:'\f12c'}.fa-subway:before{content:'\f239'}.fa-suitcase:before{content:'\f0f2'}.fa-suitcase-rolling:before{content:'\f5c1'}.fa-sun:before{content:'\f185'}.fa-superpowers:before{content:'\f2dd'}.fa-superscript:before{content:'\f12b'}.fa-supple:before{content:'\f3f9'}.fa-surprise:before{content:'\f5c2'}.fa-swatchbook:before{content:'\f5c3'}.fa-swimmer:before{content:'\f5c4'}.fa-swimming-pool:before{content:'\f5c5'}.fa-sync:before{content:'\f021'}.fa-sync-alt:before{content:'\f2f1'}.fa-syringe:before{content:'\f48e'}.fa-table:before{content:'\f0ce'}.fa-table-tennis:before{content:'\f45d'}.fa-tablet:before{content:'\f10a'}.fa-tablet-alt:before{content:'\f3fa'}.fa-tablets:before{content:'\f490'}.fa-tachometer-alt:before{content:'\f3fd'}.fa-tag:before{content:'\f02b'}.fa-tags:before{content:'\f02c'}.fa-tape:before{content:'\f4db'}.fa-tasks:before{content:'\f0ae'}.fa-taxi:before{content:'\f1ba'}.fa-teamspeak:before{content:'\f4f9'}.fa-telegram:before{content:'\f2c6'}.fa-telegram-plane:before{content:'\f3fe'}.fa-tencent-weibo:before{content:'\f1d5'}.fa-terminal:before{content:'\f120'}.fa-text-height:before{content:'\f034'}.fa-text-width:before{content:'\f035'}.fa-th:before{content:'\f00a'}.fa-th-large:before{content:'\f009'}.fa-th-list:before{content:'\f00b'}.fa-themeco:before{content:'\f5c6'}.fa-themeisle:before{content:'\f2b2'}.fa-thermometer:before{content:'\f491'}.fa-thermometer-empty:before{content:'\f2cb'}.fa-thermometer-full:before{content:'\f2c7'}.fa-thermometer-half:before{content:'\f2c9'}.fa-thermometer-quarter:before{content:'\f2ca'}.fa-thermometer-three-quarters:before{content:'\f2c8'}.fa-thumbs-down:before{content:'\f165'}.fa-thumbs-up:before{content:'\f164'}.fa-thumbtack:before{content:'\f08d'}.fa-ticket-alt:before{content:'\f3ff'}.fa-times:before{content:'\f00d'}.fa-times-circle:before{content:'\f057'}.fa-tint:before{content:'\f043'}.fa-tint-slash:before{content:'\f5c7'}.fa-tired:before{content:'\f5c8'}.fa-toggle-off:before{content:'\f204'}.fa-toggle-on:before{content:'\f205'}.fa-toolbox:before{content:'\f552'}.fa-tooth:before{content:'\f5c9'}.fa-trade-federation:before{content:'\f513'}.fa-trademark:before{content:'\f25c'}.fa-train:before{content:'\f238'}.fa-transgender:before{content:'\f224'}.fa-transgender-alt:before{content:'\f225'}.fa-trash:before{content:'\f1f8'}.fa-trash-alt:before{content:'\f2ed'}.fa-tree:before{content:'\f1bb'}.fa-trello:before{content:'\f181'}.fa-tripadvisor:before{content:'\f262'}.fa-trophy:before{content:'\f091'}.fa-truck:before{content:'\f0d1'}.fa-truck-loading:before{content:'\f4de'}.fa-truck-moving:before{content:'\f4df'}.fa-tshirt:before{content:'\f553'}.fa-tty:before{content:'\f1e4'}.fa-tumblr:before{content:'\f173'}.fa-tumblr-square:before{content:'\f174'}.fa-tv:before{content:'\f26c'}.fa-twitch:before{content:'\f1e8'}.fa-twitter:before{content:'\f099'}.fa-twitter-square:before{content:'\f081'}.fa-typo3:before{content:'\f42b'}.fa-uber:before{content:'\f402'}.fa-uikit:before{content:'\f403'}.fa-umbrella:before{content:'\f0e9'}.fa-umbrella-beach:before{content:'\f5ca'}.fa-underline:before{content:'\f0cd'}.fa-undo:before{content:'\f0e2'}.fa-undo-alt:before{content:'\f2ea'}.fa-uniregistry:before{content:'\f404'}.fa-universal-access:before{content:'\f29a'}.fa-university:before{content:'\f19c'}.fa-unlink:before{content:'\f127'}.fa-unlock:before{content:'\f09c'}.fa-unlock-alt:before{content:'\f13e'}.fa-untappd:before{content:'\f405'}.fa-upload:before{content:'\f093'}.fa-usb:before{content:'\f287'}.fa-user:before{content:'\f007'}.fa-user-alt:before{content:'\f406'}.fa-user-alt-slash:before{content:'\f4fa'}.fa-user-astronaut:before{content:'\f4fb'}.fa-user-check:before{content:'\f4fc'}.fa-user-circle:before{content:'\f2bd'}.fa-user-clock:before{content:'\f4fd'}.fa-user-cog:before{content:'\f4fe'}.fa-user-edit:before{content:'\f4ff'}.fa-user-friends:before{content:'\f500'}.fa-user-graduate:before{content:'\f501'}.fa-user-lock:before{content:'\f502'}.fa-user-md:before{content:'\f0f0'}.fa-user-minus:before{content:'\f503'}.fa-user-ninja:before{content:'\f504'}.fa-user-plus:before{content:'\f234'}.fa-user-secret:before{content:'\f21b'}.fa-user-shield:before{content:'\f505'}.fa-user-slash:before{content:'\f506'}.fa-user-tag:before{content:'\f507'}.fa-user-tie:before{content:'\f508'}.fa-user-times:before{content:'\f235'}.fa-users:before{content:'\f0c0'}.fa-users-cog:before{content:'\f509'}.fa-ussunnah:before{content:'\f407'}.fa-utensil-spoon:before{content:'\f2e5'}.fa-utensils:before{content:'\f2e7'}.fa-vaadin:before{content:'\f408'}.fa-vector-square:before{content:'\f5cb'}.fa-venus:before{content:'\f221'}.fa-venus-double:before{content:'\f226'}.fa-venus-mars:before{content:'\f228'}.fa-viacoin:before{content:'\f237'}.fa-viadeo:before{content:'\f2a9'}.fa-viadeo-square:before{content:'\f2aa'}.fa-vial:before{content:'\f492'}.fa-vials:before{content:'\f493'}.fa-viber:before{content:'\f409'}.fa-video:before{content:'\f03d'}.fa-video-slash:before{content:'\f4e2'}.fa-vimeo:before{content:'\f40a'}.fa-vimeo-square:before{content:'\f194'}.fa-vimeo-v:before{content:'\f27d'}.fa-vine:before{content:'\f1ca'}.fa-vk:before{content:'\f189'}.fa-vnv:before{content:'\f40b'}.fa-volleyball-ball:before{content:'\f45f'}.fa-volume-down:before{content:'\f027'}.fa-volume-off:before{content:'\f026'}.fa-volume-up:before{content:'\f028'}.fa-vuejs:before{content:'\f41f'}.fa-walking:before{content:'\f554'}.fa-wallet:before{content:'\f555'}.fa-warehouse:before{content:'\f494'}.fa-weebly:before{content:'\f5cc'}.fa-weibo:before{content:'\f18a'}.fa-weight:before{content:'\f496'}.fa-weight-hanging:before{content:'\f5cd'}.fa-weixin:before{content:'\f1d7'}.fa-whatsapp:before{content:'\f232'}.fa-whatsapp-square:before{content:'\f40c'}.fa-wheelchair:before{content:'\f193'}.fa-whmcs:before{content:'\f40d'}.fa-wifi:before{content:'\f1eb'}.fa-wikipedia-w:before{content:'\f266'}.fa-window-close:before{content:'\f410'}.fa-window-maximize:before{content:'\f2d0'}.fa-window-minimize:before{content:'\f2d1'}.fa-window-restore:before{content:'\f2d2'}.fa-windows:before{content:'\f17a'}.fa-wine-glass:before{content:'\f4e3'}.fa-wine-glass-alt:before{content:'\f5ce'}.fa-wix:before{content:'\f5cf'}.fa-wolf-pack-battalion:before{content:'\f514'}.fa-won-sign:before{content:'\f159'}.fa-wordpress:before{content:'\f19a'}.fa-wordpress-simple:before{content:'\f411'}.fa-wpbeginner:before{content:'\f297'}.fa-wpexplorer:before{content:'\f2de'}.fa-wpforms:before{content:'\f298'}.fa-wrench:before{content:'\f0ad'}.fa-x-ray:before{content:'\f497'}.fa-xbox:before{content:'\f412'}.fa-xing:before{content:'\f168'}.fa-xing-square:before{content:'\f169'}.fa-y-combinator:before{content:'\f23b'}.fa-yahoo:before{content:'\f19e'}.fa-yandex:before{content:'\f413'}.fa-yandex-international:before{content:'\f414'}.fa-yelp:before{content:'\f1e9'}.fa-yen-sign:before{content:'\f157'}.fa-yoast:before{content:'\f2b1'}.fa-youtube:before{content:'\f167'}.fa-youtube-square:before{content:'\f431'}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}

From ade96676712ca23fc5195fa2d6df15e6d5bf36ae Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 3 Jun 2019 13:26:24 +0200
Subject: [PATCH 427/519] adjust FE tests to using classes

---
 frontend/src/app.spec.js                      |  11 +-
 .../services/util-registry/util-registry.js   |   7 +-
 .../util-registry/util-registry.spec.js       | 138 ++++++++++--------
 3 files changed, 94 insertions(+), 62 deletions(-)

diff --git a/frontend/src/app.spec.js b/frontend/src/app.spec.js
index ab7385448..247be9f00 100644
--- a/frontend/src/app.spec.js
+++ b/frontend/src/app.spec.js
@@ -1,8 +1,15 @@
 import { App } from './app';
+import { Utility } from './core/utility';
+
+@Utility({ selector: 'util1' })
+class TestUtil1 { }
+
+@Utility({ selector: 'util2' })
+class TestUtil2 { }
 
 const TEST_UTILS = [
-  { name: 'util1' },
-  { name: 'util2' },
+  TestUtil1,
+  TestUtil2,
 ];
 
 describe('App', () => {
diff --git a/frontend/src/services/util-registry/util-registry.js b/frontend/src/services/util-registry/util-registry.js
index 5e71554bc..d96d7a4b3 100644
--- a/frontend/src/services/util-registry/util-registry.js
+++ b/frontend/src/services/util-registry/util-registry.js
@@ -59,6 +59,8 @@ export class UtilRegistry {
       console.log('setting up util', { util });
     }
 
+    let instances = [];
+
     if (util) {
       const elements = this._findUtilElements(util, scope);
 
@@ -78,10 +80,13 @@ export class UtilRegistry {
             console.info('Got utility instance for utility "' + util.name + '"', { utilInstance });
           }
 
-          this._activeUtilInstances.push(utilInstance);
+          instances.push(utilInstance);
         }
       });
     }
+
+    this._activeUtilInstances.push(...instances);
+    return instances;
   }
 
   find(name) {
diff --git a/frontend/src/services/util-registry/util-registry.spec.js b/frontend/src/services/util-registry/util-registry.spec.js
index 2e4afedf2..5f29f6a3c 100644
--- a/frontend/src/services/util-registry/util-registry.spec.js
+++ b/frontend/src/services/util-registry/util-registry.spec.js
@@ -1,14 +1,5 @@
-import { UtilRegistry } from "./util-registry";
-
-const TEST_UTILS = [{
-  name: 'util1',
-  selector: '#some-id',
-  setup: () => {},
-}, {
-  name: 'util2',
-  selector: '[uw-util]',
-  setup: () => {},
-}];
+import { UtilRegistry } from './util-registry';
+import { Utility } from '../../core/utility';
 
 describe('UtilRegistry', () => {
   let utilRegistry;
@@ -23,23 +14,26 @@ describe('UtilRegistry', () => {
 
   describe('register()', () => {
     it('should allow to add utilities', () => {
-      utilRegistry.register(TEST_UTILS[0]);
+      let foundUtil = utilRegistry.find(TestUtil1.name);
+      expect(foundUtil).toBeFalsy();
 
-      const foundUtil = utilRegistry.find(TEST_UTILS[0].name);
-      expect(foundUtil).toEqual(TEST_UTILS[0]);
+      utilRegistry.register(TestUtil1);
+
+      foundUtil = utilRegistry.find(TestUtil1.name);
+      expect(foundUtil).toEqual(TestUtil1);
     });
   });
 
   describe('deregister()', () => {
     it('should remove util', () => {
       // register util
-      utilRegistry.register(TEST_UTILS[0]);
-      let foundUtil = utilRegistry.find('util1');
+      utilRegistry.register(TestUtil1);
+      let foundUtil = utilRegistry.find(TestUtil1.name);
       expect(foundUtil).toBeTruthy();
 
       // deregister util
-      utilRegistry.deregister(TEST_UTILS[0].name);
-      foundUtil = utilRegistry.find('util1');
+      utilRegistry.deregister(TestUtil1.name);
+      foundUtil = utilRegistry.find(TestUtil1.name);
       expect(foundUtil).toBeFalsy();
     });
 
@@ -49,55 +43,62 @@ describe('UtilRegistry', () => {
   });
 
   describe('setup()', () => {
+
     it('should catch errors thrown by the utility', () => {
-      spyOn(TEST_UTILS[0], 'setup').and.throwError('some error');
       expect(() => {
-        utilRegistry.setup(TEST_UTILS[0]);
+        utilRegistry.setup(ThrowingUtil);
       }).not.toThrow();
     });
 
-    it('should pass the app instance', () => {
-      const scope = document.createElement('div');
-      const utilElement = document.createElement('div');
-      utilElement.id = 'some-id';
-      scope.appendChild(utilElement);
-      const fakeApp = { fn: () => {} };
-      utilRegistry.setApp(fakeApp);
-      spyOn(TEST_UTILS[0], 'setup');
-      utilRegistry.setup(TEST_UTILS[0], scope);
-      expect(TEST_UTILS[0].setup).toHaveBeenCalledWith(utilElement, fakeApp);
-    });
+    describe('scope has no matching elements', () => {
+      it('should not construct an instance', () => {
+        const scope = document.createElement('div');
+        const instances = utilRegistry.setup(TestUtil1, scope);
+        expect(instances.length).toBe(0);
+      });
 
-    describe('given no scope', () => {
       it('should use fallback scope', () => {
-        spyOn(TEST_UTILS[0], 'setup');
-        utilRegistry.setup(TEST_UTILS[0]);
-        expect(TEST_UTILS[0].setup).not.toHaveBeenCalled();
+        const instances = utilRegistry.setup(TestUtil1);
+        expect(instances.length).toBe(0);
       });
     });
 
-    describe('given a scope', () => {
-      let scope;
-      let utilElement1;
-      let utilElement2;
+    describe('scope has matching elements', () => {
+      let testScope;
+      let testElement1;
+      let testElement2;
 
       beforeEach(() => {
-        scope = document.createElement('div');
-        utilElement1 = document.createElement('div');
-        utilElement2 = document.createElement('div');
-        utilElement1.setAttribute('uw-util', '');
-        utilElement2.setAttribute('uw-util', '');
-        scope.appendChild(utilElement1);
-        scope.appendChild(utilElement2);
+        testScope = document.createElement('div');
+        testElement1 = document.createElement('div');
+        testElement2 = document.createElement('div');
+        testElement1.classList.add('util1');
+        testElement2.classList.add('util1');
+        testScope.appendChild(testElement1);
+        testScope.appendChild(testElement2);
       });
 
-      it('should call the utilities\' setup function for each matching element', () => {
-        spyOn(TEST_UTILS[1], 'setup');
-        utilRegistry.setup(TEST_UTILS[1], scope);
-        // 2 matching elements in scope
-        expect(TEST_UTILS[1].setup.calls.count()).toBe(2);
-        expect(TEST_UTILS[1].setup.calls.argsFor(0)).toEqual([utilElement1, undefined]);
-        expect(TEST_UTILS[1].setup.calls.argsFor(1)).toEqual([utilElement2, undefined]);
+      it('should construct a utility instance', () => {
+        const setupUtilities = utilRegistry.setup(TestUtil1, testScope);
+        expect(setupUtilities).toBeTruthy();
+        expect(setupUtilities[0]).toBeTruthy();
+      });
+
+      it('should construct an instance for each matching element', () => {
+        const setupUtilities = utilRegistry.setup(TestUtil1, testScope);
+        expect(setupUtilities).toBeTruthy();
+        expect(setupUtilities[0].element).toBe(testElement1);
+        expect(setupUtilities[1].element).toBe(testElement2);
+      });
+
+      it('should pass the app instance', () => {
+        const fakeApp = { };
+        utilRegistry.setApp(fakeApp);
+
+        const setupUtilities = utilRegistry.setup(TestUtil1, testScope);
+        expect(setupUtilities).toBeTruthy();
+        expect(setupUtilities[0].app).toBe(fakeApp);
+        expect(setupUtilities[1].app).toBe(fakeApp);
       });
     });
   });
@@ -105,22 +106,41 @@ describe('UtilRegistry', () => {
   describe('setupAll()', () => {
     it('should setup all the utilities', () => {
       spyOn(utilRegistry, 'setup');
-      utilRegistry.register(TEST_UTILS[0]);
-      utilRegistry.register(TEST_UTILS[1]);
+      utilRegistry.register(TestUtil1);
+      utilRegistry.register(TestUtil2);
       utilRegistry.setupAll();
 
       expect(utilRegistry.setup.calls.count()).toBe(2);
-      expect(utilRegistry.setup.calls.argsFor(0)).toEqual([TEST_UTILS[0], undefined]);
-      expect(utilRegistry.setup.calls.argsFor(1)).toEqual([TEST_UTILS[1], undefined]);
+      expect(utilRegistry.setup.calls.argsFor(0)).toEqual([TestUtil1, undefined]);
+      expect(utilRegistry.setup.calls.argsFor(1)).toEqual([TestUtil2, undefined]);
     });
 
     it('should pass the given scope', () => {
       spyOn(utilRegistry, 'setup');
-      utilRegistry.register(TEST_UTILS[0]);
+      utilRegistry.register(TestUtil1);
       const scope = document.createElement('div');
       utilRegistry.setupAll(scope);
 
-      expect(utilRegistry.setup).toHaveBeenCalledWith(TEST_UTILS[0], scope);
+      expect(utilRegistry.setup).toHaveBeenCalledWith(TestUtil1, scope);
     });
   });
 });
+
+// test utilities
+@Utility({ selector: '.util1' })
+class TestUtil1 {
+  constructor(element, app) {
+    this.element = element;
+    this.app = app;
+  }
+}
+
+@Utility({ selector: '#util2' })
+class TestUtil2 { }
+
+@Utility({ selector: '#throws' })
+class ThrowingUtil {
+  constructor() {
+    throw new Error();
+  }
+ }

From 0d50a43edf4b495b0666bba7e331b6af22aac66d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 3 Jun 2019 14:01:51 +0200
Subject: [PATCH 428/519] add rudimentary unit tests for some fe utilities

---
 frontend/src/utils/alerts/alerts.spec.js      |  6 +++
 frontend/src/utils/asidenav/asidenav.js       | 12 +++--
 frontend/src/utils/asidenav/asidenav.spec.js  | 21 ++++++++
 .../src/utils/async-form/async-form.spec.js   | 21 ++++++++
 frontend/src/utils/async-table/async-table.js | 11 +++-
 .../src/utils/async-table/async-table.spec.js | 52 +++++++++++++++++++
 frontend/src/utils/check-all/check-all.js     |  4 +-
 .../src/utils/check-all/check-all.spec.js     | 27 ++++++++++
 8 files changed, 146 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/utils/asidenav/asidenav.spec.js
 create mode 100644 frontend/src/utils/async-form/async-form.spec.js
 create mode 100644 frontend/src/utils/async-table/async-table.spec.js
 create mode 100644 frontend/src/utils/check-all/check-all.spec.js

diff --git a/frontend/src/utils/alerts/alerts.spec.js b/frontend/src/utils/alerts/alerts.spec.js
index c823488c6..0b4749e97 100644
--- a/frontend/src/utils/alerts/alerts.spec.js
+++ b/frontend/src/utils/alerts/alerts.spec.js
@@ -18,4 +18,10 @@ describe('Alerts', () => {
   it('should create', () => {
     expect(alerts).toBeTruthy();
   });
+
+  it('should throw if called without an element', () => {
+    expect(() => {
+      new Alerts();
+    }).toThrow();
+  });
 });
diff --git a/frontend/src/utils/asidenav/asidenav.js b/frontend/src/utils/asidenav/asidenav.js
index 3b5c048ff..2964e1617 100644
--- a/frontend/src/utils/asidenav/asidenav.js
+++ b/frontend/src/utils/asidenav/asidenav.js
@@ -42,11 +42,13 @@ export class Asidenav {
 
   _initFavoritesButton() {
     const favoritesBtn = document.querySelector('.' + FAVORITES_BTN_CLASS);
-    favoritesBtn.addEventListener('click', (event) => {
-      favoritesBtn.classList.toggle(FAVORITES_BTN_ACTIVE_CLASS);
-      this._element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
-      event.preventDefault();
-    }, true);
+    if (favoritesBtn) {
+      favoritesBtn.addEventListener('click', (event) => {
+        favoritesBtn.classList.toggle(FAVORITES_BTN_ACTIVE_CLASS);
+        this._element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
+        event.preventDefault();
+      }, true);
+    }
   }
 
   _initAsidenavSubmenus() {
diff --git a/frontend/src/utils/asidenav/asidenav.spec.js b/frontend/src/utils/asidenav/asidenav.spec.js
new file mode 100644
index 000000000..bdc7aee68
--- /dev/null
+++ b/frontend/src/utils/asidenav/asidenav.spec.js
@@ -0,0 +1,21 @@
+import { Asidenav } from './asidenav';
+
+describe('Asidenav', () => {
+
+  let asidenav;
+
+  beforeEach(() => {
+    const element = document.createElement('div');
+    asidenav = new Asidenav(element);
+  });
+
+  it('should create', () => {
+    expect(asidenav).toBeTruthy();
+  });
+
+  it('should throw if called without an element', () => {
+    expect(() => {
+      new Asidenav();
+    }).toThrow();
+  });
+});
diff --git a/frontend/src/utils/async-form/async-form.spec.js b/frontend/src/utils/async-form/async-form.spec.js
new file mode 100644
index 000000000..f01280b8a
--- /dev/null
+++ b/frontend/src/utils/async-form/async-form.spec.js
@@ -0,0 +1,21 @@
+import { AsyncForm } from './async-form';
+
+describe('AsyncForm', () => {
+
+  let asyncForm;
+
+  beforeEach(() => {
+    const element = document.createElement('div');
+    asyncForm = new AsyncForm(element);
+  });
+
+  it('should create', () => {
+    expect(asyncForm).toBeTruthy();
+  });
+
+  it('should throw if called without an element', () => {
+    expect(() => {
+      new AsyncForm();
+    }).toThrow();
+  });
+});
diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
index f32f8df33..32e0abab4 100644
--- a/frontend/src/utils/async-table/async-table.js
+++ b/frontend/src/utils/async-table/async-table.js
@@ -44,6 +44,10 @@ export class AsyncTable {
       throw new Error('Async Table utility cannot be setup without an element!');
     }
 
+    if (!app) {
+      throw new Error('Async Table utility cannot be setup without an app!');
+    }
+
     this._element = element;
     this._app = app;
 
@@ -56,7 +60,12 @@ export class AsyncTable {
       this._asyncTableHeader = this._element.dataset.asyncTableDbHeader;
     }
 
-    const rawTableId = this._element.querySelector('table').id;
+    const table = this._element.querySelector('table');
+    if (!table) {
+      throw new Error('Async Table utility needs a <table> in its element!');
+    }
+
+    const rawTableId = table.id;
     this._cssIdPrefix = findCssIdPrefix(rawTableId);
     this._asyncTableId = rawTableId.replace(this._cssIdPrefix, '');
 
diff --git a/frontend/src/utils/async-table/async-table.spec.js b/frontend/src/utils/async-table/async-table.spec.js
new file mode 100644
index 000000000..7dc36be0c
--- /dev/null
+++ b/frontend/src/utils/async-table/async-table.spec.js
@@ -0,0 +1,52 @@
+import { AsyncTable } from './async-table';
+
+const AppTestMock = {
+  httpClient: {
+    get: () => {},
+  },
+  htmlHelpers: {
+    parseResponse: () => {},
+  },
+  utilRegistry: {
+    setupAll: () => {},
+  },
+};
+
+describe('AsyncTable', () => {
+
+  let asyncTable;
+
+  beforeEach(() => {
+    const element = document.createElement('div');
+    const scrollTable = document.createElement('div');
+    const table = document.createElement('table');
+    scrollTable.classList.add('scrolltable');
+    scrollTable.appendChild(table);
+    element.appendChild(scrollTable);
+    asyncTable = new AsyncTable(element, AppTestMock);
+  });
+
+  it('should create', () => {
+    expect(asyncTable).toBeTruthy();
+  });
+
+  it('should throw if element does not contain a .scrolltable', () => {
+    const element = document.createElement('div');
+    expect(() => {
+      new AsyncTable(element, AppTestMock);
+    }).toThrow();
+  });
+
+  it('should throw if element does not contain a table', () => {
+    const element = document.createElement('div');
+    expect(() => {
+      new AsyncTable(element, AppTestMock);
+    }).toThrow();
+  });
+
+  it('should throw if called without an element', () => {
+    expect(() => {
+      new AsyncTable();
+    }).toThrow();
+  });
+});
diff --git a/frontend/src/utils/check-all/check-all.js b/frontend/src/utils/check-all/check-all.js
index c75ce2c1f..46194c029 100644
--- a/frontend/src/utils/check-all/check-all.js
+++ b/frontend/src/utils/check-all/check-all.js
@@ -92,8 +92,8 @@ export class CheckAll {
     this._checkAllCheckbox.setAttribute('id', this._getCheckboxId());
     th.insertBefore(this._checkAllCheckbox, th.firstChild);
 
-    // manually set up new checkbox
-    this._app.utilRegistry.setup(this._app.utilRegistry.find('checkbox'), th);
+    // set up new checkbox
+    this._app.utilRegistry.setupAll(th);
 
     this._checkAllCheckbox.addEventListener('input', this._onCheckAllCheckboxInput);
     this._setupCheckboxListeners();
diff --git a/frontend/src/utils/check-all/check-all.spec.js b/frontend/src/utils/check-all/check-all.spec.js
new file mode 100644
index 000000000..a04e50c41
--- /dev/null
+++ b/frontend/src/utils/check-all/check-all.spec.js
@@ -0,0 +1,27 @@
+import { CheckAll } from './check-all';
+
+const MOCK_APP = {
+  utilRegistry: {
+    setupAll: () => {},
+  },
+};
+
+describe('CheckAll', () => {
+
+  let checkAll;
+
+  beforeEach(() => {
+    const element = document.createElement('div');
+    checkAll = new CheckAll(element, MOCK_APP);
+  });
+
+  it('should create', () => {
+    expect(checkAll).toBeTruthy();
+  });
+
+  it('should throw if called without an element', () => {
+    expect(() => {
+      new CheckAll();
+    }).toThrow();
+  });
+});

From 9e2aa1da80dc4f4c4a68c790d49f976de65c6ed9 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 3 Jun 2019 16:01:18 +0200
Subject: [PATCH 429/519] fix async table header not being sent with ajax
 requests

---
 frontend/src/services/html-helpers/html-helpers.js | 7 ++++---
 frontend/src/utils/async-table/async-table.js      | 9 +--------
 templates/table/colonnade.hamlet                   | 2 +-
 templates/table/layout-wrapper.hamlet              | 2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/frontend/src/services/html-helpers/html-helpers.js b/frontend/src/services/html-helpers/html-helpers.js
index 8e6137b6c..b8bf7771b 100644
--- a/frontend/src/services/html-helpers/html-helpers.js
+++ b/frontend/src/services/html-helpers/html-helpers.js
@@ -10,13 +10,14 @@ export class HtmlHelpers {
     return response.text()
       .then(
         (responseText) => {
-          const docFrag = document.createRange().createContextualFragment(responseText);
+          const element = document.createElement('div');
+          element.innerHTML = responseText;
           let idPrefix = '';
           if (!options.keepIds) {
             idPrefix = this._getIdPrefix();
-            this._prefixIds(docFrag, idPrefix);
+            this._prefixIds(element, idPrefix);
           }
-          return Promise.resolve({ idPrefix, element: docFrag });
+          return Promise.resolve({ idPrefix, element });
         },
         Promise.reject,
       ).catch(console.error);
diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
index 32e0abab4..dd6e532b9 100644
--- a/frontend/src/utils/async-table/async-table.js
+++ b/frontend/src/utils/async-table/async-table.js
@@ -347,7 +347,7 @@ export class AsyncTable {
       this._removeListeners();
       this._element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
       // update table with new
-      this._updateWrapperContents(response);
+      this._element.innerHTML = response.element.innerHTML;
 
       this._app.utilRegistry.setupAll(this._element);
 
@@ -359,13 +359,6 @@ export class AsyncTable {
     }).catch((err) => console.error(err)
     ).finally(() => this._element.classList.remove(ASYNC_TABLE_LOADING_CLASS));
   }
-
-  _updateWrapperContents(response) {
-    const newPage = document.createElement('div');
-    newPage.appendChild(response.element);
-    const newWrapperContents = newPage.querySelector('#' + response.idPrefix + this._element.id);
-    this._element.innerHTML = newWrapperContents.innerHTML;
-  }
 }
 
 
diff --git a/templates/table/colonnade.hamlet b/templates/table/colonnade.hamlet
index 71938bc4a..9ccea4ef8 100644
--- a/templates/table/colonnade.hamlet
+++ b/templates/table/colonnade.hamlet
@@ -1,6 +1,6 @@
 $newline never
 <div .scrolltable>
-  <table *{dbsAttrs'} data-async-table-db-header=#{toPathPiece HeaderDBTableShortcircuit}>
+  <table *{dbsAttrs'}>
     $maybe wHeaders' <- wHeaders
       <thead>
         <tr .table__row.table__row--head>
diff --git a/templates/table/layout-wrapper.hamlet b/templates/table/layout-wrapper.hamlet
index fc144c1ed..1092c126f 100644
--- a/templates/table/layout-wrapper.hamlet
+++ b/templates/table/layout-wrapper.hamlet
@@ -1,3 +1,3 @@
 $newline never
-<div ##{wIdent "table-wrapper"} uw-async-table>
+<div ##{wIdent "table-wrapper"} uw-async-table data-async-table-db-header=#{toPathPiece HeaderDBTableShortcircuit}>
   ^{table}

From 60c3dac8aaafdaddfa599ab76cfc5a51dcd70077 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 3 Jun 2019 16:47:00 +0200
Subject: [PATCH 430/519] fix issues with file input

---
 frontend/src/utils/inputs/file-input.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/utils/inputs/file-input.js b/frontend/src/utils/inputs/file-input.js
index 15f330e00..676d6ff2c 100644
--- a/frontend/src/utils/inputs/file-input.js
+++ b/frontend/src/utils/inputs/file-input.js
@@ -41,8 +41,8 @@ export class FileInput {
 
     // add change listener
     this._element.addEventListener('change', () => {
-      this.updateLabel();
-      this.renderFileList();
+      this._updateLabel();
+      this._renderFileList();
     });
 
     // add util class for styling and mark as initialized
@@ -64,7 +64,7 @@ export class FileInput {
     Array.from(files).forEach((file) => {
       const fileDisplayEl = document.createElement('li');
       fileDisplayEl.innerHTML = file.name;
-      this.fileList.appendChild(fileDisplayEl);
+      this._fileList.appendChild(fileDisplayEl);
     });
   }
 

From d34998ac04d9bbe1663efd18bb988961d92a96dd Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 4 Jun 2019 08:14:13 +0200
Subject: [PATCH 431/519] automatic corrector assignment

---
 .vscode/tasks.json                         |   5 +
 messages/uniworx/de.msg                    |  10 +-
 routes                                     |   4 +-
 src/Foundation.hs                          |  55 +++++++++--
 src/Handler/Corrections.hs                 | 105 ++++++++++++++-------
 src/Handler/Submission.hs                  |  35 ++++++-
 src/Handler/Utils/Submission.hs            |   1 -
 src/Utils.hs                               |   7 ++
 src/Utils/Form.hs                          |   7 +-
 templates/corrections-assign-result.hamlet |  46 +++++++++
 10 files changed, 227 insertions(+), 48 deletions(-)
 create mode 100644 templates/corrections-assign-result.hamlet

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 27205f38c..a2b36e1b4 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -53,6 +53,11 @@
       "type": "npm",
       "script": "yesod:start",
       "problemMatcher": []
+    },
+    {
+      "type": "npm",
+      "script": "start",
+      "problemMatcher": []
     }
   ]
 }
\ No newline at end of file
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 8513fc2db..e1cfd10d2 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -17,7 +17,7 @@ BtnLecInvAccept: Annehmen
 BtnLecInvDecline: Ablehnen
 BtnCorrInvAccept: Annehmen
 BtnCorrInvDecline: Ablehnen
-
+BtnSubmissionsAssign: Abgaben zuteilen
 
 
 Aborted: Abgebrochen
@@ -33,6 +33,7 @@ GenericKey: Schlüssel
 GenericShort: Kürzel
 GenericIsNew: Neu
 GenericHasConflict: Konflikt
+GenericBack: Zurück
 
 SummerTerm year@Integer: Sommersemester #{display year}
 WinterTerm year@Integer: Wintersemester #{display year}/#{display $ succ year}
@@ -396,7 +397,11 @@ SelfCorrectors num@Int64: #{display num} Abgaben wurden Abgebenden als eigenem K
 AssignSubmissionExceptionNoCorrectors: Es sind keine Korrektoren eingestellt
 AssignSubmissionExceptionNoCorrectorsByProportion: Es sind keine Korrektoren mit Anteil ungleich Null eingestellt
 AssignSubmissionExceptionSubmissionsNotFound n@Int: #{tshow n} Abgaben konnten nicht gefunden werden
-
+NrSubmissionsTotal: Abgaben
+NrSubmissionsUnassigned: Ohne Korrektor
+NrCorrectors: Korrektoren
+NrSubmissionsNewlyAssigned: Neu zugeteilt
+NrSubmissionsNotAssigned: Nicht zugeteilt
 
 CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
 NoCorrectionsUploaded: In der hochgeladenen Datei wurden keine Korrekturen gefunden.
@@ -822,6 +827,7 @@ MenuCorrectionsUpload: Korrekturen hochladen
 MenuCorrectionsDownload: Offene Abgaben herunterladen
 MenuCorrectionsCreate: Abgaben registrieren
 MenuCorrectionsGrade: Abgaben online korrigieren
+MenuCorrectionsAssign: Abgaben an Korrektoren zuteilen
 MenuAuthPreds: Authorisierungseinstellungen
 MenuTutorialDelete: Tutorium löschen
 MenuTutorialEdit: Tutorium editieren
diff --git a/routes b/routes
index b1a1214bc..31885f668 100644
--- a/routes
+++ b/routes
@@ -92,6 +92,7 @@
   /communication              CCommR           GET POST
   /notes                      CNotesR          GET POST        !corrector -- THIS route is used to check for overall course corrector access!
   /subs                       CCorrectionsR    GET POST
+  /subs/assigned              CAssignR         GET POST
   /ex                         SheetListR       GET             !course-registered !materials !corrector
   /ex/new                     SheetNewR        GET POST
   /ex/current                 SheetCurrentR    GET             !course-registered !materials !corrector
@@ -103,10 +104,11 @@
     /subs                       SSubsR         GET POST        -- for lecturer only
     !/subs/new                  SubmissionNewR GET POST        !timeANDcourse-registeredANDuser-submissions
     !/subs/own                  SubmissionOwnR GET             !free -- just redirect
+    !/subs/assign               SAssignR       GET POST        !lecturerANDtime
     /subs/#CryptoFileNameSubmission SubmissionR:
       /                         SubShowR       GET POST        !ownerANDtimeANDuser-submissions !ownerANDread !correctorANDread
       /delete                   SubDelR        GET POST        !ownerANDtimeANDuser-submissions
-      /assign                   SAssignR       GET POST        !lecturerANDtime
+      /assign                   SubAssignR     GET POST        !lecturerANDtime
       /correction               CorrectionR    GET POST        !corrector !ownerANDreadANDrated
       /invite                   SInviteR       GET POST        !ownerANDtimeANDuser-submissions
       !/#SubmissionFileType     SubArchiveR    GET             !owner !corrector
diff --git a/src/Foundation.hs b/src/Foundation.hs
index a4fc86fb5..20d6464aa 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -676,10 +676,11 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
       SZipR                 SheetSolution   -> guard $ maybe False (<= cTime) sheetSolutionFrom
       SZipR                 _               -> mzero
       -- Submissions
-      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
-      _                      -> return ()
+      SubmissionNewR           -> guard   active
+      SAssignR                 -> guard   marking -- Correctors can only be assigned when the Sheet is inactive, since submissions are subject to change; this is assumed in Corrections.assignHandler
+      SubmissionR _ SubAssignR -> guard   marking -- Correctors can only be assigned when the Sheet is inactive, since submissions are subject to change
+      SubmissionR _ _          -> guard   active
+      _                        -> return ()
 
     return Authorized
 
@@ -1589,7 +1590,7 @@ pageActions :: Route UniWorX -> [MenuItem]
 pageActions (HomeR) =
   [
     MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgInfoLecturerTitle
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute InfoLecturerR
@@ -1896,6 +1897,16 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemAccessCallback' = return True
       }
   ]
+pageActions (CourseR tid ssh csh CCorrectionsR) =
+  [ MenuItem
+      { menuItemType = PageActionPrime
+      , menuItemLabel = MsgMenuCorrectionsAssign
+      , menuItemIcon = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh CAssignR
+      , menuItemModal = True
+      , menuItemAccessCallback' = return True
+      }
+  ]
 pageActions (CourseR tid ssh csh SheetListR) =
   [ MenuItem
       { menuItemType = PageActionPrime
@@ -1925,6 +1936,14 @@ pageActions (CourseR tid ssh csh SheetListR) =
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
+  , MenuItem
+      { menuItemType = PageActionPrime
+      , menuItemLabel = MsgMenuCorrectionsAssign
+      , menuItemIcon = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh CAssignR
+      , menuItemModal = True
+      , menuItemAccessCallback' = return True
+      }
   , MenuItem
       { menuItemType = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsOwn
@@ -2094,6 +2113,14 @@ pageActions (CSheetR tid ssh csh shn SShowR) =
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
+   , MenuItem
+      { menuItemType = PageActionPrime
+      , menuItemLabel = MsgMenuCorrectionsAssign
+      , menuItemIcon = Nothing
+      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SAssignR
+      , menuItemModal = True
+      , menuItemAccessCallback' = return True
+      }
   , MenuItem
       { menuItemType = PageActionPrime
       , menuItemLabel = MsgMenuSheetEdit
@@ -2121,6 +2148,14 @@ pageActions (CSheetR tid ssh csh shn SShowR) =
   ]
 pageActions (CSheetR tid ssh csh shn SSubsR) =
   [ MenuItem
+      { menuItemType = PageActionPrime
+      , menuItemLabel = MsgMenuSubmissionNew
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SubmissionNewR
+      , menuItemModal = True
+      , menuItemAccessCallback' = return True
+      }
+  , MenuItem
       { menuItemType = PageActionPrime
       , menuItemLabel = MsgMenuCorrectors
       , menuItemIcon = Nothing
@@ -2128,11 +2163,11 @@ pageActions (CSheetR tid ssh csh shn SSubsR) =
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
-  , MenuItem
+ , MenuItem
       { menuItemType = PageActionPrime
-      , menuItemLabel = MsgMenuSubmissionNew
-      , menuItemIcon  = Nothing
-      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SubmissionNewR
+      , menuItemLabel = MsgMenuCorrectionsAssign
+      , menuItemIcon = Nothing
+      , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SAssignR
       , menuItemModal = True
       , menuItemAccessCallback' = return True
       }
@@ -2150,7 +2185,7 @@ pageActions (CSubmissionR tid ssh csh shn cid SubShowR) =
       { menuItemType = PageActionPrime
       , menuItemLabel = MsgCorrectorAssignTitle
       , menuItemIcon  = Nothing
-      , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid SAssignR
+      , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid SubAssignR
       , menuItemModal = True
       , menuItemAccessCallback' = return True
       }
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index aef00e033..10364c814 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -528,7 +528,7 @@ correctionsR whereClause displayColumns dbtFilterUI psValidator actions = do
           E.where_ $ submission E.^. SubmissionId E.==. E.val sId
           return (course E.^. CourseTerm, course E.^. CourseSchool, course E.^. CourseShorthand, sheet E.^. SheetName)
       cID <- encrypt sId
-      let route  = CSubmissionR tid ssh csh shn cID SAssignR
+      let route  = CSubmissionR tid ssh csh shn cID SubAssignR
       (== Authorized) <$> evalAccessDB route True
 
 type ActionCorrections' = (ActionCorrections, AForm (HandlerT UniWorX IO) ActionCorrectionsData)
@@ -1015,38 +1015,79 @@ postCorrectionsGradeR = do
     $(widgetFile "corrections-grade")
 
 
-getSAssignR, postSAssignR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> Handler Html
+data ButtonSubmissionsAssign = BtnSubmissionsAssign
+  deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
+instance Universe ButtonSubmissionsAssign
+instance Finite   ButtonSubmissionsAssign
+nullaryPathPiece ''ButtonSubmissionsAssign camelToPathPiece
+embedRenderMessage ''UniWorX ''ButtonSubmissionsAssign id
+instance Button UniWorX ButtonSubmissionsAssign where
+  btnClasses BtnSubmissionsAssign = [BCIsButton, BCPrimary]
+
+-- | Gather info about corrector assignment per sheet
+data SubAssignInfo = SubAssignInfo { saiName :: SheetName, saiSubmissionNr, saiCorrectorNr, saiUnassignedNr :: Int }
+
+getCAssignR, postCAssignR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCAssignR = postCAssignR
+postCAssignR tid ssh csh = do
+  shids <- runDB $ do
+    cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+    selectKeysList [SheetCourse ==. cid] [Asc SheetActiveTo]
+  assignHandler tid ssh csh shids
+
+getSAssignR, postSAssignR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSAssignR = postSAssignR
-postSAssignR tid ssh csh shn cID = do
-  let actionUrl = CSubmissionR tid ssh csh shn cID SAssignR
-  sId <- decrypt cID
-  (currentCorrector, sheetCorrectors) <- runDB $ do
-    Submission{submissionRatingBy, submissionSheet} <- get404 sId
-    sheetCorrectors <- map (sheetCorrectorUser . entityVal) <$> selectList [SheetCorrectorSheet ==. submissionSheet] []
-    userCorrector <- traverse getJustEntity submissionRatingBy
-    return (userCorrector, maybe id (:) submissionRatingBy sheetCorrectors)
-
-  $logDebugS "SAssignR" $ tshow currentCorrector
-  let correctorField  = selectField $ optionsPersistCryptoId [UserId <-. sheetCorrectors] [Asc UserSurname, Asc UserDisplayName] userDisplayName
-  ((corrResult, corrForm'), corrEncoding) <- runFormPost . renderAForm FormStandard $
-        aopt correctorField (fslI MsgCorrector) (Just currentCorrector)
-  formResult corrResult $ \(fmap entityKey -> mbUserId) -> do
-    when (mbUserId /= fmap entityKey currentCorrector) . runDB $ do
-      now <- liftIO getCurrentTime
-      update sId  [ SubmissionRatingBy =. mbUserId
-                  , SubmissionRatingAssigned =. (now <$ mbUserId)
-                  ]
-      addMessageI Success MsgCorrectorUpdated
-    redirect actionUrl
-  let corrForm = wrapForm' BtnSave corrForm' def
-        { formAction = Just $ SomeRoute actionUrl
-        , formEncoding = corrEncoding
-        , formSubmit = FormDualSubmit
-        }
-  defaultLayout $ do
-      setTitleI MsgCorrectorAssignTitle
-      $(widgetFile "submission-assign")
-
+postSAssignR tid ssh csh shn = do
+  shid <- runDB $ fetchSheetId tid ssh csh shn
+  assignHandler tid ssh csh [shid]
 
+assignHandler :: TermId -> SchoolId -> CourseShorthand -> [SheetId] -> Handler Html
+assignHandler tid ssh csh rawSids = do
+  -- gather data
+  openSubs <- runDB $ (\f -> foldM f Map.empty rawSids) $
+      \acc sid -> maybeT (return acc) $ do
+        Just Sheet{sheetName=saiName} <- lift $ get sid
+        guardM $ lift $ hasWriteAccessTo $ CSheetR tid ssh csh saiName SAssignR  -- we must check, whether the submission is already closed and thus assignable
+        saiUnassignedNr <- lift $ count [SubmissionSheet ==. sid, SubmissionRatingBy ==. Nothing]
+        guard $ 0 < saiUnassignedNr -- only consider sheets with unassigned submissions
+        saiSubmissionNr <- lift $ count [SubmissionSheet ==. sid]
+        saiCorrectorNr  <- lift $ count [SheetCorrectorSheet ==. sid, SheetCorrectorState ==. CorrectorNormal]
+        -- guard $ saiCorrectorNr > 0 -- COMMENTED OUT BECAUSE we should show sheets without possible correctors to inform the user about these problematic sheets
+        return $ Map.insert sid SubAssignInfo{..} acc
+  let sids = Map.keys openSubs
+  -- process form
+  currentRoute <- getCurrentRoute
+  ((btnResult, btnWdgt), btnEnctype) <- runFormPost $ identifyForm FIDAssignSubmissions buttonForm
+  let headingShort = MsgMenuCorrectionsAssign
+      headingLong = prependCourseTitle tid ssh csh MsgMenuCorrectionsAssign
+  case btnResult of
+    FormSuccess BtnSubmissionsAssign -> do -- Button was pressed, assign and report
+        -- Assign submissions
+        status <- runDB $ (\f -> foldM f Map.empty sids) $
+          \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing
+        -- Too much important information for an alert. Display proper info page instead
+        -- TODO: following convenience links available via breadcrumbs already? Or as PrimaryActions?
+        link <- case sids of
+          [sid] -> do Sheet{sheetName} <- runDB $ getJust sid
+                      return $ CSheetR tid ssh csh sheetName SSubsR
+          _     ->    return $ CourseR tid ssh csh CCorrectionsR
+        siteLayoutMsg headingShort $ do
+          setTitleI headingLong
+          $(widgetFile "corrections-assign-result")
+          simpleLinkI (SomeMessage MsgGenericBack) link
+
+    other -> do -- all other cases, show what can be done
+        formFailure2Alerts other
+        -- show info about assignments
+        let btnForm = wrapForm btnWdgt def
+              { formAction = SomeRoute <$> currentRoute
+              , formEncoding = btnEnctype
+              , formSubmit = FormNoSubmit
+              }
+            status = Map.empty -- allows reuse of widget
+        siteLayoutMsg headingShort $ do
+          setTitleI headingLong
+          $(widgetFile "corrections-assign-result")
+          btnForm
 
 
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 12c605917..0fe085dc1 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -364,7 +364,7 @@ submissionHelper tid ssh csh shn mcid = do
         return (csheet,buddies,lastEdits,maySubmit,isLecturer,isOwner)
   -- @submissionModeUser == Nothing@ below iff we are currently serving a user with elevated rights (lecturer, admin, ...)
   -- Therefore we do not restrict upload behaviour in any way in that case
-  ((res,formWidget'), formEnctype) <- runFormPost . makeSubmissionForm sheetCourse msmid (fromMaybe (UploadAny True Nothing) . submissionModeUser $ sheetSubmissionMode) sheetGrouping isLecturer $ bool id (Set.insert $ Right uid) isOwner buddies 
+  ((res,formWidget'), formEnctype) <- runFormPost . makeSubmissionForm sheetCourse msmid (fromMaybe (UploadAny True Nothing) . submissionModeUser $ sheetSubmissionMode) sheetGrouping isLecturer $ bool id (Set.insert $ Right uid) isOwner buddies
   let formWidget = wrapForm' BtnHandIn formWidget' def
         { formAction = Just $ SomeRoute actionUrl
         , formEncoding = formEnctype
@@ -611,3 +611,36 @@ getCorrectionsDownloadR = do -- download all assigned and open submissions
     addMessageI Info MsgNoOpenSubmissions
     redirect CorrectionsR
   submissionMultiArchive $ Set.fromList subs
+
+
+getSubAssignR, postSubAssignR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> Handler Html
+getSubAssignR = postSubAssignR
+postSubAssignR tid ssh csh shn cID = do
+  let actionUrl = CSubmissionR tid ssh csh shn cID SubAssignR
+  sId <- decrypt cID
+  (currentCorrector, sheetCorrectors) <- runDB $ do
+    Submission{submissionRatingBy, submissionSheet} <- get404 sId
+    sheetCorrectors <- map (sheetCorrectorUser . entityVal) <$> selectList [SheetCorrectorSheet ==. submissionSheet] []
+    userCorrector <- traverse getJustEntity submissionRatingBy
+    return (userCorrector, maybe id (:) submissionRatingBy sheetCorrectors)
+
+  $logDebugS "SubAssignR" $ tshow currentCorrector
+  let correctorField  = selectField $ optionsPersistCryptoId [UserId <-. sheetCorrectors] [Asc UserSurname, Asc UserDisplayName] userDisplayName
+  ((corrResult, corrForm'), corrEncoding) <- runFormPost . renderAForm FormStandard $
+        aopt correctorField (fslI MsgCorrector) (Just currentCorrector)
+  formResult corrResult $ \(fmap entityKey -> mbUserId) -> do
+    when (mbUserId /= fmap entityKey currentCorrector) . runDB $ do
+      now <- liftIO getCurrentTime
+      update sId  [ SubmissionRatingBy =. mbUserId
+                  , SubmissionRatingAssigned =. (now <$ mbUserId)
+                  ]
+      addMessageI Success MsgCorrectorUpdated
+    redirect actionUrl
+  let corrForm = wrapForm' BtnSave corrForm' def
+        { formAction = Just $ SomeRoute actionUrl
+        , formEncoding = corrEncoding
+        , formSubmit = FormSubmit
+        }
+  defaultLayout $ do
+      setTitleI MsgCorrectorAssignTitle
+      $(widgetFile "submission-assign")
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 7356e17b0..84a747cf5 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -53,7 +53,6 @@ import Text.Hamlet (ihamletFile)
 
 import qualified Control.Monad.Catch as E (Handler(..))
 
-
 data AssignSubmissionException = NoCorrectors
                                | NoCorrectorsByProportion
                                | SubmissionsNotFound (NonNull (Set SubmissionId))
diff --git a/src/Utils.hs b/src/Utils.hs
index 2080947ec..bd9364299 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -354,7 +354,14 @@ floorToDigits :: (RealFrac a, Integral b) => b -> a -> a
 floorToDigits d x = fromInteger (floor $ x * prec) / prec
   where prec = 10^d
 
+-- | Integral division, but rounded upwards.
+ceilingDiv :: Integral a => a -> a -> a
+ceilingDiv d n = (d+n-1) `div` n
 
+-- | Integral division, rounded to custom digit; convenience function for hamlets
+roundDiv :: (Integral a, Integral b, RealFrac c) => Int -> a -> b -> c
+roundDiv digits numerator denominator
+  = roundToDigits digits $ fromIntegral numerator / fromIntegral denominator
 
 ------------
 -- Monoid --
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 2c04192ec..8a8621414 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -189,6 +189,7 @@ data FormIdentifier
   | FIDAdminDemo
   | FIDUserDelete
   | FIDCommunication
+  | FIDAssignSubmissions
   deriving (Eq, Ord, Read, Show)
 
 instance PathPiece FormIdentifier where
@@ -606,6 +607,10 @@ formFailure errs' = do
   mr <- getMessageRender
   return . FormFailure $ map mr errs'
 
+-- | Turn form errors into alerts, but otherwise do nothing at all
+formFailure2Alerts :: MonadHandler m => FormResult a -> m ()
+formFailure2Alerts = flip formResult $ const $ return ()
+
 -- | 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
@@ -661,7 +666,7 @@ aFormToWForm = mapRWST mFormToWForm' . over (mapped . _2) ($ []) . aFormToForm
       writer ((a, ints, enctype), vs)
 
 infixl 4 `fmapAForm`
-  
+
 fmapAForm :: Functor m => (FormResult a -> FormResult b) -> (AForm m a -> AForm m b)
 fmapAForm f (AForm act) = AForm $ \app env ints -> over _1 f <$> act app env ints
 
diff --git a/templates/corrections-assign-result.hamlet b/templates/corrections-assign-result.hamlet
new file mode 100644
index 000000000..2312758cf
--- /dev/null
+++ b/templates/corrections-assign-result.hamlet
@@ -0,0 +1,46 @@
+$# Display a table showing the result of the corrector assignment for possibly several sheets
+$# Expected variables"
+$#  sids     :: list of SheetId
+$#  openSubs :: Map from SheetId to SubAssignInfo, a datatype collecting info about open submissions
+$#  status   :: Map from SheetId to (Set SubmissionId, Set SubmisionId), i.e. assigned submissions and unassigned submissions for that sheet
+<div .scrolltable>
+  <table .table .table--striped>
+    <tr .table__row .table__row--head>
+      <th .table__th>
+        _{MsgSheet}
+      <th .table__th>
+        _{MsgNrSubmissionsTotal}
+      <th .table__th>
+        _{MsgNrSubmissionsUnassigned}
+      <th .table__th>
+        _{MsgNrCorrectors}
+      <th .table__th>
+        _{MsgNrSubmissionsNewlyAssigned}
+      <th .table__th>
+        _{MsgNrSubmissionsNotAssigned}
+
+    $forall sid <- sids
+      $case Map.lookup sid openSubs
+        $of Nothing
+          <!-- Empty table row; should not occur. -->
+        $of Just SubAssignInfo{saiName, saiSubmissionNr, saiUnassignedNr, saiCorrectorNr}
+          <tr .table__row>
+            <td .table__td>
+              #{saiName}
+            <td .table__td>
+              #{show saiSubmissionNr}
+            <td .table__td>
+              #{show saiUnassignedNr}
+            <td .table__td>
+              #{show saiCorrectorNr}
+            $case Map.lookup sid status
+              $of Nothing
+                <td .table__td>
+                  <!-- no newly assigned submission for this sheet -->
+                <td .table__td>
+                  <!-- no newly unassigned submission for this sheet -->
+              $of Just (assigned,unassigned)
+                <td .table__td>
+                  #{show (Set.size assigned)}
+                <td .table__td>
+                  #{show (Set.size unassigned)}

From 59d5f441c857364d178507f396c1ed9b9ec75492 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 4 Jun 2019 09:24:06 +0200
Subject: [PATCH 432/519] =?UTF-8?q?Alle=20Abgaben=20Verteilen=20Funktional?=
 =?UTF-8?q?it=C3=A4t=20eingerichtet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 messages/uniworx/de.msg                    |  5 +-
 src/Foundation.hs                          | 12 +++--
 src/Handler/Corrections.hs                 | 58 ++++++++++------------
 templates/corrections-assign-result.hamlet | 46 -----------------
 templates/corrections-assign.hamlet        | 52 +++++++++++++++++++
 5 files changed, 88 insertions(+), 85 deletions(-)
 delete mode 100644 templates/corrections-assign-result.hamlet
 create mode 100644 templates/corrections-assign.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index e1cfd10d2..e0a5882a3 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -17,7 +17,7 @@ BtnLecInvAccept: Annehmen
 BtnLecInvDecline: Ablehnen
 BtnCorrInvAccept: Annehmen
 BtnCorrInvDecline: Ablehnen
-BtnSubmissionsAssign: Abgaben zuteilen
+BtnSubmissionsAssign: Abgaben automatisch zuteilen
 
 
 Aborted: Abgebrochen
@@ -379,6 +379,7 @@ CorrDownload: Herunterladen
 CorrUploadField: Korrekturen
 CorrUpload: Korrekturen hochladen
 CorrSetCorrector: Korrektor zuweisen
+CorrSetCorrectorTooltip: Bereits verteilte Abgaben müssen zuerst Korrektor <Nichts> zugewiesen werden, bevor diese neu verteilt werden.
 CorrAutoSetCorrector: Korrekturen verteilen
 CorrDelete: Abgaben löschen
 NatField name@Text: #{name} muss eine natürliche Zahl sein!
@@ -827,7 +828,7 @@ MenuCorrectionsUpload: Korrekturen hochladen
 MenuCorrectionsDownload: Offene Abgaben herunterladen
 MenuCorrectionsCreate: Abgaben registrieren
 MenuCorrectionsGrade: Abgaben online korrigieren
-MenuCorrectionsAssign: Abgaben an Korrektoren zuteilen
+MenuCorrectionsAssign: Abgaben automatisch zuteilen
 MenuAuthPreds: Authorisierungseinstellungen
 MenuTutorialDelete: Tutorium löschen
 MenuTutorialEdit: Tutorium editieren
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 675d6638b..4567440f8 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -967,7 +967,7 @@ evalAuthTags AuthTagActive{..} (map (Set.toList . toNullable) . Set.toList . dnf
       let
         authVarSpecificity = authTagSpecificity `on` plVar
         authDNF = sortBy (authVarSpecificity `on` maximumBy authVarSpecificity . impureNonNull) $ map (sortBy authVarSpecificity) authDNF'
-        
+
         authTagIsInactive = not . authTagIsActive
 
         evalAuthTag :: AuthTag -> WriterT (Set AuthTag) m AuthResult
@@ -1427,6 +1427,7 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (CourseR tid ssh csh CInviteR)   = return ("Einladung", Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh (CUserR _)) = return ("Teilnehmer" , Just $ CourseR tid ssh csh CUsersR)
   breadcrumb (CourseR tid ssh csh CCorrectionsR) = return ("Abgaben" , Just $ CourseR tid ssh csh CShowR)
+  breadcrumb (CourseR tid ssh csh CAssignR)   = return ("Zuteilen"   , Just $ CourseR tid ssh csh CCorrectionsR)
   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 SheetCurrentR) = return ("Aktuelles Blatt", Just $ CourseR tid ssh csh SheetListR)
@@ -1440,10 +1441,11 @@ instance YesodBreadcrumbs UniWorX where
   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 ("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 SShowR)   = return (CI.original shn, Just $ CourseR tid ssh csh SheetListR)
+  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 SAssignR) = return ("Zuteilen"     , Just $ CSheetR tid ssh csh shn SSubsR)
   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)
   breadcrumb (CSubmissionR tid ssh csh shn _ SubShowR) = return ("Abgabe", Just $ CSheetR tid ssh csh shn SShowR)
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 10364c814..20182e398 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -555,7 +555,7 @@ assignAction selId = ( CorrSetCorrector
 
                          correctors' <- forM correctors $ \Entity{ entityKey, entityVal = User{..} } -> (SomeMessage userDisplayName, ) <$> encrypt entityKey
 
-                         cId <- wopt (selectFieldList correctors' :: Field (HandlerT UniWorX IO) CryptoUUIDUser) (fslI MsgCorrector) Nothing
+                         cId <- wopt (selectFieldList correctors' :: Field (HandlerT UniWorX IO) CryptoUUIDUser) (fslI MsgCorrector & setTooltip MsgCorrSetCorrectorTooltip) Nothing
                          fmap CorrSetCorrectorData <$> (traverse.traverse) decrypt cId
                      )
 
@@ -1055,39 +1055,33 @@ assignHandler tid ssh csh rawSids = do
         -- guard $ saiCorrectorNr > 0 -- COMMENTED OUT BECAUSE we should show sheets without possible correctors to inform the user about these problematic sheets
         return $ Map.insert sid SubAssignInfo{..} acc
   let sids = Map.keys openSubs
+  linkBack <- simpleLinkI (SomeMessage MsgGenericBack) <$> case sids of
+        [sid] -> do Sheet{sheetName} <- runDB $ getJust sid
+                    return $ CSheetR tid ssh csh sheetName SSubsR
+        _     ->    return $ CourseR tid ssh csh CCorrectionsR
   -- process form
   currentRoute <- getCurrentRoute
   ((btnResult, btnWdgt), btnEnctype) <- runFormPost $ identifyForm FIDAssignSubmissions buttonForm
-  let headingShort = MsgMenuCorrectionsAssign
+  assignmentStatus <- case btnResult of
+      FormSuccess BtnSubmissionsAssign -> do -- Button was pressed, assign and report
+          -- Assign submissions
+          runDB $ (\f -> foldM f Map.empty sids) $
+            \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing
+          -- Too much important information for an alert. Display proper info page instead
+      other -> do
+          formFailure2Alerts other -- show possible allerts
+          return Map.empty -- no assignments performed
+  let btnForm = wrapForm btnWdgt def
+                { formAction = SomeRoute <$> currentRoute
+                , formEncoding = btnEnctype
+                , formSubmit = FormNoSubmit
+                }
+      headingShort = MsgMenuCorrectionsAssign
       headingLong = prependCourseTitle tid ssh csh MsgMenuCorrectionsAssign
-  case btnResult of
-    FormSuccess BtnSubmissionsAssign -> do -- Button was pressed, assign and report
-        -- Assign submissions
-        status <- runDB $ (\f -> foldM f Map.empty sids) $
-          \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing
-        -- Too much important information for an alert. Display proper info page instead
-        -- TODO: following convenience links available via breadcrumbs already? Or as PrimaryActions?
-        link <- case sids of
-          [sid] -> do Sheet{sheetName} <- runDB $ getJust sid
-                      return $ CSheetR tid ssh csh sheetName SSubsR
-          _     ->    return $ CourseR tid ssh csh CCorrectionsR
-        siteLayoutMsg headingShort $ do
-          setTitleI headingLong
-          $(widgetFile "corrections-assign-result")
-          simpleLinkI (SomeMessage MsgGenericBack) link
-
-    other -> do -- all other cases, show what can be done
-        formFailure2Alerts other
-        -- show info about assignments
-        let btnForm = wrapForm btnWdgt def
-              { formAction = SomeRoute <$> currentRoute
-              , formEncoding = btnEnctype
-              , formSubmit = FormNoSubmit
-              }
-            status = Map.empty -- allows reuse of widget
-        siteLayoutMsg headingShort $ do
-          setTitleI headingLong
-          $(widgetFile "corrections-assign-result")
-          btnForm
-
+  siteLayoutMsg headingShort $ do
+    setTitleI headingLong
+    $(widgetFile "corrections-assign")
+    if null sids || not (null assignmentStatus)
+      then linkBack  -- TODO: convenience link might be unnecessary: either via breadcrumb or closing model. Remove, if modal works fine. Otherwise change to PrimaryAction?
+      else btnForm
 
diff --git a/templates/corrections-assign-result.hamlet b/templates/corrections-assign-result.hamlet
deleted file mode 100644
index 2312758cf..000000000
--- a/templates/corrections-assign-result.hamlet
+++ /dev/null
@@ -1,46 +0,0 @@
-$# Display a table showing the result of the corrector assignment for possibly several sheets
-$# Expected variables"
-$#  sids     :: list of SheetId
-$#  openSubs :: Map from SheetId to SubAssignInfo, a datatype collecting info about open submissions
-$#  status   :: Map from SheetId to (Set SubmissionId, Set SubmisionId), i.e. assigned submissions and unassigned submissions for that sheet
-<div .scrolltable>
-  <table .table .table--striped>
-    <tr .table__row .table__row--head>
-      <th .table__th>
-        _{MsgSheet}
-      <th .table__th>
-        _{MsgNrSubmissionsTotal}
-      <th .table__th>
-        _{MsgNrSubmissionsUnassigned}
-      <th .table__th>
-        _{MsgNrCorrectors}
-      <th .table__th>
-        _{MsgNrSubmissionsNewlyAssigned}
-      <th .table__th>
-        _{MsgNrSubmissionsNotAssigned}
-
-    $forall sid <- sids
-      $case Map.lookup sid openSubs
-        $of Nothing
-          <!-- Empty table row; should not occur. -->
-        $of Just SubAssignInfo{saiName, saiSubmissionNr, saiUnassignedNr, saiCorrectorNr}
-          <tr .table__row>
-            <td .table__td>
-              #{saiName}
-            <td .table__td>
-              #{show saiSubmissionNr}
-            <td .table__td>
-              #{show saiUnassignedNr}
-            <td .table__td>
-              #{show saiCorrectorNr}
-            $case Map.lookup sid status
-              $of Nothing
-                <td .table__td>
-                  <!-- no newly assigned submission for this sheet -->
-                <td .table__td>
-                  <!-- no newly unassigned submission for this sheet -->
-              $of Just (assigned,unassigned)
-                <td .table__td>
-                  #{show (Set.size assigned)}
-                <td .table__td>
-                  #{show (Set.size unassigned)}
diff --git a/templates/corrections-assign.hamlet b/templates/corrections-assign.hamlet
new file mode 100644
index 000000000..56bbbeeb5
--- /dev/null
+++ b/templates/corrections-assign.hamlet
@@ -0,0 +1,52 @@
+$# Display a table showing the result of the corrector assignment for possibly several sheets
+$# Expected variables"
+$#  sids              ::  list of SheetId
+$#  openSubs          ::  Map from SheetId to SubAssignInfo, a datatype collecting info about open submissions
+$#  assignmentStatus  ::  Map from SheetId to (Set SubmissionId, Set SubmisionId), i.e. assigned submissions and unassigned submissions for that sheet
+$if null sids
+  <p>
+    _{MsgSheetNoOldUnassigned}
+$else
+  <div .scrolltable>
+    <table .table .table--striped>
+      <tr .table__row .table__row--head>
+        <th .table__th>
+          _{MsgSheet}
+        <th .table__th>
+          _{MsgNrSubmissionsTotal}
+        <th .table__th>
+          _{MsgNrSubmissionsUnassigned}
+        <th .table__th>
+          _{MsgNrCorrectors}
+        $# Header-Styling indicates, whether assignment was attempted or not.
+        $with hasAssignment <- not (Map.null assignmentStatus)
+          <th :hasAssignment:.table__th>
+            _{MsgNrSubmissionsNewlyAssigned}
+          <th :hasAssignment:.table__th>
+            _{MsgNrSubmissionsNotAssigned}
+
+      $forall sid <- sids
+        $case Map.lookup sid openSubs
+          $of Nothing
+            <!-- Empty table row; should not occur. -->
+          $of Just SubAssignInfo{saiName, saiSubmissionNr, saiUnassignedNr, saiCorrectorNr}
+            <tr .table__row>
+              <td .table__td>
+                #{saiName}
+              <td .table__td>
+                #{show saiSubmissionNr}
+              <td .table__td>
+                #{show saiUnassignedNr}
+              <td .table__td>
+                #{show saiCorrectorNr}
+              $case Map.lookup sid assignmentStatus
+                $of Nothing
+                  <td .table__td>
+                    <!-- no newly assigned submission for this sheet -->
+                  <td .table__td>
+                    <!-- no newly unassigned submission for this sheet -->
+                $of Just (assigned,unassigned)
+                  <td .table__td>
+                    #{show (Set.size assigned)}
+                  <td .table__td>
+                    #{show (Set.size unassigned)}

From 332e83a111fae491f8240e2d30c5c97f7b1baabe Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 4 Jun 2019 10:08:57 +0200
Subject: [PATCH 433/519] Fix handling of URL-encoded jsonFields

See #392
---
 src/Handler/Utils/Form.hs             |  2 +-
 src/Handler/Utils/Table/Pagination.hs |  8 ++++++--
 src/Utils/Form.hs                     | 27 +++++++++++++++++----------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 0b661e87e..0b6850b24 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -689,7 +689,7 @@ jsonField hide = Field{..}
     inputType
       | hide      = "hidden"
       | otherwise = "text"
-    fieldParse [v] [] = return . bimap (SomeMessage . MsgJSONFieldDecodeFailure) Just . eitherDecodeStrict' $ encodeUtf8 v
+    fieldParse [encodeUtf8 -> v] [] = return . bimap (SomeMessage . MsgJSONFieldDecodeFailure) Just $ eitherDecodeStrict' v <|> eitherDecodeStrict' (urlDecode True v)
     fieldParse [] [] = return $ Right Nothing
     fieldParse _ _ = return . Left $ SomeMessage MsgValueRequired
     fieldView theId name attrs val isReq = liftWidgetT [whamlet|
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 52c1b3ec8..e87d4a405 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -641,8 +641,12 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db
       , fieldEnctype = UrlEncoded
       }
 
-  piPrevious <- lift . runInputMaybe $ ireq (jsonField True) (wIdent "pagination")
-  let piPreviousRes = maybe FormMissing FormSuccess piPrevious
+  piPreviousPost <- lift . runInputPost $ iopt (jsonField True) (wIdent "pagination")
+  piPreviousGet  <- lift . runInputGet  $ iopt (jsonField True) (wIdent "pagination")
+  let
+    piPreviousRes = maybe FormMissing FormSuccess $ piPreviousPost <|> piPreviousGet
+  $logDebugS "dbTable" [st|#{wIdent "pagination"}: #{tshow piPreviousRes}|]
+
   previousKeys <- throwExceptT . runMaybeT $ encodedSecretBoxOpen =<< MaybeT (lift . lookupPostParam $ wIdent "previous")
 
   piInput <- lift . runInputGetResult $ PaginationInput
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 2c04192ec..629e82de8 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -621,18 +621,25 @@ formResult' (FormFailure _) = Nothing
 formResult' (FormSuccess x) = Just x
 
 runInputGetMaybe, runInputPostMaybe, runInputMaybe :: MonadHandler m => FormInput m a -> m (Maybe a)
-runInputGetMaybe form = do
-  res <- runInputGetResult form
-  return $ case res of
-    FormSuccess suc -> Just suc
-    _other -> Nothing
-runInputPostMaybe form = do
-  res <- runInputPostResult form
-  return $ case res of
-    FormSuccess suc -> Just suc
-    _other -> Nothing
+runInputGetMaybe = fmap formResult' . runInputGetResult
+runInputPostMaybe = fmap formResult' . runInputPostResult
 runInputMaybe form = runMaybeT $ MaybeT (runInputPostMaybe form) <|> MaybeT (runInputGetMaybe form)
 
+runInputResult :: MonadHandler m => FormInput m a -> m (FormResult a)
+runInputResult form = do
+  postRes <- runInputPostResult form
+  getRes  <- runInputGetResult form
+  return $ case (postRes, getRes) of
+    (FormSuccess a, _) -> FormSuccess a 
+    (_, FormSuccess b) -> FormSuccess b
+    (postRes', _)      -> postRes'
+
+runInput :: (MonadHandler m, RenderMessage (HandlerSite m) FormMessage) => FormInput m a -> m a
+runInput = runInputResult >=> \case
+  FormFailure errs -> invalidArgs errs
+  FormMissing      -> invalidArgsI [MsgValueRequired]
+  FormSuccess a    -> return a
+
 hoistAForm :: HandlerSite m ~ HandlerSite n => (forall a. m a -> n a) -> AForm m b -> AForm n b
 hoistAForm f (AForm g) = AForm (\x y z ->f $ g x y z)
 

From 70b0e536cf1b345f839eb304c14d6aa28710133b Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 5 Jun 2019 22:17:45 +0200
Subject: [PATCH 434/519] ignore pending requests for async table filters if
 new input exists

closes #325
---
 frontend/src/utils/async-table/async-table.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
index dd6e532b9..416ebd34c 100644
--- a/frontend/src/utils/async-table/async-table.js
+++ b/frontend/src/utils/async-table/async-table.js
@@ -38,6 +38,7 @@ export class AsyncTable {
     change: [],
     select: [],
   };
+  _ignoreRequest = false;
 
   constructor(element, app) {
     if (!element) {
@@ -174,6 +175,10 @@ export class AsyncTable {
         }
       }, INPUT_DEBOUNCE);
       input.addEventListener('input', debouncedInput);
+      input.addEventListener('input', () => {
+        // set flag to ignore any currently pending requests (not debounced)
+        this._ignoreRequest = true;
+      });
     });
 
     this._tableFilterInputs.input.forEach((input) => {
@@ -183,6 +188,10 @@ export class AsyncTable {
         }
       }, INPUT_DEBOUNCE);
       input.addEventListener('input', debouncedInput);
+      input.addEventListener('input', () => {
+        // set flag to ignore any currently pending requests (not debounced)
+        this._ignoreRequest = true;
+      });
     });
 
     this._tableFilterInputs.change.forEach((input) => {
@@ -224,6 +233,7 @@ export class AsyncTable {
         }
       };
     }
+    this._ignoreRequest = false;
     this._updateTableFrom(url, callback);
   }
 
@@ -340,8 +350,13 @@ export class AsyncTable {
       url: url,
       headers: headers,
     }).then(
-      (response) => this._app.htmlHelpers.parseResponse(response)
+      (response) => this._app.htmlHelpers.parseResponse(response),
     ).then((response) => {
+        // check if request should be ignored
+      if (this._ignoreRequest) {
+        return false;
+      }
+
       setLocalStorageParameter('currentTableUrl', url.href);
       // reset table
       this._removeListeners();

From ee7f2b534ab7ec7abae38d4f9d0ee658709d80db Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 6 Jun 2019 10:09:35 +0200
Subject: [PATCH 435/519] minor refactor

---
 src/Handler/Corrections.hs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 20182e398..eb053bce9 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1062,17 +1062,13 @@ assignHandler tid ssh csh rawSids = do
   -- process form
   currentRoute <- getCurrentRoute
   ((btnResult, btnWdgt), btnEnctype) <- runFormPost $ identifyForm FIDAssignSubmissions buttonForm
-  assignmentStatus <- case btnResult of
-      FormSuccess BtnSubmissionsAssign -> do -- Button was pressed, assign and report
-          -- Assign submissions
-          runDB $ (\f -> foldM f Map.empty sids) $
-            \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing
-          -- Too much important information for an alert. Display proper info page instead
-      other -> do
-          formFailure2Alerts other -- show possible allerts
-          return Map.empty -- no assignments performed
+  assignmentStatus <- fmap (fromMaybe Map.empty) . formResultMaybe btnResult $ \BtnSubmissionsAssign ->
+      -- Assign submissions
+      fmap Just . runDB $ (\f -> foldM f Map.empty sids) $
+        \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing
+      -- Too much important information for an alert message. Display proper info page instead
   let btnForm = wrapForm btnWdgt def
-                { formAction = SomeRoute <$> currentRoute
+                { formAction = SomeRoute <$> currentRoute -- TODO: should be a modal route
                 , formEncoding = btnEnctype
                 , formSubmit = FormNoSubmit
                 }

From 04e37a9ae7896c296597cc3afe435653c1d51e54 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 6 Jun 2019 10:27:47 +0200
Subject: [PATCH 436/519] Fixes #397

---
 messages/uniworx/de.msg                                  | 2 ++
 templates/widgets/grading-summary/grading-summary.hamlet | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index e0a5882a3..993bffa46 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -439,6 +439,8 @@ AccessibleSince: Verfügbar seit
 
 
 Corrected: Korrigiert
+CorrectionAchievedPoints: Erzielte Punkte
+CorrectionAchievedPass: Bestanden
 FileCorrected: Korrigiert (Dateien)
 FileCorrectedDeleted: Korrigiert (gelöscht)
 RatingUpdated: Korrektur gespeichert
diff --git a/templates/widgets/grading-summary/grading-summary.hamlet b/templates/widgets/grading-summary/grading-summary.hamlet
index 248c4b085..86008771c 100644
--- a/templates/widgets/grading-summary/grading-summary.hamlet
+++ b/templates/widgets/grading-summary/grading-summary.hamlet
@@ -15,11 +15,11 @@ $# --
         <th>
           $# empty cell for row headers
         $maybe _ <- hasMarkedPasses
-          <th .table__th colspan=2>_{MsgCorrected}
+          <th .table__th colspan=2>_{MsgCorrectionAchievedPass}
         $maybe _ <- hasPasses
           <th .table__th>_{MsgSheetGradingPassing'}
         $maybe _ <- hasMarkedPoints
-          <th .table__th colspan=2>_{MsgCorrected}
+          <th .table__th colspan=2>_{MsgCorrectionAchievedPoints}
         $maybe _ <- hasPoints
           <th .table__th>_{MsgSheetGradingPoints'}
         <th .table__th>_{MsgSheetGradingCount'}

From 449cff93cb6de8753b6631290e93c3b4ba265a6d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 6 Jun 2019 11:35:50 +0200
Subject: [PATCH 437/519] Dumb down table-filter serialization

---
 frontend/src/utils/async-table/async-table.js | 40 ++++---------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
index 416ebd34c..9cd1c639d 100644
--- a/frontend/src/utils/async-table/async-table.js
+++ b/frontend/src/utils/async-table/async-table.js
@@ -13,7 +13,6 @@ const ASYNC_TABLE_INITIALIZED_CLASS = 'async-table--initialized';
 const ASYNC_TABLE_LOADING_CLASS = 'async-table--loading';
 
 const ASYNC_TABLE_FILTER_FORM_SELECTOR = '.table-filter-form';
-const ASYNC_TABLE_FILTER_FORM_ID_SELECTOR = '[name="form-identifier"]';
 
 @Utility({
   selector: '[uw-async-table]',
@@ -213,7 +212,7 @@ export class AsyncTable {
   }
 
   _updateFromTableFilter(tableFilterForm) {
-    const url = this._serializeTableFilterToURL();
+    const url = this._serializeTableFilterToURL(tableFilterForm);
     let callback = null;
 
     const focusedInput = tableFilterForm.querySelector(':focus, :active');
@@ -237,40 +236,17 @@ export class AsyncTable {
     this._updateTableFrom(url, callback);
   }
 
-  _serializeTableFilterToURL() {
+  _serializeTableFilterToURL(tableFilterForm) {
     const url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
+    const formData = new FormData(tableFilterForm);
 
-    const formIdElement = this._element.querySelector(ASYNC_TABLE_FILTER_FORM_ID_SELECTOR);
-    if (!formIdElement) {
-      // cannot serialize the filter form without an identifier
-      return;
+    for (var k of url.searchParams.keys()) {
+      url.searchParams.delete(k);
     }
 
-    url.searchParams.set('form-identifier', formIdElement.value);
-    url.searchParams.set('_hasdata', 'true');
-    url.searchParams.set(this._asyncTableId + '-page', '0');
-
-    this._tableFilterInputs.search.forEach(function(input) {
-      url.searchParams.set(input.name, input.value);
-    });
-
-    this._tableFilterInputs.input.forEach(function(input) {
-      url.searchParams.set(input.name, input.value);
-    });
-
-    this._tableFilterInputs.change.forEach(function(input) {
-      if (input.checked) {
-        url.searchParams.set(input.name, input.value);
-      }
-    });
-
-    this._tableFilterInputs.select.forEach(function(select) {
-      const options = Array.from(select.querySelectorAll('option'));
-      const selected = options.find((option) => option.selected);
-      if (selected) {
-        url.searchParams.set(select.name, selected.value);
-      }
-    });
+    for (var kv of formData.entries()) {
+      url.searchParams.append(encodeURIComponent(kv[0]), encodeURIComponent(kv[1]));
+    }
 
     return url;
   }

From 2feb751afa5d9bd7fb68810e0d6b6b1d4941c3f7 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 6 Jun 2019 13:35:42 +0200
Subject: [PATCH 438/519] Towards #298

---
 messages/uniworx/de.msg                       |  6 +++---
 src/Handler/Corrections.hs                    | 13 +++++++-----
 src/Handler/Sheet.hs                          | 17 ++++++++++++---
 src/Handler/Utils.hs                          | 21 +++++++++++--------
 src/Handler/Utils/Submission.hs               |  2 +-
 src/Utils/Frontend/Modal.hs                   | 11 ++++++++++
 src/Utils/Message.hs                          |  2 +-
 templates/messages/correctionsUploaded.hamlet |  4 ++--
 8 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 993bffa46..b02f3a475 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -519,9 +519,9 @@ CorrectorMissing: Abwesend
 CorrectorExcused: Entschuldigt
 CorrectorStateTip: Abwesende Korrektoren bekommen bei späteren Übungsblättern mehr Korrekturen zum Ausgleich zugewiesen. Entschuldigte Korrektoren müssen nicht nacharbeiten.
 
-DayIsAHoliday     tid@TermId date@Text: #{date} ist ein Feiertag
-DayIsOutOfLecture tid@TermId date@Text: #{date} ist außerhalb der Vorlesungszeit des #{display tid}
-DayIsOutOfTerm    tid@TermId date@Text: #{date} liegt nicht im #{display tid}
+DayIsAHoliday     tid@TermId name@Text date@Text: Datum für "#{name}" ist ein Feiertag: #{date}
+DayIsOutOfLecture tid@TermId name@Text date@Text: Datum für "#{name}" ist außerhalb der Vorlesungszeit des #{display tid}: #{date}
+DayIsOutOfTerm    tid@TermId name@Text date@Text: Datum für "#{name}" liegt nicht im Semester #{display tid}: #{date}
 
 UploadModeNone: Kein Upload
 UploadModeAny: Upload, beliebige Datei(en)
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index eb053bce9..deadf8c19 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -802,9 +802,10 @@ postCorrectionsUploadR = do
         (Just subs)
           | null subs -> addMessageI Warning MsgNoCorrectionsUploaded
           | otherwise -> do
-              subs' <- traverse encrypt $ Set.toList subs :: Handler [CryptoFileNameSubmission]
-              mr <- (toHtml .) <$> getMessageRender
-              addMessage Success =<< withUrlRenderer ($(ihamletFile "templates/messages/correctionsUploaded.hamlet") mr)
+              subs' <- traverse (\x -> (,) <$> encrypt x <*> encrypt x) $ Set.toList subs :: Handler [(CryptoFileNameSubmission, CryptoUUIDSubmission)]
+              let trigger = [whamlet|_{MsgCorrectionsUploaded (genericLength subs')}|]
+                  content = Right $(widgetFile "messages/correctionsUploaded")
+              addMessageModal Success trigger content
 
   let uploadForm = wrapForm upload def
         { formAction = Just $ SomeRoute CorrectionsUploadR
@@ -1008,8 +1009,10 @@ postCorrectionsGradeR = do
                                           , SubmissionRatingTime =. now <$ guard rated
                                           ]
           | otherwise -> return Nothing
-      subs' <- traverse encrypt subs :: Handler [CryptoFileNameSubmission]
-      unless (null subs') $(addMessageFile Success "templates/messages/correctionsUploaded.hamlet")
+      subs' <- traverse (\x -> (,) <$> encrypt x <*> encrypt x) subs :: Handler [(CryptoFileNameSubmission, CryptoUUIDSubmission)]
+      let trigger = [whamlet|_{MsgCorrectionsUploaded (genericLength subs')}|]
+          content = Right $(widgetFile "messages/correctionsUploaded")
+      unless (null subs') $ addMessageModal Success trigger content
 
   defaultLayout $
     $(widgetFile "corrections-grade")
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index f315c7709..238224add 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -580,14 +580,25 @@ handleSheetEdit tid ssh csh msId template dbAction = do
             insert_ $ SheetEdit aid actTime sid
             addMessageI Success $ MsgSheetEditOk tid ssh csh sfName
             -- Sanity checks generating warnings only, but not errors!
-            warnTermDays tid [sfVisibleFrom, Just sfActiveFrom, Just sfActiveTo, sfHintFrom, sfSolutionFrom]
+            warnTermDays tid $ Map.fromList [ (date,name) | (Just date, name) <-
+                [ (sfVisibleFrom,     MsgSheetVisibleFrom)
+                , (Just sfActiveFrom, MsgSheetActiveFrom)
+                , (Just sfActiveTo,   MsgSheetActiveTo)
+                , (sfHintFrom,        MsgSheetSolutionFromTip)
+                , (sfSolutionFrom,    MsgSheetSolutionFrom)
+                ] ]
             return True
       when saveOkay $ redirect $ case msId of
         Just _  -> CSheetR tid ssh csh sfName SShowR -- redirect must happen outside of runDB
         Nothing -> CSheetR tid ssh csh sfName SCorrR
     (FormFailure msgs) -> forM_ msgs $ (addMessage Error) . toHtml
-    _ -> runDB $ warnTermDays tid $ (join . (flip fmap template))
-          <$> [sfVisibleFrom, Just . sfActiveFrom, Just . sfActiveTo, sfHintFrom, sfSolutionFrom]
+    _ -> runDB $ warnTermDays tid $ Map.fromList [ (date,name) | (Just date, name) <-
+            [(sfVisibleFrom  =<< template, MsgSheetVisibleFrom)
+            ,(sfActiveFrom   <$> template, MsgSheetActiveFrom)
+            ,(sfActiveTo     <$> template, MsgSheetActiveTo)
+            ,(sfHintFrom     =<< template, MsgSheetSolutionFromTip)
+            ,(sfSolutionFrom =<< template, MsgSheetSolutionFrom)
+            ] ]
 
   let pageTitle = maybe (MsgSheetTitleNew tid ssh csh)
                         (MsgSheetTitle    tid ssh csh) mbshn
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 8877dc8de..867291c47 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -8,7 +8,8 @@ import Utils.Lens
 
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
--- import qualified Data.Set (Set)
+import Data.Map ((!))
+import qualified Data.Map as Map
 import qualified Data.Set as Set
 import Data.CaseInsensitive (original)
 -- import qualified Data.CaseInsensitive as CI
@@ -199,15 +200,17 @@ prependCourseTitle tid ssh csh msg = UniWorXMessages
     colonText :: Text
     colonText = ":"
 
-warnTermDays :: TermId -> [Maybe UTCTime] -> DB ()
-warnTermDays tid times = do
+warnTermDays :: (RenderMessage UniWorX msg) => TermId -> Map UTCTime msg -> DB ()
+warnTermDays tid timeNames = do
   Term{..} <- get404 tid
-  let alldays       = Set.map utctDay $ Set.fromList $ catMaybes times
-      warnholidays  = Set.intersection alldays $ Set.fromList termHolidays
-      outoftermdays = Set.filter (\d -> d < termStart        || d > termEnd       ) alldays
-      outoflecture  = Set.filter (\d -> d < termLectureStart || d > termLectureEnd) alldays
+  MsgRenderer mr <- getMsgRenderer
+  let alldays       = Map.keysSet timeNames
+      warnholidays  = let hdays = Set.fromList termHolidays in
+                      Set.filter (\(utctDay -> d) -> Set.member d hdays)                         alldays
+      outoftermdays = Set.filter (\(utctDay -> d) -> d < termStart        || d > termEnd       ) alldays
+      outoflecture  = Set.filter (\(utctDay -> d) -> d < termLectureStart || d > termLectureEnd) alldays
                         `Set.difference` outoftermdays -- out of term implies out of lecture-time
-      warnI msg d = formatTime SelFormatDate d >>= \dt -> addMessageI Warning $ msg tid dt
+      warnI msg d   = formatTime SelFormatDate d >>= \dt -> addMessageI Warning $ msg tid (mr (timeNames ! d)) dt
   forM_ warnholidays  $ warnI MsgDayIsAHoliday
   forM_ outoflecture  $ warnI MsgDayIsOutOfLecture
   forM_ outoftermdays $ warnI MsgDayIsOutOfTerm
@@ -250,7 +253,7 @@ guardAuthorizedFor :: ( HandlerSite h ~ UniWorX, MonadHandler h, MonadLogger h
 guardAuthorizedFor link val =
   val <$ guardM (lift $ (== Authorized) <$> evalAccessDB link False)
 
-  
+
 runAppLoggingT :: UniWorX -> LoggingT m a -> m a
 runAppLoggingT app@(appLogger -> (_, loggerTVar)) = flip runLoggingT logFunc
   where
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 84a747cf5..9bb44bf00 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -344,7 +344,7 @@ extractRatingsMsg = do
           (Right $(widgetFile "messages/submissionFilesIgnored"))
     addMessageWidget Warning ignoredModal
 
--- Nicht innerhalb von runDB aufrufen, damit das DB Rollback passieren kann!
+-- | Nicht innerhalb von runDB aufrufen, damit das DB Rollback passieren kann!
 msgSubmissionErrors :: (MonadHandler m, MonadCatch m, HandlerSite m ~ UniWorX) => m a -> m (Maybe a)
 msgSubmissionErrors = flip catches
     [ E.Handler $ \e -> Nothing <$ addMessageI Error (e :: RatingException)
diff --git a/src/Utils/Frontend/Modal.hs b/src/Utils/Frontend/Modal.hs
index 94948aeba..49f1f827e 100644
--- a/src/Utils/Frontend/Modal.hs
+++ b/src/Utils/Frontend/Modal.hs
@@ -2,12 +2,14 @@ module Utils.Frontend.Modal
   ( Modal(..)
   , customModal
   , modal, msgModal
+  , addMessageModal
   ) where
 
 import ClassyPrelude.Yesod
 
 import Control.Lens
 import Utils.Route
+import Utils.Message
 
 import Settings (widgetFile)
 
@@ -61,3 +63,12 @@ msgModal modalTrigger' modalContent = do
   customModal Modal{..}
   where
     modalTrigger mRoute triggerId = $(widgetFile "widgets/modal/trigger")
+
+-- | add message alert with a short trigger widget, whose larger content is displayed in a modal
+addMessageModal ::  forall m site.
+                    ( MonadHandler m
+                    , HandlerSite m ~ site
+                    , Yesod site
+                    ) => MessageStatus -> WidgetT site IO () -> Either (SomeRoute site) (WidgetT site IO ()) -> m ()
+addMessageModal ms trigger content =  addMessageWidget ms $ msgModal trigger content
+
diff --git a/src/Utils/Message.hs b/src/Utils/Message.hs
index 7a9e492bc..04dc41dcf 100644
--- a/src/Utils/Message.hs
+++ b/src/Utils/Message.hs
@@ -7,7 +7,6 @@ module Utils.Message
   , messageI, messageIHamlet, messageFile, messageWidget
   ) where
 
-
 import Data.Universe
 import Utils.PathPiece
 import Data.Aeson
@@ -110,6 +109,7 @@ addMessageWidget :: forall m site.
                     , Yesod site
                     ) => MessageStatus -> WidgetT site IO () -> m ()
 -- ^ _Note_: `addMessageWidget` ignores `pageTitle` and `pageHead`
+-- also see  Utils.Frontend.Modal.addMessageModal for large alerts with modal links
 addMessageWidget mc wgt = do
   PageContent{pageBody} <- liftHandlerT $ widgetToPageContent wgt
   addMessageIHamlet mc (const pageBody :: HtmlUrlI18n (SomeMessage site) (Route site))
diff --git a/templates/messages/correctionsUploaded.hamlet b/templates/messages/correctionsUploaded.hamlet
index 2edd0288b..c016ac95a 100644
--- a/templates/messages/correctionsUploaded.hamlet
+++ b/templates/messages/correctionsUploaded.hamlet
@@ -1,6 +1,6 @@
 _{MsgCorrectionsUploaded (genericLength subs')}
 
 <ul>
-  $forall cID <- subs'
+  $forall (cID,uuid) <- subs'
     <li>
-      #{toPathPiece cID}
+      ^{simpleLink (toWidget (toPathPiece cID)) (CryptoUUIDDispatchR (ciphertext uuid))}

From cd70b8ffc4653c0a4877fc45cc32343cacb644c4 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 6 Jun 2019 15:29:59 +0200
Subject: [PATCH 439/519] Fixes #298 Fixes #281

---
 messages/uniworx/de.msg                       |    9 +-
 package-lock.json                             | 6102 ++++++++---------
 package.json                                  |    3 +-
 src/Handler/Corrections.hs                    |   18 +-
 src/Handler/Sheet.hs                          |   23 +-
 src/Utils/Form.hs                             |   38 +-
 templates/default-layout.lucius               |   52 +
 .../submissionsAssignUnauthorized.hamlet      |    2 +-
 templates/sheetShow.hamlet                    |    7 +
 9 files changed, 2963 insertions(+), 3291 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index b02f3a475..5415d7578 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -173,7 +173,6 @@ SheetMarking: Hinweise für Korrektoren
 SheetMarkingFiles: Korrektur
 SheetType: Wertung
 SheetInvisible: Dieses Übungsblatt ist für Teilnehmer momentan unsichtbar!
-SheetInvisibleUntil date@Text: Dieses Übungsblatt ist für Teilnehmer momentan unsichtbar bis #{date}!
 SheetName: Name
 SheetDescription: Hinweise für Teilnehmer
 SheetGroup: Gruppenabgabe
@@ -519,9 +518,9 @@ CorrectorMissing: Abwesend
 CorrectorExcused: Entschuldigt
 CorrectorStateTip: Abwesende Korrektoren bekommen bei späteren Übungsblättern mehr Korrekturen zum Ausgleich zugewiesen. Entschuldigte Korrektoren müssen nicht nacharbeiten.
 
-DayIsAHoliday     tid@TermId name@Text date@Text: Datum für "#{name}" ist ein Feiertag: #{date}
-DayIsOutOfLecture tid@TermId name@Text date@Text: Datum für "#{name}" ist außerhalb der Vorlesungszeit des #{display tid}: #{date}
-DayIsOutOfTerm    tid@TermId name@Text date@Text: Datum für "#{name}" liegt nicht im Semester #{display tid}: #{date}
+DayIsAHoliday     tid@TermId name@Text date@Text: "#{name}" (#{date}) ist ein Feiertag
+DayIsOutOfLecture tid@TermId name@Text date@Text: "#{name}" (#{date}) ist außerhalb der Vorlesungszeit des #{display tid}
+DayIsOutOfTerm    tid@TermId name@Text date@Text: "#{name}" (#{date}) liegt nicht im Semester #{display tid}
 
 UploadModeNone: Kein Upload
 UploadModeAny: Upload, beliebige Datei(en)
@@ -547,7 +546,7 @@ 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.
+SheetCorrectorSubmissionsTip: Abgabe erfolgt über ein Uni2work-externes Verfahren (zumeist in Papierform durch Einwurf) unter Angabe eines persönlichen Pseudonyms. Korrektoren können mithilfe des Pseudonyms später Korrekturergebnisse in Uni2work eintragen, damit Sie sie einsehen können.
 
 SubmissionNoUploadExpected: Es ist keine Abgabe von Dateien vorgesehen.
 SubmissionReplace: Abgabe ersetzen
diff --git a/package-lock.json b/package-lock.json
index ef0a855d9..1a4d58870 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,16 +10,16 @@
       "integrity": "sha512-XGr5YjQSjgTa6OzQZY57FAJsdeVSAKR/u/KA5exWIz66IKtv/zXtHy+fIZcMry/EgYegwuHE7vzGnrFhjdIAsQ==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.4",
-        "commander": "^2.8.1",
-        "convert-source-map": "^1.1.0",
-        "fs-readdir-recursive": "^1.1.0",
-        "glob": "^7.0.0",
-        "lodash": "^4.17.11",
-        "mkdirp": "^0.5.1",
-        "output-file-sync": "^2.0.0",
-        "slash": "^2.0.0",
-        "source-map": "^0.5.0"
+        "chokidar": "2.1.6",
+        "commander": "2.20.0",
+        "convert-source-map": "1.6.0",
+        "fs-readdir-recursive": "1.1.0",
+        "glob": "7.1.4",
+        "lodash": "4.17.11",
+        "mkdirp": "0.5.1",
+        "output-file-sync": "2.0.1",
+        "slash": "2.0.0",
+        "source-map": "0.5.7"
       }
     },
     "@babel/code-frame": {
@@ -28,7 +28,7 @@
       "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.0.0"
+        "@babel/highlight": "7.0.0"
       }
     },
     "@babel/core": {
@@ -37,20 +37,20 @@
       "integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.4",
-        "@babel/helpers": "^7.4.4",
-        "@babel/parser": "^7.4.5",
-        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.4.5",
-        "@babel/types": "^7.4.4",
-        "convert-source-map": "^1.1.0",
-        "debug": "^4.1.0",
-        "json5": "^2.1.0",
-        "lodash": "^4.17.11",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
+        "@babel/code-frame": "7.0.0",
+        "@babel/generator": "7.4.4",
+        "@babel/helpers": "7.4.4",
+        "@babel/parser": "7.4.5",
+        "@babel/template": "7.4.4",
+        "@babel/traverse": "7.4.5",
+        "@babel/types": "7.4.4",
+        "convert-source-map": "1.6.0",
+        "debug": "4.1.1",
+        "json5": "2.1.0",
+        "lodash": "4.17.11",
+        "resolve": "1.11.0",
+        "semver": "5.7.0",
+        "source-map": "0.5.7"
       },
       "dependencies": {
         "debug": {
@@ -59,7 +59,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -76,11 +76,11 @@
       "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.4.4",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.11",
-        "source-map": "^0.5.0",
-        "trim-right": "^1.0.1"
+        "@babel/types": "7.4.4",
+        "jsesc": "2.5.2",
+        "lodash": "4.17.11",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
       }
     },
     "@babel/helper-annotate-as-pure": {
@@ -89,7 +89,7 @@
       "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
@@ -98,8 +98,8 @@
       "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-explode-assignable-expression": "7.1.0",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-call-delegate": {
@@ -108,9 +108,9 @@
       "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/helper-hoist-variables": "7.4.4",
+        "@babel/traverse": "7.4.5",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-create-class-features-plugin": {
@@ -119,12 +119,12 @@
       "integrity": "sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-member-expression-to-functions": "^7.0.0",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.4.4",
-        "@babel/helper-split-export-declaration": "^7.4.4"
+        "@babel/helper-function-name": "7.1.0",
+        "@babel/helper-member-expression-to-functions": "7.0.0",
+        "@babel/helper-optimise-call-expression": "7.0.0",
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-replace-supers": "7.4.4",
+        "@babel/helper-split-export-declaration": "7.4.4"
       }
     },
     "@babel/helper-define-map": {
@@ -133,9 +133,9 @@
       "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/types": "^7.4.4",
-        "lodash": "^4.17.11"
+        "@babel/helper-function-name": "7.1.0",
+        "@babel/types": "7.4.4",
+        "lodash": "4.17.11"
       }
     },
     "@babel/helper-explode-assignable-expression": {
@@ -144,8 +144,8 @@
       "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/traverse": "7.4.5",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-function-name": {
@@ -154,9 +154,9 @@
       "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-get-function-arity": "7.0.0",
+        "@babel/template": "7.4.4",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-get-function-arity": {
@@ -165,7 +165,7 @@
       "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -174,7 +174,7 @@
       "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.4.4"
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -183,7 +183,7 @@
       "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-module-imports": {
@@ -192,7 +192,7 @@
       "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-module-transforms": {
@@ -201,12 +201,12 @@
       "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/template": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "lodash": "^4.17.11"
+        "@babel/helper-module-imports": "7.0.0",
+        "@babel/helper-simple-access": "7.1.0",
+        "@babel/helper-split-export-declaration": "7.4.4",
+        "@babel/template": "7.4.4",
+        "@babel/types": "7.4.4",
+        "lodash": "4.17.11"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -215,7 +215,7 @@
       "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-plugin-utils": {
@@ -230,7 +230,7 @@
       "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.11"
+        "lodash": "4.17.11"
       }
     },
     "@babel/helper-remap-async-to-generator": {
@@ -239,11 +239,11 @@
       "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-wrap-function": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-annotate-as-pure": "7.0.0",
+        "@babel/helper-wrap-function": "7.2.0",
+        "@babel/template": "7.4.4",
+        "@babel/traverse": "7.4.5",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-replace-supers": {
@@ -252,10 +252,10 @@
       "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.0.0",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/helper-member-expression-to-functions": "7.0.0",
+        "@babel/helper-optimise-call-expression": "7.0.0",
+        "@babel/traverse": "7.4.5",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-simple-access": {
@@ -264,8 +264,8 @@
       "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/template": "7.4.4",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-split-export-declaration": {
@@ -274,7 +274,7 @@
       "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.4.4"
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helper-wrap-function": {
@@ -283,10 +283,10 @@
       "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.2.0"
+        "@babel/helper-function-name": "7.1.0",
+        "@babel/template": "7.4.4",
+        "@babel/traverse": "7.4.5",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/helpers": {
@@ -295,9 +295,9 @@
       "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/template": "7.4.4",
+        "@babel/traverse": "7.4.5",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/highlight": {
@@ -306,9 +306,9 @@
       "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
+        "chalk": "2.4.2",
+        "esutils": "2.0.2",
+        "js-tokens": "4.0.0"
       }
     },
     "@babel/parser": {
@@ -323,9 +323,9 @@
       "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0",
-        "@babel/plugin-syntax-async-generators": "^7.2.0"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-remap-async-to-generator": "7.1.0",
+        "@babel/plugin-syntax-async-generators": "7.2.0"
       }
     },
     "@babel/plugin-proposal-class-properties": {
@@ -334,8 +334,8 @@
       "integrity": "sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.4.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-create-class-features-plugin": "7.4.4",
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-proposal-decorators": {
@@ -344,9 +344,9 @@
       "integrity": "sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.4.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-decorators": "^7.2.0"
+        "@babel/helper-create-class-features-plugin": "7.4.4",
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/plugin-syntax-decorators": "7.2.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
@@ -355,8 +355,8 @@
       "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-json-strings": "^7.2.0"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/plugin-syntax-json-strings": "7.2.0"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
@@ -365,8 +365,8 @@
       "integrity": "sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "7.2.0"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
@@ -375,8 +375,8 @@
       "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "7.2.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
@@ -385,9 +385,9 @@
       "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.5.4"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-regex": "7.4.4",
+        "regexpu-core": "4.5.4"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -396,7 +396,7 @@
       "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-syntax-decorators": {
@@ -405,7 +405,7 @@
       "integrity": "sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-syntax-json-strings": {
@@ -414,7 +414,7 @@
       "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
@@ -423,7 +423,7 @@
       "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
@@ -432,7 +432,7 @@
       "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
@@ -441,7 +441,7 @@
       "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
@@ -450,9 +450,9 @@
       "integrity": "sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0"
+        "@babel/helper-module-imports": "7.0.0",
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-remap-async-to-generator": "7.1.0"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
@@ -461,7 +461,7 @@
       "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-block-scoping": {
@@ -470,8 +470,8 @@
       "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "lodash": "^4.17.11"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "lodash": "4.17.11"
       }
     },
     "@babel/plugin-transform-classes": {
@@ -480,14 +480,14 @@
       "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-define-map": "^7.4.4",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.4.4",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "globals": "^11.1.0"
+        "@babel/helper-annotate-as-pure": "7.0.0",
+        "@babel/helper-define-map": "7.4.4",
+        "@babel/helper-function-name": "7.1.0",
+        "@babel/helper-optimise-call-expression": "7.0.0",
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-replace-supers": "7.4.4",
+        "@babel/helper-split-export-declaration": "7.4.4",
+        "globals": "11.12.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
@@ -496,7 +496,7 @@
       "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-destructuring": {
@@ -505,7 +505,7 @@
       "integrity": "sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
@@ -514,9 +514,9 @@
       "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.5.4"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-regex": "7.4.4",
+        "regexpu-core": "4.5.4"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
@@ -525,7 +525,7 @@
       "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
@@ -534,8 +534,8 @@
       "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "7.1.0",
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-for-of": {
@@ -544,7 +544,7 @@
       "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-function-name": {
@@ -553,8 +553,8 @@
       "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-function-name": "7.1.0",
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-literals": {
@@ -563,7 +563,7 @@
       "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
@@ -572,7 +572,7 @@
       "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-modules-amd": {
@@ -581,8 +581,8 @@
       "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-module-transforms": "7.4.4",
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
@@ -591,9 +591,9 @@
       "integrity": "sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.4.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0"
+        "@babel/helper-module-transforms": "7.4.4",
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-simple-access": "7.1.0"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
@@ -602,8 +602,8 @@
       "integrity": "sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.4.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-hoist-variables": "7.4.4",
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-modules-umd": {
@@ -612,8 +612,8 @@
       "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-module-transforms": "7.4.4",
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
@@ -622,7 +622,7 @@
       "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==",
       "dev": true,
       "requires": {
-        "regexp-tree": "^0.1.6"
+        "regexp-tree": "0.1.10"
       }
     },
     "@babel/plugin-transform-new-target": {
@@ -631,7 +631,7 @@
       "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-object-super": {
@@ -640,8 +640,8 @@
       "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.1.0"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-replace-supers": "7.4.4"
       }
     },
     "@babel/plugin-transform-parameters": {
@@ -650,9 +650,9 @@
       "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
       "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "^7.4.4",
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-call-delegate": "7.4.4",
+        "@babel/helper-get-function-arity": "7.0.0",
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-property-literals": {
@@ -661,7 +661,7 @@
       "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-regenerator": {
@@ -670,7 +670,7 @@
       "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.14.0"
+        "regenerator-transform": "0.14.0"
       }
     },
     "@babel/plugin-transform-reserved-words": {
@@ -679,7 +679,7 @@
       "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
@@ -688,7 +688,7 @@
       "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-spread": {
@@ -697,7 +697,7 @@
       "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
@@ -706,8 +706,8 @@
       "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-regex": "7.4.4"
       }
     },
     "@babel/plugin-transform-template-literals": {
@@ -716,8 +716,8 @@
       "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-annotate-as-pure": "7.0.0",
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
@@ -726,7 +726,7 @@
       "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "7.0.0"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
@@ -735,9 +735,9 @@
       "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.5.4"
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/helper-regex": "7.4.4",
+        "regexpu-core": "4.5.4"
       }
     },
     "@babel/preset-env": {
@@ -746,54 +746,54 @@
       "integrity": "sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
-        "@babel/plugin-proposal-json-strings": "^7.2.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-syntax-async-generators": "^7.2.0",
-        "@babel/plugin-syntax-json-strings": "^7.2.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
-        "@babel/plugin-transform-arrow-functions": "^7.2.0",
-        "@babel/plugin-transform-async-to-generator": "^7.4.4",
-        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
-        "@babel/plugin-transform-block-scoping": "^7.4.4",
-        "@babel/plugin-transform-classes": "^7.4.4",
-        "@babel/plugin-transform-computed-properties": "^7.2.0",
-        "@babel/plugin-transform-destructuring": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/plugin-transform-duplicate-keys": "^7.2.0",
-        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
-        "@babel/plugin-transform-for-of": "^7.4.4",
-        "@babel/plugin-transform-function-name": "^7.4.4",
-        "@babel/plugin-transform-literals": "^7.2.0",
-        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
-        "@babel/plugin-transform-modules-amd": "^7.2.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.4.4",
-        "@babel/plugin-transform-modules-systemjs": "^7.4.4",
-        "@babel/plugin-transform-modules-umd": "^7.2.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
-        "@babel/plugin-transform-new-target": "^7.4.4",
-        "@babel/plugin-transform-object-super": "^7.2.0",
-        "@babel/plugin-transform-parameters": "^7.4.4",
-        "@babel/plugin-transform-property-literals": "^7.2.0",
-        "@babel/plugin-transform-regenerator": "^7.4.5",
-        "@babel/plugin-transform-reserved-words": "^7.2.0",
-        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
-        "@babel/plugin-transform-spread": "^7.2.0",
-        "@babel/plugin-transform-sticky-regex": "^7.2.0",
-        "@babel/plugin-transform-template-literals": "^7.4.4",
-        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
-        "@babel/plugin-transform-unicode-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "browserslist": "^4.6.0",
-        "core-js-compat": "^3.1.1",
-        "invariant": "^2.2.2",
-        "js-levenshtein": "^1.1.3",
-        "semver": "^5.5.0"
+        "@babel/helper-module-imports": "7.0.0",
+        "@babel/helper-plugin-utils": "7.0.0",
+        "@babel/plugin-proposal-async-generator-functions": "7.2.0",
+        "@babel/plugin-proposal-json-strings": "7.2.0",
+        "@babel/plugin-proposal-object-rest-spread": "7.4.4",
+        "@babel/plugin-proposal-optional-catch-binding": "7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "7.4.4",
+        "@babel/plugin-syntax-async-generators": "7.2.0",
+        "@babel/plugin-syntax-json-strings": "7.2.0",
+        "@babel/plugin-syntax-object-rest-spread": "7.2.0",
+        "@babel/plugin-syntax-optional-catch-binding": "7.2.0",
+        "@babel/plugin-transform-arrow-functions": "7.2.0",
+        "@babel/plugin-transform-async-to-generator": "7.4.4",
+        "@babel/plugin-transform-block-scoped-functions": "7.2.0",
+        "@babel/plugin-transform-block-scoping": "7.4.4",
+        "@babel/plugin-transform-classes": "7.4.4",
+        "@babel/plugin-transform-computed-properties": "7.2.0",
+        "@babel/plugin-transform-destructuring": "7.4.4",
+        "@babel/plugin-transform-dotall-regex": "7.4.4",
+        "@babel/plugin-transform-duplicate-keys": "7.2.0",
+        "@babel/plugin-transform-exponentiation-operator": "7.2.0",
+        "@babel/plugin-transform-for-of": "7.4.4",
+        "@babel/plugin-transform-function-name": "7.4.4",
+        "@babel/plugin-transform-literals": "7.2.0",
+        "@babel/plugin-transform-member-expression-literals": "7.2.0",
+        "@babel/plugin-transform-modules-amd": "7.2.0",
+        "@babel/plugin-transform-modules-commonjs": "7.4.4",
+        "@babel/plugin-transform-modules-systemjs": "7.4.4",
+        "@babel/plugin-transform-modules-umd": "7.2.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "7.4.5",
+        "@babel/plugin-transform-new-target": "7.4.4",
+        "@babel/plugin-transform-object-super": "7.2.0",
+        "@babel/plugin-transform-parameters": "7.4.4",
+        "@babel/plugin-transform-property-literals": "7.2.0",
+        "@babel/plugin-transform-regenerator": "7.4.5",
+        "@babel/plugin-transform-reserved-words": "7.2.0",
+        "@babel/plugin-transform-shorthand-properties": "7.2.0",
+        "@babel/plugin-transform-spread": "7.2.2",
+        "@babel/plugin-transform-sticky-regex": "7.2.0",
+        "@babel/plugin-transform-template-literals": "7.4.4",
+        "@babel/plugin-transform-typeof-symbol": "7.2.0",
+        "@babel/plugin-transform-unicode-regex": "7.4.4",
+        "@babel/types": "7.4.4",
+        "browserslist": "4.6.0",
+        "core-js-compat": "3.1.2",
+        "invariant": "2.2.4",
+        "js-levenshtein": "1.1.6",
+        "semver": "5.7.0"
       }
     },
     "@babel/runtime": {
@@ -802,7 +802,7 @@
       "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
       "dev": true,
       "requires": {
-        "regenerator-runtime": "^0.13.2"
+        "regenerator-runtime": "0.13.2"
       },
       "dependencies": {
         "regenerator-runtime": {
@@ -819,9 +819,9 @@
       "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/code-frame": "7.0.0",
+        "@babel/parser": "7.4.5",
+        "@babel/types": "7.4.4"
       }
     },
     "@babel/traverse": {
@@ -830,15 +830,15 @@
       "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.4",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.4.5",
-        "@babel/types": "^7.4.4",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.11"
+        "@babel/code-frame": "7.0.0",
+        "@babel/generator": "7.4.4",
+        "@babel/helper-function-name": "7.1.0",
+        "@babel/helper-split-export-declaration": "7.4.4",
+        "@babel/parser": "7.4.5",
+        "@babel/types": "7.4.4",
+        "debug": "4.1.1",
+        "globals": "11.12.0",
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "debug": {
@@ -847,7 +847,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -864,9 +864,9 @@
       "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.11",
-        "to-fast-properties": "^2.0.0"
+        "esutils": "2.0.2",
+        "lodash": "4.17.11",
+        "to-fast-properties": "2.0.0"
       }
     },
     "@samverschueren/stream-to-observable": {
@@ -875,7 +875,7 @@
       "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==",
       "dev": true,
       "requires": {
-        "any-observable": "^0.3.0"
+        "any-observable": "0.3.0"
       }
     },
     "@types/normalize-package-data": {
@@ -935,7 +935,7 @@
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
+        "mamacro": "0.0.3"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
@@ -962,7 +962,7 @@
       "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
       "dev": true,
       "requires": {
-        "@xtuc/ieee754": "^1.2.0"
+        "@xtuc/ieee754": "1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
@@ -1084,7 +1084,7 @@
       "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.24",
+        "mime-types": "2.1.24",
         "negotiator": "0.6.2"
       }
     },
@@ -1118,10 +1118,10 @@
       "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "fast-deep-equal": "2.0.1",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.4.1",
+        "uri-js": "4.2.2"
       }
     },
     "ajv-errors": {
@@ -1160,7 +1160,7 @@
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "1.9.3"
       }
     },
     "any-observable": {
@@ -1175,8 +1175,8 @@
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
+        "micromatch": "3.1.10",
+        "normalize-path": "2.1.1"
       },
       "dependencies": {
         "normalize-path": {
@@ -1185,7 +1185,7 @@
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
           "dev": true,
           "requires": {
-            "remove-trailing-separator": "^1.0.1"
+            "remove-trailing-separator": "1.1.0"
           }
         }
       }
@@ -1202,8 +1202,8 @@
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.6"
       }
     },
     "argparse": {
@@ -1212,7 +1212,7 @@
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
-        "sprintf-js": "~1.0.2"
+        "sprintf-js": "1.0.3"
       }
     },
     "arr-diff": {
@@ -1263,7 +1263,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "^1.0.1"
+        "array-uniq": "1.0.3"
       }
     },
     "array-uniq": {
@@ -1296,7 +1296,7 @@
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
       "dev": true,
       "requires": {
-        "safer-buffer": "~2.1.0"
+        "safer-buffer": "2.1.2"
       }
     },
     "asn1.js": {
@@ -1305,9 +1305,9 @@
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "bn.js": "4.11.8",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "assert": {
@@ -1316,7 +1316,7 @@
       "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "dev": true,
       "requires": {
-        "object-assign": "^4.1.1",
+        "object-assign": "4.1.1",
         "util": "0.10.3"
       },
       "dependencies": {
@@ -1361,7 +1361,7 @@
       "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.11"
+        "lodash": "4.17.11"
       }
     },
     "async-each": {
@@ -1400,12 +1400,12 @@
       "integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.5.4",
-        "caniuse-lite": "^1.0.30000957",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.14",
-        "postcss-value-parser": "^3.3.1"
+        "browserslist": "4.6.0",
+        "caniuse-lite": "1.0.30000971",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "7.0.16",
+        "postcss-value-parser": "3.3.1"
       }
     },
     "aws-sign2": {
@@ -1426,9 +1426,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -1443,11 +1443,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "js-tokens": {
@@ -1470,25 +1470,25 @@
       "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-generator": "^6.26.0",
-        "babel-helpers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "convert-source-map": "^1.5.1",
-        "debug": "^2.6.9",
-        "json5": "^0.5.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.4",
-        "path-is-absolute": "^1.0.1",
-        "private": "^0.1.8",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.7"
+        "babel-code-frame": "6.26.0",
+        "babel-generator": "6.26.1",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "convert-source-map": "1.6.0",
+        "debug": "2.6.9",
+        "json5": "0.5.1",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.8",
+        "slash": "1.0.0",
+        "source-map": "0.5.7"
       },
       "dependencies": {
         "json5": {
@@ -1511,12 +1511,12 @@
       "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.0.0",
-        "@babel/traverse": "^7.0.0",
-        "@babel/types": "^7.0.0",
+        "@babel/code-frame": "7.0.0",
+        "@babel/parser": "7.4.5",
+        "@babel/traverse": "7.4.5",
+        "@babel/types": "7.4.4",
         "eslint-scope": "3.7.1",
-        "eslint-visitor-keys": "^1.0.0"
+        "eslint-visitor-keys": "1.0.0"
       }
     },
     "babel-generator": {
@@ -1525,14 +1525,14 @@
       "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
       "dev": true,
       "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.11",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
       },
       "dependencies": {
         "jsesc": {
@@ -1549,10 +1549,10 @@
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-define-map": {
@@ -1561,10 +1561,10 @@
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.11"
       }
     },
     "babel-helper-function-name": {
@@ -1573,11 +1573,11 @@
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
       "dev": true,
       "requires": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-get-function-arity": {
@@ -1586,8 +1586,8 @@
       "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-hoist-variables": {
@@ -1596,8 +1596,8 @@
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-optimise-call-expression": {
@@ -1606,8 +1606,8 @@
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-regex": {
@@ -1616,9 +1616,9 @@
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.11"
       }
     },
     "babel-helper-replace-supers": {
@@ -1627,12 +1627,12 @@
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
       "dev": true,
       "requires": {
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helpers": {
@@ -1641,8 +1641,8 @@
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-loader": {
@@ -1651,10 +1651,10 @@
       "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^2.0.0",
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "pify": "^4.0.1"
+        "find-cache-dir": "2.1.0",
+        "loader-utils": "1.2.3",
+        "mkdirp": "0.5.1",
+        "pify": "4.0.1"
       }
     },
     "babel-messages": {
@@ -1663,7 +1663,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-check-es2015-constants": {
@@ -1672,7 +1672,7 @@
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-syntax-decorators": {
@@ -1693,9 +1693,9 @@
       "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-decorators": "^6.1.18",
-        "babel-runtime": "^6.2.0",
-        "babel-template": "^6.3.0"
+        "babel-plugin-syntax-decorators": "6.13.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-arrow-functions": {
@@ -1704,7 +1704,7 @@
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoped-functions": {
@@ -1713,7 +1713,7 @@
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoping": {
@@ -1722,11 +1722,11 @@
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.11"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -1735,15 +1735,15 @@
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
       "dev": true,
       "requires": {
-        "babel-helper-define-map": "^6.24.1",
-        "babel-helper-function-name": "^6.24.1",
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-define-map": "6.26.0",
+        "babel-helper-function-name": "6.24.1",
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-computed-properties": {
@@ -1752,8 +1752,8 @@
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-destructuring": {
@@ -1762,7 +1762,7 @@
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-duplicate-keys": {
@@ -1771,8 +1771,8 @@
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-for-of": {
@@ -1781,7 +1781,7 @@
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-function-name": {
@@ -1790,9 +1790,9 @@
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-literals": {
@@ -1801,7 +1801,7 @@
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-amd": {
@@ -1810,9 +1810,9 @@
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
@@ -1821,10 +1821,10 @@
       "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-strict-mode": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-types": "^6.26.0"
+        "babel-plugin-transform-strict-mode": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
@@ -1833,9 +1833,9 @@
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-umd": {
@@ -1844,9 +1844,9 @@
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-object-super": {
@@ -1855,8 +1855,8 @@
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
       "dev": true,
       "requires": {
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-runtime": "^6.22.0"
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-parameters": {
@@ -1865,12 +1865,12 @@
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
       "dev": true,
       "requires": {
-        "babel-helper-call-delegate": "^6.24.1",
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-call-delegate": "6.24.1",
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
@@ -1879,8 +1879,8 @@
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-spread": {
@@ -1889,7 +1889,7 @@
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-sticky-regex": {
@@ -1898,9 +1898,9 @@
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-template-literals": {
@@ -1909,7 +1909,7 @@
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
@@ -1918,7 +1918,7 @@
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-unicode-regex": {
@@ -1927,9 +1927,9 @@
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "regexpu-core": "^2.0.0"
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "regexpu-core": "2.0.0"
       },
       "dependencies": {
         "jsesc": {
@@ -1944,9 +1944,9 @@
           "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
           "dev": true,
           "requires": {
-            "regenerate": "^1.2.1",
-            "regjsgen": "^0.2.0",
-            "regjsparser": "^0.1.4"
+            "regenerate": "1.4.0",
+            "regjsgen": "0.2.0",
+            "regjsparser": "0.1.5"
           }
         },
         "regjsgen": {
@@ -1961,7 +1961,7 @@
           "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
           "dev": true,
           "requires": {
-            "jsesc": "~0.5.0"
+            "jsesc": "0.5.0"
           }
         }
       }
@@ -1972,7 +1972,7 @@
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.10.0"
+        "regenerator-transform": "0.10.1"
       },
       "dependencies": {
         "regenerator-transform": {
@@ -1981,9 +1981,9 @@
           "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
           "dev": true,
           "requires": {
-            "babel-runtime": "^6.18.0",
-            "babel-types": "^6.19.0",
-            "private": "^0.1.6"
+            "babel-runtime": "6.26.0",
+            "babel-types": "6.26.0",
+            "private": "0.1.8"
           }
         }
       }
@@ -1994,8 +1994,8 @@
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-preset-es2015": {
@@ -2004,30 +2004,30 @@
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "^6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
-        "babel-plugin-transform-es2015-classes": "^6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
-        "babel-plugin-transform-es2015-for-of": "^6.22.0",
-        "babel-plugin-transform-es2015-function-name": "^6.24.1",
-        "babel-plugin-transform-es2015-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
-        "babel-plugin-transform-es2015-object-super": "^6.24.1",
-        "babel-plugin-transform-es2015-parameters": "^6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-spread": "^6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
-        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
-        "babel-plugin-transform-regenerator": "^6.24.1"
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0"
       }
     },
     "babel-register": {
@@ -2036,13 +2036,13 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "home-or-tmp": "^2.0.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.15"
+        "babel-core": "6.26.3",
+        "babel-runtime": "6.26.0",
+        "core-js": "2.6.8",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.11",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18"
       }
     },
     "babel-runtime": {
@@ -2051,8 +2051,8 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "core-js": "2.6.8",
+        "regenerator-runtime": "0.11.1"
       }
     },
     "babel-template": {
@@ -2061,11 +2061,11 @@
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.11"
       }
     },
     "babel-traverse": {
@@ -2074,15 +2074,15 @@
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
+        "babel-code-frame": "6.26.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "debug": "2.6.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.4",
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "globals": {
@@ -2099,10 +2099,10 @@
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.11",
+        "to-fast-properties": "1.0.3"
       },
       "dependencies": {
         "to-fast-properties": {
@@ -2137,13 +2137,13 @@
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
+        "cache-base": "1.0.1",
+        "class-utils": "0.3.6",
+        "component-emitter": "1.3.0",
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "mixin-deep": "1.3.1",
+        "pascalcase": "0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -2152,7 +2152,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -2161,7 +2161,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -2170,7 +2170,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -2179,9 +2179,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -2210,7 +2210,7 @@
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "dev": true,
       "requires": {
-        "tweetnacl": "^0.14.3"
+        "tweetnacl": "0.14.5"
       }
     },
     "better-assert": {
@@ -2246,7 +2246,7 @@
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.0"
+        "inherits": "2.0.3"
       }
     },
     "bluebird": {
@@ -2268,15 +2268,15 @@
       "dev": true,
       "requires": {
         "bytes": "3.1.0",
-        "content-type": "~1.0.4",
+        "content-type": "1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "1.1.2",
         "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.3.0",
         "qs": "6.7.0",
         "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "type-is": "1.6.18"
       }
     },
     "brace-expansion": {
@@ -2285,7 +2285,7 @@
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "requires": {
-        "balanced-match": "^1.0.0",
+        "balanced-match": "1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -2295,16 +2295,16 @@
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
+        "arr-flatten": "1.1.0",
+        "array-unique": "0.3.2",
+        "extend-shallow": "2.0.1",
+        "fill-range": "4.0.0",
+        "isobject": "3.0.1",
+        "repeat-element": "1.1.3",
+        "snapdragon": "0.8.2",
+        "snapdragon-node": "2.1.1",
+        "split-string": "3.1.0",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "extend-shallow": {
@@ -2313,7 +2313,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -2330,12 +2330,12 @@
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "browserify-cipher": {
@@ -2344,9 +2344,9 @@
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "browserify-aes": "1.2.0",
+        "browserify-des": "1.0.2",
+        "evp_bytestokey": "1.0.3"
       }
     },
     "browserify-des": {
@@ -2355,10 +2355,10 @@
       "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "browserify-rsa": {
@@ -2367,8 +2367,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "4.11.8",
+        "randombytes": "2.1.0"
       }
     },
     "browserify-sign": {
@@ -2377,13 +2377,13 @@
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "elliptic": "6.4.1",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.4"
       }
     },
     "browserify-zlib": {
@@ -2392,7 +2392,7 @@
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
-        "pako": "~1.0.5"
+        "pako": "1.0.10"
       }
     },
     "browserslist": {
@@ -2401,9 +2401,9 @@
       "integrity": "sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000967",
-        "electron-to-chromium": "^1.3.133",
-        "node-releases": "^1.1.19"
+        "caniuse-lite": "1.0.30000971",
+        "electron-to-chromium": "1.3.137",
+        "node-releases": "1.1.21"
       }
     },
     "buffer": {
@@ -2412,9 +2412,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "1.3.0",
+        "ieee754": "1.1.13",
+        "isarray": "1.0.0"
       }
     },
     "buffer-alloc": {
@@ -2423,8 +2423,8 @@
       "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
+        "buffer-alloc-unsafe": "1.1.0",
+        "buffer-fill": "1.0.0"
       }
     },
     "buffer-alloc-unsafe": {
@@ -2469,20 +2469,20 @@
       "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.3",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.1.15",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
+        "bluebird": "3.5.5",
+        "chownr": "1.1.1",
+        "figgy-pudding": "3.5.1",
+        "glob": "7.1.4",
+        "graceful-fs": "4.1.15",
+        "lru-cache": "5.1.1",
+        "mississippi": "3.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.3",
+        "ssri": "6.0.1",
+        "unique-filename": "1.1.1",
+        "y18n": "4.0.0"
       },
       "dependencies": {
         "lru-cache": {
@@ -2491,7 +2491,7 @@
           "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
           "dev": true,
           "requires": {
-            "yallist": "^3.0.2"
+            "yallist": "3.0.3"
           }
         },
         "y18n": {
@@ -2514,15 +2514,15 @@
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
+        "collection-visit": "1.0.0",
+        "component-emitter": "1.3.0",
+        "get-value": "2.0.6",
+        "has-value": "1.0.0",
+        "isobject": "3.0.1",
+        "set-value": "2.0.0",
+        "to-object-path": "0.3.0",
+        "union-value": "1.0.0",
+        "unset-value": "1.0.0"
       }
     },
     "caller-callsite": {
@@ -2531,7 +2531,7 @@
       "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
       "dev": true,
       "requires": {
-        "callsites": "^2.0.0"
+        "callsites": "2.0.0"
       },
       "dependencies": {
         "callsites": {
@@ -2548,7 +2548,7 @@
       "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
       "dev": true,
       "requires": {
-        "caller-callsite": "^2.0.0"
+        "caller-callsite": "2.0.0"
       }
     },
     "callsite": {
@@ -2575,8 +2575,8 @@
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
       },
       "dependencies": {
         "camelcase": {
@@ -2605,9 +2605,9 @@
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "3.2.1",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "5.5.0"
       }
     },
     "chardet": {
@@ -2622,18 +2622,18 @@
       "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
       "dev": true,
       "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
+        "anymatch": "2.0.0",
+        "async-each": "1.0.3",
+        "braces": "2.3.2",
+        "fsevents": "1.2.9",
+        "glob-parent": "3.1.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "4.0.1",
+        "normalize-path": "3.0.0",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.2.1",
+        "upath": "1.1.2"
       }
     },
     "chownr": {
@@ -2648,8 +2648,8 @@
       "integrity": "sha512-3P9FCnp/nBrggFnGrjhaJBH/+VSlHxJm1phFJ0fQvKm/p8aUp1MjW7fK4BqYwbUNzLXuA5wufl35ouonEBAWtw==",
       "dev": true,
       "requires": {
-        "npm": "^6.9.0",
-        "tslib": "^1.9.0"
+        "npm": "6.9.0",
+        "tslib": "1.9.3"
       }
     },
     "ci-info": {
@@ -2664,8 +2664,8 @@
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "class-utils": {
@@ -2674,10 +2674,10 @@
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "arr-union": "3.1.0",
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "static-extend": "0.1.2"
       },
       "dependencies": {
         "define-property": {
@@ -2686,7 +2686,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -2697,7 +2697,7 @@
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "dev": true,
       "requires": {
-        "restore-cursor": "^2.0.0"
+        "restore-cursor": "2.0.0"
       }
     },
     "cli-truncate": {
@@ -2707,7 +2707,7 @@
       "dev": true,
       "requires": {
         "slice-ansi": "0.0.4",
-        "string-width": "^1.0.1"
+        "string-width": "1.0.2"
       },
       "dependencies": {
         "is-fullwidth-code-point": {
@@ -2716,7 +2716,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "slice-ansi": {
@@ -2731,9 +2731,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         }
       }
@@ -2750,9 +2750,9 @@
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
       },
       "dependencies": {
         "is-fullwidth-code-point": {
@@ -2761,7 +2761,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "string-width": {
@@ -2770,9 +2770,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "wrap-ansi": {
@@ -2781,8 +2781,8 @@
           "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1"
           }
         }
       }
@@ -2793,10 +2793,10 @@
       "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
+        "for-own": "1.0.0",
+        "is-plain-object": "2.0.4",
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
       }
     },
     "code-point-at": {
@@ -2811,8 +2811,8 @@
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "map-visit": "1.0.0",
+        "object-visit": "1.0.1"
       }
     },
     "color-convert": {
@@ -2842,7 +2842,7 @@
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "requires": {
-        "delayed-stream": "~1.0.0"
+        "delayed-stream": "1.0.0"
       }
     },
     "commander": {
@@ -2887,10 +2887,10 @@
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "buffer-from": "1.1.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "typedarray": "0.0.6"
       }
     },
     "connect": {
@@ -2901,7 +2901,7 @@
       "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
+        "parseurl": "1.3.3",
         "utils-merge": "1.0.1"
       }
     },
@@ -2911,7 +2911,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "^0.1.4"
+        "date-now": "0.1.4"
       }
     },
     "console-control-strings": {
@@ -2938,7 +2938,7 @@
       "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.1"
+        "safe-buffer": "5.1.2"
       }
     },
     "cookie": {
@@ -2953,12 +2953,12 @@
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
+        "aproba": "1.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.3",
+        "run-queue": "1.0.3"
       }
     },
     "copy-descriptor": {
@@ -2979,9 +2979,9 @@
       "integrity": "sha512-X0Ch5f6itrHxhg5HSJucX6nNLNAGr+jq+biBh6nPGc3YAWz2a8p/ZIZY8cUkDzSRNG54omAuu3hoEF8qZbu/6Q==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.6.0",
+        "browserslist": "4.6.0",
         "core-js-pure": "3.1.2",
-        "semver": "^6.0.0"
+        "semver": "6.1.0"
       },
       "dependencies": {
         "semver": {
@@ -3010,10 +3010,10 @@
       "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "requires": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
+        "import-fresh": "2.0.0",
+        "is-directory": "0.3.1",
+        "js-yaml": "3.13.1",
+        "parse-json": "4.0.0"
       },
       "dependencies": {
         "import-fresh": {
@@ -3022,8 +3022,8 @@
           "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
           "dev": true,
           "requires": {
-            "caller-path": "^2.0.0",
-            "resolve-from": "^3.0.0"
+            "caller-path": "2.0.0",
+            "resolve-from": "3.0.0"
           }
         },
         "resolve-from": {
@@ -3040,8 +3040,8 @@
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "bn.js": "4.11.8",
+        "elliptic": "6.4.1"
       }
     },
     "create-hash": {
@@ -3050,11 +3050,11 @@
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "md5.js": "1.3.5",
+        "ripemd160": "2.0.2",
+        "sha.js": "2.4.11"
       }
     },
     "create-hmac": {
@@ -3063,12 +3063,12 @@
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
       }
     },
     "cross-spawn": {
@@ -3077,11 +3077,11 @@
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "nice-try": "1.0.5",
+        "path-key": "2.0.1",
+        "semver": "5.7.0",
+        "shebang-command": "1.2.0",
+        "which": "1.3.1"
       }
     },
     "crypto-browserify": {
@@ -3090,17 +3090,17 @@
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "browserify-cipher": "1.0.1",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.3",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "diffie-hellman": "5.0.3",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.17",
+        "public-encrypt": "4.0.3",
+        "randombytes": "2.1.0",
+        "randomfill": "1.0.4"
       }
     },
     "css-loader": {
@@ -3109,17 +3109,17 @@
       "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
       "dev": true,
       "requires": {
-        "camelcase": "^5.2.0",
-        "icss-utils": "^4.1.0",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.14",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^2.0.6",
-        "postcss-modules-scope": "^2.1.0",
-        "postcss-modules-values": "^2.0.0",
-        "postcss-value-parser": "^3.3.0",
-        "schema-utils": "^1.0.0"
+        "camelcase": "5.3.1",
+        "icss-utils": "4.1.0",
+        "loader-utils": "1.2.3",
+        "normalize-path": "3.0.0",
+        "postcss": "7.0.16",
+        "postcss-modules-extract-imports": "2.0.0",
+        "postcss-modules-local-by-default": "2.0.6",
+        "postcss-modules-scope": "2.1.0",
+        "postcss-modules-values": "2.0.0",
+        "postcss-value-parser": "3.3.1",
+        "schema-utils": "1.0.0"
       }
     },
     "cssesc": {
@@ -3134,7 +3134,7 @@
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
-        "array-find-index": "^1.0.1"
+        "array-find-index": "1.0.2"
       }
     },
     "custom-event": {
@@ -3155,7 +3155,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "^0.10.9"
+        "es5-ext": "0.10.50"
       }
     },
     "dashdash": {
@@ -3164,7 +3164,7 @@
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "date-fns": {
@@ -3224,7 +3224,7 @@
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dev": true,
       "requires": {
-        "object-keys": "^1.0.12"
+        "object-keys": "1.1.1"
       }
     },
     "define-property": {
@@ -3233,8 +3233,8 @@
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "is-descriptor": "1.0.2",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -3243,7 +3243,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -3252,7 +3252,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -3261,9 +3261,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -3274,12 +3274,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
+        "globby": "6.1.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.1",
+        "p-map": "1.2.0",
+        "pify": "3.0.0",
+        "rimraf": "2.6.3"
       },
       "dependencies": {
         "pify": {
@@ -3314,8 +3314,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "detect-file": {
@@ -3330,7 +3330,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "di": {
@@ -3345,9 +3345,9 @@
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
+        "bn.js": "4.11.8",
+        "miller-rabin": "4.0.1",
+        "randombytes": "2.1.0"
       }
     },
     "doctrine": {
@@ -3356,7 +3356,7 @@
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2"
+        "esutils": "2.0.2"
       }
     },
     "dom-serialize": {
@@ -3365,10 +3365,10 @@
       "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
       "dev": true,
       "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.2",
+        "void-elements": "2.0.1"
       }
     },
     "domain-browser": {
@@ -3383,10 +3383,10 @@
       "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "stream-shift": "1.0.0"
       }
     },
     "ecc-jsbn": {
@@ -3395,8 +3395,8 @@
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "dev": true,
       "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2"
       }
     },
     "ee-first": {
@@ -3423,13 +3423,13 @@
       "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0",
+        "hash.js": "1.1.7",
+        "hmac-drbg": "1.0.1",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "emoji-regex": {
@@ -3456,7 +3456,7 @@
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "^1.4.0"
+        "once": "1.4.0"
       }
     },
     "engine.io": {
@@ -3465,12 +3465,12 @@
       "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "1.3.7",
         "base64id": "1.0.0",
         "cookie": "0.3.1",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.0",
-        "ws": "~3.3.1"
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.3",
+        "ws": "3.3.3"
       },
       "dependencies": {
         "debug": {
@@ -3492,14 +3492,14 @@
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.1",
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.3",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "ws": "~3.3.1",
-        "xmlhttprequest-ssl": "~1.5.4",
+        "ws": "3.3.3",
+        "xmlhttprequest-ssl": "1.5.5",
         "yeast": "0.1.2"
       },
       "dependencies": {
@@ -3527,10 +3527,10 @@
       "dev": true,
       "requires": {
         "after": "0.8.2",
-        "arraybuffer.slice": "~0.0.7",
+        "arraybuffer.slice": "0.0.7",
         "base64-arraybuffer": "0.1.5",
         "blob": "0.0.5",
-        "has-binary2": "~1.0.2"
+        "has-binary2": "1.0.3"
       }
     },
     "enhanced-resolve": {
@@ -3539,9 +3539,9 @@
       "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "tapable": "^1.0.0"
+        "graceful-fs": "4.1.15",
+        "memory-fs": "0.4.1",
+        "tapable": "1.1.3"
       }
     },
     "ent": {
@@ -3556,7 +3556,7 @@
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
-        "prr": "~1.0.1"
+        "prr": "1.0.1"
       }
     },
     "error-ex": {
@@ -3565,7 +3565,7 @@
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
       "requires": {
-        "is-arrayish": "^0.2.1"
+        "is-arrayish": "0.2.1"
       }
     },
     "es-abstract": {
@@ -3574,12 +3574,12 @@
       "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.2.0",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
-        "object-keys": "^1.0.12"
+        "es-to-primitive": "1.2.0",
+        "function-bind": "1.1.1",
+        "has": "1.0.3",
+        "is-callable": "1.1.4",
+        "is-regex": "1.0.4",
+        "object-keys": "1.1.1"
       }
     },
     "es-to-primitive": {
@@ -3588,9 +3588,9 @@
       "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
       "dev": true,
       "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "1.1.4",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.2"
       }
     },
     "es5-ext": {
@@ -3599,9 +3599,9 @@
       "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
       "dev": true,
       "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.1",
-        "next-tick": "^1.0.0"
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "next-tick": "1.0.0"
       }
     },
     "es6-iterator": {
@@ -3610,9 +3610,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.50",
+        "es6-symbol": "3.1.1"
       }
     },
     "es6-symbol": {
@@ -3621,8 +3621,8 @@
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.50"
       }
     },
     "escape-html": {
@@ -3643,42 +3643,42 @@
       "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.9.1",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^4.0.3",
-        "eslint-utils": "^1.3.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^5.0.1",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
-        "globals": "^11.7.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^6.2.2",
-        "js-yaml": "^3.13.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.11",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^5.5.1",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "^2.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0"
+        "@babel/code-frame": "7.0.0",
+        "ajv": "6.10.0",
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "debug": "4.1.1",
+        "doctrine": "3.0.0",
+        "eslint-scope": "4.0.3",
+        "eslint-utils": "1.3.1",
+        "eslint-visitor-keys": "1.0.0",
+        "espree": "5.0.1",
+        "esquery": "1.0.1",
+        "esutils": "2.0.2",
+        "file-entry-cache": "5.0.1",
+        "functional-red-black-tree": "1.0.1",
+        "glob": "7.1.4",
+        "globals": "11.12.0",
+        "ignore": "4.0.6",
+        "import-fresh": "3.0.0",
+        "imurmurhash": "0.1.4",
+        "inquirer": "6.3.1",
+        "js-yaml": "3.13.1",
+        "json-stable-stringify-without-jsonify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "natural-compare": "1.4.0",
+        "optionator": "0.8.2",
+        "path-is-inside": "1.0.2",
+        "progress": "2.0.3",
+        "regexpp": "2.0.1",
+        "semver": "5.7.0",
+        "strip-ansi": "4.0.0",
+        "strip-json-comments": "2.0.1",
+        "table": "5.4.0",
+        "text-table": "0.2.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -3693,7 +3693,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "eslint-scope": {
@@ -3702,8 +3702,8 @@
           "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
           "dev": true,
           "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
+            "esrecurse": "4.2.1",
+            "estraverse": "4.2.0"
           }
         },
         "ms": {
@@ -3718,7 +3718,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -3729,8 +3729,8 @@
       "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
       }
     },
     "eslint-utils": {
@@ -3751,9 +3751,9 @@
       "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
       "dev": true,
       "requires": {
-        "acorn": "^6.0.7",
-        "acorn-jsx": "^5.0.0",
-        "eslint-visitor-keys": "^1.0.0"
+        "acorn": "6.1.1",
+        "acorn-jsx": "5.0.1",
+        "eslint-visitor-keys": "1.0.0"
       }
     },
     "esprima": {
@@ -3768,7 +3768,7 @@
       "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.0.0"
+        "estraverse": "4.2.0"
       }
     },
     "esrecurse": {
@@ -3777,7 +3777,7 @@
       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "4.2.0"
       }
     },
     "estraverse": {
@@ -3810,8 +3810,8 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+        "md5.js": "1.3.5",
+        "safe-buffer": "5.1.2"
       }
     },
     "execa": {
@@ -3820,13 +3820,13 @@
       "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dev": true,
       "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "cross-spawn": "6.0.5",
+        "get-stream": "4.1.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
       }
     },
     "expand-brackets": {
@@ -3835,13 +3835,13 @@
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "posix-character-classes": "0.1.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -3850,7 +3850,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "extend-shallow": {
@@ -3859,7 +3859,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -3870,7 +3870,7 @@
       "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1"
+        "homedir-polyfill": "1.0.3"
       }
     },
     "extend": {
@@ -3885,8 +3885,8 @@
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "assign-symbols": "1.0.0",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -3895,7 +3895,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -3906,9 +3906,9 @@
       "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
       "dev": true,
       "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
+        "chardet": "0.7.0",
+        "iconv-lite": "0.4.24",
+        "tmp": "0.0.33"
       }
     },
     "extglob": {
@@ -3917,14 +3917,14 @@
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "array-unique": "0.3.2",
+        "define-property": "1.0.0",
+        "expand-brackets": "2.1.4",
+        "extend-shallow": "2.0.1",
+        "fragment-cache": "0.2.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -3933,7 +3933,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "extend-shallow": {
@@ -3942,7 +3942,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "is-accessor-descriptor": {
@@ -3951,7 +3951,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -3960,7 +3960,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -3969,9 +3969,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -3982,10 +3982,10 @@
       "integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
       "dev": true,
       "requires": {
-        "async": "^2.4.1",
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.4.5",
-        "webpack-sources": "^1.1.0"
+        "async": "2.6.2",
+        "loader-utils": "1.2.3",
+        "schema-utils": "0.4.7",
+        "webpack-sources": "1.3.0"
       },
       "dependencies": {
         "schema-utils": {
@@ -3994,8 +3994,8 @@
           "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-keywords": "^3.1.0"
+            "ajv": "6.10.0",
+            "ajv-keywords": "3.4.0"
           }
         }
       }
@@ -4036,7 +4036,7 @@
       "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5"
+        "escape-string-regexp": "1.0.5"
       }
     },
     "file-entry-cache": {
@@ -4045,7 +4045,7 @@
       "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
       "dev": true,
       "requires": {
-        "flat-cache": "^2.0.1"
+        "flat-cache": "2.0.1"
       }
     },
     "fill-range": {
@@ -4054,10 +4054,10 @@
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "extend-shallow": "2.0.1",
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1",
+        "to-regex-range": "2.1.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -4066,7 +4066,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -4078,12 +4078,12 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.3",
+        "statuses": "1.5.0",
+        "unpipe": "1.0.0"
       }
     },
     "find-cache-dir": {
@@ -4092,9 +4092,9 @@
       "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "dev": true,
       "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
+        "commondir": "1.0.1",
+        "make-dir": "2.1.0",
+        "pkg-dir": "3.0.0"
       }
     },
     "find-parent-dir": {
@@ -4109,7 +4109,7 @@
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
       "requires": {
-        "locate-path": "^3.0.0"
+        "locate-path": "3.0.0"
       }
     },
     "findup-sync": {
@@ -4118,10 +4118,10 @@
       "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
       "dev": true,
       "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "detect-file": "1.0.0",
+        "is-glob": "3.1.0",
+        "micromatch": "3.1.10",
+        "resolve-dir": "1.0.1"
       },
       "dependencies": {
         "is-glob": {
@@ -4130,7 +4130,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.0"
+            "is-extglob": "2.1.1"
           }
         }
       }
@@ -4141,7 +4141,7 @@
       "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
       "dev": true,
       "requires": {
-        "flatted": "^2.0.0",
+        "flatted": "2.0.0",
         "rimraf": "2.6.3",
         "write": "1.0.3"
       }
@@ -4163,8 +4163,8 @@
       "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "fn-name": {
@@ -4179,7 +4179,7 @@
       "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.6"
+        "debug": "3.2.6"
       },
       "dependencies": {
         "debug": {
@@ -4188,7 +4188,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -4211,7 +4211,7 @@
       "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "for-in": "1.0.2"
       }
     },
     "forever-agent": {
@@ -4226,9 +4226,9 @@
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "dev": true,
       "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.8",
+        "mime-types": "2.1.24"
       }
     },
     "fragment-cache": {
@@ -4237,7 +4237,7 @@
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
-        "map-cache": "^0.2.2"
+        "map-cache": "0.2.2"
       }
     },
     "from2": {
@@ -4246,8 +4246,8 @@
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "fs-access": {
@@ -4256,7 +4256,7 @@
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
-        "null-check": "^1.0.0"
+        "null-check": "1.0.0"
       }
     },
     "fs-extra": {
@@ -4265,9 +4265,9 @@
       "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "graceful-fs": "4.1.15",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.2"
       }
     },
     "fs-readdir-recursive": {
@@ -4282,10 +4282,10 @@
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
+        "graceful-fs": "4.1.15",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.6"
       }
     },
     "fs.realpath": {
@@ -4301,8 +4301,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "^2.12.1",
-        "node-pre-gyp": "^0.12.0"
+        "nan": "2.14.0",
+        "node-pre-gyp": "0.12.0"
       },
       "dependencies": {
         "abbrev": {
@@ -4328,8 +4328,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.6"
           }
         },
         "balanced-match": {
@@ -4342,7 +4342,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "balanced-match": "^1.0.0",
+            "balanced-match": "1.0.0",
             "concat-map": "0.0.1"
           }
         },
@@ -4379,7 +4379,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "deep-extend": {
@@ -4406,7 +4406,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "2.3.5"
           }
         },
         "fs.realpath": {
@@ -4421,14 +4421,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
+            "aproba": "1.2.0",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.3"
           }
         },
         "glob": {
@@ -4437,12 +4437,12 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "has-unicode": {
@@ -4457,7 +4457,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "safer-buffer": "2.1.2"
           }
         },
         "ignore-walk": {
@@ -4466,7 +4466,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minimatch": "^3.0.4"
+            "minimatch": "3.0.4"
           }
         },
         "inflight": {
@@ -4475,8 +4475,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
           }
         },
         "inherits": {
@@ -4495,7 +4495,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "isarray": {
@@ -4509,7 +4509,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "brace-expansion": "^1.1.7"
+            "brace-expansion": "1.1.11"
           }
         },
         "minimist": {
@@ -4522,8 +4522,8 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.3"
           }
         },
         "minizlib": {
@@ -4532,7 +4532,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "2.3.5"
           }
         },
         "mkdirp": {
@@ -4555,9 +4555,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^4.1.0",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
+            "debug": "4.1.1",
+            "iconv-lite": "0.4.24",
+            "sax": "1.2.4"
           }
         },
         "node-pre-gyp": {
@@ -4566,16 +4566,16 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
+            "detect-libc": "1.0.3",
+            "mkdirp": "0.5.1",
+            "needle": "2.3.0",
+            "nopt": "4.0.1",
+            "npm-packlist": "1.4.1",
+            "npmlog": "4.1.2",
+            "rc": "1.2.8",
+            "rimraf": "2.6.3",
+            "semver": "5.7.0",
+            "tar": "4.4.8"
           }
         },
         "nopt": {
@@ -4584,8 +4584,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
           }
         },
         "npm-bundled": {
@@ -4600,8 +4600,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.6"
           }
         },
         "npmlog": {
@@ -4610,10 +4610,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
+            "are-we-there-yet": "1.1.5",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
           }
         },
         "number-is-nan": {
@@ -4632,7 +4632,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "wrappy": "1"
+            "wrappy": "1.0.2"
           }
         },
         "os-homedir": {
@@ -4653,8 +4653,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
           }
         },
         "path-is-absolute": {
@@ -4675,10 +4675,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
+            "deep-extend": "0.6.0",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -4695,13 +4695,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "rimraf": {
@@ -4710,7 +4710,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "glob": "^7.1.3"
+            "glob": "7.1.3"
           }
         },
         "safe-buffer": {
@@ -4753,9 +4753,9 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "string_decoder": {
@@ -4764,7 +4764,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.2"
           }
         },
         "strip-ansi": {
@@ -4772,7 +4772,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "strip-json-comments": {
@@ -4787,13 +4787,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
+            "chownr": "1.1.1",
+            "fs-minipass": "1.2.5",
+            "minipass": "2.3.5",
+            "minizlib": "1.2.1",
+            "mkdirp": "0.5.1",
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.3"
           }
         },
         "util-deprecate": {
@@ -4808,7 +4808,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "^1.0.2 || 2"
+            "string-width": "1.0.2"
           }
         },
         "wrappy": {
@@ -4829,10 +4829,10 @@
       "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
+        "graceful-fs": "4.1.15",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.3"
       }
     },
     "function-bind": {
@@ -4853,9 +4853,9 @@
       "integrity": "sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.1",
-        "matcher": "^1.0.0",
-        "simple-git": "^1.85.0"
+        "arrify": "1.0.1",
+        "matcher": "1.1.1",
+        "simple-git": "1.113.0"
       }
     },
     "gauge": {
@@ -4864,14 +4864,14 @@
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
+        "aproba": "1.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.3"
       },
       "dependencies": {
         "is-fullwidth-code-point": {
@@ -4880,7 +4880,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "string-width": {
@@ -4889,9 +4889,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         }
       }
@@ -4902,7 +4902,7 @@
       "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "dev": true,
       "requires": {
-        "globule": "^1.0.0"
+        "globule": "1.2.1"
       }
     },
     "get-caller-file": {
@@ -4929,7 +4929,7 @@
       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
       "dev": true,
       "requires": {
-        "pump": "^3.0.0"
+        "pump": "3.0.0"
       }
     },
     "get-value": {
@@ -4944,7 +4944,7 @@
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "glob": {
@@ -4953,12 +4953,12 @@
       "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
       "dev": true,
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
       }
     },
     "glob-parent": {
@@ -4967,8 +4967,8 @@
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
       "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "is-glob": "3.1.0",
+        "path-dirname": "1.0.2"
       },
       "dependencies": {
         "is-glob": {
@@ -4977,7 +4977,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.0"
+            "is-extglob": "2.1.1"
           }
         }
       }
@@ -4988,9 +4988,9 @@
       "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
+        "global-prefix": "1.0.2",
+        "is-windows": "1.0.2",
+        "resolve-dir": "1.0.1"
       }
     },
     "global-prefix": {
@@ -4999,11 +4999,11 @@
       "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
+        "expand-tilde": "2.0.2",
+        "homedir-polyfill": "1.0.3",
+        "ini": "1.3.5",
+        "is-windows": "1.0.2",
+        "which": "1.3.1"
       }
     },
     "globals": {
@@ -5018,11 +5018,11 @@
       "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
       "dev": true,
       "requires": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "array-union": "1.0.2",
+        "glob": "7.1.4",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
       },
       "dependencies": {
         "pify": {
@@ -5039,9 +5039,9 @@
       "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
       "dev": true,
       "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
+        "glob": "7.1.4",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4"
       }
     },
     "graceful-fs": {
@@ -5062,8 +5062,8 @@
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
+        "ajv": "6.10.0",
+        "har-schema": "2.0.0"
       }
     },
     "has": {
@@ -5072,7 +5072,7 @@
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1"
+        "function-bind": "1.1.1"
       }
     },
     "has-ansi": {
@@ -5081,7 +5081,7 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "has-binary2": {
@@ -5131,9 +5131,9 @@
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "get-value": "2.0.6",
+        "has-values": "1.0.0",
+        "isobject": "3.0.1"
       }
     },
     "has-values": {
@@ -5142,8 +5142,8 @@
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -5152,7 +5152,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -5163,8 +5163,8 @@
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "hash.js": {
@@ -5173,8 +5173,8 @@
       "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "hmac-drbg": {
@@ -5183,9 +5183,9 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "hash.js": "1.1.7",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "home-or-tmp": {
@@ -5194,8 +5194,8 @@
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "homedir-polyfill": {
@@ -5204,7 +5204,7 @@
       "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "dev": true,
       "requires": {
-        "parse-passwd": "^1.0.0"
+        "parse-passwd": "1.0.0"
       }
     },
     "hosted-git-info": {
@@ -5219,10 +5219,10 @@
       "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "dev": true,
       "requires": {
-        "depd": "~1.1.2",
+        "depd": "1.1.2",
         "inherits": "2.0.3",
         "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "1.5.0",
         "toidentifier": "1.0.0"
       }
     },
@@ -5232,9 +5232,9 @@
       "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
-        "eventemitter3": "^3.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
+        "eventemitter3": "3.1.2",
+        "follow-redirects": "1.7.0",
+        "requires-port": "1.0.0"
       }
     },
     "http-signature": {
@@ -5243,9 +5243,9 @@
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.16.1"
       }
     },
     "https-browserify": {
@@ -5260,16 +5260,16 @@
       "integrity": "sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^5.2.0",
-        "execa": "^1.0.0",
-        "find-up": "^3.0.0",
-        "get-stdin": "^7.0.0",
-        "is-ci": "^2.0.0",
-        "pkg-dir": "^4.1.0",
-        "please-upgrade-node": "^3.1.1",
-        "read-pkg": "^5.1.1",
-        "run-node": "^1.0.0",
-        "slash": "^3.0.0"
+        "cosmiconfig": "5.2.1",
+        "execa": "1.0.0",
+        "find-up": "3.0.0",
+        "get-stdin": "7.0.0",
+        "is-ci": "2.0.0",
+        "pkg-dir": "4.2.0",
+        "please-upgrade-node": "3.1.1",
+        "read-pkg": "5.1.1",
+        "run-node": "1.0.0",
+        "slash": "3.0.0"
       },
       "dependencies": {
         "locate-path": {
@@ -5278,7 +5278,7 @@
           "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
           "dev": true,
           "requires": {
-            "p-locate": "^4.1.0"
+            "p-locate": "4.1.0"
           }
         },
         "p-locate": {
@@ -5287,7 +5287,7 @@
           "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.2.0"
+            "p-limit": "2.2.0"
           }
         },
         "pkg-dir": {
@@ -5296,7 +5296,7 @@
           "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
           "dev": true,
           "requires": {
-            "find-up": "^4.0.0"
+            "find-up": "4.0.0"
           },
           "dependencies": {
             "find-up": {
@@ -5305,7 +5305,7 @@
               "integrity": "sha512-zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q==",
               "dev": true,
               "requires": {
-                "locate-path": "^5.0.0"
+                "locate-path": "5.0.0"
               }
             }
           }
@@ -5324,7 +5324,7 @@
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
       "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": "2.1.2"
       }
     },
     "icss-replace-symbols": {
@@ -5339,7 +5339,7 @@
       "integrity": "sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.14"
+        "postcss": "7.0.16"
       }
     },
     "ieee754": {
@@ -5366,7 +5366,7 @@
       "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
       "dev": true,
       "requires": {
-        "import-from": "^2.1.0"
+        "import-from": "2.1.0"
       }
     },
     "import-fresh": {
@@ -5375,8 +5375,8 @@
       "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
       "dev": true,
       "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
+        "parent-module": "1.0.1",
+        "resolve-from": "4.0.0"
       }
     },
     "import-from": {
@@ -5385,7 +5385,7 @@
       "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "3.0.0"
       },
       "dependencies": {
         "resolve-from": {
@@ -5402,8 +5402,8 @@
       "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "3.0.0",
+        "resolve-cwd": "2.0.0"
       }
     },
     "imurmurhash": {
@@ -5442,8 +5442,8 @@
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
       }
     },
     "inherits": {
@@ -5464,19 +5464,19 @@
       "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^3.2.0",
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^2.0.0",
-        "lodash": "^4.17.11",
+        "ansi-escapes": "3.2.0",
+        "chalk": "2.4.2",
+        "cli-cursor": "2.1.0",
+        "cli-width": "2.2.0",
+        "external-editor": "3.0.3",
+        "figures": "2.0.0",
+        "lodash": "4.17.11",
         "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^5.1.0",
-        "through": "^2.3.6"
+        "run-async": "2.3.0",
+        "rxjs": "6.5.2",
+        "string-width": "2.1.1",
+        "strip-ansi": "5.2.0",
+        "through": "2.3.8"
       },
       "dependencies": {
         "ansi-regex": {
@@ -5491,7 +5491,7 @@
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "4.1.0"
           }
         }
       }
@@ -5508,7 +5508,7 @@
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "requires": {
-        "loose-envify": "^1.0.0"
+        "loose-envify": "1.4.0"
       }
     },
     "invert-kv": {
@@ -5523,7 +5523,7 @@
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -5532,7 +5532,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -5549,7 +5549,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "1.13.1"
       }
     },
     "is-buffer": {
@@ -5570,7 +5570,7 @@
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
       "dev": true,
       "requires": {
-        "ci-info": "^2.0.0"
+        "ci-info": "2.0.0"
       }
     },
     "is-data-descriptor": {
@@ -5579,7 +5579,7 @@
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -5588,7 +5588,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -5605,9 +5605,9 @@
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "0.1.6",
+        "is-data-descriptor": "0.1.4",
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -5642,7 +5642,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-fullwidth-code-point": {
@@ -5657,7 +5657,7 @@
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "dev": true,
       "requires": {
-        "is-extglob": "^2.1.1"
+        "is-extglob": "2.1.1"
       }
     },
     "is-number": {
@@ -5666,7 +5666,7 @@
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -5675,7 +5675,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -5692,7 +5692,7 @@
       "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==",
       "dev": true,
       "requires": {
-        "symbol-observable": "^1.1.0"
+        "symbol-observable": "1.2.0"
       }
     },
     "is-path-cwd": {
@@ -5707,7 +5707,7 @@
       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "1.0.1"
       }
     },
     "is-path-inside": {
@@ -5716,7 +5716,7 @@
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
+        "path-is-inside": "1.0.2"
       }
     },
     "is-plain-obj": {
@@ -5731,7 +5731,7 @@
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "is-promise": {
@@ -5746,7 +5746,7 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has": "1.0.3"
       }
     },
     "is-regexp": {
@@ -5767,7 +5767,7 @@
       "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.0"
+        "has-symbols": "1.0.0"
       }
     },
     "is-typedarray": {
@@ -5806,7 +5806,7 @@
       "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
       "dev": true,
       "requires": {
-        "buffer-alloc": "^1.2.0"
+        "buffer-alloc": "1.2.0"
       }
     },
     "isexe": {
@@ -5857,8 +5857,8 @@
       "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "1.0.10",
+        "esprima": "4.0.1"
       }
     },
     "jsbn": {
@@ -5909,7 +5909,7 @@
       "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -5926,7 +5926,7 @@
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.6"
+        "graceful-fs": "4.1.15"
       }
     },
     "jsonify": {
@@ -5953,31 +5953,31 @@
       "integrity": "sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "braces": "^2.3.2",
-        "chokidar": "^2.0.3",
-        "colors": "^1.1.0",
-        "connect": "^3.6.0",
-        "core-js": "^2.2.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.0",
-        "flatted": "^2.0.0",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "lodash": "^4.17.11",
-        "log4js": "^4.0.0",
-        "mime": "^2.3.1",
-        "minimatch": "^3.0.2",
-        "optimist": "^0.6.1",
-        "qjobs": "^1.1.4",
-        "range-parser": "^1.2.0",
-        "rimraf": "^2.6.0",
-        "safe-buffer": "^5.0.1",
+        "bluebird": "3.5.5",
+        "body-parser": "1.19.0",
+        "braces": "2.3.2",
+        "chokidar": "2.1.6",
+        "colors": "1.3.3",
+        "connect": "3.7.0",
+        "core-js": "2.6.8",
+        "di": "0.0.1",
+        "dom-serialize": "2.2.1",
+        "flatted": "2.0.0",
+        "glob": "7.1.4",
+        "graceful-fs": "4.1.15",
+        "http-proxy": "1.17.0",
+        "isbinaryfile": "3.0.3",
+        "lodash": "4.17.11",
+        "log4js": "4.3.0",
+        "mime": "2.4.3",
+        "minimatch": "3.0.4",
+        "optimist": "0.6.1",
+        "qjobs": "1.2.0",
+        "range-parser": "1.2.1",
+        "rimraf": "2.6.3",
+        "safe-buffer": "5.1.2",
         "socket.io": "2.1.1",
-        "source-map": "^0.6.1",
+        "source-map": "0.6.1",
         "tmp": "0.0.33",
         "useragent": "2.3.0"
       },
@@ -5996,8 +5996,8 @@
       "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
       "dev": true,
       "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
+        "fs-access": "1.0.1",
+        "which": "1.3.1"
       }
     },
     "karma-cli": {
@@ -6006,7 +6006,7 @@
       "integrity": "sha512-1Kb28UILg1ZsfqQmeELbPzuEb5C6GZJfVIk0qOr8LNYQuYWmAaqP16WpbpKEjhejDrDYyYOwwJXSZO6u7q5Pvw==",
       "dev": true,
       "requires": {
-        "resolve": "^1.3.3"
+        "resolve": "1.11.0"
       }
     },
     "karma-jasmine": {
@@ -6015,7 +6015,7 @@
       "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
       "dev": true,
       "requires": {
-        "jasmine-core": "^3.3"
+        "jasmine-core": "3.4.0"
       }
     },
     "karma-jasmine-html-reporter": {
@@ -6030,9 +6030,9 @@
       "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
       "dev": true,
       "requires": {
-        "chalk": "^2.1.0",
-        "log-symbols": "^2.1.0",
-        "strip-ansi": "^4.0.0"
+        "chalk": "2.4.2",
+        "log-symbols": "2.2.0",
+        "strip-ansi": "4.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -6047,7 +6047,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -6058,12 +6058,12 @@
       "integrity": "sha512-nRudGJWstvVuA6Tbju9tyGUfXTtI1UXMXoRHVmM2/78D0q6s/Ye2IC157PKNDC15PWFGR0mVIRtWLAdcfsRJoA==",
       "dev": true,
       "requires": {
-        "async": "^2.0.0",
-        "babel-runtime": "^6.0.0",
-        "loader-utils": "^1.0.0",
-        "lodash": "^4.0.0",
-        "source-map": "^0.5.6",
-        "webpack-dev-middleware": "^2.0.6"
+        "async": "2.6.2",
+        "babel-runtime": "6.26.0",
+        "loader-utils": "1.2.3",
+        "lodash": "4.17.11",
+        "source-map": "0.5.7",
+        "webpack-dev-middleware": "2.0.6"
       }
     },
     "kind-of": {
@@ -6078,7 +6078,7 @@
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
-        "invert-kv": "^1.0.0"
+        "invert-kv": "1.0.0"
       }
     },
     "levn": {
@@ -6087,8 +6087,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
       }
     },
     "lint-staged": {
@@ -6097,31 +6097,31 @@
       "integrity": "sha512-egT0goFhIFoOGk6rasPngTFh2qDqxZddM0PwI58oi66RxCDcn5uDwxmiasWIF0qGnchHSYVJ8HPRD5LrFo7TKA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.3.1",
-        "commander": "^2.14.1",
-        "cosmiconfig": "^5.2.0",
-        "debug": "^3.1.0",
-        "dedent": "^0.7.0",
-        "del": "^3.0.0",
-        "execa": "^1.0.0",
-        "find-parent-dir": "^0.3.0",
-        "g-status": "^2.0.2",
-        "is-glob": "^4.0.0",
-        "is-windows": "^1.0.2",
-        "listr": "^0.14.2",
-        "listr-update-renderer": "^0.5.0",
-        "lodash": "^4.17.11",
-        "log-symbols": "^2.2.0",
-        "micromatch": "^3.1.8",
-        "npm-which": "^3.0.1",
-        "p-map": "^1.1.1",
-        "path-is-inside": "^1.0.2",
-        "pify": "^3.0.0",
-        "please-upgrade-node": "^3.0.2",
+        "chalk": "2.4.2",
+        "commander": "2.20.0",
+        "cosmiconfig": "5.2.1",
+        "debug": "3.2.6",
+        "dedent": "0.7.0",
+        "del": "3.0.0",
+        "execa": "1.0.0",
+        "find-parent-dir": "0.3.0",
+        "g-status": "2.0.2",
+        "is-glob": "4.0.1",
+        "is-windows": "1.0.2",
+        "listr": "0.14.3",
+        "listr-update-renderer": "0.5.0",
+        "lodash": "4.17.11",
+        "log-symbols": "2.2.0",
+        "micromatch": "3.1.10",
+        "npm-which": "3.0.1",
+        "p-map": "1.2.0",
+        "path-is-inside": "1.0.2",
+        "pify": "3.0.0",
+        "please-upgrade-node": "3.1.1",
         "staged-git-files": "1.1.2",
-        "string-argv": "^0.0.2",
-        "stringify-object": "^3.2.2",
-        "yup": "^0.27.0"
+        "string-argv": "0.0.2",
+        "stringify-object": "3.3.0",
+        "yup": "0.27.0"
       },
       "dependencies": {
         "debug": {
@@ -6130,7 +6130,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -6153,15 +6153,15 @@
       "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==",
       "dev": true,
       "requires": {
-        "@samverschueren/stream-to-observable": "^0.3.0",
-        "is-observable": "^1.1.0",
-        "is-promise": "^2.1.0",
-        "is-stream": "^1.1.0",
-        "listr-silent-renderer": "^1.1.1",
-        "listr-update-renderer": "^0.5.0",
-        "listr-verbose-renderer": "^0.5.0",
-        "p-map": "^2.0.0",
-        "rxjs": "^6.3.3"
+        "@samverschueren/stream-to-observable": "0.3.0",
+        "is-observable": "1.1.0",
+        "is-promise": "2.1.0",
+        "is-stream": "1.1.0",
+        "listr-silent-renderer": "1.1.1",
+        "listr-update-renderer": "0.5.0",
+        "listr-verbose-renderer": "0.5.0",
+        "p-map": "2.1.0",
+        "rxjs": "6.5.2"
       },
       "dependencies": {
         "p-map": {
@@ -6184,14 +6184,14 @@
       "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "cli-truncate": "^0.2.1",
-        "elegant-spinner": "^1.0.1",
-        "figures": "^1.7.0",
-        "indent-string": "^3.0.0",
-        "log-symbols": "^1.0.2",
-        "log-update": "^2.3.0",
-        "strip-ansi": "^3.0.1"
+        "chalk": "1.1.3",
+        "cli-truncate": "0.2.1",
+        "elegant-spinner": "1.0.1",
+        "figures": "1.7.0",
+        "indent-string": "3.2.0",
+        "log-symbols": "1.0.2",
+        "log-update": "2.3.0",
+        "strip-ansi": "3.0.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6206,11 +6206,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "figures": {
@@ -6219,8 +6219,8 @@
           "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "^1.0.5",
-            "object-assign": "^4.1.0"
+            "escape-string-regexp": "1.0.5",
+            "object-assign": "4.1.1"
           }
         },
         "log-symbols": {
@@ -6229,7 +6229,7 @@
           "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
           "dev": true,
           "requires": {
-            "chalk": "^1.0.0"
+            "chalk": "1.1.3"
           }
         },
         "supports-color": {
@@ -6246,10 +6246,10 @@
       "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
-        "cli-cursor": "^2.1.0",
-        "date-fns": "^1.27.2",
-        "figures": "^2.0.0"
+        "chalk": "2.4.2",
+        "cli-cursor": "2.1.0",
+        "date-fns": "1.30.1",
+        "figures": "2.0.0"
       }
     },
     "load-json-file": {
@@ -6258,11 +6258,11 @@
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "graceful-fs": "4.1.15",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
       },
       "dependencies": {
         "parse-json": {
@@ -6271,7 +6271,7 @@
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.2.0"
+            "error-ex": "1.3.2"
           }
         },
         "pify": {
@@ -6294,9 +6294,9 @@
       "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
       "dev": true,
       "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
+        "big.js": "5.2.2",
+        "emojis-list": "2.1.0",
+        "json5": "1.0.1"
       },
       "dependencies": {
         "json5": {
@@ -6305,7 +6305,7 @@
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "minimist": "1.2.0"
           }
         },
         "minimist": {
@@ -6322,8 +6322,8 @@
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
       "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "3.0.0",
+        "path-exists": "3.0.0"
       }
     },
     "lodash": {
@@ -6350,7 +6350,7 @@
       "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1"
+        "chalk": "2.4.2"
       }
     },
     "log-update": {
@@ -6359,9 +6359,9 @@
       "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^3.0.0",
-        "cli-cursor": "^2.0.0",
-        "wrap-ansi": "^3.0.1"
+        "ansi-escapes": "3.2.0",
+        "cli-cursor": "2.1.0",
+        "wrap-ansi": "3.0.1"
       }
     },
     "log4js": {
@@ -6370,11 +6370,11 @@
       "integrity": "sha512-ivqZBkBvWLJ8rXfhb4E0979olSwnYBPSZy/5WhLNXwntqRgUhxHnqcXGmVw0t+XmLNTr3GAWEzjqHMzu4KM7rA==",
       "dev": true,
       "requires": {
-        "date-format": "^2.0.0",
-        "debug": "^4.1.1",
-        "flatted": "^2.0.0",
-        "rfdc": "^1.1.2",
-        "streamroller": "^1.0.5"
+        "date-format": "2.0.0",
+        "debug": "4.1.1",
+        "flatted": "2.0.0",
+        "rfdc": "1.1.4",
+        "streamroller": "1.0.5"
       },
       "dependencies": {
         "debug": {
@@ -6383,7 +6383,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -6400,8 +6400,8 @@
       "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
       "dev": true,
       "requires": {
-        "es6-symbol": "^3.1.1",
-        "object.assign": "^4.1.0"
+        "es6-symbol": "3.1.1",
+        "object.assign": "4.1.0"
       }
     },
     "loose-envify": {
@@ -6410,7 +6410,7 @@
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
       "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
+        "js-tokens": "4.0.0"
       }
     },
     "loud-rejection": {
@@ -6419,8 +6419,8 @@
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
       }
     },
     "lru-cache": {
@@ -6429,8 +6429,8 @@
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
       }
     },
     "make-dir": {
@@ -6439,8 +6439,8 @@
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
       "requires": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
+        "pify": "4.0.1",
+        "semver": "5.7.0"
       }
     },
     "mamacro": {
@@ -6455,7 +6455,7 @@
       "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
       "dev": true,
       "requires": {
-        "p-defer": "^1.0.0"
+        "p-defer": "1.0.0"
       }
     },
     "map-cache": {
@@ -6476,7 +6476,7 @@
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
-        "object-visit": "^1.0.0"
+        "object-visit": "1.0.1"
       }
     },
     "matcher": {
@@ -6485,7 +6485,7 @@
       "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.4"
+        "escape-string-regexp": "1.0.5"
       }
     },
     "md5.js": {
@@ -6494,9 +6494,9 @@
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "media-typer": {
@@ -6511,9 +6511,9 @@
       "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
       "dev": true,
       "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
+        "map-age-cleaner": "0.1.3",
+        "mimic-fn": "2.1.0",
+        "p-is-promise": "2.1.0"
       },
       "dependencies": {
         "mimic-fn": {
@@ -6530,8 +6530,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
+        "errno": "0.1.7",
+        "readable-stream": "2.3.6"
       }
     },
     "memorystream": {
@@ -6546,16 +6546,16 @@
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.5.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -6572,19 +6572,19 @@
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "braces": "2.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "extglob": "2.0.4",
+        "fragment-cache": "0.2.1",
+        "kind-of": "6.0.2",
+        "nanomatch": "1.2.13",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       }
     },
     "miller-rabin": {
@@ -6593,8 +6593,8 @@
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0"
       }
     },
     "mime": {
@@ -6642,7 +6642,7 @@
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "1.1.11"
       }
     },
     "minimist": {
@@ -6657,16 +6657,16 @@
       "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
       "dev": true,
       "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
+        "concat-stream": "1.6.2",
+        "duplexify": "3.7.1",
+        "end-of-stream": "1.4.1",
+        "flush-write-stream": "1.1.1",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "3.0.0",
+        "pumpify": "1.5.1",
+        "stream-each": "1.2.3",
+        "through2": "2.0.5"
       }
     },
     "mixin-deep": {
@@ -6675,8 +6675,8 @@
       "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
+        "for-in": "1.0.2",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -6685,7 +6685,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -6696,8 +6696,8 @@
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
+        "for-in": "0.1.8",
+        "is-extendable": "0.1.1"
       },
       "dependencies": {
         "for-in": {
@@ -6723,12 +6723,12 @@
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
+        "aproba": "1.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.3",
+        "run-queue": "1.0.3"
       }
     },
     "ms": {
@@ -6755,17 +6755,17 @@
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "fragment-cache": "0.2.1",
+        "is-windows": "1.0.2",
+        "kind-of": "6.0.2",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       }
     },
     "natural-compare": {
@@ -6804,18 +6804,18 @@
       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "dev": true,
       "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
+        "fstream": "1.0.12",
+        "glob": "7.1.4",
+        "graceful-fs": "4.1.15",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.5",
+        "request": "2.88.0",
+        "rimraf": "2.6.3",
+        "semver": "5.3.0",
+        "tar": "2.2.2",
+        "which": "1.3.1"
       },
       "dependencies": {
         "semver": {
@@ -6832,28 +6832,28 @@
       "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
       "dev": true,
       "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
+        "assert": "1.5.0",
+        "browserify-zlib": "0.2.0",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.12.0",
+        "domain-browser": "1.2.0",
+        "events": "3.0.0",
+        "https-browserify": "1.0.0",
+        "os-browserify": "0.3.0",
         "path-browserify": "0.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.6",
+        "stream-browserify": "2.0.2",
+        "stream-http": "2.8.3",
+        "string_decoder": "1.1.1",
+        "timers-browserify": "2.0.10",
         "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
+        "url": "0.11.0",
+        "util": "0.11.1",
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
@@ -6871,7 +6871,7 @@
       "integrity": "sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q==",
       "dev": true,
       "requires": {
-        "semver": "^5.3.0"
+        "semver": "5.7.0"
       }
     },
     "node-sass": {
@@ -6880,23 +6880,23 @@
       "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
       "dev": true,
       "requires": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
-        "lodash": "^4.17.11",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.13.2",
-        "node-gyp": "^3.8.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "^2.2.4",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.3",
+        "get-stdin": "4.0.1",
+        "glob": "7.1.4",
+        "in-publish": "2.0.0",
+        "lodash": "4.17.11",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.14.0",
+        "node-gyp": "3.8.0",
+        "npmlog": "4.1.2",
+        "request": "2.88.0",
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.1",
+        "true-case-path": "1.0.3"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6911,11 +6911,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "cross-spawn": {
@@ -6924,8 +6924,8 @@
           "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "dev": true,
           "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
+            "lru-cache": "4.1.5",
+            "which": "1.3.1"
           }
         },
         "get-stdin": {
@@ -6948,7 +6948,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1"
+        "abbrev": "1.1.1"
       }
     },
     "normalize-package-data": {
@@ -6957,10 +6957,10 @@
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "hosted-git-info": "2.7.1",
+        "resolve": "1.11.0",
+        "semver": "5.7.0",
+        "validate-npm-package-license": "3.0.4"
       }
     },
     "normalize-path": {
@@ -6979,604 +6979,539 @@
       "version": "6.9.0",
       "resolved": "https://registry.npmjs.org/npm/-/npm-6.9.0.tgz",
       "integrity": "sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==",
-      "dev": true,
       "requires": {
-        "JSONStream": "^1.3.5",
-        "abbrev": "~1.1.1",
-        "ansicolors": "~0.3.2",
-        "ansistyles": "~0.1.3",
-        "aproba": "^2.0.0",
-        "archy": "~1.0.0",
-        "bin-links": "^1.1.2",
-        "bluebird": "^3.5.3",
-        "byte-size": "^5.0.1",
-        "cacache": "^11.3.2",
-        "call-limit": "~1.1.0",
-        "chownr": "^1.1.1",
-        "ci-info": "^2.0.0",
-        "cli-columns": "^3.1.2",
-        "cli-table3": "^0.5.1",
-        "cmd-shim": "~2.0.2",
-        "columnify": "~1.5.4",
-        "config-chain": "^1.1.12",
-        "debuglog": "*",
-        "detect-indent": "~5.0.0",
-        "detect-newline": "^2.1.0",
-        "dezalgo": "~1.0.3",
-        "editor": "~1.0.0",
-        "figgy-pudding": "^3.5.1",
-        "find-npm-prefix": "^1.0.2",
-        "fs-vacuum": "~1.2.10",
-        "fs-write-stream-atomic": "~1.0.10",
-        "gentle-fs": "^2.0.1",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.1.15",
-        "has-unicode": "~2.0.1",
-        "hosted-git-info": "^2.7.1",
-        "iferr": "^1.0.2",
-        "imurmurhash": "*",
-        "inflight": "~1.0.6",
-        "inherits": "~2.0.3",
-        "ini": "^1.3.5",
-        "init-package-json": "^1.10.3",
-        "is-cidr": "^3.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "lazy-property": "~1.0.0",
-        "libcipm": "^3.0.3",
-        "libnpm": "^2.0.1",
-        "libnpmaccess": "*",
-        "libnpmhook": "^5.0.2",
-        "libnpmorg": "*",
-        "libnpmsearch": "*",
-        "libnpmteam": "*",
-        "libnpx": "^10.2.0",
-        "lock-verify": "^2.1.0",
-        "lockfile": "^1.0.4",
-        "lodash._baseindexof": "*",
-        "lodash._baseuniq": "~4.6.0",
-        "lodash._bindcallback": "*",
-        "lodash._cacheindexof": "*",
-        "lodash._createcache": "*",
-        "lodash._getnative": "*",
-        "lodash.clonedeep": "~4.5.0",
-        "lodash.restparam": "*",
-        "lodash.union": "~4.6.0",
-        "lodash.uniq": "~4.5.0",
-        "lodash.without": "~4.4.0",
-        "lru-cache": "^4.1.5",
-        "meant": "~1.0.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "~0.5.1",
-        "move-concurrently": "^1.0.1",
-        "node-gyp": "^3.8.0",
-        "nopt": "~4.0.1",
-        "normalize-package-data": "^2.5.0",
-        "npm-audit-report": "^1.3.2",
-        "npm-cache-filename": "~1.0.2",
-        "npm-install-checks": "~3.0.0",
-        "npm-lifecycle": "^2.1.0",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.4.1",
-        "npm-pick-manifest": "^2.2.3",
-        "npm-profile": "*",
-        "npm-registry-fetch": "^3.9.0",
-        "npm-user-validate": "~1.0.0",
-        "npmlog": "~4.1.2",
-        "once": "~1.4.0",
-        "opener": "^1.5.1",
-        "osenv": "^0.1.5",
-        "pacote": "^9.5.0",
-        "path-is-inside": "~1.0.2",
-        "promise-inflight": "~1.0.1",
-        "qrcode-terminal": "^0.12.0",
-        "query-string": "^6.2.0",
-        "qw": "~1.0.1",
-        "read": "~1.0.7",
-        "read-cmd-shim": "~1.0.1",
-        "read-installed": "~4.0.3",
-        "read-package-json": "^2.0.13",
-        "read-package-tree": "^5.2.2",
-        "readable-stream": "^3.1.1",
-        "readdir-scoped-modules": "*",
-        "request": "^2.88.0",
-        "retry": "^0.12.0",
-        "rimraf": "^2.6.3",
-        "safe-buffer": "^5.1.2",
-        "semver": "^5.6.0",
-        "sha": "~2.0.1",
-        "slide": "~1.1.6",
-        "sorted-object": "~2.0.1",
-        "sorted-union-stream": "~2.1.3",
-        "ssri": "^6.0.1",
-        "stringify-package": "^1.0.0",
-        "tar": "^4.4.8",
-        "text-table": "~0.2.0",
-        "tiny-relative-date": "^1.3.0",
+        "JSONStream": "1.3.5",
+        "abbrev": "1.1.1",
+        "ansicolors": "0.3.2",
+        "ansistyles": "0.1.3",
+        "aproba": "2.0.0",
+        "archy": "1.0.0",
+        "bin-links": "1.1.2",
+        "bluebird": "3.5.3",
+        "byte-size": "5.0.1",
+        "cacache": "11.3.2",
+        "call-limit": "1.1.0",
+        "chownr": "1.1.1",
+        "ci-info": "2.0.0",
+        "cli-columns": "3.1.2",
+        "cli-table3": "0.5.1",
+        "cmd-shim": "2.0.2",
+        "columnify": "1.5.4",
+        "config-chain": "1.1.12",
+        "debuglog": "1.0.1",
+        "detect-indent": "5.0.0",
+        "detect-newline": "2.1.0",
+        "dezalgo": "1.0.3",
+        "editor": "1.0.0",
+        "figgy-pudding": "3.5.1",
+        "find-npm-prefix": "1.0.2",
+        "fs-vacuum": "1.2.10",
+        "fs-write-stream-atomic": "1.0.10",
+        "gentle-fs": "2.0.1",
+        "glob": "7.1.3",
+        "graceful-fs": "4.1.15",
+        "has-unicode": "2.0.1",
+        "hosted-git-info": "2.7.1",
+        "iferr": "1.0.2",
+        "imurmurhash": "0.1.4",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "ini": "1.3.5",
+        "init-package-json": "1.10.3",
+        "is-cidr": "3.0.0",
+        "json-parse-better-errors": "1.0.2",
+        "lazy-property": "1.0.0",
+        "libcipm": "3.0.3",
+        "libnpm": "2.0.1",
+        "libnpmaccess": "3.0.1",
+        "libnpmhook": "5.0.2",
+        "libnpmorg": "1.0.0",
+        "libnpmsearch": "2.0.0",
+        "libnpmteam": "1.0.1",
+        "libnpx": "10.2.0",
+        "lock-verify": "2.1.0",
+        "lockfile": "1.0.4",
+        "lodash._baseindexof": "3.1.0",
+        "lodash._baseuniq": "4.6.0",
+        "lodash._bindcallback": "3.0.1",
+        "lodash._cacheindexof": "3.0.2",
+        "lodash._createcache": "3.1.2",
+        "lodash._getnative": "3.9.1",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.restparam": "3.6.1",
+        "lodash.union": "4.6.0",
+        "lodash.uniq": "4.5.0",
+        "lodash.without": "4.4.0",
+        "lru-cache": "4.1.5",
+        "meant": "1.0.1",
+        "mississippi": "3.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "node-gyp": "3.8.0",
+        "nopt": "4.0.1",
+        "normalize-package-data": "2.5.0",
+        "npm-audit-report": "1.3.2",
+        "npm-cache-filename": "1.0.2",
+        "npm-install-checks": "3.0.0",
+        "npm-lifecycle": "2.1.0",
+        "npm-package-arg": "6.1.0",
+        "npm-packlist": "1.4.1",
+        "npm-pick-manifest": "2.2.3",
+        "npm-profile": "4.0.1",
+        "npm-registry-fetch": "3.9.0",
+        "npm-user-validate": "1.0.0",
+        "npmlog": "4.1.2",
+        "once": "1.4.0",
+        "opener": "1.5.1",
+        "osenv": "0.1.5",
+        "pacote": "9.5.0",
+        "path-is-inside": "1.0.2",
+        "promise-inflight": "1.0.1",
+        "qrcode-terminal": "0.12.0",
+        "query-string": "6.2.0",
+        "qw": "1.0.1",
+        "read": "1.0.7",
+        "read-cmd-shim": "1.0.1",
+        "read-installed": "4.0.3",
+        "read-package-json": "2.0.13",
+        "read-package-tree": "5.2.2",
+        "readable-stream": "3.1.1",
+        "readdir-scoped-modules": "1.0.2",
+        "request": "2.88.0",
+        "retry": "0.12.0",
+        "rimraf": "2.6.3",
+        "safe-buffer": "5.1.2",
+        "semver": "5.6.0",
+        "sha": "2.0.1",
+        "slide": "1.1.6",
+        "sorted-object": "2.0.1",
+        "sorted-union-stream": "2.1.3",
+        "ssri": "6.0.1",
+        "stringify-package": "1.0.0",
+        "tar": "4.4.8",
+        "text-table": "0.2.0",
+        "tiny-relative-date": "1.3.0",
         "uid-number": "0.0.6",
-        "umask": "~1.1.0",
-        "unique-filename": "^1.1.1",
-        "unpipe": "~1.0.0",
-        "update-notifier": "^2.5.0",
-        "uuid": "^3.3.2",
-        "validate-npm-package-license": "^3.0.4",
-        "validate-npm-package-name": "~3.0.0",
-        "which": "^1.3.1",
-        "worker-farm": "^1.6.0",
-        "write-file-atomic": "^2.4.2"
+        "umask": "1.1.0",
+        "unique-filename": "1.1.1",
+        "unpipe": "1.0.0",
+        "update-notifier": "2.5.0",
+        "uuid": "3.3.2",
+        "validate-npm-package-license": "3.0.4",
+        "validate-npm-package-name": "3.0.0",
+        "which": "1.3.1",
+        "worker-farm": "1.6.0",
+        "write-file-atomic": "2.4.2"
       },
       "dependencies": {
         "JSONStream": {
           "version": "1.3.5",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "jsonparse": "^1.2.0",
-            "through": ">=2.2.7 <3"
+            "jsonparse": "1.3.1",
+            "through": "2.3.8"
           }
         },
         "abbrev": {
           "version": "1.1.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "agent-base": {
           "version": "4.2.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "es6-promisify": "^5.0.0"
+            "es6-promisify": "5.0.0"
           }
         },
         "agentkeepalive": {
           "version": "3.4.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "humanize-ms": "^1.2.1"
+            "humanize-ms": "1.2.1"
           }
         },
         "ajv": {
           "version": "5.5.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         },
         "ansi-align": {
           "version": "2.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "string-width": "^2.0.0"
+            "string-width": "2.1.1"
           }
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "ansi-styles": {
           "version": "3.2.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "ansicolors": {
           "version": "0.3.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "ansistyles": {
           "version": "0.1.3",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "aproba": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "archy": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "are-we-there-yet": {
           "version": "1.1.4",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.6"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
         },
         "asap": {
           "version": "2.0.6",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "asn1": {
           "version": "0.2.4",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "safer-buffer": "~2.1.0"
+            "safer-buffer": "2.1.2"
           }
         },
         "assert-plus": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "asynckit": {
           "version": "0.4.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "aws-sign2": {
           "version": "0.7.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "aws4": {
           "version": "1.8.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "bcrypt-pbkdf": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
-            "tweetnacl": "^0.14.3"
+            "tweetnacl": "0.14.5"
           }
         },
         "bin-links": {
           "version": "1.1.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "bluebird": "^3.5.0",
-            "cmd-shim": "^2.0.2",
-            "gentle-fs": "^2.0.0",
-            "graceful-fs": "^4.1.11",
-            "write-file-atomic": "^2.3.0"
+            "bluebird": "3.5.3",
+            "cmd-shim": "2.0.2",
+            "gentle-fs": "2.0.1",
+            "graceful-fs": "4.1.15",
+            "write-file-atomic": "2.4.2"
           }
         },
         "block-stream": {
           "version": "0.0.9",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "inherits": "~2.0.0"
+            "inherits": "2.0.3"
           }
         },
         "bluebird": {
           "version": "3.5.3",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "boxen": {
           "version": "1.3.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ansi-align": "^2.0.0",
-            "camelcase": "^4.0.0",
-            "chalk": "^2.0.1",
-            "cli-boxes": "^1.0.0",
-            "string-width": "^2.0.0",
-            "term-size": "^1.2.0",
-            "widest-line": "^2.0.0"
+            "ansi-align": "2.0.0",
+            "camelcase": "4.1.0",
+            "chalk": "2.4.1",
+            "cli-boxes": "1.0.0",
+            "string-width": "2.1.1",
+            "term-size": "1.2.0",
+            "widest-line": "2.0.0"
           }
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "balanced-match": "^1.0.0",
+            "balanced-match": "1.0.0",
             "concat-map": "0.0.1"
           }
         },
         "buffer-from": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "builtins": {
           "version": "1.0.3",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "byline": {
           "version": "5.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "byte-size": {
           "version": "5.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "cacache": {
           "version": "11.3.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.1.15",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
+            "bluebird": "3.5.3",
+            "chownr": "1.1.1",
+            "figgy-pudding": "3.5.1",
+            "glob": "7.1.3",
+            "graceful-fs": "4.1.15",
+            "lru-cache": "5.1.1",
+            "mississippi": "3.0.0",
+            "mkdirp": "0.5.1",
+            "move-concurrently": "1.0.1",
+            "promise-inflight": "1.0.1",
+            "rimraf": "2.6.3",
+            "ssri": "6.0.1",
+            "unique-filename": "1.1.1",
+            "y18n": "4.0.0"
           },
           "dependencies": {
             "chownr": {
               "version": "1.1.1",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "lru-cache": {
               "version": "5.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "yallist": "^3.0.2"
+                "yallist": "3.0.3"
               }
             },
             "unique-filename": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "unique-slug": "^2.0.0"
+                "unique-slug": "2.0.0"
               }
             },
             "yallist": {
               "version": "3.0.3",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "call-limit": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "camelcase": {
           "version": "4.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "capture-stack-trace": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "caseless": {
           "version": "0.12.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "chalk": {
           "version": "2.4.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "chownr": {
           "version": "1.1.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "ci-info": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "cidr-regex": {
           "version": "2.0.10",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ip-regex": "^2.1.0"
+            "ip-regex": "2.1.0"
           }
         },
         "cli-boxes": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "cli-columns": {
           "version": "3.1.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "string-width": "^2.0.0",
-            "strip-ansi": "^3.0.1"
+            "string-width": "2.1.1",
+            "strip-ansi": "3.0.1"
           }
         },
         "cli-table3": {
           "version": "0.5.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "colors": "^1.1.2",
-            "object-assign": "^4.1.0",
-            "string-width": "^2.1.1"
+            "colors": "1.3.3",
+            "object-assign": "4.1.1",
+            "string-width": "2.1.1"
           }
         },
         "cliui": {
           "version": "4.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
           },
           "dependencies": {
             "ansi-regex": {
               "version": "3.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "strip-ansi": {
               "version": "4.0.0",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
         },
         "clone": {
           "version": "1.0.4",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "cmd-shim": {
           "version": "2.0.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "~0.5.0"
+            "graceful-fs": "4.1.15",
+            "mkdirp": "0.5.1"
           }
         },
         "co": {
           "version": "4.6.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "color-convert": {
           "version": "1.9.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "color-name": "^1.1.1"
+            "color-name": "1.1.3"
           }
         },
         "color-name": {
           "version": "1.1.3",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "colors": {
           "version": "1.3.3",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "columnify": {
           "version": "1.5.4",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "strip-ansi": "^3.0.0",
-            "wcwidth": "^1.0.0"
+            "strip-ansi": "3.0.1",
+            "wcwidth": "1.0.1"
           }
         },
         "combined-stream": {
           "version": "1.0.6",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "delayed-stream": "~1.0.0"
+            "delayed-stream": "1.0.0"
           }
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "concat-stream": {
           "version": "1.6.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "buffer-from": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.2.2",
-            "typedarray": "^0.0.6"
+            "buffer-from": "1.0.0",
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.6",
+            "typedarray": "0.0.6"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
@@ -7584,217 +7519,187 @@
         "config-chain": {
           "version": "1.1.12",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ini": "^1.3.4",
-            "proto-list": "~1.2.1"
+            "ini": "1.3.5",
+            "proto-list": "1.2.4"
           }
         },
         "configstore": {
           "version": "3.1.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "dot-prop": "^4.1.0",
-            "graceful-fs": "^4.1.2",
-            "make-dir": "^1.0.0",
-            "unique-string": "^1.0.0",
-            "write-file-atomic": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
+            "dot-prop": "4.2.0",
+            "graceful-fs": "4.1.15",
+            "make-dir": "1.3.0",
+            "unique-string": "1.0.0",
+            "write-file-atomic": "2.4.2",
+            "xdg-basedir": "3.0.0"
           }
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "copy-concurrently": {
           "version": "1.0.5",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^1.1.1",
-            "fs-write-stream-atomic": "^1.0.8",
-            "iferr": "^0.1.5",
-            "mkdirp": "^0.5.1",
-            "rimraf": "^2.5.4",
-            "run-queue": "^1.0.0"
+            "aproba": "1.2.0",
+            "fs-write-stream-atomic": "1.0.10",
+            "iferr": "0.1.5",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.3",
+            "run-queue": "1.0.3"
           },
           "dependencies": {
             "aproba": {
               "version": "1.2.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "iferr": {
               "version": "0.1.5",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "core-util-is": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "create-error-class": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "capture-stack-trace": "^1.0.0"
+            "capture-stack-trace": "1.0.0"
           }
         },
         "cross-spawn": {
           "version": "5.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "lru-cache": "4.1.5",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "crypto-random-string": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "cyclist": {
           "version": "0.2.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "dashdash": {
           "version": "1.14.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "assert-plus": "^1.0.0"
+            "assert-plus": "1.0.0"
           }
         },
         "debug": {
           "version": "3.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           },
           "dependencies": {
             "ms": {
               "version": "2.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "debuglog": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "decamelize": {
           "version": "1.2.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "decode-uri-component": {
           "version": "0.2.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "deep-extend": {
           "version": "0.5.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "defaults": {
           "version": "1.0.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "clone": "^1.0.2"
+            "clone": "1.0.4"
           }
         },
         "delayed-stream": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "delegates": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "detect-indent": {
           "version": "5.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "detect-newline": {
           "version": "2.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "dezalgo": {
           "version": "1.0.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "asap": "^2.0.0",
-            "wrappy": "1"
+            "asap": "2.0.6",
+            "wrappy": "1.0.2"
           }
         },
         "dot-prop": {
           "version": "4.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "is-obj": "^1.0.0"
+            "is-obj": "1.0.1"
           }
         },
         "dotenv": {
           "version": "5.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "duplexer3": {
           "version": "0.1.4",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "duplexify": {
           "version": "3.6.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "end-of-stream": "^1.0.0",
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.0",
-            "stream-shift": "^1.0.0"
+            "end-of-stream": "1.4.1",
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.6",
+            "stream-shift": "1.0.0"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
@@ -7802,201 +7707,175 @@
         "ecc-jsbn": {
           "version": "0.1.2",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.1.0"
+            "jsbn": "0.1.1",
+            "safer-buffer": "2.1.2"
           }
         },
         "editor": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "encoding": {
           "version": "0.1.12",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "iconv-lite": "~0.4.13"
+            "iconv-lite": "0.4.23"
           }
         },
         "end-of-stream": {
           "version": "1.4.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "once": "^1.4.0"
+            "once": "1.4.0"
           }
         },
         "err-code": {
           "version": "1.1.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "errno": {
           "version": "0.1.7",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "prr": "~1.0.1"
+            "prr": "1.0.1"
           }
         },
         "es6-promise": {
           "version": "4.2.6",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "es6-promisify": {
           "version": "5.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "es6-promise": "^4.0.3"
+            "es6-promise": "4.2.6"
           }
         },
         "escape-string-regexp": {
           "version": "1.0.5",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "execa": {
           "version": "0.7.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "cross-spawn": "5.1.0",
+            "get-stream": "3.0.0",
+            "is-stream": "1.1.0",
+            "npm-run-path": "2.0.2",
+            "p-finally": "1.0.0",
+            "signal-exit": "3.0.2",
+            "strip-eof": "1.0.0"
           },
           "dependencies": {
             "get-stream": {
               "version": "3.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "extend": {
           "version": "3.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "extsprintf": {
           "version": "1.3.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "fast-deep-equal": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "fast-json-stable-stringify": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "figgy-pudding": {
           "version": "3.5.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "find-npm-prefix": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "find-up": {
           "version": "2.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "locate-path": "^2.0.0"
+            "locate-path": "2.0.0"
           }
         },
         "flush-write-stream": {
           "version": "1.0.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.4"
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.6"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
         },
         "forever-agent": {
           "version": "0.6.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "form-data": {
           "version": "2.3.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "asynckit": "^0.4.0",
+            "asynckit": "0.4.0",
             "combined-stream": "1.0.6",
-            "mime-types": "^2.1.12"
+            "mime-types": "2.1.19"
           }
         },
         "from2": {
           "version": "2.3.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.0"
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.6"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
@@ -8004,491 +7883,424 @@
         "fs-minipass": {
           "version": "1.2.5",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "2.3.3"
           }
         },
         "fs-vacuum": {
           "version": "1.2.10",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "path-is-inside": "^1.0.1",
-            "rimraf": "^2.5.2"
+            "graceful-fs": "4.1.15",
+            "path-is-inside": "1.0.2",
+            "rimraf": "2.6.3"
           }
         },
         "fs-write-stream-atomic": {
           "version": "1.0.10",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "iferr": "^0.1.5",
-            "imurmurhash": "^0.1.4",
-            "readable-stream": "1 || 2"
+            "graceful-fs": "4.1.15",
+            "iferr": "0.1.5",
+            "imurmurhash": "0.1.4",
+            "readable-stream": "2.3.6"
           },
           "dependencies": {
             "iferr": {
               "version": "0.1.5",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "fstream": {
           "version": "1.0.11",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
+            "graceful-fs": "4.1.15",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.3"
           }
         },
         "gauge": {
           "version": "2.7.4",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
+            "aproba": "1.2.0",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
           },
           "dependencies": {
             "aproba": {
               "version": "1.2.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "code-point-at": "1.1.0",
+                "is-fullwidth-code-point": "1.0.0",
+                "strip-ansi": "3.0.1"
               }
             }
           }
         },
         "genfun": {
           "version": "5.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "gentle-fs": {
           "version": "2.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^1.1.2",
-            "fs-vacuum": "^1.2.10",
-            "graceful-fs": "^4.1.11",
-            "iferr": "^0.1.5",
-            "mkdirp": "^0.5.1",
-            "path-is-inside": "^1.0.2",
-            "read-cmd-shim": "^1.0.1",
-            "slide": "^1.1.6"
+            "aproba": "1.2.0",
+            "fs-vacuum": "1.2.10",
+            "graceful-fs": "4.1.15",
+            "iferr": "0.1.5",
+            "mkdirp": "0.5.1",
+            "path-is-inside": "1.0.2",
+            "read-cmd-shim": "1.0.1",
+            "slide": "1.1.6"
           },
           "dependencies": {
             "aproba": {
               "version": "1.2.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "iferr": {
               "version": "0.1.5",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "get-caller-file": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "get-stream": {
           "version": "4.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "pump": "^3.0.0"
+            "pump": "3.0.0"
           }
         },
         "getpass": {
           "version": "0.1.7",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "assert-plus": "^1.0.0"
+            "assert-plus": "1.0.0"
           }
         },
         "glob": {
           "version": "7.1.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "global-dirs": {
           "version": "0.1.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ini": "^1.3.4"
+            "ini": "1.3.5"
           }
         },
         "got": {
           "version": "6.7.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "create-error-class": "^3.0.0",
-            "duplexer3": "^0.1.4",
-            "get-stream": "^3.0.0",
-            "is-redirect": "^1.0.0",
-            "is-retry-allowed": "^1.0.0",
-            "is-stream": "^1.0.0",
-            "lowercase-keys": "^1.0.0",
-            "safe-buffer": "^5.0.1",
-            "timed-out": "^4.0.0",
-            "unzip-response": "^2.0.1",
-            "url-parse-lax": "^1.0.0"
+            "create-error-class": "3.0.2",
+            "duplexer3": "0.1.4",
+            "get-stream": "3.0.0",
+            "is-redirect": "1.0.0",
+            "is-retry-allowed": "1.1.0",
+            "is-stream": "1.1.0",
+            "lowercase-keys": "1.0.1",
+            "safe-buffer": "5.1.2",
+            "timed-out": "4.0.1",
+            "unzip-response": "2.0.1",
+            "url-parse-lax": "1.0.0"
           },
           "dependencies": {
             "get-stream": {
               "version": "3.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "graceful-fs": {
           "version": "4.1.15",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "har-schema": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "har-validator": {
           "version": "5.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ajv": "^5.3.0",
-            "har-schema": "^2.0.0"
+            "ajv": "5.5.2",
+            "har-schema": "2.0.0"
           }
         },
         "has-flag": {
           "version": "3.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "has-unicode": {
           "version": "2.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "hosted-git-info": {
           "version": "2.7.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "http-cache-semantics": {
           "version": "3.8.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "http-proxy-agent": {
           "version": "2.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "agent-base": "4",
+            "agent-base": "4.2.1",
             "debug": "3.1.0"
           }
         },
         "http-signature": {
           "version": "1.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "assert-plus": "^1.0.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
+            "assert-plus": "1.0.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.14.2"
           }
         },
         "https-proxy-agent": {
           "version": "2.2.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "agent-base": "^4.1.0",
-            "debug": "^3.1.0"
+            "agent-base": "4.2.1",
+            "debug": "3.1.0"
           }
         },
         "humanize-ms": {
           "version": "1.2.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ms": "^2.0.0"
+            "ms": "2.1.1"
           }
         },
         "iconv-lite": {
           "version": "0.4.23",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "safer-buffer": "2.1.2"
           }
         },
         "iferr": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "ignore-walk": {
           "version": "3.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "minimatch": "^3.0.4"
+            "minimatch": "3.0.4"
           }
         },
         "import-lazy": {
           "version": "2.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "imurmurhash": {
           "version": "0.1.4",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "inflight": {
           "version": "1.0.6",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
           }
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "init-package-json": {
           "version": "1.10.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "glob": "^7.1.1",
-            "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
-            "promzard": "^0.3.0",
-            "read": "~1.0.1",
-            "read-package-json": "1 || 2",
-            "semver": "2.x || 3.x || 4 || 5",
-            "validate-npm-package-license": "^3.0.1",
-            "validate-npm-package-name": "^3.0.0"
+            "glob": "7.1.3",
+            "npm-package-arg": "6.1.0",
+            "promzard": "0.3.0",
+            "read": "1.0.7",
+            "read-package-json": "2.0.13",
+            "semver": "5.6.0",
+            "validate-npm-package-license": "3.0.4",
+            "validate-npm-package-name": "3.0.0"
           }
         },
         "invert-kv": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "ip": {
           "version": "1.1.5",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "ip-regex": {
           "version": "2.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "is-ci": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ci-info": "^1.0.0"
+            "ci-info": "1.6.0"
           },
           "dependencies": {
             "ci-info": {
               "version": "1.6.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "is-cidr": {
           "version": "3.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "cidr-regex": "^2.0.10"
+            "cidr-regex": "2.0.10"
           }
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "is-installed-globally": {
           "version": "0.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "global-dirs": "^0.1.0",
-            "is-path-inside": "^1.0.0"
+            "global-dirs": "0.1.1",
+            "is-path-inside": "1.0.1"
           }
         },
         "is-npm": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "is-obj": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "is-path-inside": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "path-is-inside": "^1.0.1"
+            "path-is-inside": "1.0.2"
           }
         },
         "is-redirect": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "is-retry-allowed": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "is-stream": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "is-typedarray": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "isarray": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "isexe": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "isstream": {
           "version": "0.1.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "jsbn": {
           "version": "0.1.1",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "json-parse-better-errors": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "json-schema": {
           "version": "0.2.3",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "json-schema-traverse": {
           "version": "0.3.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "json-stringify-safe": {
           "version": "5.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "jsonparse": {
           "version": "1.3.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "jsprim": {
           "version": "1.4.1",
           "bundled": true,
-          "dev": true,
           "requires": {
             "assert-plus": "1.0.0",
             "extsprintf": "1.3.0",
@@ -8499,456 +8311,403 @@
         "latest-version": {
           "version": "3.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "package-json": "^4.0.0"
+            "package-json": "4.0.1"
           }
         },
         "lazy-property": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lcid": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "invert-kv": "^1.0.0"
+            "invert-kv": "1.0.0"
           }
         },
         "libcipm": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "bin-links": "^1.1.2",
-            "bluebird": "^3.5.1",
-            "figgy-pudding": "^3.5.1",
-            "find-npm-prefix": "^1.0.2",
-            "graceful-fs": "^4.1.11",
-            "ini": "^1.3.5",
-            "lock-verify": "^2.0.2",
-            "mkdirp": "^0.5.1",
-            "npm-lifecycle": "^2.0.3",
-            "npm-logical-tree": "^1.2.1",
-            "npm-package-arg": "^6.1.0",
-            "pacote": "^9.1.0",
-            "read-package-json": "^2.0.13",
-            "rimraf": "^2.6.2",
-            "worker-farm": "^1.6.0"
+            "bin-links": "1.1.2",
+            "bluebird": "3.5.3",
+            "figgy-pudding": "3.5.1",
+            "find-npm-prefix": "1.0.2",
+            "graceful-fs": "4.1.15",
+            "ini": "1.3.5",
+            "lock-verify": "2.1.0",
+            "mkdirp": "0.5.1",
+            "npm-lifecycle": "2.1.0",
+            "npm-logical-tree": "1.2.1",
+            "npm-package-arg": "6.1.0",
+            "pacote": "9.5.0",
+            "read-package-json": "2.0.13",
+            "rimraf": "2.6.3",
+            "worker-farm": "1.6.0"
           }
         },
         "libnpm": {
           "version": "2.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "bin-links": "^1.1.2",
-            "bluebird": "^3.5.3",
-            "find-npm-prefix": "^1.0.2",
-            "libnpmaccess": "^3.0.1",
-            "libnpmconfig": "^1.2.1",
-            "libnpmhook": "^5.0.2",
-            "libnpmorg": "^1.0.0",
-            "libnpmpublish": "^1.1.0",
-            "libnpmsearch": "^2.0.0",
-            "libnpmteam": "^1.0.1",
-            "lock-verify": "^2.0.2",
-            "npm-lifecycle": "^2.1.0",
-            "npm-logical-tree": "^1.2.1",
-            "npm-package-arg": "^6.1.0",
-            "npm-profile": "^4.0.1",
-            "npm-registry-fetch": "^3.8.0",
-            "npmlog": "^4.1.2",
-            "pacote": "^9.2.3",
-            "read-package-json": "^2.0.13",
-            "stringify-package": "^1.0.0"
+            "bin-links": "1.1.2",
+            "bluebird": "3.5.3",
+            "find-npm-prefix": "1.0.2",
+            "libnpmaccess": "3.0.1",
+            "libnpmconfig": "1.2.1",
+            "libnpmhook": "5.0.2",
+            "libnpmorg": "1.0.0",
+            "libnpmpublish": "1.1.1",
+            "libnpmsearch": "2.0.0",
+            "libnpmteam": "1.0.1",
+            "lock-verify": "2.1.0",
+            "npm-lifecycle": "2.1.0",
+            "npm-logical-tree": "1.2.1",
+            "npm-package-arg": "6.1.0",
+            "npm-profile": "4.0.1",
+            "npm-registry-fetch": "3.9.0",
+            "npmlog": "4.1.2",
+            "pacote": "9.5.0",
+            "read-package-json": "2.0.13",
+            "stringify-package": "1.0.0"
           }
         },
         "libnpmaccess": {
           "version": "3.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^2.0.0",
-            "get-stream": "^4.0.0",
-            "npm-package-arg": "^6.1.0",
-            "npm-registry-fetch": "^3.8.0"
+            "aproba": "2.0.0",
+            "get-stream": "4.1.0",
+            "npm-package-arg": "6.1.0",
+            "npm-registry-fetch": "3.9.0"
           },
           "dependencies": {
             "aproba": {
               "version": "2.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "libnpmconfig": {
           "version": "1.2.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1",
-            "find-up": "^3.0.0",
-            "ini": "^1.3.5"
+            "figgy-pudding": "3.5.1",
+            "find-up": "3.0.0",
+            "ini": "1.3.5"
           },
           "dependencies": {
             "find-up": {
               "version": "3.0.0",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "locate-path": "^3.0.0"
+                "locate-path": "3.0.0"
               }
             },
             "locate-path": {
               "version": "3.0.0",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "p-locate": "^3.0.0",
-                "path-exists": "^3.0.0"
+                "p-locate": "3.0.0",
+                "path-exists": "3.0.0"
               }
             },
             "p-limit": {
               "version": "2.1.0",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "p-try": "^2.0.0"
+                "p-try": "2.0.0"
               }
             },
             "p-locate": {
               "version": "3.0.0",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "p-limit": "^2.0.0"
+                "p-limit": "2.1.0"
               }
             },
             "p-try": {
               "version": "2.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "libnpmhook": {
           "version": "5.0.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.4.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^3.8.0"
+            "aproba": "2.0.0",
+            "figgy-pudding": "3.5.1",
+            "get-stream": "4.1.0",
+            "npm-registry-fetch": "3.9.0"
           }
         },
         "libnpmorg": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.4.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^3.8.0"
+            "aproba": "2.0.0",
+            "figgy-pudding": "3.5.1",
+            "get-stream": "4.1.0",
+            "npm-registry-fetch": "3.9.0"
           },
           "dependencies": {
             "aproba": {
               "version": "2.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "libnpmpublish": {
           "version": "1.1.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.5.1",
-            "get-stream": "^4.0.0",
-            "lodash.clonedeep": "^4.5.0",
-            "normalize-package-data": "^2.4.0",
-            "npm-package-arg": "^6.1.0",
-            "npm-registry-fetch": "^3.8.0",
-            "semver": "^5.5.1",
-            "ssri": "^6.0.1"
+            "aproba": "2.0.0",
+            "figgy-pudding": "3.5.1",
+            "get-stream": "4.1.0",
+            "lodash.clonedeep": "4.5.0",
+            "normalize-package-data": "2.5.0",
+            "npm-package-arg": "6.1.0",
+            "npm-registry-fetch": "3.9.0",
+            "semver": "5.6.0",
+            "ssri": "6.0.1"
           }
         },
         "libnpmsearch": {
           "version": "2.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^3.8.0"
+            "figgy-pudding": "3.5.1",
+            "get-stream": "4.1.0",
+            "npm-registry-fetch": "3.9.0"
           }
         },
         "libnpmteam": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.4.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^3.8.0"
+            "aproba": "2.0.0",
+            "figgy-pudding": "3.5.1",
+            "get-stream": "4.1.0",
+            "npm-registry-fetch": "3.9.0"
           },
           "dependencies": {
             "aproba": {
               "version": "2.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "libnpx": {
           "version": "10.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "dotenv": "^5.0.1",
-            "npm-package-arg": "^6.0.0",
-            "rimraf": "^2.6.2",
-            "safe-buffer": "^5.1.0",
-            "update-notifier": "^2.3.0",
-            "which": "^1.3.0",
-            "y18n": "^4.0.0",
-            "yargs": "^11.0.0"
+            "dotenv": "5.0.1",
+            "npm-package-arg": "6.1.0",
+            "rimraf": "2.6.3",
+            "safe-buffer": "5.1.2",
+            "update-notifier": "2.5.0",
+            "which": "1.3.1",
+            "y18n": "4.0.0",
+            "yargs": "11.0.0"
           }
         },
         "locate-path": {
           "version": "2.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
+            "p-locate": "2.0.0",
+            "path-exists": "3.0.0"
           }
         },
         "lock-verify": {
           "version": "2.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "npm-package-arg": "^6.1.0",
-            "semver": "^5.4.1"
+            "npm-package-arg": "6.1.0",
+            "semver": "5.6.0"
           }
         },
         "lockfile": {
           "version": "1.0.4",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "signal-exit": "^3.0.2"
+            "signal-exit": "3.0.2"
           }
         },
         "lodash._baseindexof": {
           "version": "3.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash._baseuniq": {
           "version": "4.6.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "lodash._createset": "~4.0.0",
-            "lodash._root": "~3.0.0"
+            "lodash._createset": "4.0.3",
+            "lodash._root": "3.0.1"
           }
         },
         "lodash._bindcallback": {
           "version": "3.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash._cacheindexof": {
           "version": "3.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash._createcache": {
           "version": "3.1.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "lodash._getnative": "^3.0.0"
+            "lodash._getnative": "3.9.1"
           }
         },
         "lodash._createset": {
           "version": "4.0.3",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash._getnative": {
           "version": "3.9.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash._root": {
           "version": "3.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash.clonedeep": {
           "version": "4.5.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash.restparam": {
           "version": "3.6.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash.union": {
           "version": "4.6.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash.uniq": {
           "version": "4.5.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lodash.without": {
           "version": "4.4.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lowercase-keys": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "lru-cache": {
           "version": "4.1.5",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
           }
         },
         "make-dir": {
           "version": "1.3.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "pify": "^3.0.0"
+            "pify": "3.0.0"
           }
         },
         "make-fetch-happen": {
           "version": "4.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "agentkeepalive": "^3.4.1",
-            "cacache": "^11.0.1",
-            "http-cache-semantics": "^3.8.1",
-            "http-proxy-agent": "^2.1.0",
-            "https-proxy-agent": "^2.2.1",
-            "lru-cache": "^4.1.2",
-            "mississippi": "^3.0.0",
-            "node-fetch-npm": "^2.0.2",
-            "promise-retry": "^1.1.1",
-            "socks-proxy-agent": "^4.0.0",
-            "ssri": "^6.0.0"
+            "agentkeepalive": "3.4.1",
+            "cacache": "11.3.2",
+            "http-cache-semantics": "3.8.1",
+            "http-proxy-agent": "2.1.0",
+            "https-proxy-agent": "2.2.1",
+            "lru-cache": "4.1.5",
+            "mississippi": "3.0.0",
+            "node-fetch-npm": "2.0.2",
+            "promise-retry": "1.1.1",
+            "socks-proxy-agent": "4.0.1",
+            "ssri": "6.0.1"
           }
         },
         "meant": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "mem": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "mimic-fn": "^1.0.0"
+            "mimic-fn": "1.2.0"
           }
         },
         "mime-db": {
           "version": "1.35.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "mime-types": {
           "version": "2.1.19",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "mime-db": "~1.35.0"
+            "mime-db": "1.35.0"
           }
         },
         "mimic-fn": {
           "version": "1.2.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "brace-expansion": "^1.1.7"
+            "brace-expansion": "1.1.11"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.2"
           },
           "dependencies": {
             "yallist": {
               "version": "3.0.2",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "minizlib": {
           "version": "1.1.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "2.3.3"
           }
         },
         "mississippi": {
           "version": "3.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
+            "concat-stream": "1.6.2",
+            "duplexify": "3.6.0",
+            "end-of-stream": "1.4.1",
+            "flush-write-stream": "1.0.3",
+            "from2": "2.3.0",
+            "parallel-transform": "1.1.0",
+            "pump": "3.0.0",
+            "pumpify": "1.5.1",
+            "stream-each": "1.2.2",
+            "through2": "2.0.3"
           }
         },
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "dev": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -8956,83 +8715,74 @@
         "move-concurrently": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^1.1.1",
-            "copy-concurrently": "^1.0.0",
-            "fs-write-stream-atomic": "^1.0.8",
-            "mkdirp": "^0.5.1",
-            "rimraf": "^2.5.4",
-            "run-queue": "^1.0.3"
+            "aproba": "1.2.0",
+            "copy-concurrently": "1.0.5",
+            "fs-write-stream-atomic": "1.0.10",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.3",
+            "run-queue": "1.0.3"
           },
           "dependencies": {
             "aproba": {
               "version": "1.2.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "ms": {
           "version": "2.1.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "mute-stream": {
           "version": "0.0.7",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "node-fetch-npm": {
           "version": "2.0.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "encoding": "^0.1.11",
-            "json-parse-better-errors": "^1.0.0",
-            "safe-buffer": "^5.1.1"
+            "encoding": "0.1.12",
+            "json-parse-better-errors": "1.0.2",
+            "safe-buffer": "5.1.2"
           }
         },
         "node-gyp": {
           "version": "3.8.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "fstream": "^1.0.0",
-            "glob": "^7.0.3",
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "^0.5.0",
-            "nopt": "2 || 3",
-            "npmlog": "0 || 1 || 2 || 3 || 4",
-            "osenv": "0",
-            "request": "^2.87.0",
-            "rimraf": "2",
-            "semver": "~5.3.0",
-            "tar": "^2.0.0",
-            "which": "1"
+            "fstream": "1.0.11",
+            "glob": "7.1.3",
+            "graceful-fs": "4.1.15",
+            "mkdirp": "0.5.1",
+            "nopt": "3.0.6",
+            "npmlog": "4.1.2",
+            "osenv": "0.1.5",
+            "request": "2.88.0",
+            "rimraf": "2.6.3",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "which": "1.3.1"
           },
           "dependencies": {
             "nopt": {
               "version": "3.0.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "abbrev": "1"
+                "abbrev": "1.1.1"
               }
             },
             "semver": {
               "version": "5.3.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "tar": {
               "version": "2.2.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "block-stream": "*",
-                "fstream": "^1.0.2",
-                "inherits": "2"
+                "block-stream": "0.0.9",
+                "fstream": "1.0.11",
+                "inherits": "2.0.3"
               }
             }
           }
@@ -9040,29 +8790,26 @@
         "nopt": {
           "version": "4.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
           }
         },
         "normalize-package-data": {
           "version": "2.5.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
+            "hosted-git-info": "2.7.1",
+            "resolve": "1.10.0",
+            "semver": "5.6.0",
+            "validate-npm-package-license": "3.0.4"
           },
           "dependencies": {
             "resolve": {
               "version": "1.10.0",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "path-parse": "^1.0.6"
+                "path-parse": "1.0.6"
               }
             }
           }
@@ -9070,711 +8817,623 @@
         "npm-audit-report": {
           "version": "1.3.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "cli-table3": "^0.5.0",
-            "console-control-strings": "^1.1.0"
+            "cli-table3": "0.5.1",
+            "console-control-strings": "1.1.0"
           }
         },
         "npm-bundled": {
           "version": "1.0.6",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "npm-cache-filename": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "npm-install-checks": {
           "version": "3.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "semver": "^2.3.0 || 3.x || 4 || 5"
+            "semver": "5.6.0"
           }
         },
         "npm-lifecycle": {
           "version": "2.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "byline": "^5.0.0",
-            "graceful-fs": "^4.1.11",
-            "node-gyp": "^3.8.0",
-            "resolve-from": "^4.0.0",
-            "slide": "^1.1.6",
+            "byline": "5.0.0",
+            "graceful-fs": "4.1.15",
+            "node-gyp": "3.8.0",
+            "resolve-from": "4.0.0",
+            "slide": "1.1.6",
             "uid-number": "0.0.6",
-            "umask": "^1.1.0",
-            "which": "^1.3.1"
+            "umask": "1.1.0",
+            "which": "1.3.1"
           }
         },
         "npm-logical-tree": {
           "version": "1.2.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "npm-package-arg": {
           "version": "6.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "hosted-git-info": "^2.6.0",
-            "osenv": "^0.1.5",
-            "semver": "^5.5.0",
-            "validate-npm-package-name": "^3.0.0"
+            "hosted-git-info": "2.7.1",
+            "osenv": "0.1.5",
+            "semver": "5.6.0",
+            "validate-npm-package-name": "3.0.0"
           }
         },
         "npm-packlist": {
           "version": "1.4.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.6"
           }
         },
         "npm-pick-manifest": {
           "version": "2.2.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1",
-            "npm-package-arg": "^6.0.0",
-            "semver": "^5.4.1"
+            "figgy-pudding": "3.5.1",
+            "npm-package-arg": "6.1.0",
+            "semver": "5.6.0"
           }
         },
         "npm-profile": {
           "version": "4.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^1.1.2 || 2",
-            "figgy-pudding": "^3.4.1",
-            "npm-registry-fetch": "^3.8.0"
+            "aproba": "2.0.0",
+            "figgy-pudding": "3.5.1",
+            "npm-registry-fetch": "3.9.0"
           }
         },
         "npm-registry-fetch": {
           "version": "3.9.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "JSONStream": "^1.3.4",
-            "bluebird": "^3.5.1",
-            "figgy-pudding": "^3.4.1",
-            "lru-cache": "^4.1.3",
-            "make-fetch-happen": "^4.0.1",
-            "npm-package-arg": "^6.1.0"
+            "JSONStream": "1.3.5",
+            "bluebird": "3.5.3",
+            "figgy-pudding": "3.5.1",
+            "lru-cache": "4.1.5",
+            "make-fetch-happen": "4.0.1",
+            "npm-package-arg": "6.1.0"
           }
         },
         "npm-run-path": {
           "version": "2.0.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "path-key": "^2.0.0"
+            "path-key": "2.0.1"
           }
         },
         "npm-user-validate": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "npmlog": {
           "version": "4.1.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
           }
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "oauth-sign": {
           "version": "0.9.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "wrappy": "1"
+            "wrappy": "1.0.2"
           }
         },
         "opener": {
           "version": "1.5.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "os-homedir": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "os-locale": {
           "version": "2.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
           }
         },
         "os-tmpdir": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "osenv": {
           "version": "0.1.5",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
           }
         },
         "p-finally": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "p-limit": {
           "version": "1.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "p-try": "^1.0.0"
+            "p-try": "1.0.0"
           }
         },
         "p-locate": {
           "version": "2.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "p-limit": "^1.1.0"
+            "p-limit": "1.2.0"
           }
         },
         "p-try": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "package-json": {
           "version": "4.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "got": "^6.7.1",
-            "registry-auth-token": "^3.0.1",
-            "registry-url": "^3.0.3",
-            "semver": "^5.1.0"
+            "got": "6.7.1",
+            "registry-auth-token": "3.3.2",
+            "registry-url": "3.1.0",
+            "semver": "5.6.0"
           }
         },
         "pacote": {
           "version": "9.5.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "bluebird": "^3.5.3",
-            "cacache": "^11.3.2",
-            "figgy-pudding": "^3.5.1",
-            "get-stream": "^4.1.0",
-            "glob": "^7.1.3",
-            "lru-cache": "^5.1.1",
-            "make-fetch-happen": "^4.0.1",
-            "minimatch": "^3.0.4",
-            "minipass": "^2.3.5",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "normalize-package-data": "^2.4.0",
-            "npm-package-arg": "^6.1.0",
-            "npm-packlist": "^1.1.12",
-            "npm-pick-manifest": "^2.2.3",
-            "npm-registry-fetch": "^3.8.0",
-            "osenv": "^0.1.5",
-            "promise-inflight": "^1.0.1",
-            "promise-retry": "^1.1.1",
-            "protoduck": "^5.0.1",
-            "rimraf": "^2.6.2",
-            "safe-buffer": "^5.1.2",
-            "semver": "^5.6.0",
-            "ssri": "^6.0.1",
-            "tar": "^4.4.8",
-            "unique-filename": "^1.1.1",
-            "which": "^1.3.1"
+            "bluebird": "3.5.3",
+            "cacache": "11.3.2",
+            "figgy-pudding": "3.5.1",
+            "get-stream": "4.1.0",
+            "glob": "7.1.3",
+            "lru-cache": "5.1.1",
+            "make-fetch-happen": "4.0.1",
+            "minimatch": "3.0.4",
+            "minipass": "2.3.5",
+            "mississippi": "3.0.0",
+            "mkdirp": "0.5.1",
+            "normalize-package-data": "2.5.0",
+            "npm-package-arg": "6.1.0",
+            "npm-packlist": "1.4.1",
+            "npm-pick-manifest": "2.2.3",
+            "npm-registry-fetch": "3.9.0",
+            "osenv": "0.1.5",
+            "promise-inflight": "1.0.1",
+            "promise-retry": "1.1.1",
+            "protoduck": "5.0.1",
+            "rimraf": "2.6.3",
+            "safe-buffer": "5.1.2",
+            "semver": "5.6.0",
+            "ssri": "6.0.1",
+            "tar": "4.4.8",
+            "unique-filename": "1.1.1",
+            "which": "1.3.1"
           },
           "dependencies": {
             "lru-cache": {
               "version": "5.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "yallist": "^3.0.2"
+                "yallist": "3.0.3"
               }
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
+                "safe-buffer": "5.1.2",
+                "yallist": "3.0.3"
               }
             },
             "yallist": {
               "version": "3.0.3",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "parallel-transform": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "cyclist": "~0.2.2",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.1.5"
+            "cyclist": "0.2.2",
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.6"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
         },
         "path-exists": {
           "version": "3.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "path-is-inside": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "path-key": {
           "version": "2.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "path-parse": {
           "version": "1.0.6",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "performance-now": {
           "version": "2.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "pify": {
           "version": "3.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "prepend-http": {
           "version": "1.0.4",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "promise-inflight": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "promise-retry": {
           "version": "1.1.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "err-code": "^1.0.0",
-            "retry": "^0.10.0"
+            "err-code": "1.1.2",
+            "retry": "0.10.1"
           },
           "dependencies": {
             "retry": {
               "version": "0.10.1",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "promzard": {
           "version": "0.3.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "read": "1"
+            "read": "1.0.7"
           }
         },
         "proto-list": {
           "version": "1.2.4",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "protoduck": {
           "version": "5.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "genfun": "^5.0.0"
+            "genfun": "5.0.0"
           }
         },
         "prr": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "pseudomap": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "psl": {
           "version": "1.1.29",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "pump": {
           "version": "3.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "pumpify": {
           "version": "1.5.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "duplexify": "^3.6.0",
-            "inherits": "^2.0.3",
-            "pump": "^2.0.0"
+            "duplexify": "3.6.0",
+            "inherits": "2.0.3",
+            "pump": "2.0.1"
           },
           "dependencies": {
             "pump": {
               "version": "2.0.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
+                "end-of-stream": "1.4.1",
+                "once": "1.4.0"
               }
             }
           }
         },
         "punycode": {
           "version": "1.4.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "qrcode-terminal": {
           "version": "0.12.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "qs": {
           "version": "6.5.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "query-string": {
           "version": "6.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "decode-uri-component": "^0.2.0",
-            "strict-uri-encode": "^2.0.0"
+            "decode-uri-component": "0.2.0",
+            "strict-uri-encode": "2.0.0"
           }
         },
         "qw": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "rc": {
           "version": "1.2.7",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "deep-extend": "^0.5.1",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
+            "deep-extend": "0.5.1",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
           },
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "read": {
           "version": "1.0.7",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "mute-stream": "~0.0.4"
+            "mute-stream": "0.0.7"
           }
         },
         "read-cmd-shim": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2"
+            "graceful-fs": "4.1.15"
           }
         },
         "read-installed": {
           "version": "4.0.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "debuglog": "^1.0.1",
-            "graceful-fs": "^4.1.2",
-            "read-package-json": "^2.0.0",
-            "readdir-scoped-modules": "^1.0.0",
-            "semver": "2 || 3 || 4 || 5",
-            "slide": "~1.1.3",
-            "util-extend": "^1.0.1"
+            "debuglog": "1.0.1",
+            "graceful-fs": "4.1.15",
+            "read-package-json": "2.0.13",
+            "readdir-scoped-modules": "1.0.2",
+            "semver": "5.6.0",
+            "slide": "1.1.6",
+            "util-extend": "1.0.3"
           }
         },
         "read-package-json": {
           "version": "2.0.13",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.1.2",
-            "json-parse-better-errors": "^1.0.1",
-            "normalize-package-data": "^2.0.0",
-            "slash": "^1.0.0"
+            "glob": "7.1.3",
+            "graceful-fs": "4.1.15",
+            "json-parse-better-errors": "1.0.2",
+            "normalize-package-data": "2.5.0",
+            "slash": "1.0.0"
           }
         },
         "read-package-tree": {
           "version": "5.2.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "debuglog": "^1.0.1",
-            "dezalgo": "^1.0.0",
-            "once": "^1.3.0",
-            "read-package-json": "^2.0.0",
-            "readdir-scoped-modules": "^1.0.0"
+            "debuglog": "1.0.1",
+            "dezalgo": "1.0.3",
+            "once": "1.4.0",
+            "read-package-json": "2.0.13",
+            "readdir-scoped-modules": "1.0.2"
           }
         },
         "readable-stream": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "inherits": "2.0.3",
+            "string_decoder": "1.2.0",
+            "util-deprecate": "1.0.2"
           }
         },
         "readdir-scoped-modules": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "debuglog": "^1.0.1",
-            "dezalgo": "^1.0.0",
-            "graceful-fs": "^4.1.2",
-            "once": "^1.3.0"
+            "debuglog": "1.0.1",
+            "dezalgo": "1.0.3",
+            "graceful-fs": "4.1.15",
+            "once": "1.4.0"
           }
         },
         "registry-auth-token": {
           "version": "3.3.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "rc": "^1.1.6",
-            "safe-buffer": "^5.0.1"
+            "rc": "1.2.7",
+            "safe-buffer": "5.1.2"
           }
         },
         "registry-url": {
           "version": "3.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "rc": "^1.0.1"
+            "rc": "1.2.7"
           }
         },
         "request": {
           "version": "2.88.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
+            "aws-sign2": "0.7.0",
+            "aws4": "1.8.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.6",
+            "extend": "3.0.2",
+            "forever-agent": "0.6.1",
+            "form-data": "2.3.2",
+            "har-validator": "5.1.0",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.19",
+            "oauth-sign": "0.9.0",
+            "performance-now": "2.1.0",
+            "qs": "6.5.2",
+            "safe-buffer": "5.1.2",
+            "tough-cookie": "2.4.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.3.2"
           }
         },
         "require-directory": {
           "version": "2.1.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "require-main-filename": {
           "version": "1.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "resolve-from": {
           "version": "4.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "retry": {
           "version": "0.12.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "rimraf": {
           "version": "2.6.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "glob": "^7.1.3"
+            "glob": "7.1.3"
           }
         },
         "run-queue": {
           "version": "1.0.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "aproba": "^1.1.1"
+            "aproba": "1.2.0"
           },
           "dependencies": {
             "aproba": {
               "version": "1.2.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "semver": {
           "version": "5.6.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "semver-diff": {
           "version": "2.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "semver": "^5.0.3"
+            "semver": "5.6.0"
           }
         },
         "set-blocking": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "sha": {
           "version": "2.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "readable-stream": "^2.0.2"
+            "graceful-fs": "4.1.15",
+            "readable-stream": "2.3.6"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
@@ -9782,229 +9441,199 @@
         "shebang-command": {
           "version": "1.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "shebang-regex": "^1.0.0"
+            "shebang-regex": "1.0.0"
           }
         },
         "shebang-regex": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "slash": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "slide": {
           "version": "1.1.6",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "smart-buffer": {
           "version": "4.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "socks": {
           "version": "2.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ip": "^1.1.5",
-            "smart-buffer": "^4.0.1"
+            "ip": "1.1.5",
+            "smart-buffer": "4.0.1"
           }
         },
         "socks-proxy-agent": {
           "version": "4.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "agent-base": "~4.2.0",
-            "socks": "~2.2.0"
+            "agent-base": "4.2.1",
+            "socks": "2.2.0"
           }
         },
         "sorted-object": {
           "version": "2.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "sorted-union-stream": {
           "version": "2.1.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "from2": "^1.3.0",
-            "stream-iterate": "^1.1.0"
+            "from2": "1.3.0",
+            "stream-iterate": "1.2.0"
           },
           "dependencies": {
             "from2": {
               "version": "1.3.0",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "inherits": "~2.0.1",
-                "readable-stream": "~1.1.10"
+                "inherits": "2.0.3",
+                "readable-stream": "1.1.14"
               }
             },
             "isarray": {
               "version": "0.0.1",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "readable-stream": {
               "version": "1.1.14",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
                 "isarray": "0.0.1",
-                "string_decoder": "~0.10.x"
+                "string_decoder": "0.10.31"
               }
             },
             "string_decoder": {
               "version": "0.10.31",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "spdx-correct": {
           "version": "3.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "spdx-expression-parse": "^3.0.0",
-            "spdx-license-ids": "^3.0.0"
+            "spdx-expression-parse": "3.0.0",
+            "spdx-license-ids": "3.0.3"
           }
         },
         "spdx-exceptions": {
           "version": "2.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "spdx-expression-parse": {
           "version": "3.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "spdx-exceptions": "^2.1.0",
-            "spdx-license-ids": "^3.0.0"
+            "spdx-exceptions": "2.1.0",
+            "spdx-license-ids": "3.0.3"
           }
         },
         "spdx-license-ids": {
           "version": "3.0.3",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "sshpk": {
           "version": "1.14.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "asn1": "~0.2.3",
-            "assert-plus": "^1.0.0",
-            "bcrypt-pbkdf": "^1.0.0",
-            "dashdash": "^1.12.0",
-            "ecc-jsbn": "~0.1.1",
-            "getpass": "^0.1.1",
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.0.2",
-            "tweetnacl": "~0.14.0"
+            "asn1": "0.2.4",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.2",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.2",
+            "getpass": "0.1.7",
+            "jsbn": "0.1.1",
+            "safer-buffer": "2.1.2",
+            "tweetnacl": "0.14.5"
           }
         },
         "ssri": {
           "version": "6.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1"
+            "figgy-pudding": "3.5.1"
           }
         },
         "stream-each": {
           "version": "1.2.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "stream-shift": "^1.0.0"
+            "end-of-stream": "1.4.1",
+            "stream-shift": "1.0.0"
           }
         },
         "stream-iterate": {
           "version": "1.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "stream-shift": "^1.0.0"
+            "readable-stream": "2.3.6",
+            "stream-shift": "1.0.0"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
         },
         "stream-shift": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "strict-uri-encode": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "string-width": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
           },
           "dependencies": {
             "ansi-regex": {
               "version": "3.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "is-fullwidth-code-point": {
               "version": "2.0.0",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "strip-ansi": {
               "version": "4.0.0",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -10012,314 +9641,272 @@
         "string_decoder": {
           "version": "1.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.2"
           }
         },
         "stringify-package": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "strip-eof": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "strip-json-comments": {
           "version": "2.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "supports-color": {
           "version": "5.4.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         },
         "tar": {
           "version": "4.4.8",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
+            "chownr": "1.1.1",
+            "fs-minipass": "1.2.5",
+            "minipass": "2.3.5",
+            "minizlib": "1.1.1",
+            "mkdirp": "0.5.1",
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.3"
           },
           "dependencies": {
             "chownr": {
               "version": "1.1.1",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
+                "safe-buffer": "5.1.2",
+                "yallist": "3.0.3"
               }
             },
             "yallist": {
               "version": "3.0.3",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "term-size": {
           "version": "1.2.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "execa": "^0.7.0"
+            "execa": "0.7.0"
           }
         },
         "text-table": {
           "version": "0.2.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "through": {
           "version": "2.3.8",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "through2": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "1.0.0",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
+                "util-deprecate": "1.0.2"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "5.1.2"
               }
             }
           }
         },
         "timed-out": {
           "version": "4.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "tiny-relative-date": {
           "version": "1.3.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "tough-cookie": {
           "version": "2.4.3",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
+            "psl": "1.1.29",
+            "punycode": "1.4.1"
           }
         },
         "tunnel-agent": {
           "version": "0.6.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "safe-buffer": "^5.0.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "tweetnacl": {
           "version": "0.14.5",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "typedarray": {
           "version": "0.0.6",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "uid-number": {
           "version": "0.0.6",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "umask": {
           "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "unique-filename": {
           "version": "1.1.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "unique-slug": "^2.0.0"
+            "unique-slug": "2.0.0"
           }
         },
         "unique-slug": {
           "version": "2.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "imurmurhash": "^0.1.4"
+            "imurmurhash": "0.1.4"
           }
         },
         "unique-string": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "crypto-random-string": "^1.0.0"
+            "crypto-random-string": "1.0.0"
           }
         },
         "unpipe": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "unzip-response": {
           "version": "2.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "update-notifier": {
           "version": "2.5.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "boxen": "^1.2.1",
-            "chalk": "^2.0.1",
-            "configstore": "^3.0.0",
-            "import-lazy": "^2.1.0",
-            "is-ci": "^1.0.10",
-            "is-installed-globally": "^0.1.0",
-            "is-npm": "^1.0.0",
-            "latest-version": "^3.0.0",
-            "semver-diff": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
+            "boxen": "1.3.0",
+            "chalk": "2.4.1",
+            "configstore": "3.1.2",
+            "import-lazy": "2.1.0",
+            "is-ci": "1.1.0",
+            "is-installed-globally": "0.1.0",
+            "is-npm": "1.0.0",
+            "latest-version": "3.1.0",
+            "semver-diff": "2.1.0",
+            "xdg-basedir": "3.0.0"
           }
         },
         "url-parse-lax": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "prepend-http": "^1.0.1"
+            "prepend-http": "1.0.4"
           }
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "util-extend": {
           "version": "1.0.3",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "uuid": {
           "version": "3.3.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "validate-npm-package-license": {
           "version": "3.0.4",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "spdx-correct": "^3.0.0",
-            "spdx-expression-parse": "^3.0.0"
+            "spdx-correct": "3.0.0",
+            "spdx-expression-parse": "3.0.0"
           }
         },
         "validate-npm-package-name": {
           "version": "3.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "builtins": "^1.0.3"
+            "builtins": "1.0.3"
           }
         },
         "verror": {
           "version": "1.10.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "assert-plus": "^1.0.0",
+            "assert-plus": "1.0.0",
             "core-util-is": "1.0.2",
-            "extsprintf": "^1.2.0"
+            "extsprintf": "1.3.0"
           }
         },
         "wcwidth": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "defaults": "^1.0.3"
+            "defaults": "1.0.3"
           }
         },
         "which": {
           "version": "1.3.1",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "isexe": "^2.0.0"
+            "isexe": "2.0.0"
           }
         },
         "which-module": {
           "version": "2.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "wide-align": {
           "version": "1.1.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "string-width": "^1.0.2"
+            "string-width": "1.0.2"
           },
           "dependencies": {
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "code-point-at": "1.1.0",
+                "is-fullwidth-code-point": "1.0.0",
+                "strip-ansi": "3.0.1"
               }
             }
           }
@@ -10327,107 +9914,94 @@
         "widest-line": {
           "version": "2.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "string-width": "^2.1.1"
+            "string-width": "2.1.1"
           }
         },
         "worker-farm": {
           "version": "1.6.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "errno": "~0.1.7"
+            "errno": "0.1.7"
           }
         },
         "wrap-ansi": {
           "version": "2.1.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1"
           },
           "dependencies": {
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
               "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "code-point-at": "1.1.0",
+                "is-fullwidth-code-point": "1.0.0",
+                "strip-ansi": "3.0.1"
               }
             }
           }
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "write-file-atomic": {
           "version": "2.4.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.11",
-            "imurmurhash": "^0.1.4",
-            "signal-exit": "^3.0.2"
+            "graceful-fs": "4.1.15",
+            "imurmurhash": "0.1.4",
+            "signal-exit": "3.0.2"
           }
         },
         "xdg-basedir": {
           "version": "3.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "xtend": {
           "version": "4.0.1",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "y18n": {
           "version": "4.0.0",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "yallist": {
           "version": "2.1.2",
-          "bundled": true,
-          "dev": true
+          "bundled": true
         },
         "yargs": {
           "version": "11.0.0",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.1.1",
-            "find-up": "^2.1.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^9.0.2"
+            "cliui": "4.1.0",
+            "decamelize": "1.2.0",
+            "find-up": "2.1.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "9.0.2"
           },
           "dependencies": {
             "y18n": {
               "version": "3.2.1",
-              "bundled": true,
-              "dev": true
+              "bundled": true
             }
           }
         },
         "yargs-parser": {
           "version": "9.0.2",
           "bundled": true,
-          "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -10438,7 +10012,7 @@
       "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==",
       "dev": true,
       "requires": {
-        "which": "^1.2.10"
+        "which": "1.3.1"
       }
     },
     "npm-run-all": {
@@ -10447,15 +10021,15 @@
       "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "memorystream": "^0.3.1",
-        "minimatch": "^3.0.4",
-        "pidtree": "^0.3.0",
-        "read-pkg": "^3.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
+        "ansi-styles": "3.2.1",
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "memorystream": "0.3.1",
+        "minimatch": "3.0.4",
+        "pidtree": "0.3.0",
+        "read-pkg": "3.0.0",
+        "shell-quote": "1.6.1",
+        "string.prototype.padend": "3.0.0"
       },
       "dependencies": {
         "load-json-file": {
@@ -10464,10 +10038,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.15",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "path-type": {
@@ -10476,7 +10050,7 @@
           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "dev": true,
           "requires": {
-            "pify": "^3.0.0"
+            "pify": "3.0.0"
           }
         },
         "pify": {
@@ -10491,9 +10065,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.5.0",
+            "path-type": "3.0.0"
           }
         },
         "strip-bom": {
@@ -10510,7 +10084,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "^2.0.0"
+        "path-key": "2.0.1"
       }
     },
     "npm-which": {
@@ -10519,9 +10093,9 @@
       "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=",
       "dev": true,
       "requires": {
-        "commander": "^2.9.0",
-        "npm-path": "^2.0.2",
-        "which": "^1.2.10"
+        "commander": "2.20.0",
+        "npm-path": "2.0.4",
+        "which": "1.3.1"
       }
     },
     "npmlog": {
@@ -10530,10 +10104,10 @@
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "are-we-there-yet": "1.1.5",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
       }
     },
     "null-check": {
@@ -10548,8 +10122,8 @@
       "integrity": "sha512-PhEeA3v/tAacxC5dNO1i2yXzGVWWrZ9jTx+TMEJ716amvnBXzvrxIwy9HW7MyJsHe8ACQzpiQgbrAjDRMA7gcg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.2.3",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
       }
     },
     "num2fraction": {
@@ -10588,9 +10162,9 @@
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "define-property": {
@@ -10599,7 +10173,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "kind-of": {
@@ -10608,7 +10182,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -10625,7 +10199,7 @@
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.0"
+        "isobject": "3.0.1"
       }
     },
     "object.assign": {
@@ -10634,10 +10208,10 @@
       "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "define-properties": "1.1.3",
+        "function-bind": "1.1.1",
+        "has-symbols": "1.0.0",
+        "object-keys": "1.1.1"
       }
     },
     "object.pick": {
@@ -10646,7 +10220,7 @@
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "on-finished": {
@@ -10664,7 +10238,7 @@
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
-        "wrappy": "1"
+        "wrappy": "1.0.2"
       }
     },
     "onetime": {
@@ -10673,7 +10247,7 @@
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "optimist": {
@@ -10682,8 +10256,8 @@
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "dev": true,
       "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
+        "minimist": "0.0.8",
+        "wordwrap": "0.0.3"
       },
       "dependencies": {
         "wordwrap": {
@@ -10700,12 +10274,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
       }
     },
     "os-browserify": {
@@ -10726,7 +10300,7 @@
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
-        "lcid": "^1.0.0"
+        "lcid": "1.0.0"
       }
     },
     "os-tmpdir": {
@@ -10741,8 +10315,8 @@
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "output-file-sync": {
@@ -10751,9 +10325,9 @@
       "integrity": "sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "is-plain-obj": "^1.1.0",
-        "mkdirp": "^0.5.1"
+        "graceful-fs": "4.1.15",
+        "is-plain-obj": "1.1.0",
+        "mkdirp": "0.5.1"
       }
     },
     "p-defer": {
@@ -10780,7 +10354,7 @@
       "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
       "dev": true,
       "requires": {
-        "p-try": "^2.0.0"
+        "p-try": "2.2.0"
       }
     },
     "p-locate": {
@@ -10789,7 +10363,7 @@
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
       "requires": {
-        "p-limit": "^2.0.0"
+        "p-limit": "2.2.0"
       }
     },
     "p-map": {
@@ -10816,9 +10390,9 @@
       "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
       "dev": true,
       "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
+        "cyclist": "0.2.2",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "parent-module": {
@@ -10827,7 +10401,7 @@
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
       "requires": {
-        "callsites": "^3.0.0"
+        "callsites": "3.1.0"
       }
     },
     "parse-asn1": {
@@ -10836,12 +10410,12 @@
       "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
       "dev": true,
       "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
+        "asn1.js": "4.10.1",
+        "browserify-aes": "1.2.0",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "pbkdf2": "3.0.17",
+        "safe-buffer": "5.1.2"
       }
     },
     "parse-json": {
@@ -10850,8 +10424,8 @@
       "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
       "dev": true,
       "requires": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "error-ex": "1.3.2",
+        "json-parse-better-errors": "1.0.2"
       }
     },
     "parse-passwd": {
@@ -10866,7 +10440,7 @@
       "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseuri": {
@@ -10875,7 +10449,7 @@
       "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseurl": {
@@ -10938,9 +10512,9 @@
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "graceful-fs": "4.1.15",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
       },
       "dependencies": {
         "pify": {
@@ -10957,11 +10531,11 @@
       "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
       "dev": true,
       "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
       }
     },
     "performance-now": {
@@ -10994,7 +10568,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "^2.0.0"
+        "pinkie": "2.0.4"
       }
     },
     "pkg-dir": {
@@ -11003,7 +10577,7 @@
       "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
       "requires": {
-        "find-up": "^3.0.0"
+        "find-up": "3.0.0"
       }
     },
     "please-upgrade-node": {
@@ -11012,7 +10586,7 @@
       "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==",
       "dev": true,
       "requires": {
-        "semver-compare": "^1.0.0"
+        "semver-compare": "1.0.0"
       }
     },
     "posix-character-classes": {
@@ -11027,9 +10601,9 @@
       "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
+        "chalk": "2.4.2",
+        "source-map": "0.6.1",
+        "supports-color": "6.1.0"
       },
       "dependencies": {
         "source-map": {
@@ -11044,7 +10618,7 @@
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -11055,8 +10629,8 @@
       "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^4.0.0",
-        "import-cwd": "^2.0.0"
+        "cosmiconfig": "4.0.0",
+        "import-cwd": "2.1.0"
       },
       "dependencies": {
         "cosmiconfig": {
@@ -11065,10 +10639,10 @@
           "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
           "dev": true,
           "requires": {
-            "is-directory": "^0.3.1",
-            "js-yaml": "^3.9.0",
-            "parse-json": "^4.0.0",
-            "require-from-string": "^2.0.1"
+            "is-directory": "0.3.1",
+            "js-yaml": "3.13.1",
+            "parse-json": "4.0.0",
+            "require-from-string": "2.0.2"
           }
         }
       }
@@ -11079,10 +10653,10 @@
       "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "postcss": "7.0.16",
+        "postcss-load-config": "2.0.0",
+        "schema-utils": "1.0.0"
       }
     },
     "postcss-modules-extract-imports": {
@@ -11091,7 +10665,7 @@
       "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.5"
+        "postcss": "7.0.16"
       }
     },
     "postcss-modules-local-by-default": {
@@ -11100,9 +10674,9 @@
       "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0",
-        "postcss-value-parser": "^3.3.1"
+        "postcss": "7.0.16",
+        "postcss-selector-parser": "6.0.2",
+        "postcss-value-parser": "3.3.1"
       }
     },
     "postcss-modules-scope": {
@@ -11111,8 +10685,8 @@
       "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
+        "postcss": "7.0.16",
+        "postcss-selector-parser": "6.0.2"
       }
     },
     "postcss-modules-values": {
@@ -11121,8 +10695,8 @@
       "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
       "dev": true,
       "requires": {
-        "icss-replace-symbols": "^1.1.0",
-        "postcss": "^7.0.6"
+        "icss-replace-symbols": "1.1.0",
+        "postcss": "7.0.16"
       }
     },
     "postcss-selector-parser": {
@@ -11131,9 +10705,9 @@
       "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
       "dev": true,
       "requires": {
-        "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "cssesc": "3.0.0",
+        "indexes-of": "1.0.1",
+        "uniq": "1.0.1"
       }
     },
     "postcss-value-parser": {
@@ -11208,12 +10782,12 @@
       "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "parse-asn1": "5.1.4",
+        "randombytes": "2.1.0",
+        "safe-buffer": "5.1.2"
       }
     },
     "pump": {
@@ -11222,8 +10796,8 @@
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
       }
     },
     "pumpify": {
@@ -11232,9 +10806,9 @@
       "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "dev": true,
       "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
+        "duplexify": "3.7.1",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
       },
       "dependencies": {
         "pump": {
@@ -11243,8 +10817,8 @@
           "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         }
       }
@@ -11285,7 +10859,7 @@
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.0"
+        "safe-buffer": "5.1.2"
       }
     },
     "randomfill": {
@@ -11294,8 +10868,8 @@
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
+        "randombytes": "2.1.0",
+        "safe-buffer": "5.1.2"
       }
     },
     "range-parser": {
@@ -11322,10 +10896,10 @@
       "integrity": "sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==",
       "dev": true,
       "requires": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^4.0.0",
-        "type-fest": "^0.4.1"
+        "@types/normalize-package-data": "2.4.0",
+        "normalize-package-data": "2.5.0",
+        "parse-json": "4.0.0",
+        "type-fest": "0.4.1"
       }
     },
     "read-pkg-up": {
@@ -11334,8 +10908,8 @@
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
       },
       "dependencies": {
         "find-up": {
@@ -11344,8 +10918,8 @@
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "path-exists": {
@@ -11354,7 +10928,7 @@
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "pinkie-promise": "2.0.1"
           }
         },
         "read-pkg": {
@@ -11363,9 +10937,9 @@
           "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
           "dev": true,
           "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
+            "load-json-file": "1.1.0",
+            "normalize-package-data": "2.5.0",
+            "path-type": "1.1.0"
           }
         }
       }
@@ -11376,13 +10950,13 @@
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "dev": true,
       "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "2.0.0",
+        "safe-buffer": "5.1.2",
+        "string_decoder": "1.1.1",
+        "util-deprecate": "1.0.2"
       }
     },
     "readdirp": {
@@ -11391,9 +10965,9 @@
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
+        "graceful-fs": "4.1.15",
+        "micromatch": "3.1.10",
+        "readable-stream": "2.3.6"
       }
     },
     "redent": {
@@ -11402,8 +10976,8 @@
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
       },
       "dependencies": {
         "indent-string": {
@@ -11412,7 +10986,7 @@
           "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
           "dev": true,
           "requires": {
-            "repeating": "^2.0.0"
+            "repeating": "2.0.1"
           }
         }
       }
@@ -11429,7 +11003,7 @@
       "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
       "dev": true,
       "requires": {
-        "regenerate": "^1.4.0"
+        "regenerate": "1.4.0"
       }
     },
     "regenerator-runtime": {
@@ -11444,7 +11018,7 @@
       "integrity": "sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==",
       "dev": true,
       "requires": {
-        "private": "^0.1.6"
+        "private": "0.1.8"
       }
     },
     "regex-not": {
@@ -11453,8 +11027,8 @@
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
+        "extend-shallow": "3.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "regexp-tree": {
@@ -11475,12 +11049,12 @@
       "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
       "dev": true,
       "requires": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.0.2",
-        "regjsgen": "^0.5.0",
-        "regjsparser": "^0.6.0",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.1.0"
+        "regenerate": "1.4.0",
+        "regenerate-unicode-properties": "8.1.0",
+        "regjsgen": "0.5.0",
+        "regjsparser": "0.6.0",
+        "unicode-match-property-ecmascript": "1.0.4",
+        "unicode-match-property-value-ecmascript": "1.1.0"
       }
     },
     "regjsgen": {
@@ -11495,7 +11069,7 @@
       "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
       "dev": true,
       "requires": {
-        "jsesc": "~0.5.0"
+        "jsesc": "0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -11530,7 +11104,7 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "^1.0.0"
+        "is-finite": "1.0.2"
       }
     },
     "request": {
@@ -11539,26 +11113,26 @@
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "dev": true,
       "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
+        "aws-sign2": "0.7.0",
+        "aws4": "1.8.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.8",
+        "extend": "3.0.2",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.3",
+        "har-validator": "5.1.3",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.24",
+        "oauth-sign": "0.9.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.2",
+        "safe-buffer": "5.1.2",
+        "tough-cookie": "2.4.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.3.2"
       },
       "dependencies": {
         "qs": {
@@ -11599,7 +11173,7 @@
       "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
       "dev": true,
       "requires": {
-        "path-parse": "^1.0.6"
+        "path-parse": "1.0.6"
       }
     },
     "resolve-cwd": {
@@ -11608,7 +11182,7 @@
       "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "3.0.0"
       },
       "dependencies": {
         "resolve-from": {
@@ -11625,8 +11199,8 @@
       "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
+        "expand-tilde": "2.0.2",
+        "global-modules": "1.0.0"
       }
     },
     "resolve-from": {
@@ -11647,8 +11221,8 @@
       "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "dev": true,
       "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
+        "onetime": "2.0.1",
+        "signal-exit": "3.0.2"
       }
     },
     "ret": {
@@ -11669,7 +11243,7 @@
       "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "dev": true,
       "requires": {
-        "glob": "^7.1.3"
+        "glob": "7.1.4"
       }
     },
     "ripemd160": {
@@ -11678,8 +11252,8 @@
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
       }
     },
     "run-async": {
@@ -11688,7 +11262,7 @@
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "dev": true,
       "requires": {
-        "is-promise": "^2.1.0"
+        "is-promise": "2.1.0"
       }
     },
     "run-node": {
@@ -11703,7 +11277,7 @@
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1"
+        "aproba": "1.2.0"
       }
     },
     "rxjs": {
@@ -11712,7 +11286,7 @@
       "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
       "dev": true,
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "safe-buffer": {
@@ -11727,7 +11301,7 @@
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
-        "ret": "~0.1.10"
+        "ret": "0.1.15"
       }
     },
     "safer-buffer": {
@@ -11742,10 +11316,10 @@
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "glob": "7.1.4",
+        "lodash": "4.17.11",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
       }
     },
     "sass-loader": {
@@ -11754,12 +11328,12 @@
       "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
       "dev": true,
       "requires": {
-        "clone-deep": "^2.0.1",
-        "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
-        "neo-async": "^2.5.0",
-        "pify": "^3.0.0",
-        "semver": "^5.5.0"
+        "clone-deep": "2.0.2",
+        "loader-utils": "1.2.3",
+        "lodash.tail": "4.1.1",
+        "neo-async": "2.6.1",
+        "pify": "3.0.0",
+        "semver": "5.7.0"
       },
       "dependencies": {
         "pify": {
@@ -11776,9 +11350,9 @@
       "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
       "requires": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
+        "ajv": "6.10.0",
+        "ajv-errors": "1.0.1",
+        "ajv-keywords": "3.4.0"
       }
     },
     "scss-tokenizer": {
@@ -11787,8 +11361,8 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
+        "js-base64": "2.5.1",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-map": {
@@ -11797,7 +11371,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -11832,10 +11406,10 @@
       "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
+        "extend-shallow": "2.0.1",
+        "is-extendable": "0.1.1",
+        "is-plain-object": "2.0.4",
+        "split-string": "3.1.0"
       },
       "dependencies": {
         "extend-shallow": {
@@ -11844,7 +11418,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -11867,8 +11441,8 @@
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "shallow-clone": {
@@ -11877,9 +11451,9 @@
       "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^5.0.0",
-        "mixin-object": "^2.0.1"
+        "is-extendable": "0.1.1",
+        "kind-of": "5.1.0",
+        "mixin-object": "2.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -11896,7 +11470,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "1.0.0"
       }
     },
     "shebang-regex": {
@@ -11911,10 +11485,10 @@
       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
       "dev": true,
       "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
+        "array-filter": "0.0.1",
+        "array-map": "0.0.0",
+        "array-reduce": "0.0.0",
+        "jsonify": "0.0.0"
       }
     },
     "signal-exit": {
@@ -11929,7 +11503,7 @@
       "integrity": "sha512-i9WVsrK2u0G/cASI9nh7voxOk9mhanWY9eGtWBDSYql6m49Yk5/Fan6uZsDr/xmzv8n+eQ8ahKCoEr8cvU3h+g==",
       "dev": true,
       "requires": {
-        "debug": "^4.0.1"
+        "debug": "4.1.1"
       },
       "dependencies": {
         "debug": {
@@ -11938,7 +11512,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -11961,9 +11535,9 @@
       "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
+        "ansi-styles": "3.2.1",
+        "astral-regex": "1.0.0",
+        "is-fullwidth-code-point": "2.0.0"
       }
     },
     "snapdragon": {
@@ -11972,14 +11546,14 @@
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
+        "base": "0.11.2",
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "map-cache": "0.2.2",
+        "source-map": "0.5.7",
+        "source-map-resolve": "0.5.2",
+        "use": "3.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -11988,7 +11562,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "extend-shallow": {
@@ -11997,7 +11571,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -12008,9 +11582,9 @@
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "snapdragon-util": "3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -12019,7 +11593,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -12028,7 +11602,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -12037,7 +11611,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -12046,9 +11620,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -12059,7 +11633,7 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.2.0"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -12068,7 +11642,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -12079,12 +11653,12 @@
       "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
       "dev": true,
       "requires": {
-        "debug": "~3.1.0",
-        "engine.io": "~3.2.0",
-        "has-binary2": "~1.0.2",
-        "socket.io-adapter": "~1.1.0",
+        "debug": "3.1.0",
+        "engine.io": "3.2.1",
+        "has-binary2": "1.0.3",
+        "socket.io-adapter": "1.1.1",
         "socket.io-client": "2.1.1",
-        "socket.io-parser": "~3.2.0"
+        "socket.io-parser": "3.2.0"
       },
       "dependencies": {
         "debug": {
@@ -12114,15 +11688,15 @@
         "base64-arraybuffer": "0.1.5",
         "component-bind": "1.0.0",
         "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
-        "engine.io-client": "~3.2.0",
-        "has-binary2": "~1.0.2",
+        "debug": "3.1.0",
+        "engine.io-client": "3.2.1",
+        "has-binary2": "1.0.3",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "object-component": "0.0.3",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "socket.io-parser": "~3.2.0",
+        "socket.io-parser": "3.2.0",
         "to-array": "0.1.4"
       },
       "dependencies": {
@@ -12150,7 +11724,7 @@
       "dev": true,
       "requires": {
         "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
+        "debug": "3.1.0",
         "isarray": "2.0.1"
       },
       "dependencies": {
@@ -12195,11 +11769,11 @@
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "atob": "2.1.2",
+        "decode-uri-component": "0.2.0",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.4.0",
+        "urix": "0.1.0"
       }
     },
     "source-map-support": {
@@ -12208,7 +11782,7 @@
       "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
-        "source-map": "^0.5.6"
+        "source-map": "0.5.7"
       }
     },
     "source-map-url": {
@@ -12223,8 +11797,8 @@
       "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "dev": true,
       "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
+        "spdx-expression-parse": "3.0.0",
+        "spdx-license-ids": "3.0.4"
       }
     },
     "spdx-exceptions": {
@@ -12239,8 +11813,8 @@
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
       "dev": true,
       "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
+        "spdx-exceptions": "2.2.0",
+        "spdx-license-ids": "3.0.4"
       }
     },
     "spdx-license-ids": {
@@ -12255,7 +11829,7 @@
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.0"
+        "extend-shallow": "3.0.2"
       }
     },
     "sprintf-js": {
@@ -12270,15 +11844,15 @@
       "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "dev": true,
       "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
+        "asn1": "0.2.4",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.2",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.2",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2",
+        "tweetnacl": "0.14.5"
       }
     },
     "ssri": {
@@ -12287,7 +11861,7 @@
       "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "^3.5.1"
+        "figgy-pudding": "3.5.1"
       }
     },
     "staged-git-files": {
@@ -12302,8 +11876,8 @@
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -12312,7 +11886,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -12329,7 +11903,7 @@
       "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "2.3.6"
       }
     },
     "stream-browserify": {
@@ -12338,8 +11912,8 @@
       "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "stream-each": {
@@ -12348,8 +11922,8 @@
       "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "stream-shift": "1.0.0"
       }
     },
     "stream-http": {
@@ -12358,11 +11932,11 @@
       "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
       }
     },
     "stream-shift": {
@@ -12377,11 +11951,11 @@
       "integrity": "sha512-iGVaMcyF5PcUY0cPbW3xFQUXnr9O4RZXNBBjhuLZgrjLO4XCLLGfx4T2sGqygSeylUjwgWRsnNbT9aV0Zb8AYw==",
       "dev": true,
       "requires": {
-        "async": "^2.6.2",
-        "date-format": "^2.0.0",
-        "debug": "^3.2.6",
-        "fs-extra": "^7.0.1",
-        "lodash": "^4.17.11"
+        "async": "2.6.2",
+        "date-format": "2.0.0",
+        "debug": "3.2.6",
+        "fs-extra": "7.0.1",
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "debug": {
@@ -12390,7 +11964,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -12413,8 +11987,8 @@
       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "is-fullwidth-code-point": "2.0.0",
+        "strip-ansi": "4.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -12429,7 +12003,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -12440,9 +12014,9 @@
       "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.4.3",
-        "function-bind": "^1.0.2"
+        "define-properties": "1.1.3",
+        "es-abstract": "1.13.0",
+        "function-bind": "1.1.1"
       }
     },
     "string_decoder": {
@@ -12451,7 +12025,7 @@
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "5.1.2"
       }
     },
     "stringify-object": {
@@ -12460,9 +12034,9 @@
       "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
       "dev": true,
       "requires": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
+        "get-own-enumerable-property-symbols": "3.0.0",
+        "is-obj": "1.0.1",
+        "is-regexp": "1.0.0"
       }
     },
     "strip-ansi": {
@@ -12471,7 +12045,7 @@
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "strip-bom": {
@@ -12480,7 +12054,7 @@
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "is-utf8": "^0.2.0"
+        "is-utf8": "0.2.1"
       }
     },
     "strip-eof": {
@@ -12495,7 +12069,7 @@
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
       "requires": {
-        "get-stdin": "^4.0.1"
+        "get-stdin": "4.0.1"
       },
       "dependencies": {
         "get-stdin": {
@@ -12518,8 +12092,8 @@
       "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
       }
     },
     "supports-color": {
@@ -12528,7 +12102,7 @@
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "requires": {
-        "has-flag": "^3.0.0"
+        "has-flag": "3.0.0"
       }
     },
     "symbol-observable": {
@@ -12549,10 +12123,10 @@
       "integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
       "dev": true,
       "requires": {
-        "ajv": "^6.9.1",
-        "lodash": "^4.17.11",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
+        "ajv": "6.10.0",
+        "lodash": "4.17.11",
+        "slice-ansi": "2.1.0",
+        "string-width": "3.1.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -12567,9 +12141,9 @@
           "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "7.0.3",
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "5.2.0"
           }
         },
         "strip-ansi": {
@@ -12578,7 +12152,7 @@
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "4.1.0"
           }
         }
       }
@@ -12595,9 +12169,9 @@
       "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "dev": true,
       "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
+        "block-stream": "0.0.9",
+        "fstream": "1.0.12",
+        "inherits": "2.0.3"
       }
     },
     "terser": {
@@ -12606,9 +12180,9 @@
       "integrity": "sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==",
       "dev": true,
       "requires": {
-        "commander": "^2.19.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.10"
+        "commander": "2.20.0",
+        "source-map": "0.6.1",
+        "source-map-support": "0.5.12"
       },
       "dependencies": {
         "source-map": {
@@ -12623,8 +12197,8 @@
           "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
           "dev": true,
           "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
+            "buffer-from": "1.1.1",
+            "source-map": "0.6.1"
           }
         }
       }
@@ -12635,16 +12209,16 @@
       "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
       "dev": true,
       "requires": {
-        "cacache": "^11.3.2",
-        "find-cache-dir": "^2.0.0",
-        "is-wsl": "^1.1.0",
-        "loader-utils": "^1.2.3",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.7.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.0.0",
-        "webpack-sources": "^1.3.0",
-        "worker-farm": "^1.7.0"
+        "cacache": "11.3.2",
+        "find-cache-dir": "2.1.0",
+        "is-wsl": "1.1.0",
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0",
+        "serialize-javascript": "1.7.0",
+        "source-map": "0.6.1",
+        "terser": "4.0.0",
+        "webpack-sources": "1.3.0",
+        "worker-farm": "1.7.0"
       },
       "dependencies": {
         "source-map": {
@@ -12673,8 +12247,8 @@
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
       "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "readable-stream": "2.3.6",
+        "xtend": "4.0.1"
       }
     },
     "timers-browserify": {
@@ -12683,7 +12257,7 @@
       "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
       "dev": true,
       "requires": {
-        "setimmediate": "^1.0.4"
+        "setimmediate": "1.0.5"
       }
     },
     "tmp": {
@@ -12692,7 +12266,7 @@
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
-        "os-tmpdir": "~1.0.2"
+        "os-tmpdir": "1.0.2"
       }
     },
     "to-array": {
@@ -12719,7 +12293,7 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -12728,7 +12302,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -12739,10 +12313,10 @@
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "regex-not": "1.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "to-regex-range": {
@@ -12751,8 +12325,8 @@
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1"
       }
     },
     "toidentifier": {
@@ -12773,8 +12347,8 @@
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
+        "psl": "1.1.32",
+        "punycode": "1.4.1"
       },
       "dependencies": {
         "punycode": {
@@ -12803,7 +12377,7 @@
       "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
       "dev": true,
       "requires": {
-        "glob": "^7.1.2"
+        "glob": "7.1.4"
       }
     },
     "tslib": {
@@ -12824,7 +12398,7 @@
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.0.1"
+        "safe-buffer": "5.1.2"
       }
     },
     "tweetnacl": {
@@ -12839,7 +12413,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "1.1.2"
       }
     },
     "type-fest": {
@@ -12855,7 +12429,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
+        "mime-types": "2.1.24"
       }
     },
     "typedarray": {
@@ -12870,8 +12444,8 @@
       "integrity": "sha512-fe7aYFotptIddkwcm6YuA0HmknBZ52ZzOsUxZEdhhkSsz7RfjHDX2QDxwKTiv4JQ5t5NhfmpgAK+J7LiDhKSqg==",
       "dev": true,
       "requires": {
-        "commander": "~2.20.0",
-        "source-map": "~0.6.1"
+        "commander": "2.20.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -12888,15 +12462,15 @@
       "integrity": "sha512-/lRkCaFbI6pT3CxsQHDhBcqB6tocOnqba0vJqJ2DzSWFLRgOIiip8q0nVFydyXk+n8UtF7ZuS6hvWopcYH5FuA==",
       "dev": true,
       "requires": {
-        "cacache": "^11.3.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.7.0",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.5.12",
-        "webpack-sources": "^1.3.0",
-        "worker-farm": "^1.7.0"
+        "cacache": "11.3.2",
+        "find-cache-dir": "2.1.0",
+        "is-wsl": "1.1.0",
+        "schema-utils": "1.0.0",
+        "serialize-javascript": "1.7.0",
+        "source-map": "0.6.1",
+        "uglify-js": "3.5.15",
+        "webpack-sources": "1.3.0",
+        "worker-farm": "1.7.0"
       },
       "dependencies": {
         "source-map": {
@@ -12925,8 +12499,8 @@
       "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
       "dev": true,
       "requires": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
+        "unicode-canonical-property-names-ecmascript": "1.0.4",
+        "unicode-property-aliases-ecmascript": "1.0.5"
       }
     },
     "unicode-match-property-value-ecmascript": {
@@ -12947,10 +12521,10 @@
       "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
+        "arr-union": "3.1.0",
+        "get-value": "2.0.6",
+        "is-extendable": "0.1.1",
+        "set-value": "0.4.3"
       },
       "dependencies": {
         "extend-shallow": {
@@ -12959,7 +12533,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "set-value": {
@@ -12968,10 +12542,10 @@
           "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
+            "extend-shallow": "2.0.1",
+            "is-extendable": "0.1.1",
+            "is-plain-object": "2.0.4",
+            "to-object-path": "0.3.0"
           }
         }
       }
@@ -12988,7 +12562,7 @@
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "dev": true,
       "requires": {
-        "unique-slug": "^2.0.0"
+        "unique-slug": "2.0.1"
       }
     },
     "unique-slug": {
@@ -12997,7 +12571,7 @@
       "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
       "dev": true,
       "requires": {
-        "imurmurhash": "^0.1.4"
+        "imurmurhash": "0.1.4"
       }
     },
     "universalify": {
@@ -13018,8 +12592,8 @@
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
+        "has-value": "0.3.1",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "has-value": {
@@ -13028,9 +12602,9 @@
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
+            "get-value": "2.0.6",
+            "has-values": "0.1.4",
+            "isobject": "2.1.0"
           },
           "dependencies": {
             "isobject": {
@@ -13064,7 +12638,7 @@
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "dev": true,
       "requires": {
-        "punycode": "^2.1.0"
+        "punycode": "2.1.1"
       }
     },
     "urix": {
@@ -13109,8 +12683,8 @@
       "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.x",
-        "tmp": "0.0.x"
+        "lru-cache": "4.1.5",
+        "tmp": "0.0.33"
       }
     },
     "util": {
@@ -13152,8 +12726,8 @@
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
       "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
+        "spdx-correct": "3.1.0",
+        "spdx-expression-parse": "3.0.0"
       }
     },
     "verror": {
@@ -13162,9 +12736,9 @@
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
+        "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+        "extsprintf": "1.3.0"
       }
     },
     "vm-browserify": {
@@ -13188,9 +12762,9 @@
       "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "chokidar": "2.1.6",
+        "graceful-fs": "4.1.15",
+        "neo-async": "2.6.1"
       }
     },
     "webpack": {
@@ -13203,26 +12777,26 @@
         "@webassemblyjs/helper-module-context": "1.8.5",
         "@webassemblyjs/wasm-edit": "1.8.5",
         "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "^6.0.5",
-        "acorn-dynamic-import": "^4.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.0",
-        "terser-webpack-plugin": "^1.1.0",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
+        "acorn": "6.1.1",
+        "acorn-dynamic-import": "4.0.0",
+        "ajv": "6.10.0",
+        "ajv-keywords": "3.4.0",
+        "chrome-trace-event": "1.0.1",
+        "enhanced-resolve": "4.1.0",
+        "eslint-scope": "4.0.3",
+        "json-parse-better-errors": "1.0.2",
+        "loader-runner": "2.4.0",
+        "loader-utils": "1.2.3",
+        "memory-fs": "0.4.1",
+        "micromatch": "3.1.10",
+        "mkdirp": "0.5.1",
+        "neo-async": "2.6.1",
+        "node-libs-browser": "2.2.0",
+        "schema-utils": "1.0.0",
+        "tapable": "1.1.3",
+        "terser-webpack-plugin": "1.3.0",
+        "watchpack": "1.6.0",
+        "webpack-sources": "1.3.0"
       },
       "dependencies": {
         "eslint-scope": {
@@ -13231,8 +12805,8 @@
           "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
           "dev": true,
           "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
+            "esrecurse": "4.2.1",
+            "estraverse": "4.2.0"
           }
         }
       }
@@ -13243,17 +12817,17 @@
       "integrity": "sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "enhanced-resolve": "^4.1.0",
-        "findup-sync": "^2.0.0",
-        "global-modules": "^1.0.0",
-        "import-local": "^2.0.0",
-        "interpret": "^1.1.0",
-        "loader-utils": "^1.1.0",
-        "supports-color": "^5.5.0",
-        "v8-compile-cache": "^2.0.2",
-        "yargs": "^12.0.5"
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "enhanced-resolve": "4.1.0",
+        "findup-sync": "2.0.0",
+        "global-modules": "1.0.0",
+        "import-local": "2.0.0",
+        "interpret": "1.2.0",
+        "loader-utils": "1.2.3",
+        "supports-color": "5.5.0",
+        "v8-compile-cache": "2.0.3",
+        "yargs": "12.0.5"
       },
       "dependencies": {
         "ansi-regex": {
@@ -13268,9 +12842,9 @@
           "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
           }
         },
         "invert-kv": {
@@ -13285,7 +12859,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "lcid": {
@@ -13294,7 +12868,7 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "^2.0.0"
+            "invert-kv": "2.0.0"
           }
         },
         "os-locale": {
@@ -13303,9 +12877,9 @@
           "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
+            "execa": "1.0.0",
+            "lcid": "2.0.0",
+            "mem": "4.3.0"
           }
         },
         "strip-ansi": {
@@ -13314,7 +12888,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         },
         "which-module": {
@@ -13329,8 +12903,8 @@
           "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1"
           },
           "dependencies": {
             "ansi-regex": {
@@ -13345,9 +12919,9 @@
               "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
               "dev": true,
               "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "code-point-at": "1.1.0",
+                "is-fullwidth-code-point": "1.0.0",
+                "strip-ansi": "3.0.1"
               }
             },
             "strip-ansi": {
@@ -13356,7 +12930,7 @@
               "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^2.0.0"
+                "ansi-regex": "2.1.1"
               }
             }
           }
@@ -13367,18 +12941,18 @@
           "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
+            "cliui": "4.1.0",
+            "decamelize": "1.2.0",
+            "find-up": "3.0.0",
+            "get-caller-file": "1.0.3",
+            "os-locale": "3.1.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "11.1.1"
           }
         },
         "yargs-parser": {
@@ -13387,8 +12961,8 @@
           "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "camelcase": "5.3.1",
+            "decamelize": "1.2.0"
           }
         }
       }
@@ -13399,13 +12973,13 @@
       "integrity": "sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==",
       "dev": true,
       "requires": {
-        "loud-rejection": "^1.6.0",
-        "memory-fs": "~0.4.1",
-        "mime": "^2.1.0",
-        "path-is-absolute": "^1.0.0",
-        "range-parser": "^1.0.3",
-        "url-join": "^2.0.2",
-        "webpack-log": "^1.0.1"
+        "loud-rejection": "1.6.0",
+        "memory-fs": "0.4.1",
+        "mime": "2.4.3",
+        "path-is-absolute": "1.0.1",
+        "range-parser": "1.2.1",
+        "url-join": "2.0.5",
+        "webpack-log": "1.2.0"
       }
     },
     "webpack-log": {
@@ -13414,10 +12988,10 @@
       "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.1.0",
-        "log-symbols": "^2.1.0",
-        "loglevelnext": "^1.0.1",
-        "uuid": "^3.1.0"
+        "chalk": "2.4.2",
+        "log-symbols": "2.2.0",
+        "loglevelnext": "1.0.5",
+        "uuid": "3.3.2"
       }
     },
     "webpack-sources": {
@@ -13426,8 +13000,8 @@
       "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "2.0.1",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -13444,7 +13018,7 @@
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
-        "isexe": "^2.0.0"
+        "isexe": "2.0.0"
       }
     },
     "which-module": {
@@ -13459,7 +13033,7 @@
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "string-width": "2.1.1"
       }
     },
     "wordwrap": {
@@ -13474,7 +13048,7 @@
       "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
       "dev": true,
       "requires": {
-        "errno": "~0.1.7"
+        "errno": "0.1.7"
       }
     },
     "wrap-ansi": {
@@ -13483,8 +13057,8 @@
       "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=",
       "dev": true,
       "requires": {
-        "string-width": "^2.1.1",
-        "strip-ansi": "^4.0.0"
+        "string-width": "2.1.1",
+        "strip-ansi": "4.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -13499,7 +13073,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -13516,7 +13090,7 @@
       "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
       "requires": {
-        "mkdirp": "^0.5.1"
+        "mkdirp": "0.5.1"
       }
     },
     "ws": {
@@ -13525,9 +13099,9 @@
       "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
-        "async-limiter": "~1.0.0",
-        "safe-buffer": "~5.1.0",
-        "ultron": "~1.1.0"
+        "async-limiter": "1.0.0",
+        "safe-buffer": "5.1.2",
+        "ultron": "1.1.1"
       }
     },
     "xmlhttprequest-ssl": {
@@ -13560,19 +13134,19 @@
       "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
       "dev": true,
       "requires": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.0"
+        "camelcase": "3.0.0",
+        "cliui": "3.2.0",
+        "decamelize": "1.2.0",
+        "get-caller-file": "1.0.3",
+        "os-locale": "1.4.0",
+        "read-pkg-up": "1.0.1",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "1.0.2",
+        "which-module": "1.0.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "5.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -13587,7 +13161,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "string-width": {
@@ -13596,9 +13170,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         }
       }
@@ -13609,7 +13183,7 @@
       "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
       "dev": true,
       "requires": {
-        "camelcase": "^3.0.0"
+        "camelcase": "3.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -13632,12 +13206,12 @@
       "integrity": "sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "^7.0.0",
-        "fn-name": "~2.0.1",
-        "lodash": "^4.17.11",
-        "property-expr": "^1.5.0",
-        "synchronous-promise": "^2.0.6",
-        "toposort": "^2.0.2"
+        "@babel/runtime": "7.4.5",
+        "fn-name": "2.0.1",
+        "lodash": "4.17.11",
+        "property-expr": "1.5.1",
+        "synchronous-promise": "2.0.9",
+        "toposort": "2.0.2"
       }
     }
   }
diff --git a/package.json b/package.json
index a8744aec4..315c21ea7 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,7 @@
     "webpack-cli": "^3.3.2"
   },
   "dependencies": {
-    "flatpickr": "^4.5.7"
+    "flatpickr": "^4.5.7",
+    "npm": "^6.9.0"
   }
 }
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index deadf8c19..b865ee96e 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -447,7 +447,10 @@ correctionsR whereClause displayColumns dbtFilterUI psValidator actions = do
         unless (null unassignedUnauth) $ do
           let submissionEncrypt = encrypt :: SubmissionId -> DB CryptoFileNameSubmission
           unassignedUnauth' <- mapM submissionEncrypt $ Set.toList unassignedUnauth
-          $(addMessageFile Warning "templates/messages/submissionsAssignUnauthorized.hamlet")
+          let numUnassignedUnauth = fromIntegral $ length unassignedUnauth'
+              trigger = [whamlet|_{MsgSubmissionsAssignUnauthorized numUnassignedUnauth}|]
+              content = Right $(widgetFile "messages/submissionsAssignUnauthorized")
+          addMessageModal Warning trigger content
         unless (null unassignedAuth) $ do
           num <- updateWhereCount [SubmissionId <-. Set.toList unassignedAuth]
                     [ SubmissionRatingBy       =. Just uid
@@ -497,7 +500,10 @@ correctionsR whereClause displayColumns dbtFilterUI psValidator actions = do
         unless (null unassignedUnauth) $ do
           let submissionEncrypt = encrypt :: SubmissionId -> DB CryptoFileNameSubmission
           unassignedUnauth' <- mapM submissionEncrypt $ Set.toList unassignedUnauth
-          $(addMessageFile Warning "templates/messages/submissionsAssignUnauthorized.hamlet")
+          let numUnassignedUnauth = fromIntegral $ length unassignedUnauth'
+              trigger = [whamlet|_{MsgSubmissionsAssignUnauthorized numUnassignedUnauth}|]
+              content = Right $(widgetFile "messages/submissionsAssignUnauthorized")
+          addMessageModal Warning trigger content
         unless (null unassignedAuth) $ do
           (assigned, stillUnassigned) <- assignSubmissions shid (Just unassignedAuth)
           unless (null assigned) $
@@ -881,8 +887,8 @@ postCorrectionsCreateR = do
               , submissionRatingAssigned = Just now
               , submissionRatingTime = Nothing
               }
-          unless (null duplicate)
-            $(addMessageFile Warning "templates/messages/submissionCreateDuplicates.hamlet")
+          unless (null duplicate) $
+            addMessageModal Warning [whamlet|_{MsgSheetDuplicatePseudonym}|] $ Right $(widgetFile "messages/submissionCreateDuplicates")
           existingSubUsers <- E.select . E.from $ \(submissionUser `E.InnerJoin` submission) -> do
             E.on $ submission E.^. SubmissionId E.==. submissionUser E.^. SubmissionUserSubmission
             E.where_ $ submissionUser E.^. SubmissionUserUser `E.in_` E.valList (sheetPseudonymUser <$> concat sps')
@@ -890,7 +896,9 @@ postCorrectionsCreateR = do
             return submissionUser
           unless (null existingSubUsers) . mapReaderT lift $ do
             (Map.toList -> subs) <- foldrM (\(Entity _ SubmissionUser{..}) mp -> Map.insertWith (<>) <$> (encrypt submissionUserSubmission :: DB CryptoFileNameSubmission) <*> pure (Set.fromList . map sheetPseudonymPseudonym . filter (\SheetPseudonym{..} -> sheetPseudonymUser == submissionUserUser) $ concat sps') <*> pure mp) Map.empty existingSubUsers
-            $(addMessageFile Warning "templates/messages/submissionCreateExisting.hamlet")
+            let trigger = [whamlet|_{MsgSheetCreateExisting}|]
+                content = Right $(widgetFile "messages/submissionCreateExisting")
+            addMessageModal Warning trigger content
           let sps'' = filter (not . null) $ filter (\spGroup -> not . flip any spGroup $ \SheetPseudonym{sheetPseudonymUser} -> sheetPseudonymUser `elem` map (submissionUserUser . entityVal) existingSubUsers) sps'
           forM_ sps'' $ \spGroup
             -> let
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 238224add..83d0bc9cf 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -406,10 +406,6 @@ getSShowR tid ssh csh shn = do
     hasHints <- (/= 0) <$> count [ SheetFileSheet ==. sid, SheetFileType ==. SheetHint ]
     hasSolution <- (/= 0) <$> count [ SheetFileSheet ==. sid, SheetFileType ==. SheetSolution ]
     return (hasHints, hasSolution)
-  cTime <- Just <$> liftIO getCurrentTime
-  visibleFrom <-    traverse (formatTime SelFormatDateTime) $ sheetVisibleFrom  sheet
-  when (NTop (sheetVisibleFrom sheet) >= NTop cTime) $ addMessageI Warning $
-    maybe MsgSheetInvisible MsgSheetInvisibleUntil visibleFrom
   mPseudonym <- runMaybeT $ do
     uid <- MaybeT maybeAuthId
     Entity _ SheetPseudonym{sheetPseudonymPseudonym} <- MaybeT . runDB . getBy $ UniqueSheetPseudonymUser sid uid
@@ -421,12 +417,14 @@ getSShowR tid ssh csh shn = do
         , formEncoding = generateEnctype
         , formSubmit = FormNoSubmit
         }
+
   defaultLayout $ do
     setTitleI $ prependCourseTitle tid ssh csh $ SomeMessage shn
-    sheetFrom    <-           formatTime SelFormatDateTime  $ sheetActiveFrom   sheet
-    sheetTo      <-           formatTime SelFormatDateTime  $ sheetActiveTo     sheet
-    hintsFrom    <- traverse (formatTime SelFormatDateTime) $ sheetHintFrom     sheet
-    solutionFrom <- traverse (formatTime SelFormatDateTime) $ sheetSolutionFrom sheet
+    let visibleFrom =     visibleUTCTime SelFormatDateTime <$> sheetVisibleFrom  sheet
+    sheetFrom    <-           formatTime SelFormatDateTime  $  sheetActiveFrom   sheet
+    sheetTo      <-           formatTime SelFormatDateTime  $  sheetActiveTo     sheet
+    hintsFrom    <- traverse (formatTime SelFormatDateTime) $  sheetHintFrom     sheet
+    solutionFrom <- traverse (formatTime SelFormatDateTime) $  sheetSolutionFrom sheet
     markingText  <- runMaybeT $ assertM_ (Authorized ==) (evalAccessCorrector tid ssh csh) >> hoistMaybe (sheetMarkingText sheet)
     $(widgetFile "sheetShow")
 
@@ -702,11 +700,14 @@ correctorForm shid = wFormToAForm $ do
       | applyDefaultLoads = defaultLoads'
       | otherwise         = currentLoads'
 
-  when (not (Map.null loads) && applyDefaultLoads) $
-    addMessageI Warning MsgCorrectorsDefaulted
-
   countTutRes <- wreq checkBoxField (fslI MsgCountTutProp & setTooltip MsgCountTutPropTip) . Just . any (\(_, Load{..}) -> fromMaybe False byTutorial) $ Map.elems loads
 
+  -- when (not (Map.null loads) && applyDefaultLoads) $       -- Alert Message
+  --   addMessageI Warning MsgCorrectorsDefaulted
+  when (not (Map.null loads) && applyDefaultLoads) $          -- Alert Notification
+    wformMessage =<< messageI Warning MsgCorrectorsDefaulted
+
+
   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
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 2e5f22004..ec6e12730 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -533,6 +533,11 @@ renderWForm formLayout = renderAForm formLayout . wFormToAForm
 idFormSectionNoinput :: Text
 idFormSectionNoinput = "form-section-noinput"
 
+-- | special id to identify form messages, see 'aformMessage' and 'formMessage'
+--   currently only treated by form generation through 'renderAForm'
+idFormMessageNoinput :: Text
+idFormMessageNoinput = "form-message-noinput"
+
 -- | Generates a form having just a form-section-header and no input title.
 --   Currently only correctly rendered by 'renderAForm' and mforms using 'widget/form.hamlet'
 --   Usage:
@@ -550,7 +555,7 @@ aformSection = formToAForm . fmap (second pure) . formSection
 wformSection :: (MonadHandler m, RenderMessage (HandlerSite m) msg) => msg -> WForm m ()
 wformSection = void . aFormToWForm . aformSection
 
-formSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> MForm m (FormResult (), FieldView site) -- TODO: WIP, delete
+formSection :: (MonadHandler m, site ~ HandlerSite m, RenderMessage site msg) => msg -> MForm m (FormResult (), FieldView site)
 formSection formSectionTitle = do
     mr <- getMessageRender
     return (FormSuccess (), FieldView
@@ -562,8 +567,6 @@ formSection formSectionTitle = do
       , fvInput    = mempty
       })
 
-
-
 -------------------
 -- Special Forms --
 -------------------
@@ -582,6 +585,33 @@ formSection' formSectionTitleSettings = mreq noinputField sectionSettings Nothin
     sectionSettings = formSectionTitleSettings { fsId = Just idFormSectionNoinput }
 
 
+-- | Similar to aformSection, generates a form having just a view widget, but no input.
+--   Currently only correctly rendered by 'renderAForm' and mforms using 'widget/form.hamlet'
+--   Usage:
+--   @
+--      (,) <$  formMessage (Message Info html1)
+--          <*> areq intField "int here" Nothing
+--          <*  formSection (Message Warning html2)
+--          <*> areq doubleField "double there " Nothing
+--          <*  submitButton
+--   @
+
+aformMessage :: (MonadHandler m) => Message -> AForm m ()
+aformMessage = formToAForm . fmap (second pure) . formMessage
+
+wformMessage :: (MonadHandler m) => Message -> WForm m ()
+wformMessage = void . aFormToWForm . aformMessage
+
+formMessage :: (MonadHandler m) => Message -> MForm m (FormResult (), FieldView site)
+formMessage Message{..} = do
+    return (FormSuccess (), FieldView
+      { fvLabel    = mempty
+      , fvTooltip  = Nothing
+      , fvId       = idFormMessageNoinput
+      , fvErrors   = Nothing
+      , fvRequired = False
+      , fvInput    = [whamlet|<div .notification .notification-#{toPathPiece messageStatus}>#{messageContent}|]
+      })
 
 ---------------------
 -- Form evaluation --
@@ -635,7 +665,7 @@ runInputResult form = do
   postRes <- runInputPostResult form
   getRes  <- runInputGetResult form
   return $ case (postRes, getRes) of
-    (FormSuccess a, _) -> FormSuccess a 
+    (FormSuccess a, _) -> FormSuccess a
     (_, FormSuccess b) -> FormSuccess b
     (postRes', _)      -> postRes'
 
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 644ad3d11..8e9b86452 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -554,3 +554,55 @@ section {
 .headline-one {
   margin-bottom: 10px;
 }
+
+/* Notification style used as requested by @hamanf in #298, but class was not globally available. Copied from dead-code. For @hamanf to clean up: */
+
+.notification {
+  position: relative;
+  border-radius: 3px;
+  padding: 10px 20px 20px;
+  margin: 40px 0;
+  color: var(--color-dark);
+  box-shadow: 0 0 4px 2px inset currentColor;
+  padding-left: 20%;
+
+  &::before {
+    content: 'i';
+    position: absolute;
+    display: flex;
+    left: 0;
+    top: 0;
+    height: 100%;
+    width: 20%;
+    font-size: 100px;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+@media (max-width: 768px) {
+
+  .notification {
+
+    padding-left: 40px;
+
+    &::before {
+      height: auto;
+      width: 45px;
+      font-size: 40px;
+      top: 15px;
+    }
+  }
+}
+
+.notification-danger {
+  color: #c51919 ;
+
+  &::before {
+    content: '!';
+  }
+}
+
+.notification__content {
+  color: var(--color-font);
+}
diff --git a/templates/messages/submissionsAssignUnauthorized.hamlet b/templates/messages/submissionsAssignUnauthorized.hamlet
index f0002faed..c0a618b0d 100644
--- a/templates/messages/submissionsAssignUnauthorized.hamlet
+++ b/templates/messages/submissionsAssignUnauthorized.hamlet
@@ -1,4 +1,4 @@
-_{MsgSubmissionsAssignUnauthorized (fromIntegral (length unassignedUnauth'))}
+_{MsgSubmissionsAssignUnauthorized numUnassignedUnauth}
 
 <ul>
   $forall cID <- unassignedUnauth'
diff --git a/templates/sheetShow.hamlet b/templates/sheetShow.hamlet
index 994fbe52e..04ab1b8aa 100644
--- a/templates/sheetShow.hamlet
+++ b/templates/sheetShow.hamlet
@@ -7,6 +7,13 @@ $maybe descr <- sheetDescription sheet
 
 <section>
   <dl .deflist>
+    <dt .deflist__dt>_{MsgAccessibleSince}
+    <dd .deflist__dd>
+      $maybe invisible <- visibleFrom
+        ^{invisible}
+      $nothing
+        #{isVisible False}
+        _{MsgSheetInvisible}
     <dt .deflist__dt>_{MsgSheetActiveFrom}
     <dd .deflist__dd>#{sheetFrom}
     <dt .deflist__dt>_{MsgSheetActiveTo}

From 7d3c20b2f3e791c6809ad2eba3a44cc9d6b6f11f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 6 Jun 2019 15:56:37 +0200
Subject: [PATCH 440/519] Don't manually encode filter-form values

---
 frontend/src/utils/async-table/async-table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
index 9cd1c639d..ee662229d 100644
--- a/frontend/src/utils/async-table/async-table.js
+++ b/frontend/src/utils/async-table/async-table.js
@@ -245,7 +245,7 @@ export class AsyncTable {
     }
 
     for (var kv of formData.entries()) {
-      url.searchParams.append(encodeURIComponent(kv[0]), encodeURIComponent(kv[1]));
+      url.searchParams.append(kv[0], kv[1]);
     }
 
     return url;

From fbd7c3947de3e9fa912ac8565e5d38e17b88538f Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 6 Jun 2019 16:04:43 +0200
Subject: [PATCH 441/519] Towards #257

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

diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 83d0bc9cf..1d08e0ba8 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -364,7 +364,12 @@ getSShowR tid ssh csh shn = do
         -- return desired columns
         return $ (file E.^. FileTitle, file E.^. FileModified, sheetFile E.^. SheetFileType)
   let colonnadeFiles = widgetColonnade $ mconcat
-        [ sortable (Just "type") (i18nCell MsgSheetFileTypeHeader) $ \(_,_, E.Value ftype) -> i18nCell ftype & cellContents %~ (\act -> act <* tell (Any True))
+        [ sortable (Just "type") (i18nCell MsgSheetFileTypeHeader) $ \(_,_, E.Value ftype) ->
+            let link = CSheetR tid ssh csh shn $ SZipR ftype in
+            tellCell (Any True) $
+            anchorCell link [whamlet|#{sheetFile2markup ftype}  _{ftype}|]
+            -- i18nCell ftype & cellContents %~ (\act -> act <* tell (Any True))
+
         -- , 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))))
         , sortable (Just "path") (i18nCell MsgFileTitle) $ \(E.Value fName,_,E.Value fType) -> anchorCell
              (CSheetR tid ssh csh shn (SFileR fType fName))

From 1cf20ac2093a4cc6b2f78090db9fa6117030446c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 6 Jun 2019 17:26:47 +0200
Subject: [PATCH 442/519] Only display zip in list of allowed extensions if
 zips are expected

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

diff --git a/templates/widgets/zipFileField.hamlet b/templates/widgets/zipFileField.hamlet
index 1e39effa6..301d16c4b 100644
--- a/templates/widgets/zipFileField.hamlet
+++ b/templates/widgets/zipFileField.hamlet
@@ -4,5 +4,5 @@ $maybe exts <- fmap toNullable permittedExtensions
   <br>
   _{MsgUploadModeExtensionRestriction}: 
   <ul .list--inline .list--comma-separated .list--iconless>
-    $forall ext <- zipExtensions <> exts
+    $forall ext <- bool id (mappend zipExtensions) doUnpack exts
       <li style="font-family: monospace">#{ext}

From ee58d61285d0ddcf9062d8584a4105a4e5aa3b45 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 6 Jun 2019 18:39:32 +0200
Subject: [PATCH 443/519] Fixes #257

---
 routes                     |  1 +
 src/Handler/Sheet.hs       | 18 +++++++++++++++---
 src/Handler/Utils.hs       | 17 +++++++++++++++++
 src/Utils.hs               |  6 +++++-
 src/Utils/Sheet.hs         | 22 ++++++++++++++++++++--
 templates/sheetShow.hamlet |  2 +-
 6 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/routes b/routes
index 31885f668..0d7c3a1a0 100644
--- a/routes
+++ b/routes
@@ -99,6 +99,7 @@
   /ex/unassigned              SheetOldUnassignedR  GET
   /ex/#SheetName SheetR:
     /show                       SShowR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
+    /show/download              SArchiveR      GET             !timeANDcourse-registered !timeANDmaterials !corrector !timeANDtutor
     /edit                       SEditR         GET POST
     /delete                     SDelR          GET POST
     /subs                       SSubsR         GET POST        -- for lecturer only
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 1d08e0ba8..c14424251 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -425,7 +425,8 @@ getSShowR tid ssh csh shn = do
 
   defaultLayout $ do
     setTitleI $ prependCourseTitle tid ssh csh $ SomeMessage shn
-    let visibleFrom =     visibleUTCTime SelFormatDateTime <$> sheetVisibleFrom  sheet
+    let zipLink = CSheetR tid ssh csh shn SArchiveR
+        visibleFrom =     visibleUTCTime SelFormatDateTime <$> sheetVisibleFrom  sheet
     sheetFrom    <-           formatTime SelFormatDateTime  $  sheetActiveFrom   sheet
     sheetTo      <-           formatTime SelFormatDateTime  $  sheetActiveTo     sheet
     hintsFrom    <- traverse (formatTime SelFormatDateTime) $  sheetHintFrom     sheet
@@ -433,6 +434,15 @@ getSShowR tid ssh csh shn = do
     markingText  <- runMaybeT $ assertM_ (Authorized ==) (evalAccessCorrector tid ssh csh) >> hoistMaybe (sheetMarkingText sheet)
     $(widgetFile "sheetShow")
 
+getSArchiveR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler TypedContent
+getSArchiveR tid ssh csh shn = do
+  MsgRenderer mr <- getMsgRenderer
+  let archiveName = (unpack . stripAll $ mr (prependCourseTitle tid ssh csh $ SomeMessage shn)) <.> "zip"
+      sftArchive  = CSheetR tid ssh csh shn . SZipR    -- used to check access to SheetFileTypes
+  allowedSFTs <- filterM (hasReadAccessTo . sftArchive) [minBound..maxBound]
+  serveZipArchive archiveName $ sheetFilesSFTsQuery tid ssh csh shn allowedSFTs .| C.map entityVal
+
+
 getSPseudonymR, postSPseudonymR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler TypedContent
 getSPseudonymR = postSPseudonymR
 postSPseudonymR tid ssh csh shn = do
@@ -462,8 +472,10 @@ getSFileR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType
 getSFileR tid ssh csh shn sft file = serveOneFile $ sheetFileQuery tid ssh csh shn sft file .| C.map entityVal
 
 getSZipR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> Handler TypedContent
-getSZipR tid ssh csh shn sft
-  = serveSomeFiles (unpack (toPathPiece sft) <.> "zip") $ sheetFilesAllQuery tid ssh csh shn sft .| C.map entityVal
+getSZipR tid ssh csh shn sft = do
+  MsgRenderer mr <- getMsgRenderer
+  let archiveName = (unpack . stripAll $ mr (prependCourseTitle tid ssh csh $ SomeMessage shn)) <> "_" <> (unpack $ toPathPiece sft) <.> "zip"
+  serveSomeFiles archiveName $ sheetFilesAllQuery tid ssh csh shn sft .| C.map entityVal
 
 
 getSheetNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 867291c47..ed7682772 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -93,6 +93,23 @@ serveSomeFiles archiveName source = do
         let zipComment = T.encodeUtf8 $ pack archiveName
         source .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
 
+-- | Serve any number of files as a zip-archive of files, identified through a given DB query
+--
+-- Like `serveSomeFiles`, but always sends a zip-archive, even if a single file is returned
+serveZipArchive :: FilePath -> Source (YesodDB UniWorX) File -> Handler TypedContent
+serveZipArchive archiveName source = do
+  results <- runDB . runConduit $ source .| peekN 2
+
+  $logDebugS "serveZipArchive" . tshow $ length results
+
+  case results of
+    []         -> notFound
+    _moreFiles -> do
+      setContentDisposition' $ Just archiveName
+      respondSourceDB "application/zip" $ do
+        let zipComment = T.encodeUtf8 $ pack archiveName
+        source .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder
+
 
 
 ---------
diff --git a/src/Utils.hs b/src/Utils.hs
index b9239d9e3..e8f0d27f5 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -204,6 +204,10 @@ boolSymbol False = fontAwesomeIcon "times"
 -- tickmark :: IsString a => a
 -- tickmark = fromString "✔"
 
+-- | remove all Whitespace from Text
+stripAll :: Text -> Text
+stripAll = Text.filter (not . isSpace)
+
 -- | Convert text as it is to Html, may prevent ambiguous types
 -- This function definition is mainly for documentation purposes
 text2Html :: Text -> Html
@@ -883,7 +887,7 @@ encodedSecretBoxOpen' :: (FromJSON a, MonadError EncodedSecretBoxException m)
                       => SecretBox.Key
                       -> Text -> m a
 encodedSecretBoxOpen' sKey chunked = do
-  let unchunked = Text.filter (not . isSpace) chunked
+  let unchunked = stripAll chunked
   decoded <- either (throwError . EncodedSecretBoxInvalidBase64) return . Base64.decode $ encodeUtf8 unchunked
 
   unless (BS.length decoded >= Saltine.secretBoxNonce + Saltine.secretBoxMac) $
diff --git a/src/Utils/Sheet.hs b/src/Utils/Sheet.hs
index 0fa7da74f..192019102 100644
--- a/src/Utils/Sheet.hs
+++ b/src/Utils/Sheet.hs
@@ -74,11 +74,29 @@ sheetFilesAllQuery tid ssh csh shn sft = E.selectSource $ E.from $
   E.on (sFile E.^. SheetFileSheet E.==. sheet  E.^. SheetId)
   E.on (sheet E.^. SheetCourse    E.==. course E.^. CourseId)
   -- filter to requested file
-  E.where_ ((sFile  E.^. SheetFileType   E.==. E.val sft  )
-    E.&&.   (sheet  E.^. SheetName       E.==. E.val shn  )
+  E.where_ ((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  )
+    E.&&.   (sFile  E.^. SheetFileType   E.==. E.val sft  )
+    )
+  -- return file entity
+  return file
+
+-- | Return all files of certain `SheetFileTypes` for a `Sheet`
+sheetFilesSFTsQuery :: MonadResource m => TermId -> SchoolId -> CourseShorthand -> SheetName -> [SheetFileType] -> Source (SqlPersistT m) (Entity File)
+sheetFilesSFTsQuery tid ssh csh shn sfts = E.selectSource $ E.from $
+  \(course `E.InnerJoin` sheet `E.InnerJoin` sFile `E.InnerJoin` file) -> do
+  -- Restrict to consistent rows that correspond to each other
+  E.on (file  E.^. FileId         E.==. sFile  E.^. SheetFileFile)
+  E.on (sFile E.^. SheetFileSheet E.==. sheet  E.^. SheetId)
+  E.on (sheet E.^. SheetCourse    E.==. course E.^. CourseId)
+  -- filter to requested file
+  E.where_ ((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      )
+    E.&&.   (sFile  E.^. SheetFileType  `E.in_` E.valList sfts )
     )
   -- return file entity
   return file
diff --git a/templates/sheetShow.hamlet b/templates/sheetShow.hamlet
index 04ab1b8aa..198a831a6 100644
--- a/templates/sheetShow.hamlet
+++ b/templates/sheetShow.hamlet
@@ -52,5 +52,5 @@ $maybe marktxt <- markingText
 
 $if hasFiles
   <section>
-    <h2>_{MsgSheetFiles}
+    <h2>^{simpleLinkI (SomeMessage MsgSheetFiles) zipLink}
     ^{fileTable}

From 405067d019be3b5f63222ab3e87322339613ce98 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 7 Jun 2019 08:01:14 +0200
Subject: [PATCH 444/519] changelog update

---
 ChangeLog.md | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 64cf0b8f7..25616306d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,31 +1,37 @@
+  * Version 07.06.2019
+
+    Abgaben können bestimmte Dateinamen und Endungen erzwingen
+
+    Übungsblätter bieten nun Zip-Archive für alle veröffentlichte Dateien, bzw. Dateigruppen an
+
   * Version 20.05.2019
-  
+
     Komplett überarbeitete Funktionalität zur automatischen Verteilung von Korrekturen
 
   * Version 13.05.2019
-  
+
     Kursverwalter können Teilnehmer hinzufügen
 
   * Version 10.05.2019
-  
+
     Besseres Interface zum Einstellen von Abgebenden
-    
+
     Download von allen Dateien pro Kursmaterial/Übungsblatt
-    
+
   * Version 04.05.2019
-  
+
     Kursmaterial
 
   * Version 29.04.2019
-  
+
     Tutorien
-    
+
     Anzeige von Korrektoren auf den Kursseiten
 
   * Version 20.04.2019
-  
+
     Versand von Benachrichtigungen an Kursteilnehmer
-    
+
     Eintragen von Korrektoren und Kursverwaltern auch ohne bestehenden Account
 
   * Version 27.03.2019

From 054ff5cdc3c11e934c19a05df76f391bb6a006c8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 7 Jun 2019 13:42:37 +0200
Subject: [PATCH 445/519] Create new exams

---
 messages/uniworx/de.msg                       |  88 +++-
 models/exams                                  |  25 +-
 models/tutorials                              |   2 +-
 routes                                        |   4 +
 src/Application.hs                            |   1 +
 src/Foundation.hs                             |  28 ++
 src/Handler/Course.hs                         |   2 +-
 src/Handler/Exam.hs                           | 391 ++++++++++++++++++
 src/Handler/Tutorial.hs                       |   8 +-
 src/Handler/Utils/Exam.hs                     |  47 +++
 src/Handler/Utils/Form.hs                     | 162 +++++++-
 .../Form/{Occurences.hs => Occurrences.hs}    |  82 ++--
 src/Handler/Utils/Table/Cells.hs              |  22 +-
 src/Model/Types/Common.hs                     |   2 +
 src/Model/Types/DateTime.hs                   |  42 +-
 src/Model/Types/Exam.hs                       |  81 +++-
 src/Utils/Form.hs                             |  60 ++-
 src/Utils/Lens.hs                             |  13 +-
 src/Utils/{Occurences.hs => Occurrences.hs}   |  36 +-
 src/Utils/PathPiece.hs                        |  14 +-
 templates/exam-list.hamlet                    |   2 +
 templates/exam-new.hamlet                     |   2 +
 templates/widgets/gradingKey.hamlet           |  15 +
 .../massinput/examCorrectors/add.hamlet       |   6 +
 .../examCorrectors/cellInvitation.hamlet      |   9 +
 .../massinput/examCorrectors/cellKnown.hamlet |   3 +
 .../examCorrectors/layout.hamlet}             |   0
 .../widgets/massinput/examParts/add.hamlet    |   4 +
 .../widgets/massinput/examParts/form.hamlet   |   4 +
 .../widgets/massinput/examParts/layout.hamlet |  16 +
 .../widgets/massinput/examRooms/add.hamlet    |   4 +
 .../widgets/massinput/examRooms/form.hamlet   |   6 +
 .../widgets/massinput/examRooms/layout.hamlet |  18 +
 .../uploadSpecificFiles/layout.hamlet         |   2 +-
 .../{occurence => occurrence}/cell.hamlet     |   6 +-
 .../cell/except-no-occurr.hamlet}             |   0
 .../cell/except-occurr.hamlet}                |   0
 .../cell/weekly.hamlet                        |   0
 .../form/except-add.hamlet                    |   0
 .../occurrence/form/except-layout.hamlet      |  11 +
 .../form/except-no-occur.hamlet               |   0
 .../form/except-occur.hamlet                  |   0
 .../occurrence/form/scheduled-add.hamlet      |   5 +
 .../occurrence/form/scheduled-layout.hamlet   |  11 +
 .../form/weekly.hamlet                        |   0
 test/Database.hs                              |  12 +-
 46 files changed, 1093 insertions(+), 153 deletions(-)
 create mode 100644 src/Handler/Exam.hs
 create mode 100644 src/Handler/Utils/Exam.hs
 rename src/Handler/Utils/Form/{Occurences.hs => Occurrences.hs} (59%)
 rename src/Utils/{Occurences.hs => Occurrences.hs} (65%)
 create mode 100644 templates/exam-list.hamlet
 create mode 100644 templates/exam-new.hamlet
 create mode 100644 templates/widgets/gradingKey.hamlet
 create mode 100644 templates/widgets/massinput/examCorrectors/add.hamlet
 create mode 100644 templates/widgets/massinput/examCorrectors/cellInvitation.hamlet
 create mode 100644 templates/widgets/massinput/examCorrectors/cellKnown.hamlet
 rename templates/widgets/{occurence/form/scheduled-layout.hamlet => massinput/examCorrectors/layout.hamlet} (100%)
 create mode 100644 templates/widgets/massinput/examParts/add.hamlet
 create mode 100644 templates/widgets/massinput/examParts/form.hamlet
 create mode 100644 templates/widgets/massinput/examParts/layout.hamlet
 create mode 100644 templates/widgets/massinput/examRooms/add.hamlet
 create mode 100644 templates/widgets/massinput/examRooms/form.hamlet
 create mode 100644 templates/widgets/massinput/examRooms/layout.hamlet
 rename templates/widgets/{occurence => occurrence}/cell.hamlet (64%)
 rename templates/widgets/{occurence/cell/except-no-occur.hamlet => occurrence/cell/except-no-occurr.hamlet} (100%)
 rename templates/widgets/{occurence/cell/except-occur.hamlet => occurrence/cell/except-occurr.hamlet} (100%)
 rename templates/widgets/{occurence => occurrence}/cell/weekly.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/form/except-add.hamlet (100%)
 create mode 100644 templates/widgets/occurrence/form/except-layout.hamlet
 rename templates/widgets/{occurence => occurrence}/form/except-no-occur.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/form/except-occur.hamlet (100%)
 create mode 100644 templates/widgets/occurrence/form/scheduled-add.hamlet
 create mode 100644 templates/widgets/occurrence/form/scheduled-layout.hamlet
 rename templates/widgets/{occurence => occurrence}/form/weekly.hamlet (100%)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 993bffa46..96791ae8b 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -631,6 +631,8 @@ MailSubjectCorrectorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@S
 
 MailSubjectTutorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand tutn@TutorialName: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Tutor für #{tutn}
 
+MailSubjectExamCorrectorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand examn@ExamName: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Korrektor für Klausur #{examn}
+
 MailSubjectSubmissionUserInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@SheetName: [#{display tid}-#{display ssh}-#{csh}] Einladung zu einer Abgabe für #{shn}
 
 SheetGrading: Bewertung
@@ -835,6 +837,8 @@ MenuAuthPreds: Authorisierungseinstellungen
 MenuTutorialDelete: Tutorium löschen
 MenuTutorialEdit: Tutorium editieren
 MenuTutorialComm: Mitteilung an Teilnehmer
+MenuExamList: Klausuren
+MenuExamNew: Neue Klausur anlegen
 
 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
@@ -922,6 +926,11 @@ TutorInvitationDeclined tutn@TutorialName: Sie haben die Einladung, Tutor für #
 TutorInviteHeading tutn@TutorialName: Einladung zum Tutor für #{tutn}
 TutorInviteExplanation: Sie wurden eingeladen, Tutor zu sein.
 
+ExamCorrectorInvitationAccepted examn@ExamName: Sie wurden als Korrektor für Klausur #{examn} eingetragen
+ExamCorrectorInvitationDeclined examn@ExamName: Sie haben die Einladung, Korrektor für Klausur #{examn} zu werden, abgelehnt
+ExamCorrectorInviteHeading examn@ExamName: Einladung zum Korrektor für Klausur #{examn}
+ExamCorrectorInviteExplanation: Sie wurden eingeladen, Klausur-Korrektor zu sein.
+
 SubmissionUserInvitationAccepted shn@SheetName: Sie wurden als Mitabgebende(r) für eine Abgabe zu #{shn} eingetragen
 SubmissionUserInvitationDeclined shn@SheetName: Sie haben die Einladung, Mitabgebende(r) für #{shn} zu werden, abgelehnt
 SubmissionUserInviteHeading shn@SheetName: Einladung zu einer Abgabe für #{shn}
@@ -942,8 +951,8 @@ ScheduleRegular: Planmäßiger Termin
 ScheduleRegularKind: Plan
 WeekDay: Wochentag
 Day: Tag
-OccurenceStart: Beginn
-OccurenceEnd: Ende
+OccurrenceStart: Beginn
+OccurrenceEnd: Ende
 ScheduleExists: Dieser Plan existiert bereits
 
 ScheduleExceptions: Termin-Ausnahmen
@@ -1012,4 +1021,77 @@ CourseParticipantsInvited n@Int: #{tshow n} #{pluralDE n "Einladung" "Einladunge
 CourseParticipantsAlreadyRegistered n@Int: #{tshow n} Teilnehmer #{pluralDE n "ist" "sind"} bereits angemeldet
 CourseParticipantsRegisteredWithoutField n@Int: #{tshow n} Teilnehmer #{pluralDE n "wurde ohne assoziiertes Hauptfach" "wurden assoziierte Hauptfächer"} angemeldet, da #{pluralDE n "kein eindeutiges Hauptfach bestimmt werden konnte" "keine eindeutigen Hauptfächer bestimmt werden konnten"}
 CourseParticipantsRegistered n@Int: #{tshow n} Teilnehmer erfolgreich angemeldet
-CourseParticipantsRegisterHeading: Kursteilnehmer hinzufügen
\ No newline at end of file
+CourseParticipantsRegisterHeading: Kursteilnehmer hinzufügen
+
+ExamName: Name
+ExamTime: Termin
+ExamsHeading: Klausuren
+ExamNameTip: Muss innerhalb der Veranstaltung eindeutig sein
+ExamStart: Beginn
+ExamEnd: Ende
+ExamDescription: Beschreibung
+ExamVisibleFrom: Sichtbar ab
+ExamVisibleFromTip: Ohne Datum nie sichtbar und keine Anmeldung möglich
+ExamRegisterFrom: Anmeldung ab
+ExamRegisterFromTip: Zeitpunkt ab dem sich Kursteilnehmer selbständig zur Klausur anmelden können; ohne Datum ist keine Anmeldung möglich
+ExamRegisterTo: Anmeldung bis
+ExamDeregisterUntil: Abmeldung bis
+ExamPublishOccurrenceAssignments: Terminzuteilung den Teilnehmern mitteilen um
+ExamFinished: Bewertung abgeschlossen ab
+ExamFinishedTip: Zeitpunkt zu dem Klausurergebnisse den Teilnehmern gemeldet werden
+ExamClosed: Noten stehen fest ab
+ExamClosedTip: Zeitpunkt ab dem keine Änderungen an den Ergebnissen zulässig sind; Prüfungsämter bekommen Einsicht
+ExamPublicStatistics: Statistik veröffentlichen
+ExamPublicStatisticsTip: Soll die statistische Auswertung auch den Teilnehmer angezeigt werden, sobald diese ihre Noten einsehen können?
+ExamGradingRule: Notenberechnung
+ExamGradingManual': Manuell
+ExamGradingKey': Nach Schlüssel
+ExamGradingKey: Notenschlüssel
+ExamGradingKeyTip: Die Grenzen beziehen sich auf die effektive Maximalpunktzahl, nachdem etwaige Bonuspunkte aus dem Übungsbetrieb angerechnet und die Ergebnise der Teilaufgaben mit ihrem Gewicht multipliziert wurden
+Points: Punkte
+PointsMustBeNonNegative: Punktegrenzen dürfen nicht negativ sein
+PointsMustBeMonotonic: Punktegrenzen müssen aufsteigend sein
+GradingFrom: Ab
+ExamNew: Neue Klausur
+ExamBonusRule: Klausurbonus aus Übungsbetrieb
+ExamNoBonus': Kein Bonus
+ExamBonusPoints': Umrechnung von Übungspunkten
+
+ExamBonusMaxPoints: Maximal erreichbare Klausur-Bonuspunkte
+ExamBonusMaxPointsNonPositive: Maximaler Klausurbonus muss positiv und größer null sein
+ExamBonusOnlyPassed: Bonus nur nach Bestehen anrechnen
+
+ExamOccurrenceRule: Automatische Terminzuteilung
+ExamRoomManual': Keine automatische Zuteilung
+ExamRoomSurname': Nach Nachname
+ExamRoomMatriculation': Nach Matrikelnummer
+ExamRoomRandom': Zufällig pro Teilnehmer
+
+ExamOccurrences: Prüfungen
+ExamRoomAlreadyExists: Prüfung ist bereits eingetragen
+ExamRoom: Raum
+ExamRoomCapacity: Kapazität
+ExamRoomCapacityNonPositive: Kapazität muss positiv und größer null sein
+ExamRoomStart: Beginn
+ExamRoomEnd: Ende
+ExamRoomDescription: Beschreibung
+ExamTimeTip: Nur zur Information der Studierenden, die tatsächliche Zeitangabe erfolgt pro Prüfung
+
+ExamFormTimes: Zeiten
+ExamFormOccurrences: Prüfungstermine
+ExamFormAutomaticFunctions: Automatische Funktionen
+ExamFormCorrection: Korrektur
+ExamFormParts: Teile
+
+ExamCorrectors: Korrektoren
+ExamCorrectorAlreadyAdded: Ein Korrektor mit dieser E-Mail ist bereits für diese Klausur eingetragen
+
+ExamParts: Teilaufgaben
+ExamPartWeightNegative: Gewicht aller Teilaufgaben muss größer oder gleich Null sein
+ExamPartAlreadyExists: Teilaufgabe mit diesem Namen existiert bereits
+ExamPartName: Name
+ExamPartMaxPoints: Maximalpunktzahl
+ExamPartWeight: Gewichtung
+
+ExamNameTaken exam@ExamName: Es existiert bereits eine Klausur mit Namen #{exam}
+ExamCreated exam@ExamName: Klausur #{exam} erfolgreich angelegt
\ No newline at end of file
diff --git a/models/exams b/models/exams
index 7d61e2e6d..b6ed523e2 100644
--- a/models/exams
+++ b/models/exams
@@ -1,18 +1,18 @@
 Exam
   course CourseId
-  name (CI Text)
-  gradingKey [Points] -- [n1,n2,n3,...] means 0 <= p < n1 -> p ~= 5, n1 <= p < n2 -> p ~ 4.7, n2 <= p < n3 -> p ~ 4.3, ...
+  name ExamName
+  gradingRule ExamGradingRule
   bonusRule ExamBonusRule
-  occurrenceRule ExamOccurenceRule
+  occurrenceRule ExamOccurrenceRule
   visibleFrom UTCTime Maybe
   registerFrom UTCTime Maybe
   registerTo UTCTime Maybe
   deregisterUntil UTCTime Maybe
-  publishOccurenceAssignments UTCTime
+  publishOccurrenceAssignments UTCTime
   start UTCTime
   end UTCTime Maybe
   finished UTCTime Maybe -- Grades shown to students, `ExamCorrector`s locked out
-  closed Bool -- Prüfungsamt hat Einsicht (notification)
+  closed UTCTime Maybe -- Prüfungsamt hat Einsicht (notification)
   publicStatistics Bool
   description Html Maybe
   UniqueExam course name
@@ -22,14 +22,17 @@ ExamPart
   maxPoints Points Maybe
   weight Rational
   UniqueExamPart exam name
-ExamOccurence
+ExamOccurrence
   exam ExamId
   room Text
   capacity Natural
+  start UTCTime
+  end UTCTime Maybe
+  description Html Maybe
 ExamRegistration
   exam ExamId
   user UserId
-  occurance ExamOccurenceId Maybe
+  occurance ExamOccurrenceId Maybe
   UniqueExamRegistration exam user
 ExamResult
   examPart ExamPartId
@@ -37,6 +40,10 @@ ExamResult
   result ExamPartResult
   UniqueExamResult examPart user
 ExamCorrector
-  examPart ExamPartId
+  exam ExamId
   user UserId
-  UniqueExamCorrector examPart user
\ No newline at end of file
+  UniqueExamCorrector exam user
+ExamPartCorrector
+  part ExamPartId
+  corrector ExamCorrector
+  UniqueExamPartCorrector part corrector
\ No newline at end of file
diff --git a/models/tutorials b/models/tutorials
index 4961e0bd5..166a8dbef 100644
--- a/models/tutorials
+++ b/models/tutorials
@@ -4,7 +4,7 @@ Tutorial json
     type            (CI Text) -- "Tutorium", "Zentralübung", ...
     capacity        Int Maybe -- limit for enrolment in this tutorial
     room            Text
-    time            Occurences
+    time            Occurrences
     regGroup        (CI Text) Maybe -- each participant may register for one tutorial per regGroup
     registerFrom    UTCTime Maybe
     registerTo      UTCTime Maybe
diff --git a/routes b/routes
index 31885f668..abed932c2 100644
--- a/routes
+++ b/routes
@@ -136,6 +136,10 @@
     /register                 TRegisterR           POST        !timeANDcapacityANDcourse-registeredANDregister-group !timeANDtutorial-registered
     /communication            TCommR           GET POST        !tutor
     /tutor-invite             TInviteR         GET POST
+  /exams                        CExamListR     GET             !development -- Missing permission checks on which exams can be shown
+  /exams/new                    CExamNewR      GET POST
+  /exams/#ExamName ExamR:
+    /corrector-invite           ECInviteR      GET POST
 
 
 /subs          CorrectionsR          GET POST !corrector !lecturer
diff --git a/src/Application.hs b/src/Application.hs
index ab612883c..3e20e6613 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -113,6 +113,7 @@ import Handler.Material
 import Handler.CryptoIDDispatch
 import Handler.SystemMessage
 import Handler.Health
+import Handler.Exam
 
 
 -- This line actually creates our YesodDispatch instance. It is the second half
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 4567440f8..dc3621858 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -181,6 +181,10 @@ pattern CTutorialR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> T
 pattern CTutorialR tid ssh csh tnm ptn
   = CourseR tid ssh csh (TutorialR tnm ptn)
 
+pattern CExamR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> ExamR -> Route UniWorX
+pattern CExamR tid ssh csh tnm ptn
+  = CourseR tid ssh csh (ExamR tnm 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)
@@ -318,6 +322,9 @@ instance RenderMessage UniWorX StudyDegreeTerm where
       mr :: RenderMessage UniWorX msg => msg -> Text
       mr = renderMessage foundation ls
 
+instance RenderMessage UniWorX ExamGrade where
+  renderMessage _ _ = pack . (showFixed False :: Deci -> String) . fromRational . review numberGrade
+
 
 
 newtype ErrorResponseTitle = ErrorResponseTitle ErrorResponse
@@ -1436,6 +1443,9 @@ instance YesodBreadcrumbs UniWorX where
   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 (CourseR tid ssh csh CExamListR) = return ("Klausuren", Just $ CourseR tid ssh csh CShowR)
+  breadcrumb (CourseR tid ssh csh CExamNewR) = return ("Anlegen", Just $ CourseR tid ssh csh CExamListR)
+
   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)
@@ -1876,6 +1886,14 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
+  , MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuExamList
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh CExamListR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
   , MenuItem
       { menuItemType = PageActionSecondary
       , menuItemLabel = MsgMenuCourseMembers
@@ -2080,6 +2098,16 @@ pageActions (CTutorialR tid ssh csh tutn TUsersR) =
       , menuItemAccessCallback' = return True
       }
   ]
+pageActions (CourseR tid ssh csh CExamListR) =
+  [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuExamNew
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh CExamNewR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
 pageActions (CSheetR tid ssh csh shn SShowR) =
   [ MenuItem
       { menuItemType = PageActionPrime
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 5abd1e624..c31b7048c 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -360,7 +360,7 @@ getCShowR tid ssh csh = do
                              ^{nameEmailWidget' tutor}
                      |]
           , sortable (Just "room") (i18nCell MsgTutorialRoom) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> textCell tutorialRoom
-          , sortable Nothing (i18nCell MsgTutorialTime) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> occurencesCell tutorialTime
+          , sortable Nothing (i18nCell MsgTutorialTime) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> occurrencesCell 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
diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
new file mode 100644
index 000000000..4f1c4917a
--- /dev/null
+++ b/src/Handler/Exam.hs
@@ -0,0 +1,391 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Handler.Exam where
+
+import Import
+
+import Handler.Utils
+import Handler.Utils.Exam
+import Handler.Utils.Invitations
+import Jobs.Queue
+
+import Utils.Lens
+
+import qualified Database.Esqueleto as E
+
+import Data.Map ((!))
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+
+import Data.Aeson hiding (Result(..))
+import Text.Hamlet (ihamlet)
+import Text.Blaze.Html.Renderer.String (renderHtml)
+
+
+getCExamListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCExamListR tid ssh csh = do
+  Entity cid Course{..} <- runDB . getBy404 $ TermSchoolCourseShort tid ssh csh
+
+  let
+    examDBTable = DBTable{..}
+      where
+        dbtSQLQuery exam = do
+          E.where_ $ exam E.^. ExamCourse E.==. E.val cid
+          return exam
+        dbtRowKey = (E.^. ExamId)
+        dbtProj = return
+        dbtColonnade = dbColonnade $ mconcat
+          [ sortable (Just "name") (i18nCell MsgExamName) $ \DBRow{ dbrOutput = Entity _ Exam{..} } -> cell $ toWidget examName
+          , sortable (Just "time") (i18nCell MsgExamTime) $ \DBRow{ dbrOutput = Entity _ Exam{..} } -> cell $ do
+              startT <- formatTime SelFormatDateTime examStart
+              endT <- traverse (\examEnd' -> formatTime (bool SelFormatDateTime SelFormatTime $ ((==) `on` utctDay) examStart examEnd') examEnd') examEnd
+              [whamlet|
+                $newline never
+                #{startT}
+                $maybe endT' <- endT
+                  \ – #{endT'}
+              |]
+          ]
+        dbtSorting = Map.fromList
+          [ ("name", SortColumn $ \exam -> exam E.^. ExamName )
+          , ("time", SortColumn $ \exam -> exam E.^. ExamStart )
+          ]
+        dbtFilter = Map.empty
+        dbtFilterUI = const mempty
+        dbtStyle = def
+        dbtParams = def
+        dbtIdent :: Text
+        dbtIdent = "exams"
+
+    examDBTableValidator = def
+      & defaultSorting [SortAscBy "time"]
+  ((), examTable) <- runDB $ dbTable examDBTableValidator examDBTable
+
+  siteLayoutMsg (prependCourseTitle tid ssh csh MsgExamsHeading) $ do
+    setTitleI $ prependCourseTitle tid ssh csh MsgExamsHeading
+    $(widgetFile "exam-list")
+
+  
+instance IsInvitableJunction ExamCorrector where
+  type InvitationFor ExamCorrector = Exam
+  data InvitableJunction ExamCorrector = JunctionExamCorrector
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationDBData ExamCorrector = InvDBDataExamCorrector
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationTokenData ExamCorrector = InvTokenDataExamCorrector
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+  _InvitableJunction = iso
+    (\ExamCorrector{..} -> (examCorrectorUser, examCorrectorExam, JunctionExamCorrector))
+    (\(examCorrectorUser, examCorrectorExam, JunctionExamCorrector) -> ExamCorrector{..})
+
+instance ToJSON (InvitableJunction ExamCorrector) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+instance FromJSON (InvitableJunction ExamCorrector) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+
+instance ToJSON (InvitationDBData ExamCorrector) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+instance FromJSON (InvitationDBData ExamCorrector) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+
+instance ToJSON (InvitationTokenData ExamCorrector) where
+  toJSON = genericToJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
+  toEncoding = genericToEncoding defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
+instance FromJSON (InvitationTokenData ExamCorrector) where
+  parseJSON = genericParseJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
+
+examCorrectorInvitationConfig :: InvitationConfig ExamCorrector
+examCorrectorInvitationConfig = InvitationConfig{..}
+  where
+    invitationRoute (Entity _ Exam{..}) _ = do
+      Course{..} <- get404 examCourse
+      return $ CExamR courseTerm courseSchool courseShorthand examName ECInviteR
+    invitationResolveFor = do
+      Just (CExamR tid csh ssh examn ECInviteR) <- getCurrentRoute
+      fetchExamId tid csh ssh examn
+    invitationSubject Exam{..} _ = do
+      Course{..} <- get404 examCourse
+      return . SomeMessage $ MsgMailSubjectExamCorrectorInvitation courseTerm courseSchool courseShorthand examName
+    invitationHeading Exam{..} _ = return . SomeMessage $ MsgExamCorrectorInviteHeading examName
+    invitationExplanation _ _ = [ihamlet|_{SomeMessage MsgExamCorrectorInviteExplanation}|]
+    invitationTokenConfig _ _ = do
+      itAuthority <- liftHandlerT requireAuthId
+      return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
+    invitationRestriction _ _ = return Authorized
+    invitationForm _ _ _ = pure JunctionExamCorrector
+    invitationSuccessMsg Exam{..} _ = return . SomeMessage $ MsgExamCorrectorInvitationAccepted examName
+    invitationUltDest Exam{..} _ = do
+      Course{..} <- get404 examCourse
+      return . SomeRoute $ CourseR courseTerm courseSchool courseShorthand CExamListR
+
+getECInviteR, postECInviteR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
+getECInviteR = postECInviteR
+postECInviteR = invitationR examCorrectorInvitationConfig
+
+
+data ExamForm = ExamForm
+  { efName :: ExamName
+  , efDescription :: Maybe Html
+  , efStart :: UTCTime
+  , efEnd :: Maybe UTCTime
+  , efVisibleFrom :: Maybe UTCTime
+  , efRegisterFrom :: Maybe UTCTime
+  , efRegisterTo :: Maybe UTCTime
+  , efDeregisterUntil :: Maybe UTCTime
+  , efPublishOccurrenceAssignments :: UTCTime
+  , efFinished :: Maybe UTCTime
+  , efClosed :: Maybe UTCTime
+  , efOccurrences :: Set ExamOccurrenceForm
+  , efPublicStatistics :: Bool
+  , efGradingRule :: ExamGradingRule
+  , efBonusRule :: ExamBonusRule
+  , efOccurrenceRule :: ExamOccurrenceRule
+  , efCorrectors :: Set (Either UserEmail UserId)
+  , efExamParts :: Set ExamPartForm
+  }
+
+data ExamOccurrenceForm = ExamOccurrenceForm
+  { eofRoom :: Text
+  , eofCapacity :: Natural
+  , eofStart :: UTCTime
+  , eofEnd :: Maybe UTCTime
+  , eofDescription :: Maybe Html
+  } deriving (Read, Show, Eq, Ord, Generic, Typeable)
+
+data ExamPartForm = ExamPartForm
+  { epfName :: ExamPartName
+  , epfMaxPoints :: Maybe Points
+  , epfWeight :: Rational
+  } deriving (Read, Show, Eq, Ord, Generic, Typeable)
+
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 1
+  } ''ExamPartForm
+
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 1
+  } ''ExamOccurrenceForm
+
+
+examForm :: Maybe ExamForm -> Form ExamForm
+examForm template html = do
+  MsgRenderer mr <- getMsgRenderer
+
+  flip (renderAForm FormStandard) html $ ExamForm
+    <$> areq ciField (fslpI MsgExamName (mr MsgExamName) & setTooltip MsgExamNameTip) (efName <$> template)
+    <*> (assertM (not . null . renderHtml) <$> aopt htmlField (fslpI MsgExamDescription "Html") (efDescription <$> template))
+    <*  aformSection MsgExamFormTimes
+    <*> areq utcTimeField (fslpI MsgExamStart (mr MsgDate) & setTooltip MsgExamTimeTip) (efStart <$> template)
+    <*> aopt utcTimeField (fslpI MsgExamEnd (mr MsgDate) & setTooltip MsgExamTimeTip) (efEnd <$> template)
+    <*> aopt utcTimeField (fslpI MsgExamVisibleFrom (mr MsgDate) & setTooltip MsgExamVisibleFromTip) (efVisibleFrom <$> template)
+    <*> aopt utcTimeField (fslpI MsgExamRegisterFrom (mr MsgDate) & setTooltip MsgExamRegisterFromTip) (efRegisterFrom <$> template)
+    <*> aopt utcTimeField (fslpI MsgExamRegisterTo (mr MsgDate)) (efRegisterTo <$> template)
+    <*> aopt utcTimeField (fslpI MsgExamDeregisterUntil (mr MsgDate)) (efDeregisterUntil <$> template)
+    <*> areq utcTimeField (fslpI MsgExamPublishOccurrenceAssignments (mr MsgDate)) (efPublishOccurrenceAssignments <$> template)
+    <*> aopt utcTimeField (fslpI MsgExamFinished (mr MsgDate) & setTooltip MsgExamFinishedTip) (efFinished <$> template)
+    <*> aopt utcTimeField (fslpI MsgExamClosed (mr MsgDate) & setTooltip MsgExamClosedTip) (efClosed <$> template)
+    <*  aformSection MsgExamFormOccurrences
+    <*> examOccurrenceForm (efOccurrences <$> template)
+    <*  aformSection MsgExamFormAutomaticFunctions
+    <*> (fromMaybe False <$> aopt checkBoxField (fslI MsgExamPublicStatistics & setTooltip MsgExamPublicStatisticsTip) (Just . efPublicStatistics <$> template))
+    <*> examGradingRuleForm (efGradingRule <$> template)
+    <*> bonusRuleForm (efBonusRule <$> template)
+    <*> examOccurrenceRuleForm (efOccurrenceRule <$> template)
+    <*  aformSection MsgExamFormCorrection
+    <*> examCorrectorsForm (efCorrectors <$> template)
+    <*  aformSection MsgExamFormParts
+    <*> examPartsForm (efExamParts <$> template)
+
+examCorrectorsForm :: Maybe (Set (Either UserEmail UserId)) -> AForm Handler (Set (Either UserEmail UserId))
+examCorrectorsForm mPrev = wFormToAForm $ do
+  MsgRenderer mr <- getMsgRenderer
+  Just currentRoute <- getCurrentRoute
+  uid <- liftHandlerT requireAuthId
+
+  let
+    miButtonAction' :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX)
+    miButtonAction' frag = Just . SomeRoute $ currentRoute :#: frag
+
+    miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([Either UserEmail UserId] -> FormResult [Either UserEmail UserId])
+    miAdd' nudge submitView csrf = do
+      (addRes, addView) <- mpreq (multiUserField False $ Just corrUserSuggestions) ("" & addName (nudge "email")) Nothing
+      let
+        addRes'
+          | otherwise
+          = addRes <&> \newDat oldDat -> if
+              | existing <- newDat `Set.intersection` Set.fromList oldDat
+              , not $ Set.null existing
+                -> FormFailure [mr MsgExamCorrectorAlreadyAdded]
+              | otherwise
+                -> FormSuccess $ Set.toList newDat
+      return (addRes', $(widgetFile "widgets/massinput/examCorrectors/add"))
+
+    corrUserSuggestions :: E.SqlQuery (E.SqlExpr (Entity User))
+    corrUserSuggestions = E.from $ \(lecturer `E.InnerJoin` course `E.InnerJoin` exam `E.InnerJoin` corrector `E.InnerJoin` corrUser) -> do
+      E.on $ corrUser E.^. UserId E.==. corrector E.^. ExamCorrectorUser
+      E.on $ corrector E.^. ExamCorrectorExam E.==. exam E.^. ExamId
+      E.on $ exam E.^. ExamCourse E.==. course E.^. CourseId
+      E.on $ course E.^. CourseId E.==. lecturer E.^. LecturerCourse
+      E.where_ $ lecturer E.^. LecturerUser E.==. E.val uid
+      return corrUser
+
+
+    miCell' :: Either UserEmail UserId -> Widget
+    miCell' (Left email) =
+      $(widgetFile "widgets/massinput/examCorrectors/cellInvitation")
+    miCell' (Right userId) = do
+      User{..} <- liftHandlerT . runDB $ get404 userId
+      $(widgetFile "widgets/massinput/examCorrectors/cellKnown")
+
+    miLayout' :: MassInputLayout ListLength (Either UserEmail UserId) ()
+    miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/massinput/examCorrectors/layout")
+
+  fmap Set.fromList <$> massInputAccumW miAdd' miCell' miButtonAction' miLayout' ("correctors" :: Text) (fslI MsgExamCorrectors & setTooltip MsgMassInputTip) True (Set.toList <$> mPrev)
+
+examOccurrenceForm :: Maybe (Set ExamOccurrenceForm) -> AForm Handler (Set ExamOccurrenceForm)
+examOccurrenceForm prev = wFormToAForm $ do
+  Just currentRoute <- getCurrentRoute
+  let
+    miButtonAction' :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX)
+    miButtonAction' frag = Just . SomeRoute $ currentRoute :#: frag
+  
+  fmap (fmap Set.fromList) . massInputAccumEditW miAdd' miCell' miButtonAction' miLayout' miIdent' (fslI MsgExamOccurrences & setTooltip MsgMassInputTip) True $ Set.toList <$> prev
+  where
+    examOccurrenceForm' nudge mPrev csrf = do
+      (eofRoomRes, eofRoomView) <- mpreq textField ("" & addName (nudge "name")) (eofRoom <$> mPrev)
+      (eofCapacityRes, eofCapacityView) <- mpreq (posIntFieldI MsgExamRoomCapacityNonPositive) ("" & addName (nudge "capacity")) (eofCapacity <$> mPrev)
+      (eofStartRes, eofStartView) <- mpreq utcTimeField ("" & addName (nudge "start")) (eofStart <$> mPrev)
+      (eofEndRes, eofEndView) <- mopt utcTimeField ("" & addName (nudge "end")) (eofEnd <$> mPrev)
+      (eofDescRes, eofDescView) <- mopt htmlFieldSmall ("" & addName (nudge "description")) (eofDescription <$> mPrev)
+
+      return ( ExamOccurrenceForm
+                 <$> eofRoomRes
+                 <*> eofCapacityRes
+                 <*> eofStartRes
+                 <*> eofEndRes
+                 <*> (assertM (not . null . renderHtml) <$> eofDescRes)
+             , $(widgetFile "widgets/massinput/examRooms/form")
+             )
+    
+    miAdd' nudge submitView csrf = do
+      MsgRenderer mr <- getMsgRenderer
+      (res, formWidget) <- examOccurrenceForm' nudge Nothing csrf
+      let
+        addRes = res <&> \newDat (Set.fromList -> oldDat) -> if
+          | newDat `Set.member` oldDat -> FormFailure [mr MsgExamRoomAlreadyExists]
+          | otherwise -> FormSuccess $ pure newDat
+      return (addRes, $(widgetFile "widgets/massinput/examRooms/add"))
+    miCell' nudge dat = examOccurrenceForm' nudge (Just dat)
+    miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/massinput/examRooms/layout")
+    miIdent' :: Text
+    miIdent' = "exam-occurrences"
+
+examPartsForm :: Maybe (Set ExamPartForm) -> AForm Handler (Set ExamPartForm)
+examPartsForm prev = wFormToAForm $ do
+  Just currentRoute <- getCurrentRoute
+  let
+    miButtonAction' :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX)
+    miButtonAction' frag = Just . SomeRoute $ currentRoute :#: frag
+  
+  fmap (fmap Set.fromList) . massInputAccumEditW miAdd' miCell' miButtonAction' miLayout' miIdent' (fslI MsgExamParts & setTooltip MsgMassInputTip) True $ Set.toList <$> prev
+  where
+    examPartForm' nudge mPrev csrf = do
+      (epfNameRes, epfNameView) <- mpreq ciField ("" & addName (nudge "name")) (epfName <$> mPrev)
+      (epfMaxPointsRes, epfMaxPointsView) <- mopt pointsField ("" & addName (nudge "max-points")) (epfMaxPoints <$> mPrev)
+      (epfWeightRes, epfWeightView) <- mpreq (checkBool (>= 0) MsgExamPartWeightNegative rationalField) ("" & addName (nudge "weight")) (epfWeight <$> mPrev <|> Just 1)
+
+      return ( ExamPartForm
+                 <$> epfNameRes
+                 <*> epfMaxPointsRes
+                 <*> epfWeightRes
+             , $(widgetFile "widgets/massinput/examParts/form")
+             )
+    
+    miAdd' nudge submitView csrf = do
+      MsgRenderer mr <- getMsgRenderer
+      (res, formWidget) <- examPartForm' nudge Nothing csrf
+      let
+        addRes = res <&> \newDat (Set.fromList -> oldDat) -> if
+          | any (((==) `on` epfName) newDat) oldDat -> FormFailure [mr MsgExamPartAlreadyExists]
+          | otherwise -> FormSuccess $ pure newDat
+      return (addRes, $(widgetFile "widgets/massinput/examParts/add"))
+    miCell' nudge dat = examPartForm' nudge (Just dat)
+    miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/massinput/examParts/layout")
+    miIdent' :: Text
+    miIdent' = "exam-parts"   
+
+getCExamNewR, postCExamNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCExamNewR = postCExamNewR
+postCExamNewR tid ssh csh = do
+  cid <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+  
+  ((newExamResult, newExamWidget), newExamEnctype) <- runFormPost $ examForm Nothing
+
+  formResult newExamResult $ \ExamForm{..} -> do
+    insertRes <- runDBJobs $ do
+      insertRes <- insertUnique Exam
+        { examName                         = efName
+        , examCourse                       = cid
+        , examGradingRule                  = efGradingRule
+        , examBonusRule                    = efBonusRule
+        , examOccurrenceRule               = efOccurrenceRule
+        , examVisibleFrom                  = efVisibleFrom
+        , examRegisterFrom                 = efRegisterFrom
+        , examRegisterTo                   = efRegisterTo
+        , examDeregisterUntil              = efDeregisterUntil
+        , examPublishOccurrenceAssignments = efPublishOccurrenceAssignments
+        , examStart                        = efStart
+        , examEnd                          = efEnd
+        , examFinished                     = efFinished
+        , examClosed                       = efClosed
+        , examPublicStatistics             = efPublicStatistics
+        , examDescription                  = efDescription
+        }
+      whenIsJust insertRes $ \examid -> do
+        insertMany_
+          [ ExamPart{..}
+          | ExamPartForm{..} <- Set.toList efExamParts
+          , let examPartExam      = examid
+                examPartName      = epfName
+                examPartMaxPoints = epfMaxPoints
+                examPartWeight    = epfWeight
+          ]
+
+        insertMany_
+          [ ExamOccurrence{..}
+          | ExamOccurrenceForm{..} <- Set.toList efOccurrences
+          , let examOccurrenceExam        = examid
+                examOccurrenceRoom        = eofRoom
+                examOccurrenceCapacity    = eofCapacity
+                examOccurrenceStart       = eofStart
+                examOccurrenceEnd         = eofEnd
+                examOccurrenceDescription = eofDescription
+          ]
+       
+        let (invites, adds) = partitionEithers $ Set.toList efCorrectors
+        insertMany_ [ ExamCorrector{..}
+                    | examCorrectorUser <- adds
+                    , let examCorrectorExam = examid
+                    ]
+        sinkInvitationsF examCorrectorInvitationConfig $ map (, examid, (InvDBDataExamCorrector, InvTokenDataExamCorrector)) invites
+      return insertRes
+    case insertRes of
+      Nothing -> addMessageI Error $ MsgExamNameTaken efName
+      Just _  -> do
+        addMessageI Success $ MsgExamCreated efName
+        redirect $ CourseR tid ssh csh CExamListR
+
+  let heading = prependCourseTitle tid ssh csh MsgExamNew
+
+  siteLayoutMsg heading $ do
+    setTitleI heading
+    let
+      newExamForm = wrapForm newExamWidget def
+        { formMethod = POST
+        , formAction = Just . SomeRoute $ CourseR tid ssh csh CExamNewR
+        , formEncoding = newExamEnctype
+        }
+    $(widgetFile "exam-new")
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 2a98110c1..964dfa1b3 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -8,7 +8,7 @@ import Handler.Utils.Tutorial
 import Handler.Utils.Table.Cells
 import Handler.Utils.Delete
 import Handler.Utils.Communication
-import Handler.Utils.Form.Occurences
+import Handler.Utils.Form.Occurrences
 import Handler.Utils.Invitations
 import Jobs.Queue
 
@@ -64,7 +64,7 @@ getCTutorialListR tid ssh csh = do
           , 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 Nothing (i18nCell MsgTutorialTime) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> occurrencesCell tutorialTime
           , sortable (Just "register-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
@@ -275,7 +275,7 @@ data TutorialForm = TutorialForm
   , tfType            :: CI Text
   , tfCapacity        :: Maybe Int
   , tfRoom            :: Text
-  , tfTime            :: Occurences
+  , tfTime            :: Occurrences
   , tfRegGroup        :: Maybe (CI Text)
   , tfRegisterFrom    :: Maybe UTCTime
   , tfRegisterTo      :: Maybe UTCTime
@@ -322,7 +322,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 ("occurences" :: Text) (tfTime <$> template)
+    <*> occurrencesAForm ("occurrences" :: 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/Exam.hs b/src/Handler/Utils/Exam.hs
new file mode 100644
index 000000000..249d98b73
--- /dev/null
+++ b/src/Handler/Utils/Exam.hs
@@ -0,0 +1,47 @@
+module Handler.Utils.Exam
+  ( fetchExamAux
+  , fetchExam, fetchExamId, fetchCourseIdExamId, fetchCourseIdExam
+  ) 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
+
+
+fetchExamAux :: ( SqlBackendCanRead backend
+                , E.SqlSelect b a
+                , MonadHandler m
+                , Typeable a
+                )
+             => (E.SqlExpr (Entity Exam) -> E.SqlExpr (Entity Course) -> b)
+             -> TermId -> SchoolId -> CourseShorthand -> ExamName -> ReaderT backend m a
+fetchExamAux prj tid ssh csh examn =
+    let cachId = encodeUtf8 $ tshow (tid, ssh, csh, examn)
+    in  cachedBy cachId $ do
+        tutList <- E.select . E.from $ \(course `E.InnerJoin` tut) -> do
+            E.on     $ course E.^. CourseId E.==. tut E.^. ExamCourse
+            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.^. ExamName    E.==. E.val examn
+            return $ prj tut course
+        case tutList of
+          [tut] -> return tut
+          _other  -> notFound
+
+fetchExam :: TermId -> SchoolId -> CourseShorthand -> ExamName -> DB (Entity Exam)
+fetchExam = fetchExamAux const
+
+fetchExamId :: TermId -> SchoolId -> CourseShorthand -> ExamName -> YesodDB UniWorX (Key Exam)
+fetchExamId tid ssh cid examn = E.unValue <$> fetchExamAux (\tutorial _ -> tutorial E.^. ExamId) tid ssh cid examn
+
+fetchCourseIdExamId  :: TermId -> SchoolId -> CourseShorthand -> ExamName -> YesodDB UniWorX (Key Course, Key Exam)
+fetchCourseIdExamId tid ssh cid examn = $(unValueN 2) <$> fetchExamAux (\tutorial course -> (course E.^. CourseId, tutorial E.^. ExamId)) tid ssh cid examn
+
+fetchCourseIdExam  :: TermId -> SchoolId -> CourseShorthand -> ExamName -> YesodDB UniWorX (Key Course, Entity Exam)
+fetchCourseIdExam tid ssh cid examn = over _1 E.unValue <$> fetchExamAux (\tutorial course -> (course E.^. CourseId, tutorial)) tid ssh cid examn
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 0b6850b24..ea6d929b3 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -19,7 +19,6 @@ import qualified Data.CaseInsensitive as CI
 -- import Yesod.Core
 import qualified Data.Text as T
 -- import Yesod.Form.Types
-import Yesod.Form.Functions (parseHelper)
 import Yesod.Form.Bootstrap3
 
 import Handler.Utils.Zip
@@ -38,8 +37,6 @@ import Control.Monad.Trans.Except (throwE, runExceptT)
 import Control.Monad.Writer.Class
 import Control.Monad.Error.Class (MonadError(..))
 
-import Data.Scientific (Scientific)
-import Text.Read (readMaybe)
 import Data.Either (partitionEithers)
 
 import Utils.Lens
@@ -56,6 +53,9 @@ import Yesod.Core.Types (FileInfo(..))
 import System.FilePath (isExtensionOf)
 import Data.Text.Lens (unpacked)
 
+import Data.Char (isDigit)
+import Text.Blaze (toMarkup)
+
 import Handler.Utils.Form.MassInput
 
 ----------------------------
@@ -241,35 +241,28 @@ htmlField' = htmlField
   }
 
 natFieldI :: (Monad m, Integral i, RenderMessage (HandlerSite m) msg, RenderMessage (HandlerSite m) FormMessage) => msg -> Field m i
-natFieldI msg = checkBool (>= 0) msg intField
+natFieldI msg = convertField fromInteger toInteger $ checkBool (>= 0) msg intField
 
 natField :: (Monad m, Integral i, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m i
-natField d = checkBool (>= 0) (T.append  d " muss eine natürliche Zahl sein.") intField
+natField d = convertField fromInteger toInteger $ checkBool (>= 0) (T.append  d " muss eine natürliche Zahl sein.") intField
 
 natIntField ::(Monad m, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m Integer
 natIntField = natField
 
 posIntField :: (Monad m, Integral i, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m i
-posIntField d = checkBool (> 0) (T.append  d " muss eine positive Zahl sein.") intField
+posIntField d = convertField fromInteger toInteger $ checkBool (> 0) (T.append  d " muss eine positive Zahl sein.") intField
+
+posIntFieldI :: (Monad m, Integral i, RenderMessage (HandlerSite m) msg, RenderMessage (HandlerSite m) FormMessage) => msg -> Field m i
+posIntFieldI msg = convertField fromInteger toInteger $ checkBool (> 0) msg intField
 
 -- | Field to request integral number > 'm'
 minIntField :: (Monad m, Integral i, Show i, RenderMessage (HandlerSite m) FormMessage) => i -> Text -> Field m i
 minIntField m d = checkBool (> m) (T.concat [d," muss größer als ", T.pack $ show m, " sein."]) intField
 
-pointsField :: (Monad m, HandlerSite m ~ UniWorX) => Field m Points --TODO allow fractions
-pointsField = checkBool (>= 0) MsgPointsNotPositive Field{..}
-  where
-    fieldEnctype = UrlEncoded
-    fieldView theId name attrs val isReq
-      = [whamlet|
-          $newline never
-          <input id=#{theId} name=#{name} *{attrs} type=number step="0.01" :isReq:required value=#{either id tshow val}>
-        |]
-    fieldParse = parseHelper $ \t -> do
-      sci <- maybe (Left $ MsgInvalidNumber t) Right (readMaybe $ unpack t :: Maybe Scientific)
-      return . fromRational $ round (sci * 100) % 100
+pointsField :: (Monad m, HandlerSite m ~ UniWorX) => Field m Points
+pointsField = checkBool (>= 0) MsgPointsNotPositive fixedPrecField
 
-pointsFieldMax :: (Monad m, HandlerSite m ~ UniWorX) => Maybe Points -> Field m Points --TODO allow fractions
+pointsFieldMax :: (Monad m, HandlerSite m ~ UniWorX) => Maybe Points -> Field m Points
 pointsFieldMax Nothing = pointsField
 pointsFieldMax (Just maxp) = checkBool (<= maxp) (MsgPointsTooHigh maxp) pointsField
 
@@ -448,6 +441,137 @@ submissionModeForm prev = multiActionA actions (fslI MsgSheetSubmissionMode) $ c
         )
       ]
 
+data ExamBonusRule' = ExamNoBonus'
+                    | ExamBonusPoints'
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe ExamBonusRule'
+instance Finite ExamBonusRule'
+
+nullaryPathPiece ''ExamBonusRule' $ camelToPathPiece' 1 . dropSuffix "'"
+embedRenderMessage ''UniWorX ''ExamBonusRule' id
+
+classifyBonusRule :: ExamBonusRule -> ExamBonusRule'
+classifyBonusRule = \case
+  ExamNoBonus       -> ExamNoBonus'
+  ExamBonusPoints{} -> ExamBonusPoints'
+
+bonusRuleForm :: Maybe ExamBonusRule -> AForm Handler ExamBonusRule
+bonusRuleForm prev = multiActionA actions (fslI MsgExamBonusRule) $ classifyBonusRule <$> prev
+  where
+    actions :: Map ExamBonusRule' (AForm Handler ExamBonusRule)
+    actions = Map.fromList
+      [ ( ExamNoBonus'
+        , pure ExamNoBonus
+        )
+      , ( ExamBonusPoints'
+        , ExamBonusPoints
+            <$> apreq (checkBool (> 0) MsgExamBonusMaxPointsNonPositive pointsField) (fslI MsgExamBonusMaxPoints) (preview _bonusMaxPoints =<< prev)
+            <*> (fromMaybe False <$> aopt checkBoxField (fslI MsgExamBonusOnlyPassed) (Just <$> preview _bonusOnlyPassed =<< prev))
+        )
+      ]
+
+data ExamOccurrenceRule' = ExamRoomManual'
+                         | ExamRoomSurname'
+                         | ExamRoomMatriculation'
+                         | ExamRoomRandom'
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe ExamOccurrenceRule'
+instance Finite ExamOccurrenceRule'
+
+nullaryPathPiece ''ExamOccurrenceRule' $ camelToPathPiece' 1 . dropSuffix "'"
+embedRenderMessage ''UniWorX ''ExamOccurrenceRule' id
+
+classifyExamOccurrenceRule :: ExamOccurrenceRule -> ExamOccurrenceRule'
+classifyExamOccurrenceRule = \case
+  ExamRoomManual        -> ExamRoomManual'
+  ExamRoomSurname       -> ExamRoomSurname'
+  ExamRoomMatriculation -> ExamRoomMatriculation'
+  ExamRoomRandom        -> ExamRoomRandom'
+
+examOccurrenceRuleForm :: Maybe ExamOccurrenceRule -> AForm Handler ExamOccurrenceRule
+examOccurrenceRuleForm = fmap reverseClassify . areq (selectField optionsFinite) (fslI MsgExamOccurrenceRule) . fmap classifyExamOccurrenceRule
+  where
+    reverseClassify = \case
+      ExamRoomManual'        -> ExamRoomManual
+      ExamRoomSurname'       -> ExamRoomSurname
+      ExamRoomMatriculation' -> ExamRoomMatriculation
+      ExamRoomRandom'        -> ExamRoomRandom
+
+data ExamGradingRule' = ExamGradingManual'
+                      | ExamGradingKey'
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe ExamGradingRule'
+instance Finite ExamGradingRule'
+
+nullaryPathPiece ''ExamGradingRule' $ camelToPathPiece' 2 . dropSuffix "'"
+embedRenderMessage ''UniWorX ''ExamGradingRule' id
+
+classifyExamGradingRule :: ExamGradingRule -> ExamGradingRule'
+classifyExamGradingRule = \case
+  ExamGradingManual -> ExamGradingManual'
+  ExamGradingKey{}  -> ExamGradingKey'
+
+examGradingRuleForm :: Maybe ExamGradingRule -> AForm Handler ExamGradingRule
+examGradingRuleForm prev = multiActionA actions (fslI MsgExamGradingRule) $ classifyExamGradingRule <$> prev
+  where
+    actions :: Map ExamGradingRule' (AForm Handler ExamGradingRule)
+    actions = Map.fromList
+      [ ( ExamGradingManual'
+        , pure ExamGradingManual
+        )
+      , ( ExamGradingKey'
+        , ExamGradingKey <$> gradingKeyForm (fslI MsgExamGradingKey & setTooltip MsgExamGradingKeyTip) (preview _examGradingKey =<< prev)
+        )
+      ]
+
+    
+    gradingKeyForm :: FieldSettings UniWorX -> Maybe [Points] -> AForm Handler [Points]
+    gradingKeyForm FieldSettings{..} template = formToAForm . over (mapped . _2) pure $ do
+      MsgRenderer mr <- getMsgRenderer
+
+      fvId <- maybe newIdent return fsId
+      fvName <- maybe newFormIdent return fsName
+
+      let
+        grades :: [ExamGrade]
+        grades = universeF
+
+      let boundsFS (Text.filter isDigit . toPathPiece -> g) = ""
+            & addPlaceholder (mr MsgPoints)
+            & addName (fvName <> "__" <> g)
+            & addId (fvId <> "__" <> g)
+      bounds <- forM grades $ \case
+        g@Grade50 -> mforced pointsField (boundsFS g) 0
+        grade     -> mpreq   pointsField (boundsFS grade) $ preview (ix . pred $ fromEnum grade) =<< template
+
+      let errors
+            | anyOf (folded . _1 . _FormSuccess) (< 0) bounds = [mr MsgPointsMustBeNonNegative]
+            | FormSuccess bounds' <- sequence $ map (view _1) bounds
+            , not $ monotone bounds'
+            = [mr MsgPointsMustBeMonotonic]
+            | otherwise
+            = []
+
+      return ( if
+                 | null errors -> sequence . unsafeTail $ map fst bounds
+                 | otherwise   -> FormFailure errors
+             , FieldView
+               { fvLabel   = toMarkup $ mr fsLabel
+               , fvTooltip = toMarkup . mr <$> fsTooltip
+               , fvId
+               , fvInput = $(widgetFile "widgets/gradingKey")
+               , fvErrors = if
+                   | (e : _) <- errors -> Just $ toMarkup e
+                   | otherwise -> Nothing
+               , fvRequired = True
+               }
+             )
+
+      where
+        monotone (x1:x2:xs) = x1 <= x2 && monotone (x2:xs)
+        monotone _          = True
+
+
 pseudonymWordField :: Field Handler PseudonymWord
 pseudonymWordField = checkMMap doCheck CI.original $ textField & addDatalist (return $ map CI.original pseudonymWordlist)
   where
diff --git a/src/Handler/Utils/Form/Occurences.hs b/src/Handler/Utils/Form/Occurrences.hs
similarity index 59%
rename from src/Handler/Utils/Form/Occurences.hs
rename to src/Handler/Utils/Form/Occurrences.hs
index da0e7733f..9fb8118e4 100644
--- a/src/Handler/Utils/Form/Occurences.hs
+++ b/src/Handler/Utils/Form/Occurrences.hs
@@ -1,5 +1,5 @@
-module Handler.Utils.Form.Occurences
-  ( occurencesAForm
+module Handler.Utils.Form.Occurrences
+  ( occurrencesAForm
   ) where
 
 import Import
@@ -13,32 +13,32 @@ import qualified Data.Map as Map
 import Utils.Lens
 
   
-data OccurenceScheduleKind = ScheduleKindWeekly
+data OccurrenceScheduleKind = ScheduleKindWeekly
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
-instance Universe OccurenceScheduleKind
-instance Finite OccurenceScheduleKind
+instance Universe OccurrenceScheduleKind
+instance Finite OccurrenceScheduleKind
 
-nullaryPathPiece ''OccurenceScheduleKind $ camelToPathPiece' 2
-embedRenderMessage ''UniWorX ''OccurenceScheduleKind id
+nullaryPathPiece ''OccurrenceScheduleKind $ camelToPathPiece' 2
+embedRenderMessage ''UniWorX ''OccurrenceScheduleKind id
 
-data OccurenceExceptionKind = ExceptionKindOccur
-                            | ExceptionKindNoOccur
+data OccurrenceExceptionKind = ExceptionKindOccur
+                             | ExceptionKindNoOccur
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
-instance Universe OccurenceExceptionKind
-instance Finite OccurenceExceptionKind
+instance Universe OccurrenceExceptionKind
+instance Finite OccurrenceExceptionKind
 
-nullaryPathPiece ''OccurenceExceptionKind $ camelToPathPiece' 2
-embedRenderMessage ''UniWorX ''OccurenceExceptionKind id
+nullaryPathPiece ''OccurrenceExceptionKind $ camelToPathPiece' 2
+embedRenderMessage ''UniWorX ''OccurrenceExceptionKind id
 
 
-occurencesAForm :: PathPiece ident => ident -> Maybe Occurences -> AForm Handler Occurences
-occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
+occurrencesAForm :: PathPiece ident => ident -> Maybe Occurrences -> AForm Handler Occurrences
+occurrencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
   Just cRoute <- getCurrentRoute
   
   let
-    scheduled :: AForm Handler (Set OccurenceSchedule)
+    scheduled :: AForm Handler (Set OccurrenceSchedule)
     scheduled = Set.fromList <$> massInputAccumA
       miAdd'
       miCell'
@@ -47,16 +47,16 @@ occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
       (miIdent' <> "__scheduled" :: Text)
       (fslI MsgScheduleRegular & setTooltip MsgMassInputTip)
       False
-      (Set.toList . occurencesScheduled <$> mPrev)
+      (Set.toList . occurrencesScheduled <$> 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
+        miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([OccurrenceSchedule] -> FormResult [OccurrenceSchedule])
+        miAdd' nudge submitView = over (mapped . mapped . _2) (\addWidget -> $(widgetFile "widgets/occurrence/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
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurrenceStart & addName (nudge "occur-start")) Nothing
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurrenceEnd & addName (nudge "occur-end")) Nothing
                             )
                           ]
             ) (fslI MsgScheduleRegularKind & addName (nudge "kind")) Nothing
@@ -65,16 +65,16 @@ occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
             | newSched' `elem` oldScheds -> FormFailure [mr MsgScheduleExists]
             | otherwise -> FormSuccess $ pure newSched'
 
-        miCell' :: OccurenceSchedule -> Widget
+        miCell' :: OccurrenceSchedule -> Widget
         miCell' ScheduleWeekly{..} = do
           scheduleStart' <- formatTime SelFormatTime scheduleStart
           scheduleEnd' <- formatTime SelFormatTime scheduleEnd
-          $(widgetFile "widgets/occurence/form/weekly")
+          $(widgetFile "widgets/occurrence/form/weekly")
 
-        miLayout' :: MassInputLayout ListLength OccurenceSchedule ()
-        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurence/form/scheduled-layout")
+        miLayout' :: MassInputLayout ListLength OccurrenceSchedule ()
+        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurrence/form/scheduled-layout")
 
-    exceptions :: AForm Handler (Set OccurenceException)
+    exceptions :: AForm Handler (Set OccurrenceException)
     exceptions = Set.fromList <$> massInputAccumA
       miAdd'
       miCell'
@@ -83,19 +83,19 @@ occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
       (miIdent' <> "__exceptions" :: Text)
       (fslI MsgScheduleExceptions & setTooltip (UniWorXMessages [SomeMessage MsgScheduleExceptionsTip, SomeMessage MsgMassInputTip]))
       False
-      (Set.toList . occurencesExceptions <$> mPrev)
+      (Set.toList . occurrencesExceptions <$> 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
+        miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([OccurrenceException] -> FormResult [OccurrenceException])
+        miAdd' nudge submitView = over (mapped . mapped . _2) (\addWidget -> $(widgetFile "widgets/occurrence/form/except-add")) . renderAForm FormStandard . wFormToAForm $ do
           newExc <- multiActionW
             (Map.fromList [ ( ExceptionKindOccur
-                            , ExceptOccur
+                            , ExceptOccurr
                                 <$> 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
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurrenceStart & addName (nudge "occur-start")) Nothing
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurrenceEnd & addName (nudge "occur-end")) Nothing
                             )
                           , ( ExceptionKindNoOccur
-                            , ExceptNoOccur
+                            , ExceptNoOccurr
                                 <$> apreq localTimeField (fslI MsgExceptionNoOccurAt & addName (nudge "no-occur-time")) Nothing
                             )
                           ]
@@ -106,18 +106,18 @@ occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
             | otherwise -> FormSuccess $ pure newExc'
           
 
-        miCell' :: OccurenceException -> Widget
-        miCell' ExceptOccur{..} = do
+        miCell' :: OccurrenceException -> Widget
+        miCell' ExceptOccurr{..} = do
           exceptStart' <- formatTime SelFormatDateTime (LocalTime exceptDay exceptStart)
           exceptEnd'   <- formatTime SelFormatTime     exceptEnd
-          $(widgetFile "widgets/occurence/form/except-occur")
-        miCell' ExceptNoOccur{..} = do
+          $(widgetFile "widgets/occurrence/form/except-occur")
+        miCell' ExceptNoOccurr{..} = do
           exceptTime' <- formatTime SelFormatDateTime exceptTime
-          $(widgetFile "widgets/occurence/form/except-no-occur")
+          $(widgetFile "widgets/occurrence/form/except-no-occur")
 
-        miLayout' :: MassInputLayout ListLength OccurenceException ()
-        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurence/form/except-layout")
+        miLayout' :: MassInputLayout ListLength OccurrenceException ()
+        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurrence/form/except-layout")
 
-  aFormToWForm $ Occurences
+  aFormToWForm $ Occurrences
     <$> scheduled
     <*> exceptions
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 620e6776b..a16d088c2 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -14,7 +14,7 @@ import Text.Blaze (ToMarkup(..))
 import Utils.Lens
 import Handler.Utils
 
-import Utils.Occurences
+import Utils.Occurrences
 
 import qualified Data.Set as Set
 
@@ -248,19 +248,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
+occurrencesCell :: IsDBTable m a => Occurrences -> DBCell m a
+occurrencesCell (normalizeOccurrences -> Occurrences{..}) = cell $ do
+  let occurrencesScheduled' = flip map (Set.toList occurrencesScheduled) $ \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
+          $(widgetFile "widgets/occurrence/cell/weekly")
+      occurrencesExceptions' = flip map (Set.toList occurrencesExceptions) $ \case
+        ExceptOccurr{..} -> do
           exceptStart' <- formatTime SelFormatDateTime (LocalTime exceptDay exceptStart)
           exceptEnd'   <- formatTime SelFormatTime     exceptStart
-          $(widgetFile "widgets/occurence/cell/except-occur")
-        ExceptNoOccur{..} -> do
+          $(widgetFile "widgets/occurrence/cell/except-occurr")
+        ExceptNoOccurr{..} -> do
           exceptTime' <- formatTime SelFormatDateTime exceptTime
-          $(widgetFile "widgets/occurence/cell/except-no-occur")
-  $(widgetFile "widgets/occurence/cell")
+          $(widgetFile "widgets/occurrence/cell/except-no-occurr")
+  $(widgetFile "widgets/occurrence/cell")
diff --git a/src/Model/Types/Common.hs b/src/Model/Types/Common.hs
index 5ffbcfb07..94966e1c1 100644
--- a/src/Model/Types/Common.hs
+++ b/src/Model/Types/Common.hs
@@ -27,6 +27,8 @@ type SheetName       = CI Text
 type MaterialName    = CI Text
 type UserEmail       = CI Email
 type TutorialName    = CI Text
+type ExamName        = CI Text
+type ExamPartName    = CI Text
 
 type PWHashAlgorithm = ByteString -> PWStore.Salt -> Int -> ByteString
 type InstanceId      = UUID
diff --git a/src/Model/Types/DateTime.hs b/src/Model/Types/DateTime.hs
index 10783550e..aa0226c34 100644
--- a/src/Model/Types/DateTime.hs
+++ b/src/Model/Types/DateTime.hs
@@ -2,7 +2,7 @@
 Module: Model.Types.DateTime
 Description: Time related types
 
-Terms, Seasons, and Occurence schedules
+Terms, Seasons, and Occurrence schedules
 -}
 module Model.Types.DateTime
   ( module Model.Types.DateTime
@@ -152,11 +152,11 @@ time `withinTerm` term = timeYear `mod` 100 == termYear `mod` 100
     termYear = year term
 
 
-data OccurenceSchedule = ScheduleWeekly
-                         { scheduleDayOfWeek :: WeekDay
-                         , scheduleStart     :: TimeOfDay
-                         , scheduleEnd       :: TimeOfDay
-                         }
+data OccurrenceSchedule = ScheduleWeekly
+                          { scheduleDayOfWeek :: WeekDay
+                          , scheduleStart     :: TimeOfDay
+                          , scheduleEnd       :: TimeOfDay
+                          }
   deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 deriveJSON defaultOptions
@@ -164,31 +164,31 @@ deriveJSON defaultOptions
   , constructorTagModifier = camelToPathPiece' 1
   , tagSingleConstructors = True
   , sumEncoding = TaggedObject "repeat" "schedule"
-  } ''OccurenceSchedule
+  } ''OccurrenceSchedule
 
-data OccurenceException = ExceptOccur
-                          { exceptDay   :: Day
-                          , exceptStart :: TimeOfDay
-                          , exceptEnd   :: TimeOfDay
-                          }
-                        | ExceptNoOccur
-                          { exceptTime  :: LocalTime
-                          }
+data OccurrenceException = ExceptOccurr
+                           { exceptDay   :: Day
+                           , exceptStart :: TimeOfDay
+                           , exceptEnd   :: TimeOfDay
+                           }
+                         | ExceptNoOccurr
+                           { exceptTime  :: LocalTime
+                           }
   deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 deriveJSON defaultOptions
   { fieldLabelModifier = camelToPathPiece' 1
   , constructorTagModifier = camelToPathPiece' 1
   , sumEncoding = TaggedObject "exception" "for"
-  } ''OccurenceException
+  } ''OccurrenceException
 
-data Occurences = Occurences
-  { occurencesScheduled  :: Set OccurenceSchedule
-  , occurencesExceptions :: Set OccurenceException
+data Occurrences = Occurrences
+  { occurrencesScheduled  :: Set OccurrenceSchedule
+  , occurrencesExceptions :: Set OccurrenceException
   } deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 deriveJSON defaultOptions
   { fieldLabelModifier = camelToPathPiece' 1
-  } ''Occurences
-derivePersistFieldJSON ''Occurences
+  } ''Occurrences
+derivePersistFieldJSON ''Occurrences
 
diff --git a/src/Model/Types/Exam.hs b/src/Model/Types/Exam.hs
index 66abbe195..1f8d5876f 100644
--- a/src/Model/Types/Exam.hs
+++ b/src/Model/Types/Exam.hs
@@ -9,6 +9,8 @@ module Model.Types.Exam
 import Import.NoModel
 import Model.Types.Common
 
+import Control.Lens
+
 data ExamPartResult = ExamAttended { examPartResult :: Maybe Points }
                     | ExamNoShow
                     | ExamVoided
@@ -23,7 +25,7 @@ derivePersistFieldJSON ''ExamPartResult
 
 data ExamBonusRule = ExamNoBonus
                    | ExamBonusPoints
-                     { bonusExchangeRate :: Rational
+                     { bonusMaxPoints :: Points
                      , bonusOnlyPassed :: Bool
                      }
   deriving (Show, Read, Eq, Ord, Generic, Typeable)
@@ -34,14 +36,79 @@ deriveJSON defaultOptions
   } ''ExamBonusRule
 derivePersistFieldJSON ''ExamBonusRule
 
-data ExamOccurenceRule = ExamRoomManual
-                       | ExamRoomSurname
-                       | ExamRoomMatriculation
-                       | ExamRoomRandom
+data ExamOccurrenceRule = ExamRoomManual
+                        | ExamRoomSurname
+                        | ExamRoomMatriculation
+                        | ExamRoomRandom
   deriving (Show, Read, Eq, Ord, Generic, Typeable)
 deriveJSON defaultOptions
   { constructorTagModifier = camelToPathPiece' 2
   , fieldLabelModifier = camelToPathPiece' 1
   , sumEncoding = TaggedObject "rule" "settings"
-  } ''ExamOccurenceRule
-derivePersistFieldJSON ''ExamOccurenceRule
+  } ''ExamOccurrenceRule
+derivePersistFieldJSON ''ExamOccurrenceRule
+
+data ExamGrade
+  = Grade50
+  | Grade40
+  | Grade37
+  | Grade33
+  | Grade30
+  | Grade27
+  | Grade23
+  | Grade20
+  | Grade17
+  | Grade13
+  | Grade10
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe ExamGrade
+instance Finite ExamGrade
+
+numberGrade :: Prism' Rational ExamGrade
+numberGrade = prism toNumberGrade fromNumberGrade
+  where
+    toNumberGrade = \case
+      Grade50 -> 5.0
+      Grade40 -> 4.0
+      Grade37 -> 3.7
+      Grade33 -> 3.3
+      Grade30 -> 3.0
+      Grade27 -> 2.7
+      Grade23 -> 2.3
+      Grade20 -> 2.0
+      Grade17 -> 1.7
+      Grade13 -> 1.3
+      Grade10 -> 1.0
+    fromNumberGrade = \case
+      5.0 -> Right Grade50
+      4.0 -> Right Grade40
+      3.7 -> Right Grade37
+      3.3 -> Right Grade33
+      3.0 -> Right Grade30
+      2.7 -> Right Grade27
+      2.3 -> Right Grade23
+      2.0 -> Right Grade20
+      1.7 -> Right Grade17
+      1.3 -> Right Grade13
+      1.0 -> Right Grade10
+      n   -> Left  n
+
+instance PathPiece ExamGrade where
+  toPathPiece = tshow . review numberGrade
+  fromPathPiece = finiteFromPathPiece
+
+pathPieceJSON ''ExamGrade
+pathPieceJSONKey ''ExamGrade
+
+data ExamGradingRule
+  = ExamGradingManual
+  | ExamGradingKey
+    { examGradingKey :: [Points] -- ^ @[n1, n2, n3, ..., n11]@ means @0 <= p < n1 -> p ~= 5@, @n1 <= p < n2 -> p ~ 4.7@, @n2 <= p < n3 -> p ~ 4.3@, ..., @n11 <= p -> p ~ 1.0@
+    }
+  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 2
+  , fieldLabelModifier = camelToPathPiece' 2
+  , sumEncoding = TaggedObject "rule" "settings"
+  } ''ExamGradingRule
+derivePersistFieldJSON ''ExamGradingRule
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 2e5f22004..7690db79c 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -34,6 +34,10 @@ import Web.PathPieces
 
 import Data.UUID
 
+import Data.Ratio ((%))
+import Data.Fixed
+import Data.Scientific
+
 import Utils
 -- import Utils.Message
 -- import Utils.PathPiece
@@ -41,6 +45,10 @@ import Utils
 
 import Data.Proxy
 
+import Text.HTML.SanitizeXSS (sanitizeBalance)
+import Text.Blaze (preEscapedText)
+import Text.Blaze.Html.Renderer.Pretty (renderHtml)
+
 
 
 
@@ -444,8 +452,52 @@ optionsFinite = do
       }
   return . mkOptionList $ mkOption <$> universeF
 
+fractionalField :: forall m a.
+                   ( RealFrac a
+                   , Monad m
+                   , RenderMessage (HandlerSite m) FormMessage
+                   ) => Field m a
+-- | Form `Field` for any `Fractional` number
+--
+-- Use more specific `Field`s (i.e. `fixedPrecField`) whenever they exist
+fractionalField = Field{..}
+  where
+    scientific' :: Iso' a Scientific
+    scientific' = iso (fromRational . toRational) (fromRational . toRational)
+    
+    fieldEnctype = UrlEncoded
+    fieldView theId name attrs (fmap $ view scientific' -> val) isReq
+      = [whamlet|
+          $newline never
+          <input id=#{theId} name=#{name} *{attrs} type=number :isReq:required value=#{either id (pack . formatScientific Fixed Nothing) val}>
+        |]
+    fieldParse = parseHelper $ \t ->
+      maybe (Left $ MsgInvalidNumber t) (Right . review scientific') (readMay t :: Maybe Scientific)
+
+fixedPrecField :: forall m p.
+                  ( Monad m
+                  , RenderMessage (HandlerSite m) FormMessage
+                  , HasResolution p
+                  ) => Field m (Fixed p)
+fixedPrecField = Field{..}
+  where
+    resolution' :: Integer
+    resolution' = resolution $ Proxy @p
+
+    step = showFixed True (fromRational $ 1 % resolution' :: Fixed p)
+    
+    fieldEnctype = UrlEncoded
+    fieldView theId name attrs val isReq
+      = [whamlet|
+          $newline never
+          <input id=#{theId} name=#{name} *{attrs} type=number step=#{step} :isReq:required value=#{either id (pack . showFixed True) val}>
+        |]
+    fieldParse = parseHelper $ \t -> do
+      sci <- maybe (Left $ MsgInvalidNumber t) Right (readMay t :: Maybe Scientific)
+      return . fromRational $ round (sci * fromIntegral resolution') % resolution'
+
 rationalField :: (MonadHandler m, RenderMessage (HandlerSite m) FormMessage) => Field m Rational
-rationalField = convertField toRational fromRational doubleField
+rationalField = fractionalField
 
 data SecretJSONFieldException = SecretJSONFieldDecryptFailure
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
@@ -471,6 +523,12 @@ secretJsonField = Field{..}
       |]
     fieldEnctype = UrlEncoded
 
+htmlFieldSmall :: forall m. (Monad m, RenderMessage (HandlerSite m) FormMessage) => Field m Html
+htmlFieldSmall = checkMMap sanitize (pack . renderHtml) textField
+  where
+    sanitize :: Text -> m (Either FormMessage Html)
+    sanitize = return . Right . preEscapedText . sanitizeBalance
+
 -----------
 -- Forms --
 -----------
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index b4cd5a572..955b7dcf6 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -111,18 +111,21 @@ makeLenses_ ''SubmissionMode
 
 makePrisms ''E.Value
 
-makeLenses_ ''OccurenceSchedule
+makeLenses_ ''OccurrenceSchedule
 
-makePrisms ''OccurenceSchedule
+makePrisms ''OccurrenceSchedule
 
-makeLenses_ ''OccurenceException
+makeLenses_ ''OccurrenceException
 
-makePrisms ''OccurenceException
+makePrisms ''OccurrenceException
 
-makeLenses_ ''Occurences
+makeLenses_ ''Occurrences
 
 makeLenses_ ''PredDNF
 
+makeLenses_ ''ExamBonusRule
+makeLenses_ ''ExamGradingRule
+
 
 -- makeClassy_ ''Load
 
diff --git a/src/Utils/Occurences.hs b/src/Utils/Occurrences.hs
similarity index 65%
rename from src/Utils/Occurences.hs
rename to src/Utils/Occurrences.hs
index 077d79250..6de64fac3 100644
--- a/src/Utils/Occurences.hs
+++ b/src/Utils/Occurrences.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-overlapping-patterns #-}
 
-module Utils.Occurences
-  ( normalizeOccurences
+module Utils.Occurrences
+  ( normalizeOccurrences
   ) where
 
 import ClassyPrelude
@@ -20,21 +20,21 @@ import Data.Time
 import Data.Time.Calendar.WeekDate
 
 
-normalizeOccurences :: Occurences -> Occurences
+normalizeOccurrences :: Occurrences -> Occurrences
 -- ^ 
 --
 --   - Removes unnecessary exceptions
 --   - Merges overlapping schedules
-normalizeOccurences initial
+normalizeOccurrences initial
   | Left new <- runReader (runExceptT go) initial
-  = normalizeOccurences new
+  = normalizeOccurrences new
   | otherwise
   = initial
   where
-    go :: ExceptT Occurences (Reader Occurences) ()
+    go :: ExceptT Occurrences (Reader Occurrences) ()
     -- Find some inconsistency and `throwE` a version without it
     go = do
-      scheduled <- view _occurencesScheduled
+      scheduled <- view _occurrencesScheduled
       forM_ scheduled $ \case
         a@ScheduleWeekly{} -> do
           let
@@ -50,35 +50,35 @@ normalizeOccurences initial
               | otherwise
               = Nothing
             merge _ = Nothing
-          merges <- views _occurencesScheduled $ mapMaybe (\b -> (,) <$> pure b <*> merge b) . Set.toList . Set.delete a
+          merges <- views _occurrencesScheduled $ 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)
+            ((b, merged) : _) -> throwE =<< asks (over _occurrencesScheduled $ Set.insert merged . Set.delete b . Set.delete a)
 
-      exceptions <- view _occurencesExceptions
+      exceptions <- view _occurrencesExceptions
       forM_ exceptions $ \case
-        needle@ExceptNoOccur{..} -> do
+        needle@ExceptNoOccurr{..} -> do
           let LocalTime{..} = exceptTime
               (_, _, toEnum . (`mod` 7) -> localWeekDay) = toWeekDate localDay
-          needed <- views _occurencesScheduled . any $ \case
+          needed <- views _occurrencesScheduled . any $ \case
             ScheduleWeekly{..} -> and
               [ scheduleDayOfWeek == localWeekDay
               , scheduleStart <= localTimeOfDay
               , localTimeOfDay <= scheduleEnd
               ]
           unless needed $
-            throwE =<< asks (over _occurencesExceptions $ Set.delete needle)
-        needle@ExceptOccur{..} -> do
+            throwE =<< asks (over _occurrencesExceptions $ Set.delete needle)
+        needle@ExceptOccurr{..} -> 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 ExceptNoOccurr{..} = LocalTime exceptDay exceptStart <= exceptTime
+                                             && exceptTime <= LocalTime exceptDay exceptEnd
               withinNeedle _ = False
-          needed <- views _occurencesScheduled . none $ \case
+          needed <- views _occurrencesScheduled . none $ \case
             ScheduleWeekly{..} -> and
               [ scheduleDayOfWeek == localWeekDay
               , scheduleStart == exceptStart
               , scheduleEnd == exceptEnd
               ]
           unless needed $
-            throwE =<< asks (over _occurencesExceptions $ Set.filter (not . withinNeedle) . Set.delete needle)
+            throwE =<< asks (over _occurrencesExceptions $ Set.filter (not . withinNeedle) . Set.delete needle)
diff --git a/src/Utils/PathPiece.hs b/src/Utils/PathPiece.hs
index 2d9b8b860..f3b8e0e7b 100644
--- a/src/Utils/PathPiece.hs
+++ b/src/Utils/PathPiece.hs
@@ -5,7 +5,7 @@ module Utils.PathPiece
   , splitCamel
   , camelToPathPiece, camelToPathPiece'
   , tuplePathPiece
-  , pathPieceJSONKey
+  , pathPieceJSON, pathPieceJSONKey
   ) where
 
 import ClassyPrelude.Yesod
@@ -25,6 +25,7 @@ import Numeric.Natural
 import Data.List (foldl)
 
 import Data.Aeson.Types
+import qualified Data.Aeson.Types as Aeson
   
 
 finiteFromPathPiece :: (PathPiece a, Finite a) => Text -> Maybe a
@@ -120,5 +121,14 @@ pathPieceJSONKey tName
   = [d| instance ToJSONKey $(conT tName) where
           toJSONKey = toJSONKeyText toPathPiece
         instance FromJSONKey $(conT tName) where
-          fromJSONKey = FromJSONKeyTextParser $ \t -> maybe (fail $ "Could not parse ‘" <> unpack t <> "’ as value for " <> $(TH.lift $ nameBase tName) <> "via PathPiece") return $ fromPathPiece t
+          fromJSONKey = FromJSONKeyTextParser $ \t -> maybe (fail $ "Could not parse ‘" <> unpack t <> "’ as value for " <> $(TH.lift $ nameBase tName) <> " via PathPiece") return $ fromPathPiece t
+      |]
+
+pathPieceJSON :: Name -> DecsQ
+-- ^ Derive `ToJSON`- and `FromJSON`-Instances from a `PathPiece`-Instance
+pathPieceJSON tName
+  = [d| instance ToJSON $(conT tName) where
+          toJSON = Aeson.String . toPathPiece
+        instance FromJSON $(conT tName) where
+          parseJSON = Aeson.withText $(TH.lift $ nameBase tName) $ \t -> maybe (fail $ "Could not parse ‘" <> unpack t <> "’ as value for " <> $(TH.lift $ nameBase tName) <> " via PathPiece") return $ fromPathPiece t
       |]
diff --git a/templates/exam-list.hamlet b/templates/exam-list.hamlet
new file mode 100644
index 000000000..b39bba56d
--- /dev/null
+++ b/templates/exam-list.hamlet
@@ -0,0 +1,2 @@
+$newline never
+^{examTable}
diff --git a/templates/exam-new.hamlet b/templates/exam-new.hamlet
new file mode 100644
index 000000000..2b87f350b
--- /dev/null
+++ b/templates/exam-new.hamlet
@@ -0,0 +1,2 @@
+$newline never
+^{newExamForm}
diff --git a/templates/widgets/gradingKey.hamlet b/templates/widgets/gradingKey.hamlet
new file mode 100644
index 000000000..d6a95326b
--- /dev/null
+++ b/templates/widgets/gradingKey.hamlet
@@ -0,0 +1,15 @@
+$newline never
+<table>
+  <thead>
+    <tr>
+      <td>
+      $forall g <- grades
+        <th>
+          _{g}
+  <tbody>
+    <tr>
+      <th>
+        _{MsgGradingFrom}
+      $forall (_, fv) <- bounds
+        <td>
+          ^{fvInput fv}
diff --git a/templates/widgets/massinput/examCorrectors/add.hamlet b/templates/widgets/massinput/examCorrectors/add.hamlet
new file mode 100644
index 000000000..bdf6da247
--- /dev/null
+++ b/templates/widgets/massinput/examCorrectors/add.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<td colspan=2>
+  #{csrf}
+  ^{fvInput addView}
+<td>
+  ^{fvInput submitView}
diff --git a/templates/widgets/massinput/examCorrectors/cellInvitation.hamlet b/templates/widgets/massinput/examCorrectors/cellInvitation.hamlet
new file mode 100644
index 000000000..27c423ad1
--- /dev/null
+++ b/templates/widgets/massinput/examCorrectors/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/widgets/massinput/examCorrectors/cellKnown.hamlet b/templates/widgets/massinput/examCorrectors/cellKnown.hamlet
new file mode 100644
index 000000000..5ea4cca6f
--- /dev/null
+++ b/templates/widgets/massinput/examCorrectors/cellKnown.hamlet
@@ -0,0 +1,3 @@
+$newline never
+<td colspan=2>
+  ^{nameEmailWidget userEmail userDisplayName userSurname}
diff --git a/templates/widgets/occurence/form/scheduled-layout.hamlet b/templates/widgets/massinput/examCorrectors/layout.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/scheduled-layout.hamlet
rename to templates/widgets/massinput/examCorrectors/layout.hamlet
diff --git a/templates/widgets/massinput/examParts/add.hamlet b/templates/widgets/massinput/examParts/add.hamlet
new file mode 100644
index 000000000..6ef4903fb
--- /dev/null
+++ b/templates/widgets/massinput/examParts/add.hamlet
@@ -0,0 +1,4 @@
+$newline never
+^{formWidget}
+<td>
+  ^{fvInput submitView}
diff --git a/templates/widgets/massinput/examParts/form.hamlet b/templates/widgets/massinput/examParts/form.hamlet
new file mode 100644
index 000000000..2da5a3234
--- /dev/null
+++ b/templates/widgets/massinput/examParts/form.hamlet
@@ -0,0 +1,4 @@
+$newline never
+<td>#{csrf}^{fvInput epfNameView}
+<td>^{fvInput epfMaxPointsView}
+<td>^{fvInput epfWeightView}
diff --git a/templates/widgets/massinput/examParts/layout.hamlet b/templates/widgets/massinput/examParts/layout.hamlet
new file mode 100644
index 000000000..87ab7fef4
--- /dev/null
+++ b/templates/widgets/massinput/examParts/layout.hamlet
@@ -0,0 +1,16 @@
+$newline never
+<table>
+  <thead>
+    <th>_{MsgExamPartName}
+    <th>_{MsgExamPartMaxPoints}
+    <th>_{MsgExamPartWeight}
+    <td>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput__cell>
+        ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr .massinput__cell.massinput__cell--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/examRooms/add.hamlet b/templates/widgets/massinput/examRooms/add.hamlet
new file mode 100644
index 000000000..6ef4903fb
--- /dev/null
+++ b/templates/widgets/massinput/examRooms/add.hamlet
@@ -0,0 +1,4 @@
+$newline never
+^{formWidget}
+<td>
+  ^{fvInput submitView}
diff --git a/templates/widgets/massinput/examRooms/form.hamlet b/templates/widgets/massinput/examRooms/form.hamlet
new file mode 100644
index 000000000..a6bdff401
--- /dev/null
+++ b/templates/widgets/massinput/examRooms/form.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<td>#{csrf}^{fvInput eofRoomView}
+<td>^{fvInput eofCapacityView}
+<td>^{fvInput eofStartView}
+<td>^{fvInput eofEndView}
+<td>^{fvInput eofDescView}
diff --git a/templates/widgets/massinput/examRooms/layout.hamlet b/templates/widgets/massinput/examRooms/layout.hamlet
new file mode 100644
index 000000000..cc4211e5c
--- /dev/null
+++ b/templates/widgets/massinput/examRooms/layout.hamlet
@@ -0,0 +1,18 @@
+$newline never
+<table>
+  <thead>
+    <th>_{MsgExamRoom}
+    <th>_{MsgExamRoomCapacity}
+    <th>_{MsgExamRoomStart}
+    <th>_{MsgExamRoomEnd}
+    <th>_{MsgExamRoomDescription}
+    <td>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput__cell>
+        ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr .massinput__cell.massinput__cell--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/uploadSpecificFiles/layout.hamlet b/templates/widgets/massinput/uploadSpecificFiles/layout.hamlet
index 2179c82b1..15911ac06 100644
--- a/templates/widgets/massinput/uploadSpecificFiles/layout.hamlet
+++ b/templates/widgets/massinput/uploadSpecificFiles/layout.hamlet
@@ -4,7 +4,7 @@ $newline never
     <th>_{MsgUploadSpecificFileLabel}
     <th>_{MsgUploadSpecificFileName}
     <th>_{MsgUploadSpecificFileRequired}
-    <th>
+    <td>
   <tbody>
     $forall coord <- review liveCoords lLength
       <tr .massinput__cell>
diff --git a/templates/widgets/occurence/cell.hamlet b/templates/widgets/occurrence/cell.hamlet
similarity index 64%
rename from templates/widgets/occurence/cell.hamlet
rename to templates/widgets/occurrence/cell.hamlet
index bb1f1f3d7..295b3ae24 100644
--- a/templates/widgets/occurence/cell.hamlet
+++ b/templates/widgets/occurrence/cell.hamlet
@@ -1,12 +1,12 @@
 $newline never
 <ul .list--inline .list--iconless .list--comma-separated>
-  $forall sched <- occurencesScheduled'
+  $forall sched <- occurrencesScheduled'
     <li>^{sched}
 
-$if not (null occurencesExceptions)
+$if not (null occurrencesExceptions)
   $# <div .tooltip>
   $#   <div .tooltip__handle .tooltip__handle--danger>
   $#   <div .tooltip__content>
       <ul>
-        $forall exc <- occurencesExceptions'
+        $forall exc <- occurrencesExceptions'
           <li>^{exc}
diff --git a/templates/widgets/occurence/cell/except-no-occur.hamlet b/templates/widgets/occurrence/cell/except-no-occurr.hamlet
similarity index 100%
rename from templates/widgets/occurence/cell/except-no-occur.hamlet
rename to templates/widgets/occurrence/cell/except-no-occurr.hamlet
diff --git a/templates/widgets/occurence/cell/except-occur.hamlet b/templates/widgets/occurrence/cell/except-occurr.hamlet
similarity index 100%
rename from templates/widgets/occurence/cell/except-occur.hamlet
rename to templates/widgets/occurrence/cell/except-occurr.hamlet
diff --git a/templates/widgets/occurence/cell/weekly.hamlet b/templates/widgets/occurrence/cell/weekly.hamlet
similarity index 100%
rename from templates/widgets/occurence/cell/weekly.hamlet
rename to templates/widgets/occurrence/cell/weekly.hamlet
diff --git a/templates/widgets/occurence/form/except-add.hamlet b/templates/widgets/occurrence/form/except-add.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/except-add.hamlet
rename to templates/widgets/occurrence/form/except-add.hamlet
diff --git a/templates/widgets/occurrence/form/except-layout.hamlet b/templates/widgets/occurrence/form/except-layout.hamlet
new file mode 100644
index 000000000..65352dd95
--- /dev/null
+++ b/templates/widgets/occurrence/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__cell.massinput__cell--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/occurence/form/except-no-occur.hamlet b/templates/widgets/occurrence/form/except-no-occur.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/except-no-occur.hamlet
rename to templates/widgets/occurrence/form/except-no-occur.hamlet
diff --git a/templates/widgets/occurence/form/except-occur.hamlet b/templates/widgets/occurrence/form/except-occur.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/except-occur.hamlet
rename to templates/widgets/occurrence/form/except-occur.hamlet
diff --git a/templates/widgets/occurrence/form/scheduled-add.hamlet b/templates/widgets/occurrence/form/scheduled-add.hamlet
new file mode 100644
index 000000000..bcb16ecfa
--- /dev/null
+++ b/templates/widgets/occurrence/form/scheduled-add.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<td colspan=2>
+  ^{addWidget}
+<td>
+  ^{fvInput submitView}
diff --git a/templates/widgets/occurrence/form/scheduled-layout.hamlet b/templates/widgets/occurrence/form/scheduled-layout.hamlet
new file mode 100644
index 000000000..65352dd95
--- /dev/null
+++ b/templates/widgets/occurrence/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__cell.massinput__cell--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/occurence/form/weekly.hamlet b/templates/widgets/occurrence/form/weekly.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/weekly.hamlet
rename to templates/widgets/occurrence/form/weekly.hamlet
diff --git a/test/Database.hs b/test/Database.hs
index ea044ac75..f339ee6d0 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -586,9 +586,9 @@ fillDb = do
     , 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
+    , tutorialTime = Occurrences
+      { occurrencesScheduled = Set.singleton $ ScheduleWeekly Tuesday (TimeOfDay 08 15 00) (TimeOfDay 10 00 00)
+      , occurrencesExceptions = Set.empty
       }
     , tutorialRegGroup = Just "tutorium"
     , tutorialRegisterFrom = Just now
@@ -604,9 +604,9 @@ fillDb = do
     , 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
+    , tutorialTime = Occurrences
+      { occurrencesScheduled = Set.singleton $ ScheduleWeekly Tuesday (TimeOfDay 10 15 00) (TimeOfDay 12 00 00)
+      , occurrencesExceptions = Set.empty
       }
     , tutorialRegGroup = Just "tutorium"
     , tutorialRegisterFrom = Just now

From 497e4c373a0027333099fca00f4ddc8f7e8c782d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 11 Jun 2019 16:20:26 +0200
Subject: [PATCH 446/519] Update data-protection to reflect installation of
 ipscrub

---
 templates/i18n/data-protection/de.hamlet | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/i18n/data-protection/de.hamlet b/templates/i18n/data-protection/de.hamlet
index 8158b4709..31bd6a038 100644
--- a/templates/i18n/data-protection/de.hamlet
+++ b/templates/i18n/data-protection/de.hamlet
@@ -73,7 +73,7 @@
     <h4>Welche Daten werden erhoben
     Der Webserver protokolliert
     <ul>
-      <li>IP-Adresse des Webclients des Nutzers dieses Dienstes
+      <li>Pseudonymisierte IP-Adresse des Webclients des Nutzers dieses Dienstes
       <li>Datum und Uhrzeit des Abrufs eines Elementes der Webseite
       <li>Adresse des abgerufenen Elementes
       <li>übertragene Datenmenge
@@ -84,6 +84,8 @@
     <p>
       Im Falle einer Störung oder eines Sicherheitsvorfalles wird für die Dauer des Vorfalles
       die Anonymisierung der IP-Adresse aufgehoben.
+    <p>
+      Zur Pseudonymisierung der IP-Adressen wird ipscrub (<a href="http://www.ipscrub.org">http://www.ipscrub.org</a>) verwendet.
 
     <h4>Zweckbindung
     <p>
@@ -190,4 +192,4 @@ $#    <p>
 $#      Der Nutzer ist bei Nutzung dieses Dienstes verpflichtet die Daten bereitzustellen und
 $#      verarbeiten zu lassen. Wir behalten uns das Recht vor,
 $#      Nutzer, die die Daten nicht bereitstellen, von der Nutzung des Dienstes auszuschließen.
-$#
\ No newline at end of file
+$#

From d054370b29b5098c7dad1e0360c5cf24e205b48d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 12 Jun 2019 09:17:32 +0200
Subject: [PATCH 447/519] Better exam table

---
 messages/uniworx/de.msg   |  1 +
 routes                    |  3 ++-
 src/Foundation.hs         | 11 +++++++++++
 src/Handler/Exam.hs       | 19 +++++++++++++++----
 src/Handler/Utils/Exam.hs | 10 +++++-----
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 530f07b25..5dfe93c8c 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -278,6 +278,7 @@ 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.
+UnauthorizedExamTime: Diese Klausur ist momentan nicht freigegeben.
 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.
diff --git a/routes b/routes
index f409deb1d..17d24e02c 100644
--- a/routes
+++ b/routes
@@ -137,9 +137,10 @@
     /register                 TRegisterR           POST        !timeANDcapacityANDcourse-registeredANDregister-group !timeANDtutorial-registered
     /communication            TCommR           GET POST        !tutor
     /tutor-invite             TInviteR         GET POST
-  /exams                        CExamListR     GET             !development -- Missing permission checks on which exams can be shown
+  /exams                        CExamListR     GET             !free
   /exams/new                    CExamNewR      GET POST
   /exams/#ExamName ExamR:
+    /show                       EShowR         GET             !time
     /corrector-invite           ECInviteR      GET POST
 
 
diff --git a/src/Foundation.hs b/src/Foundation.hs
index dc3621858..2808e6180 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -641,6 +641,15 @@ tagAccessPredicate AuthTutor = APDB $ \mAuthId route _ -> exceptT return return
       guardMExceptT (not $ Map.null resMap) (unauthorizedI MsgUnauthorizedTutor)
       return Authorized
 tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
+  CExamR tid ssh csh examn _subRoute -> maybeT (unauthorizedI MsgUnauthorizedExamTime) $ do
+    course <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity _ Exam{..} <- $cachedHereBinary (course, examn) . MaybeT . getBy $ UniqueExam course examn
+    cTime <- liftIO getCurrentTime
+
+    guard $ NTop examVisibleFrom <= NTop (Just cTime)
+
+    return Authorized
+  
   CTutorialR tid ssh csh tutn TRegisterR -> maybeT (unauthorizedI MsgUnauthorizedTutorialTime) $ do
     now <- liftIO getCurrentTime
     course <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
@@ -1446,6 +1455,8 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (CourseR tid ssh csh CExamListR) = return ("Klausuren", Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh CExamNewR) = return ("Anlegen", Just $ CourseR tid ssh csh CExamListR)
 
+  breadcrumb (CExamR tid ssh csh examn EShowR) = return (CI.original examn, Just $ CourseR tid ssh csh CExamListR)
+
   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)
diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
index 4f1c4917a..5def10ff3 100644
--- a/src/Handler/Exam.hs
+++ b/src/Handler/Exam.hs
@@ -7,6 +7,7 @@ import Import
 import Handler.Utils
 import Handler.Utils.Exam
 import Handler.Utils.Invitations
+import Handler.Utils.Table.Cells
 import Jobs.Queue
 
 import Utils.Lens
@@ -25,6 +26,8 @@ import Text.Blaze.Html.Renderer.String (renderHtml)
 getCExamListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCExamListR tid ssh csh = do
   Entity cid Course{..} <- runDB . getBy404 $ TermSchoolCourseShort tid ssh csh
+  now <- liftIO getCurrentTime
+  mayCreate <- hasWriteAccessTo $ CourseR tid ssh csh CExamNewR
 
   let
     examDBTable = DBTable{..}
@@ -33,10 +36,15 @@ getCExamListR tid ssh csh = do
           E.where_ $ exam E.^. ExamCourse E.==. E.val cid
           return exam
         dbtRowKey = (E.^. ExamId)
-        dbtProj = return
-        dbtColonnade = dbColonnade $ mconcat
-          [ sortable (Just "name") (i18nCell MsgExamName) $ \DBRow{ dbrOutput = Entity _ Exam{..} } -> cell $ toWidget examName
-          , sortable (Just "time") (i18nCell MsgExamTime) $ \DBRow{ dbrOutput = Entity _ Exam{..} } -> cell $ do
+        dbtProj x@DBRow{ dbrOutput = Entity _ Exam{..} } = do
+          guardM . hasReadAccessTo $ CExamR tid ssh csh examName EShowR
+          return x
+        dbtColonnade = dbColonnade . mconcat $ catMaybes
+          [ Just . sortable (Just "name") (i18nCell MsgExamName) $ \DBRow{ dbrOutput = Entity _ Exam{..} } -> anchorCell (CExamR tid ssh csh examName EShowR) $ toWidget examName
+          , (<$ guard mayCreate) . sortable (Just "visible") (i18nCell MsgExamVisibleFrom) $ \DBRow { dbrOutput = Entity _ Exam{..} } -> maybe mempty (dateTimeCellVisible now) examVisibleFrom
+          , Just . sortable (Just "register-from") (i18nCell MsgExamRegisterFrom) $ \DBRow { dbrOutput = Entity _ Exam{..} } -> maybe mempty dateTimeCell examRegisterFrom
+          , Just . sortable (Just "register-to") (i18nCell MsgExamRegisterTo) $ \DBRow { dbrOutput = Entity _ Exam{..} } -> maybe mempty dateTimeCell examRegisterTo
+          , Just . sortable (Just "time") (i18nCell MsgExamTime) $ \DBRow{ dbrOutput = Entity _ Exam{..} } -> cell $ do
               startT <- formatTime SelFormatDateTime examStart
               endT <- traverse (\examEnd' -> formatTime (bool SelFormatDateTime SelFormatTime $ ((==) `on` utctDay) examStart examEnd') examEnd') examEnd
               [whamlet|
@@ -389,3 +397,6 @@ postCExamNewR tid ssh csh = do
         , formEncoding = newExamEnctype
         }
     $(widgetFile "exam-new")
+
+getEShowR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
+getEShowR = error "getExamShowR"
diff --git a/src/Handler/Utils/Exam.hs b/src/Handler/Utils/Exam.hs
index 249d98b73..3d1d43845 100644
--- a/src/Handler/Utils/Exam.hs
+++ b/src/Handler/Utils/Exam.hs
@@ -3,7 +3,7 @@ module Handler.Utils.Exam
   , fetchExam, fetchExamId, fetchCourseIdExamId, fetchCourseIdExam
   ) where
 
-import Import
+import Import.NoFoundation
 
 import Database.Persist.Sql (SqlBackendCanRead)
 import qualified Database.Esqueleto as E
@@ -34,14 +34,14 @@ fetchExamAux prj tid ssh csh examn =
           [tut] -> return tut
           _other  -> notFound
 
-fetchExam :: TermId -> SchoolId -> CourseShorthand -> ExamName -> DB (Entity Exam)
+fetchExam :: MonadHandler m => TermId -> SchoolId -> CourseShorthand -> ExamName -> ReaderT SqlBackend m (Entity Exam)
 fetchExam = fetchExamAux const
 
-fetchExamId :: TermId -> SchoolId -> CourseShorthand -> ExamName -> YesodDB UniWorX (Key Exam)
+fetchExamId :: MonadHandler m => TermId -> SchoolId -> CourseShorthand -> ExamName -> ReaderT SqlBackend m (Key Exam)
 fetchExamId tid ssh cid examn = E.unValue <$> fetchExamAux (\tutorial _ -> tutorial E.^. ExamId) tid ssh cid examn
 
-fetchCourseIdExamId  :: TermId -> SchoolId -> CourseShorthand -> ExamName -> YesodDB UniWorX (Key Course, Key Exam)
+fetchCourseIdExamId  :: MonadHandler m => TermId -> SchoolId -> CourseShorthand -> ExamName -> ReaderT SqlBackend m (Key Course, Key Exam)
 fetchCourseIdExamId tid ssh cid examn = $(unValueN 2) <$> fetchExamAux (\tutorial course -> (course E.^. CourseId, tutorial E.^. ExamId)) tid ssh cid examn
 
-fetchCourseIdExam  :: TermId -> SchoolId -> CourseShorthand -> ExamName -> YesodDB UniWorX (Key Course, Entity Exam)
+fetchCourseIdExam  :: MonadHandler m => TermId -> SchoolId -> CourseShorthand -> ExamName -> ReaderT SqlBackend m (Key Course, Entity Exam)
 fetchCourseIdExam tid ssh cid examn = over _1 E.unValue <$> fetchExamAux (\tutorial course -> (course E.^. CourseId, tutorial)) tid ssh cid examn

From 0185fd3c87f46223eb99df44588f615467845f3b Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 13 Jun 2019 09:49:17 +0200
Subject: [PATCH 448/519] assignSubmission split into planning and assigning
 part

---
 src/Foundation.hs               | 114 ++++++++++++++++----------------
 src/Handler/Utils/Submission.hs |  28 +++++---
 2 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 4567440f8..7ce7a5eed 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1744,7 +1744,7 @@ pageActions  InstanceR = [
   ]
 pageActions (HelpR) = [
     -- MenuItem
-    --   { menuItemType = PageActionPrime
+    --   { menuItemType  = PageActionPrime
     --   , menuItemLabel = MsgInfoLecturerTitle
     --   , menuItemIcon  = Nothing
     --   , menuItemRoute = SomeRoute InfoLecturerR
@@ -1754,7 +1754,7 @@ pageActions (HelpR) = [
   ]
 pageActions (ProfileR) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuProfileData
       , menuItemIcon  = Just "book"
       , menuItemRoute = SomeRoute ProfileDataR
@@ -1762,7 +1762,7 @@ pageActions (ProfileR) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuAuthPreds
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute AuthPredsR
@@ -1772,7 +1772,7 @@ pageActions (ProfileR) =
   ]
 pageActions TermShowR =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuTermCreate
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute TermEditR
@@ -1782,7 +1782,7 @@ pageActions TermShowR =
   ]
 pageActions (TermCourseListR tid) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCourseNew
       , menuItemIcon  = Just "book"
       , menuItemRoute = SomeRoute CourseNewR
@@ -1790,7 +1790,7 @@ pageActions (TermCourseListR tid) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuTermEdit
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ TermEditExistR tid
@@ -1810,7 +1810,7 @@ pageActions (TermSchoolCourseListR _tid _ssh) =
   ]
 pageActions (CourseListR) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCourseNew
       , menuItemIcon  = Just "book"
       , menuItemRoute = SomeRoute CourseNewR
@@ -1820,7 +1820,7 @@ pageActions (CourseListR) =
   ]
 pageActions (CourseNewR) = [
     MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgInfoLecturerTitle
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute InfoLecturerR
@@ -1849,7 +1849,7 @@ pageActions (CourseR tid ssh csh CShowR) =
           in runDB $ lecturerAccess `or2M` existsVisible
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSheetList
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetListR
@@ -1877,7 +1877,7 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuCourseMembers
       , menuItemIcon  = Just "user-graduate"
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh CUsersR
@@ -1885,7 +1885,7 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuCourseCommunication
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh CCommR
@@ -1893,7 +1893,7 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuCourseEdit
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh CEditR
@@ -1901,7 +1901,7 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuCourseClone
       , menuItemIcon  = Just "copy"
       , menuItemRoute = SomeRoute (CourseNewR, [("tid", toPathPiece tid), ("ssh", toPathPiece ssh), ("csh", toPathPiece csh)])
@@ -1909,9 +1909,9 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuCourseDelete
-      , menuItemIcon = Just "trash"
+      , menuItemIcon  = Just "trash"
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh CDeleteR
       , menuItemModal = False
       , menuItemAccessCallback' = return True
@@ -1919,17 +1919,17 @@ pageActions (CourseR tid ssh csh CShowR) =
   ]
 pageActions (CourseR tid ssh csh CCorrectionsR) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsAssign
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh CAssignR
-      , menuItemModal = True
+      , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   ]
 pageActions (CourseR tid ssh csh SheetListR) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSheetCurrent
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetCurrentR
@@ -1939,7 +1939,7 @@ pageActions (CourseR tid ssh csh SheetListR) =
           return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSheetOldUnassigned
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetOldUnassignedR
@@ -1949,25 +1949,25 @@ pageActions (CourseR tid ssh csh SheetListR) =
           return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSubmissions
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh CCorrectionsR
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsAssign
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh CAssignR
-      , menuItemModal = True
+      , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsOwn
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute (CorrectionsR, [ ("corrections-term"  , termToText $ unTermKey tid)
                                                  , ("corrections-school", CI.original $ unSchoolKey ssh)
                                                  , ("corrections-course", CI.original csh)
@@ -1988,7 +1988,7 @@ pageActions (CourseR tid ssh csh SheetListR) =
               return ok
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSheetNew
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetNewR
@@ -2082,7 +2082,7 @@ pageActions (CTutorialR tid ssh csh tutn TUsersR) =
   ]
 pageActions (CSheetR tid ssh csh shn SShowR) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSubmissionNew
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SubmissionNewR
@@ -2094,7 +2094,7 @@ pageActions (CSheetR tid ssh csh shn SShowR) =
           return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSubmissionOwn
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SubmissionOwnR
@@ -2118,49 +2118,49 @@ pageActions (CSheetR tid ssh csh shn SShowR) =
       , menuItemAccessCallback' = (== Authorized) <$> evalAccessCorrector tid ssh csh
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectors
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SCorrR
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSubmissions
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SSubsR
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
    , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsAssign
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SAssignR
-      , menuItemModal = True
+      , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSheetEdit
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SEditR
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuSheetClone
-      , menuItemIcon = Just "copy"
+      , menuItemIcon  = Just "copy"
       , menuItemRoute = SomeRoute (CourseR tid ssh csh SheetNewR, [("shn", toPathPiece shn)])
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuSheetDelete
-      , menuItemIcon = Just "trash"
+      , menuItemIcon  = Just "trash"
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SDelR
       , menuItemModal = False
       , menuItemAccessCallback' = return True
@@ -2168,7 +2168,7 @@ pageActions (CSheetR tid ssh csh shn SShowR) =
   ]
 pageActions (CSheetR tid ssh csh shn SSubsR) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSubmissionNew
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SubmissionNewR
@@ -2176,25 +2176,25 @@ pageActions (CSheetR tid ssh csh shn SSubsR) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectors
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SCorrR
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
  , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrectionsAssign
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SAssignR
-      , menuItemModal = True
+      , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   ]
 pageActions (CSubmissionR tid ssh csh shn cid SubShowR) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuCorrection
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid CorrectionR
@@ -2202,7 +2202,7 @@ pageActions (CSubmissionR tid ssh csh shn cid SubShowR) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgCorrectorAssignTitle
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid SubAssignR
@@ -2210,7 +2210,7 @@ pageActions (CSubmissionR tid ssh csh shn cid SubShowR) =
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuSubmissionDelete
       , menuItemIcon  = Just "trash"
       , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid SubDelR
@@ -2220,7 +2220,7 @@ pageActions (CSubmissionR tid ssh csh shn cid SubShowR) =
   ]
 pageActions (CSubmissionR tid ssh csh shn cid CorrectionR) =
   [ MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuSubmissionDelete
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid SubDelR
@@ -2230,17 +2230,17 @@ pageActions (CSubmissionR tid ssh csh shn cid CorrectionR) =
   ]
 pageActions (CSheetR tid ssh csh shn SCorrR) =
   [ MenuItem
-      { menuItemType = PageActionPrime
+      { menuItemType  = PageActionPrime
       , menuItemLabel = MsgMenuSubmissions
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SSubsR
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
   , MenuItem
-      { menuItemType = PageActionSecondary
+      { menuItemType  = PageActionSecondary
       , menuItemLabel = MsgMenuSheetEdit
-      , menuItemIcon = Nothing
+      , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SEditR
       , menuItemModal = False
       , menuItemAccessCallback' = return True
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 9bb44bf00..dc55df410 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -67,6 +67,24 @@ assignSubmissions :: SheetId -- ^ Sheet to distribute to correctors
                                      , Set SubmissionId
                                      ) -- ^ Returns assigned and unassigned submissions; unassigned submissions occur only if no tutors have an assigned load
 assignSubmissions sid restriction = do
+    newSubmissionData <- planSubmissions sid restriction
+    now <- liftIO getCurrentTime
+    execWriterT . forM_ (Map.toList newSubmissionData) $ \(subId, mCorrector) -> case mCorrector of
+      Just corrector -> do
+        lift $ update subId [ SubmissionRatingBy       =. Just corrector
+                            , SubmissionRatingAssigned =. Just now
+                            ]
+        tell (Set.singleton subId, mempty)
+      Nothing ->
+        tell (mempty, Set.singleton subId)
+
+
+-- | Compute a map that shows which submissions ought the be assigned to each corrector according to sheet corrector loads, but does not alter database yet!
+planSubmissions :: SheetId -- ^ Sheet to distribute to correctors
+                  -> Maybe (Set SubmissionId) -- ^ Optionally restrict submission to consider
+                  -> YesodDB UniWorX (Map SubmissionId (Maybe UserId))
+                  -- ^ Return map that assigns submissions to Corrector
+planSubmissions sid restriction = do
     Sheet{..} <- getJust sid
     correctorsRaw <- E.select . E.from $ \(sheet `E.InnerJoin` sheetCorrector) -> do
       E.on $ sheet E.^. SheetId E.==. sheetCorrector E.^. SheetCorrectorSheet
@@ -210,15 +228,7 @@ assignSubmissions sid restriction = do
 
         ix subId . _1 <~ Just <$> liftIO (Rand.uniform bestCorrectors)
 
-    now <- liftIO getCurrentTime
-    execWriterT . forM_ (Map.toList newSubmissionData) $ \(subId, (mCorrector, _, _)) -> case mCorrector of
-      Just corrector -> do
-        lift $ update subId [ SubmissionRatingBy       =. Just corrector
-                            , SubmissionRatingAssigned =. Just now
-                            ]
-        tell (Set.singleton subId, mempty)
-      Nothing ->
-        tell (mempty, Set.singleton subId)
+    return $ fmap (view _1) newSubmissionData
   where
     maximumsBy :: (Ord a, Ord b) => (a -> b) -> Set a -> Set a
     maximumsBy f xs = flip Set.filter xs $ \x -> maybe True (((==) `on` f) x . maximumBy (comparing f)) $ fromNullable xs

From 09e681eeb1ec77a1f8c263978322026683aae031 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 14 Jun 2019 00:05:23 +0200
Subject: [PATCH 449/519] fix(fe-check-all): use arrow fn to keep scope in
 event listeners

---
 frontend/src/utils/check-all/check-all.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/utils/check-all/check-all.js b/frontend/src/utils/check-all/check-all.js
index 46194c029..340dca0b1 100644
--- a/frontend/src/utils/check-all/check-all.js
+++ b/frontend/src/utils/check-all/check-all.js
@@ -36,7 +36,7 @@ export class CheckAll {
   }
 
   destroy() {
-    console.log('TBD: Destroy CheckAll');
+    this._checkAllCheckbox.destroy();
   }
 
   _getCheckboxId() {
@@ -95,7 +95,7 @@ export class CheckAll {
     // set up new checkbox
     this._app.utilRegistry.setupAll(th);
 
-    this._checkAllCheckbox.addEventListener('input', this._onCheckAllCheckboxInput);
+    this._checkAllCheckbox.addEventListener('input', () => this._onCheckAllCheckboxInput());
     this._setupCheckboxListeners();
   }
 
@@ -108,7 +108,7 @@ export class CheckAll {
         return cell.querySelector(CHECKBOX_SELECTOR);
       })
       .forEach((checkbox) => {
-        checkbox.addEventListener('input', this.updateCheckAllCheckboxState);
+        checkbox.addEventListener('input', () => this._updateCheckAllCheckboxState());
       });
   }
 

From c495ef577231ac0db6b8c467cf4b0a69c3cf961c Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 14 Jun 2019 00:25:12 +0200
Subject: [PATCH 450/519] feat(development): add standard-version for automatic
 changelog generation

---
 package-lock.json | 6970 ++++++++++++++++++++++++++++-----------------
 package.json      |    4 +-
 2 files changed, 4336 insertions(+), 2638 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1a4d58870..eab845d32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,16 +10,16 @@
       "integrity": "sha512-XGr5YjQSjgTa6OzQZY57FAJsdeVSAKR/u/KA5exWIz66IKtv/zXtHy+fIZcMry/EgYegwuHE7vzGnrFhjdIAsQ==",
       "dev": true,
       "requires": {
-        "chokidar": "2.1.6",
-        "commander": "2.20.0",
-        "convert-source-map": "1.6.0",
-        "fs-readdir-recursive": "1.1.0",
-        "glob": "7.1.4",
-        "lodash": "4.17.11",
-        "mkdirp": "0.5.1",
-        "output-file-sync": "2.0.1",
-        "slash": "2.0.0",
-        "source-map": "0.5.7"
+        "chokidar": "^2.0.4",
+        "commander": "^2.8.1",
+        "convert-source-map": "^1.1.0",
+        "fs-readdir-recursive": "^1.1.0",
+        "glob": "^7.0.0",
+        "lodash": "^4.17.11",
+        "mkdirp": "^0.5.1",
+        "output-file-sync": "^2.0.0",
+        "slash": "^2.0.0",
+        "source-map": "^0.5.0"
       }
     },
     "@babel/code-frame": {
@@ -28,7 +28,7 @@
       "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "7.0.0"
+        "@babel/highlight": "^7.0.0"
       }
     },
     "@babel/core": {
@@ -37,20 +37,20 @@
       "integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.0.0",
-        "@babel/generator": "7.4.4",
-        "@babel/helpers": "7.4.4",
-        "@babel/parser": "7.4.5",
-        "@babel/template": "7.4.4",
-        "@babel/traverse": "7.4.5",
-        "@babel/types": "7.4.4",
-        "convert-source-map": "1.6.0",
-        "debug": "4.1.1",
-        "json5": "2.1.0",
-        "lodash": "4.17.11",
-        "resolve": "1.11.0",
-        "semver": "5.7.0",
-        "source-map": "0.5.7"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.4.4",
+        "@babel/helpers": "^7.4.4",
+        "@babel/parser": "^7.4.5",
+        "@babel/template": "^7.4.4",
+        "@babel/traverse": "^7.4.5",
+        "@babel/types": "^7.4.4",
+        "convert-source-map": "^1.1.0",
+        "debug": "^4.1.0",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.11",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
       },
       "dependencies": {
         "debug": {
@@ -59,7 +59,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -76,11 +76,11 @@
       "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.4.4",
-        "jsesc": "2.5.2",
-        "lodash": "4.17.11",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
+        "@babel/types": "^7.4.4",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.11",
+        "source-map": "^0.5.0",
+        "trim-right": "^1.0.1"
       }
     },
     "@babel/helper-annotate-as-pure": {
@@ -89,7 +89,7 @@
       "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.4.4"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
@@ -98,8 +98,8 @@
       "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "7.1.0",
-        "@babel/types": "7.4.4"
+        "@babel/helper-explode-assignable-expression": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-call-delegate": {
@@ -108,9 +108,9 @@
       "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "7.4.4",
-        "@babel/traverse": "7.4.5",
-        "@babel/types": "7.4.4"
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-create-class-features-plugin": {
@@ -119,12 +119,12 @@
       "integrity": "sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-member-expression-to-functions": "7.0.0",
-        "@babel/helper-optimise-call-expression": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-replace-supers": "7.4.4",
-        "@babel/helper-split-export-declaration": "7.4.4"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-member-expression-to-functions": "^7.0.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.4.4",
+        "@babel/helper-split-export-declaration": "^7.4.4"
       }
     },
     "@babel/helper-define-map": {
@@ -133,9 +133,9 @@
       "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/types": "7.4.4",
-        "lodash": "4.17.11"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/types": "^7.4.4",
+        "lodash": "^4.17.11"
       }
     },
     "@babel/helper-explode-assignable-expression": {
@@ -144,8 +144,8 @@
       "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "7.4.5",
-        "@babel/types": "7.4.4"
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-function-name": {
@@ -154,9 +154,9 @@
       "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "7.0.0",
-        "@babel/template": "7.4.4",
-        "@babel/types": "7.4.4"
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-get-function-arity": {
@@ -165,7 +165,7 @@
       "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.4.4"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -174,7 +174,7 @@
       "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.4.4"
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -183,7 +183,7 @@
       "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.4.4"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-module-imports": {
@@ -192,7 +192,7 @@
       "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.4.4"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-module-transforms": {
@@ -201,12 +201,12 @@
       "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "7.0.0",
-        "@babel/helper-simple-access": "7.1.0",
-        "@babel/helper-split-export-declaration": "7.4.4",
-        "@babel/template": "7.4.4",
-        "@babel/types": "7.4.4",
-        "lodash": "4.17.11"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/template": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "lodash": "^4.17.11"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -215,7 +215,7 @@
       "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.4.4"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-plugin-utils": {
@@ -230,7 +230,7 @@
       "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.11"
+        "lodash": "^4.17.11"
       }
     },
     "@babel/helper-remap-async-to-generator": {
@@ -239,11 +239,11 @@
       "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "7.0.0",
-        "@babel/helper-wrap-function": "7.2.0",
-        "@babel/template": "7.4.4",
-        "@babel/traverse": "7.4.5",
-        "@babel/types": "7.4.4"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-wrap-function": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-replace-supers": {
@@ -252,10 +252,10 @@
       "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "7.0.0",
-        "@babel/helper-optimise-call-expression": "7.0.0",
-        "@babel/traverse": "7.4.5",
-        "@babel/types": "7.4.4"
+        "@babel/helper-member-expression-to-functions": "^7.0.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-simple-access": {
@@ -264,8 +264,8 @@
       "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
       "dev": true,
       "requires": {
-        "@babel/template": "7.4.4",
-        "@babel/types": "7.4.4"
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-split-export-declaration": {
@@ -274,7 +274,7 @@
       "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.4.4"
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-wrap-function": {
@@ -283,10 +283,10 @@
       "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/template": "7.4.4",
-        "@babel/traverse": "7.4.5",
-        "@babel/types": "7.4.4"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.2.0"
       }
     },
     "@babel/helpers": {
@@ -295,9 +295,9 @@
       "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==",
       "dev": true,
       "requires": {
-        "@babel/template": "7.4.4",
-        "@babel/traverse": "7.4.5",
-        "@babel/types": "7.4.4"
+        "@babel/template": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/highlight": {
@@ -306,9 +306,9 @@
       "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "esutils": "2.0.2",
-        "js-tokens": "4.0.0"
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
@@ -323,9 +323,9 @@
       "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-remap-async-to-generator": "7.1.0",
-        "@babel/plugin-syntax-async-generators": "7.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0",
+        "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-class-properties": {
@@ -334,8 +334,8 @@
       "integrity": "sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "7.4.4",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-create-class-features-plugin": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-proposal-decorators": {
@@ -344,9 +344,9 @@
       "integrity": "sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "7.4.4",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-decorators": "7.2.0"
+        "@babel/helper-create-class-features-plugin": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-decorators": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
@@ -355,8 +355,8 @@
       "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-json-strings": "7.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
@@ -365,8 +365,8 @@
       "integrity": "sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "7.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
@@ -375,8 +375,8 @@
       "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "7.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
@@ -385,9 +385,9 @@
       "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.4.4",
-        "regexpu-core": "4.5.4"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -396,7 +396,7 @@
       "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-decorators": {
@@ -405,7 +405,7 @@
       "integrity": "sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-json-strings": {
@@ -414,7 +414,7 @@
       "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
@@ -423,7 +423,7 @@
       "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
@@ -432,7 +432,7 @@
       "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
@@ -441,7 +441,7 @@
       "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
@@ -450,9 +450,9 @@
       "integrity": "sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-remap-async-to-generator": "7.1.0"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
@@ -461,7 +461,7 @@
       "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-block-scoping": {
@@ -470,8 +470,8 @@
       "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "lodash": "4.17.11"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "lodash": "^4.17.11"
       }
     },
     "@babel/plugin-transform-classes": {
@@ -480,14 +480,14 @@
       "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "7.0.0",
-        "@babel/helper-define-map": "7.4.4",
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-optimise-call-expression": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-replace-supers": "7.4.4",
-        "@babel/helper-split-export-declaration": "7.4.4",
-        "globals": "11.12.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-define-map": "^7.4.4",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.4.4",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
@@ -496,7 +496,7 @@
       "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-destructuring": {
@@ -505,7 +505,7 @@
       "integrity": "sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
@@ -514,9 +514,9 @@
       "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.4.4",
-        "regexpu-core": "4.5.4"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
@@ -525,7 +525,7 @@
       "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
@@ -534,8 +534,8 @@
       "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "7.1.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-for-of": {
@@ -544,7 +544,7 @@
       "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-function-name": {
@@ -553,8 +553,8 @@
       "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-literals": {
@@ -563,7 +563,7 @@
       "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
@@ -572,7 +572,7 @@
       "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-amd": {
@@ -581,8 +581,8 @@
       "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "7.4.4",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
@@ -591,9 +591,9 @@
       "integrity": "sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "7.4.4",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-simple-access": "7.1.0"
+        "@babel/helper-module-transforms": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
@@ -602,8 +602,8 @@
       "integrity": "sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "7.4.4",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-umd": {
@@ -612,8 +612,8 @@
       "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "7.4.4",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
@@ -622,7 +622,7 @@
       "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==",
       "dev": true,
       "requires": {
-        "regexp-tree": "0.1.10"
+        "regexp-tree": "^0.1.6"
       }
     },
     "@babel/plugin-transform-new-target": {
@@ -631,7 +631,7 @@
       "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-object-super": {
@@ -640,8 +640,8 @@
       "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-replace-supers": "7.4.4"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.1.0"
       }
     },
     "@babel/plugin-transform-parameters": {
@@ -650,9 +650,9 @@
       "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
       "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "7.4.4",
-        "@babel/helper-get-function-arity": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-call-delegate": "^7.4.4",
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-property-literals": {
@@ -661,7 +661,7 @@
       "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-regenerator": {
@@ -670,7 +670,7 @@
       "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "0.14.0"
+        "regenerator-transform": "^0.14.0"
       }
     },
     "@babel/plugin-transform-reserved-words": {
@@ -679,7 +679,7 @@
       "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
@@ -688,7 +688,7 @@
       "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-spread": {
@@ -697,7 +697,7 @@
       "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
@@ -706,8 +706,8 @@
       "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.4.4"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0"
       }
     },
     "@babel/plugin-transform-template-literals": {
@@ -716,8 +716,8 @@
       "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
@@ -726,7 +726,7 @@
       "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
@@ -735,9 +735,9 @@
       "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.4.4",
-        "regexpu-core": "4.5.4"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
       }
     },
     "@babel/preset-env": {
@@ -746,54 +746,54 @@
       "integrity": "sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-proposal-async-generator-functions": "7.2.0",
-        "@babel/plugin-proposal-json-strings": "7.2.0",
-        "@babel/plugin-proposal-object-rest-spread": "7.4.4",
-        "@babel/plugin-proposal-optional-catch-binding": "7.2.0",
-        "@babel/plugin-proposal-unicode-property-regex": "7.4.4",
-        "@babel/plugin-syntax-async-generators": "7.2.0",
-        "@babel/plugin-syntax-json-strings": "7.2.0",
-        "@babel/plugin-syntax-object-rest-spread": "7.2.0",
-        "@babel/plugin-syntax-optional-catch-binding": "7.2.0",
-        "@babel/plugin-transform-arrow-functions": "7.2.0",
-        "@babel/plugin-transform-async-to-generator": "7.4.4",
-        "@babel/plugin-transform-block-scoped-functions": "7.2.0",
-        "@babel/plugin-transform-block-scoping": "7.4.4",
-        "@babel/plugin-transform-classes": "7.4.4",
-        "@babel/plugin-transform-computed-properties": "7.2.0",
-        "@babel/plugin-transform-destructuring": "7.4.4",
-        "@babel/plugin-transform-dotall-regex": "7.4.4",
-        "@babel/plugin-transform-duplicate-keys": "7.2.0",
-        "@babel/plugin-transform-exponentiation-operator": "7.2.0",
-        "@babel/plugin-transform-for-of": "7.4.4",
-        "@babel/plugin-transform-function-name": "7.4.4",
-        "@babel/plugin-transform-literals": "7.2.0",
-        "@babel/plugin-transform-member-expression-literals": "7.2.0",
-        "@babel/plugin-transform-modules-amd": "7.2.0",
-        "@babel/plugin-transform-modules-commonjs": "7.4.4",
-        "@babel/plugin-transform-modules-systemjs": "7.4.4",
-        "@babel/plugin-transform-modules-umd": "7.2.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "7.4.5",
-        "@babel/plugin-transform-new-target": "7.4.4",
-        "@babel/plugin-transform-object-super": "7.2.0",
-        "@babel/plugin-transform-parameters": "7.4.4",
-        "@babel/plugin-transform-property-literals": "7.2.0",
-        "@babel/plugin-transform-regenerator": "7.4.5",
-        "@babel/plugin-transform-reserved-words": "7.2.0",
-        "@babel/plugin-transform-shorthand-properties": "7.2.0",
-        "@babel/plugin-transform-spread": "7.2.2",
-        "@babel/plugin-transform-sticky-regex": "7.2.0",
-        "@babel/plugin-transform-template-literals": "7.4.4",
-        "@babel/plugin-transform-typeof-symbol": "7.2.0",
-        "@babel/plugin-transform-unicode-regex": "7.4.4",
-        "@babel/types": "7.4.4",
-        "browserslist": "4.6.0",
-        "core-js-compat": "3.1.2",
-        "invariant": "2.2.4",
-        "js-levenshtein": "1.1.6",
-        "semver": "5.7.0"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+        "@babel/plugin-proposal-json-strings": "^7.2.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-syntax-async-generators": "^7.2.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-transform-arrow-functions": "^7.2.0",
+        "@babel/plugin-transform-async-to-generator": "^7.4.4",
+        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+        "@babel/plugin-transform-block-scoping": "^7.4.4",
+        "@babel/plugin-transform-classes": "^7.4.4",
+        "@babel/plugin-transform-computed-properties": "^7.2.0",
+        "@babel/plugin-transform-destructuring": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/plugin-transform-duplicate-keys": "^7.2.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+        "@babel/plugin-transform-for-of": "^7.4.4",
+        "@babel/plugin-transform-function-name": "^7.4.4",
+        "@babel/plugin-transform-literals": "^7.2.0",
+        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
+        "@babel/plugin-transform-modules-amd": "^7.2.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.4.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.4.4",
+        "@babel/plugin-transform-modules-umd": "^7.2.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+        "@babel/plugin-transform-new-target": "^7.4.4",
+        "@babel/plugin-transform-object-super": "^7.2.0",
+        "@babel/plugin-transform-parameters": "^7.4.4",
+        "@babel/plugin-transform-property-literals": "^7.2.0",
+        "@babel/plugin-transform-regenerator": "^7.4.5",
+        "@babel/plugin-transform-reserved-words": "^7.2.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+        "@babel/plugin-transform-spread": "^7.2.0",
+        "@babel/plugin-transform-sticky-regex": "^7.2.0",
+        "@babel/plugin-transform-template-literals": "^7.4.4",
+        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+        "@babel/plugin-transform-unicode-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "browserslist": "^4.6.0",
+        "core-js-compat": "^3.1.1",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.5.0"
       }
     },
     "@babel/runtime": {
@@ -802,7 +802,7 @@
       "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
       "dev": true,
       "requires": {
-        "regenerator-runtime": "0.13.2"
+        "regenerator-runtime": "^0.13.2"
       },
       "dependencies": {
         "regenerator-runtime": {
@@ -819,9 +819,9 @@
       "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.0.0",
-        "@babel/parser": "7.4.5",
-        "@babel/types": "7.4.4"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.4.4",
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/traverse": {
@@ -830,15 +830,15 @@
       "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.0.0",
-        "@babel/generator": "7.4.4",
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-split-export-declaration": "7.4.4",
-        "@babel/parser": "7.4.5",
-        "@babel/types": "7.4.4",
-        "debug": "4.1.1",
-        "globals": "11.12.0",
-        "lodash": "4.17.11"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.4.4",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/parser": "^7.4.5",
+        "@babel/types": "^7.4.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.11"
       },
       "dependencies": {
         "debug": {
@@ -847,7 +847,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -864,9 +864,9 @@
       "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
       "dev": true,
       "requires": {
-        "esutils": "2.0.2",
-        "lodash": "4.17.11",
-        "to-fast-properties": "2.0.0"
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.11",
+        "to-fast-properties": "^2.0.0"
       }
     },
     "@samverschueren/stream-to-observable": {
@@ -875,7 +875,7 @@
       "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==",
       "dev": true,
       "requires": {
-        "any-observable": "0.3.0"
+        "any-observable": "^0.3.0"
       }
     },
     "@types/normalize-package-data": {
@@ -935,7 +935,7 @@
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "0.0.3"
+        "mamacro": "^0.0.3"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
@@ -962,7 +962,7 @@
       "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
       "dev": true,
       "requires": {
-        "@xtuc/ieee754": "1.2.0"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
@@ -1072,6 +1072,16 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -1084,7 +1094,7 @@
       "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
       "dev": true,
       "requires": {
-        "mime-types": "2.1.24",
+        "mime-types": "~2.1.24",
         "negotiator": "0.6.2"
       }
     },
@@ -1118,10 +1128,10 @@
       "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "2.0.1",
-        "fast-json-stable-stringify": "2.0.0",
-        "json-schema-traverse": "0.4.1",
-        "uri-js": "4.2.2"
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
     "ajv-errors": {
@@ -1160,7 +1170,7 @@
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "color-convert": "1.9.3"
+        "color-convert": "^1.9.0"
       }
     },
     "any-observable": {
@@ -1175,8 +1185,8 @@
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "micromatch": "3.1.10",
-        "normalize-path": "2.1.1"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       },
       "dependencies": {
         "normalize-path": {
@@ -1185,7 +1195,7 @@
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
           "dev": true,
           "requires": {
-            "remove-trailing-separator": "1.1.0"
+            "remove-trailing-separator": "^1.0.1"
           }
         }
       }
@@ -1202,8 +1212,8 @@
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "requires": {
-        "delegates": "1.0.0",
-        "readable-stream": "2.3.6"
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
       }
     },
     "argparse": {
@@ -1212,7 +1222,7 @@
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
-        "sprintf-js": "1.0.3"
+        "sprintf-js": "~1.0.2"
       }
     },
     "arr-diff": {
@@ -1245,6 +1255,12 @@
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
       "dev": true
     },
+    "array-ify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
+      "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
+      "dev": true
+    },
     "array-map": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
@@ -1263,7 +1279,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "1.0.3"
+        "array-uniq": "^1.0.1"
       }
     },
     "array-uniq": {
@@ -1296,7 +1312,7 @@
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
       "dev": true,
       "requires": {
-        "safer-buffer": "2.1.2"
+        "safer-buffer": "~2.1.0"
       }
     },
     "asn1.js": {
@@ -1305,9 +1321,9 @@
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1"
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "assert": {
@@ -1316,7 +1332,7 @@
       "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
+        "object-assign": "^4.1.1",
         "util": "0.10.3"
       },
       "dependencies": {
@@ -1361,7 +1377,7 @@
       "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.11"
+        "lodash": "^4.17.11"
       }
     },
     "async-each": {
@@ -1400,12 +1416,12 @@
       "integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==",
       "dev": true,
       "requires": {
-        "browserslist": "4.6.0",
-        "caniuse-lite": "1.0.30000971",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "7.0.16",
-        "postcss-value-parser": "3.3.1"
+        "browserslist": "^4.5.4",
+        "caniuse-lite": "^1.0.30000957",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.14",
+        "postcss-value-parser": "^3.3.1"
       }
     },
     "aws-sign2": {
@@ -1426,9 +1442,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -1443,11 +1459,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
           }
         },
         "js-tokens": {
@@ -1470,25 +1486,25 @@
       "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-generator": "6.26.1",
-        "babel-helpers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "convert-source-map": "1.6.0",
-        "debug": "2.6.9",
-        "json5": "0.5.1",
-        "lodash": "4.17.11",
-        "minimatch": "3.0.4",
-        "path-is-absolute": "1.0.1",
-        "private": "0.1.8",
-        "slash": "1.0.0",
-        "source-map": "0.5.7"
+        "babel-code-frame": "^6.26.0",
+        "babel-generator": "^6.26.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "convert-source-map": "^1.5.1",
+        "debug": "^2.6.9",
+        "json5": "^0.5.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.4",
+        "path-is-absolute": "^1.0.1",
+        "private": "^0.1.8",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.7"
       },
       "dependencies": {
         "json5": {
@@ -1511,12 +1527,12 @@
       "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.0.0",
-        "@babel/parser": "7.4.5",
-        "@babel/traverse": "7.4.5",
-        "@babel/types": "7.4.4",
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.0.0",
+        "@babel/traverse": "^7.0.0",
+        "@babel/types": "^7.0.0",
         "eslint-scope": "3.7.1",
-        "eslint-visitor-keys": "1.0.0"
+        "eslint-visitor-keys": "^1.0.0"
       }
     },
     "babel-generator": {
@@ -1525,14 +1541,14 @@
       "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
       "dev": true,
       "requires": {
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "detect-indent": "4.0.0",
-        "jsesc": "1.3.0",
-        "lodash": "4.17.11",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
       },
       "dependencies": {
         "jsesc": {
@@ -1549,10 +1565,10 @@
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-define-map": {
@@ -1561,10 +1577,10 @@
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.11"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-helper-function-name": {
@@ -1573,11 +1589,11 @@
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
       "dev": true,
       "requires": {
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-get-function-arity": {
@@ -1586,8 +1602,8 @@
       "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-hoist-variables": {
@@ -1596,8 +1612,8 @@
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-optimise-call-expression": {
@@ -1606,8 +1622,8 @@
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helper-regex": {
@@ -1616,9 +1632,9 @@
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.11"
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-helper-replace-supers": {
@@ -1627,12 +1643,12 @@
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
       "dev": true,
       "requires": {
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-helpers": {
@@ -1641,8 +1657,8 @@
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-loader": {
@@ -1651,10 +1667,10 @@
       "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "2.1.0",
-        "loader-utils": "1.2.3",
-        "mkdirp": "0.5.1",
-        "pify": "4.0.1"
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1"
       }
     },
     "babel-messages": {
@@ -1663,7 +1679,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-check-es2015-constants": {
@@ -1672,7 +1688,7 @@
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-syntax-decorators": {
@@ -1693,9 +1709,9 @@
       "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-decorators": "6.13.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-syntax-decorators": "^6.1.18",
+        "babel-runtime": "^6.2.0",
+        "babel-template": "^6.3.0"
       }
     },
     "babel-plugin-transform-es2015-arrow-functions": {
@@ -1704,7 +1720,7 @@
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoped-functions": {
@@ -1713,7 +1729,7 @@
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoping": {
@@ -1722,11 +1738,11 @@
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.11"
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -1735,15 +1751,15 @@
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
       "dev": true,
       "requires": {
-        "babel-helper-define-map": "6.26.0",
-        "babel-helper-function-name": "6.24.1",
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-define-map": "^6.24.1",
+        "babel-helper-function-name": "^6.24.1",
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-computed-properties": {
@@ -1752,8 +1768,8 @@
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-destructuring": {
@@ -1762,7 +1778,7 @@
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-duplicate-keys": {
@@ -1771,8 +1787,8 @@
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-for-of": {
@@ -1781,7 +1797,7 @@
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-function-name": {
@@ -1790,9 +1806,9 @@
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-literals": {
@@ -1801,7 +1817,7 @@
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-modules-amd": {
@@ -1810,9 +1826,9 @@
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
@@ -1821,10 +1837,10 @@
       "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-strict-mode": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-plugin-transform-strict-mode": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
@@ -1833,9 +1849,9 @@
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-modules-umd": {
@@ -1844,9 +1860,9 @@
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-object-super": {
@@ -1855,8 +1871,8 @@
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
       "dev": true,
       "requires": {
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-runtime": "6.26.0"
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-parameters": {
@@ -1865,12 +1881,12 @@
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
       "dev": true,
       "requires": {
-        "babel-helper-call-delegate": "6.24.1",
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-call-delegate": "^6.24.1",
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
@@ -1879,8 +1895,8 @@
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-spread": {
@@ -1889,7 +1905,7 @@
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-sticky-regex": {
@@ -1898,9 +1914,9 @@
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-plugin-transform-es2015-template-literals": {
@@ -1909,7 +1925,7 @@
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
@@ -1918,7 +1934,7 @@
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0"
+        "babel-runtime": "^6.22.0"
       }
     },
     "babel-plugin-transform-es2015-unicode-regex": {
@@ -1927,9 +1943,9 @@
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "regexpu-core": "2.0.0"
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
       },
       "dependencies": {
         "jsesc": {
@@ -1944,9 +1960,9 @@
           "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
           "dev": true,
           "requires": {
-            "regenerate": "1.4.0",
-            "regjsgen": "0.2.0",
-            "regjsparser": "0.1.5"
+            "regenerate": "^1.2.1",
+            "regjsgen": "^0.2.0",
+            "regjsparser": "^0.1.4"
           }
         },
         "regjsgen": {
@@ -1961,7 +1977,7 @@
           "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
           "dev": true,
           "requires": {
-            "jsesc": "0.5.0"
+            "jsesc": "~0.5.0"
           }
         }
       }
@@ -1972,7 +1988,7 @@
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
       "dev": true,
       "requires": {
-        "regenerator-transform": "0.10.1"
+        "regenerator-transform": "^0.10.0"
       },
       "dependencies": {
         "regenerator-transform": {
@@ -1981,9 +1997,9 @@
           "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
           "dev": true,
           "requires": {
-            "babel-runtime": "6.26.0",
-            "babel-types": "6.26.0",
-            "private": "0.1.8"
+            "babel-runtime": "^6.18.0",
+            "babel-types": "^6.19.0",
+            "private": "^0.1.6"
           }
         }
       }
@@ -1994,8 +2010,8 @@
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
       }
     },
     "babel-preset-es2015": {
@@ -2004,30 +2020,30 @@
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "babel-plugin-transform-es2015-function-name": "6.24.1",
-        "babel-plugin-transform-es2015-literals": "6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
-        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
-        "babel-plugin-transform-es2015-object-super": "6.24.1",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.26.0"
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+        "babel-plugin-transform-es2015-classes": "^6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+        "babel-plugin-transform-es2015-for-of": "^6.22.0",
+        "babel-plugin-transform-es2015-function-name": "^6.24.1",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+        "babel-plugin-transform-es2015-object-super": "^6.24.1",
+        "babel-plugin-transform-es2015-parameters": "^6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+        "babel-plugin-transform-regenerator": "^6.24.1"
       }
     },
     "babel-register": {
@@ -2036,13 +2052,13 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "6.26.3",
-        "babel-runtime": "6.26.0",
-        "core-js": "2.6.8",
-        "home-or-tmp": "2.0.0",
-        "lodash": "4.17.11",
-        "mkdirp": "0.5.1",
-        "source-map-support": "0.4.18"
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
       }
     },
     "babel-runtime": {
@@ -2051,8 +2067,8 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "2.6.8",
-        "regenerator-runtime": "0.11.1"
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
       }
     },
     "babel-template": {
@@ -2061,11 +2077,11 @@
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "lodash": "4.17.11"
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
       }
     },
     "babel-traverse": {
@@ -2074,15 +2090,15 @@
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "debug": "2.6.9",
-        "globals": "9.18.0",
-        "invariant": "2.2.4",
-        "lodash": "4.17.11"
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
       },
       "dependencies": {
         "globals": {
@@ -2099,10 +2115,10 @@
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.26.0",
-        "esutils": "2.0.2",
-        "lodash": "4.17.11",
-        "to-fast-properties": "1.0.3"
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
       },
       "dependencies": {
         "to-fast-properties": {
@@ -2137,13 +2153,13 @@
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
-        "cache-base": "1.0.1",
-        "class-utils": "0.3.6",
-        "component-emitter": "1.3.0",
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "mixin-deep": "1.3.1",
-        "pascalcase": "0.1.1"
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -2152,7 +2168,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "is-accessor-descriptor": {
@@ -2161,7 +2177,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -2170,7 +2186,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -2179,9 +2195,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -2210,7 +2226,7 @@
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "dev": true,
       "requires": {
-        "tweetnacl": "0.14.5"
+        "tweetnacl": "^0.14.3"
       }
     },
     "better-assert": {
@@ -2246,7 +2262,7 @@
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "~2.0.0"
       }
     },
     "bluebird": {
@@ -2268,15 +2284,15 @@
       "dev": true,
       "requires": {
         "bytes": "3.1.0",
-        "content-type": "1.0.4",
+        "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "1.1.2",
+        "depd": "~1.1.2",
         "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
-        "on-finished": "2.3.0",
+        "on-finished": "~2.3.0",
         "qs": "6.7.0",
         "raw-body": "2.4.0",
-        "type-is": "1.6.18"
+        "type-is": "~1.6.17"
       }
     },
     "brace-expansion": {
@@ -2285,7 +2301,7 @@
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "requires": {
-        "balanced-match": "1.0.0",
+        "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -2295,16 +2311,16 @@
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "requires": {
-        "arr-flatten": "1.1.0",
-        "array-unique": "0.3.2",
-        "extend-shallow": "2.0.1",
-        "fill-range": "4.0.0",
-        "isobject": "3.0.1",
-        "repeat-element": "1.1.3",
-        "snapdragon": "0.8.2",
-        "snapdragon-node": "2.1.1",
-        "split-string": "3.1.0",
-        "to-regex": "3.0.2"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -2313,7 +2329,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -2330,12 +2346,12 @@
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
-        "buffer-xor": "1.0.3",
-        "cipher-base": "1.0.4",
-        "create-hash": "1.2.0",
-        "evp_bytestokey": "1.0.3",
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "browserify-cipher": {
@@ -2344,9 +2360,9 @@
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
-        "browserify-aes": "1.2.0",
-        "browserify-des": "1.0.2",
-        "evp_bytestokey": "1.0.3"
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
       }
     },
     "browserify-des": {
@@ -2355,10 +2371,10 @@
       "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "des.js": "1.0.0",
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       }
     },
     "browserify-rsa": {
@@ -2367,8 +2383,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "randombytes": "2.1.0"
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
       }
     },
     "browserify-sign": {
@@ -2377,13 +2393,13 @@
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "elliptic": "6.4.1",
-        "inherits": "2.0.3",
-        "parse-asn1": "5.1.4"
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
       }
     },
     "browserify-zlib": {
@@ -2392,7 +2408,7 @@
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
-        "pako": "1.0.10"
+        "pako": "~1.0.5"
       }
     },
     "browserslist": {
@@ -2401,9 +2417,9 @@
       "integrity": "sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "1.0.30000971",
-        "electron-to-chromium": "1.3.137",
-        "node-releases": "1.1.21"
+        "caniuse-lite": "^1.0.30000967",
+        "electron-to-chromium": "^1.3.133",
+        "node-releases": "^1.1.19"
       }
     },
     "buffer": {
@@ -2412,9 +2428,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "1.3.0",
-        "ieee754": "1.1.13",
-        "isarray": "1.0.0"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
       }
     },
     "buffer-alloc": {
@@ -2423,8 +2439,8 @@
       "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
-        "buffer-alloc-unsafe": "1.1.0",
-        "buffer-fill": "1.0.0"
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
       }
     },
     "buffer-alloc-unsafe": {
@@ -2469,20 +2485,20 @@
       "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.5",
-        "chownr": "1.1.1",
-        "figgy-pudding": "3.5.1",
-        "glob": "7.1.4",
-        "graceful-fs": "4.1.15",
-        "lru-cache": "5.1.1",
-        "mississippi": "3.0.0",
-        "mkdirp": "0.5.1",
-        "move-concurrently": "1.0.1",
-        "promise-inflight": "1.0.1",
-        "rimraf": "2.6.3",
-        "ssri": "6.0.1",
-        "unique-filename": "1.1.1",
-        "y18n": "4.0.0"
+        "bluebird": "^3.5.3",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.1.15",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.2",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
       },
       "dependencies": {
         "lru-cache": {
@@ -2491,7 +2507,7 @@
           "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
           "dev": true,
           "requires": {
-            "yallist": "3.0.3"
+            "yallist": "^3.0.2"
           }
         },
         "y18n": {
@@ -2514,15 +2530,15 @@
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
-        "collection-visit": "1.0.0",
-        "component-emitter": "1.3.0",
-        "get-value": "2.0.6",
-        "has-value": "1.0.0",
-        "isobject": "3.0.1",
-        "set-value": "2.0.0",
-        "to-object-path": "0.3.0",
-        "union-value": "1.0.0",
-        "unset-value": "1.0.0"
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
       }
     },
     "caller-callsite": {
@@ -2531,7 +2547,7 @@
       "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
       "dev": true,
       "requires": {
-        "callsites": "2.0.0"
+        "callsites": "^2.0.0"
       },
       "dependencies": {
         "callsites": {
@@ -2548,7 +2564,7 @@
       "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
       "dev": true,
       "requires": {
-        "caller-callsite": "2.0.0"
+        "caller-callsite": "^2.0.0"
       }
     },
     "callsite": {
@@ -2575,8 +2591,8 @@
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
-        "camelcase": "2.1.1",
-        "map-obj": "1.0.1"
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -2605,9 +2621,9 @@
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "3.2.1",
-        "escape-string-regexp": "1.0.5",
-        "supports-color": "5.5.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
     "chardet": {
@@ -2622,18 +2638,18 @@
       "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
       "dev": true,
       "requires": {
-        "anymatch": "2.0.0",
-        "async-each": "1.0.3",
-        "braces": "2.3.2",
-        "fsevents": "1.2.9",
-        "glob-parent": "3.1.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "4.0.1",
-        "normalize-path": "3.0.0",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.2.1",
-        "upath": "1.1.2"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
       }
     },
     "chownr": {
@@ -2643,13 +2659,12 @@
       "dev": true
     },
     "chrome-trace-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.1.tgz",
-      "integrity": "sha512-3P9FCnp/nBrggFnGrjhaJBH/+VSlHxJm1phFJ0fQvKm/p8aUp1MjW7fK4BqYwbUNzLXuA5wufl35ouonEBAWtw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
       "dev": true,
       "requires": {
-        "npm": "6.9.0",
-        "tslib": "1.9.3"
+        "tslib": "^1.9.0"
       }
     },
     "ci-info": {
@@ -2664,8 +2679,8 @@
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "class-utils": {
@@ -2674,10 +2689,10 @@
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
-        "arr-union": "3.1.0",
-        "define-property": "0.2.5",
-        "isobject": "3.0.1",
-        "static-extend": "0.1.2"
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -2686,7 +2701,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         }
       }
@@ -2697,7 +2712,7 @@
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "dev": true,
       "requires": {
-        "restore-cursor": "2.0.0"
+        "restore-cursor": "^2.0.0"
       }
     },
     "cli-truncate": {
@@ -2707,7 +2722,7 @@
       "dev": true,
       "requires": {
         "slice-ansi": "0.0.4",
-        "string-width": "1.0.2"
+        "string-width": "^1.0.1"
       },
       "dependencies": {
         "is-fullwidth-code-point": {
@@ -2716,7 +2731,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "slice-ansi": {
@@ -2731,9 +2746,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         }
       }
@@ -2750,9 +2765,9 @@
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       },
       "dependencies": {
         "is-fullwidth-code-point": {
@@ -2761,7 +2776,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "string-width": {
@@ -2770,9 +2785,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
         "wrap-ansi": {
@@ -2781,8 +2796,8 @@
           "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
           "dev": true,
           "requires": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1"
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
           }
         }
       }
@@ -2793,10 +2808,10 @@
       "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "for-own": "1.0.0",
-        "is-plain-object": "2.0.4",
-        "kind-of": "6.0.2",
-        "shallow-clone": "1.0.0"
+        "for-own": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.0",
+        "shallow-clone": "^1.0.0"
       }
     },
     "code-point-at": {
@@ -2811,8 +2826,8 @@
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
-        "map-visit": "1.0.0",
-        "object-visit": "1.0.1"
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
       }
     },
     "color-convert": {
@@ -2842,7 +2857,7 @@
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "requires": {
-        "delayed-stream": "1.0.0"
+        "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
@@ -2857,6 +2872,16 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
+    "compare-func": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
+      "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
+      "dev": true,
+      "requires": {
+        "array-ify": "^1.0.0",
+        "dot-prop": "^3.0.0"
+      }
+    },
     "component-bind": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
@@ -2887,10 +2912,10 @@
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "buffer-from": "1.1.1",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6",
-        "typedarray": "0.0.6"
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
     "connect": {
@@ -2901,7 +2926,7 @@
       "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
-        "parseurl": "1.3.3",
+        "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
       }
     },
@@ -2911,7 +2936,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "0.1.4"
+        "date-now": "^0.1.4"
       }
     },
     "console-control-strings": {
@@ -2932,13 +2957,864 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
+    "conventional-changelog": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.8.tgz",
+      "integrity": "sha512-fb3/DOLLrQdNqN0yYn/lT6HcNsAa9A+VTDBqlZBMQcEPPIeJIMI+DBs3yu+eiYOLi22w9oShq3nn/zN6qm1Hmw==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-angular": "^5.0.3",
+        "conventional-changelog-atom": "^2.0.1",
+        "conventional-changelog-codemirror": "^2.0.1",
+        "conventional-changelog-conventionalcommits": "^3.0.2",
+        "conventional-changelog-core": "^3.2.2",
+        "conventional-changelog-ember": "^2.0.2",
+        "conventional-changelog-eslint": "^3.0.2",
+        "conventional-changelog-express": "^2.0.1",
+        "conventional-changelog-jquery": "^3.0.4",
+        "conventional-changelog-jshint": "^2.0.1",
+        "conventional-changelog-preset-loader": "^2.1.1"
+      }
+    },
+    "conventional-changelog-angular": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz",
+      "integrity": "sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==",
+      "dev": true,
+      "requires": {
+        "compare-func": "^1.3.1",
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-atom": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.1.tgz",
+      "integrity": "sha512-9BniJa4gLwL20Sm7HWSNXd0gd9c5qo49gCi8nylLFpqAHhkFTj7NQfROq3f1VpffRtzfTQp4VKU5nxbe2v+eZQ==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-codemirror": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.1.tgz",
+      "integrity": "sha512-23kT5IZWa+oNoUaDUzVXMYn60MCdOygTA2I+UjnOMiYVhZgmVwNd6ri/yDlmQGXHqbKhNR5NoXdBzSOSGxsgIQ==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-config-spec": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-1.0.0.tgz",
+      "integrity": "sha512-RR3479x5Qw7XWkmNDYx/kOnsQJW+FZBIakURG/Dg7FkTaCrGjAkgfH96pQs9SyOEZI07USEXy7FjUDWYP8bt3Q==",
+      "dev": true
+    },
+    "conventional-changelog-conventionalcommits": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-3.0.2.tgz",
+      "integrity": "sha512-w1+fQSDnm/7+sPKIYC5nfRVYDszt+6HdWizrigSqWFVIiiBVzkHGeqDLMSHc+Qq9qssHVAxAak5206epZyK87A==",
+      "dev": true,
+      "requires": {
+        "compare-func": "^1.3.1",
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-core": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz",
+      "integrity": "sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-writer": "^4.0.5",
+        "conventional-commits-parser": "^3.0.2",
+        "dateformat": "^3.0.0",
+        "get-pkg-repo": "^1.0.0",
+        "git-raw-commits": "2.0.0",
+        "git-remote-origin-url": "^2.0.0",
+        "git-semver-tags": "^2.0.2",
+        "lodash": "^4.2.1",
+        "normalize-package-data": "^2.3.5",
+        "q": "^1.5.1",
+        "read-pkg": "^3.0.0",
+        "read-pkg-up": "^3.0.0",
+        "through2": "^3.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "through2": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
+    "conventional-changelog-ember": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.2.tgz",
+      "integrity": "sha512-qtZbA3XefO/n6DDmkYywDYi6wDKNNc98MMl2F9PKSaheJ25Trpi3336W8fDlBhq0X+EJRuseceAdKLEMmuX2tg==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-eslint": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.2.tgz",
+      "integrity": "sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-express": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.1.tgz",
+      "integrity": "sha512-G6uCuCaQhLxdb4eEfAIHpcfcJ2+ao3hJkbLrw/jSK/eROeNfnxCJasaWdDAfFkxsbpzvQT4W01iSynU3OoPLIw==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-jquery": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.4.tgz",
+      "integrity": "sha512-IVJGI3MseYoY6eybknnTf9WzeQIKZv7aNTm2KQsiFVJH21bfP2q7XVjfoMibdCg95GmgeFlaygMdeoDDa+ZbEQ==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-jshint": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.1.tgz",
+      "integrity": "sha512-kRFJsCOZzPFm2tzRHULWP4tauGMvccOlXYf3zGeuSW4U0mZhk5NsjnRZ7xFWrTFPlCLV+PNmHMuXp5atdoZmEg==",
+      "dev": true,
+      "requires": {
+        "compare-func": "^1.3.1",
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-preset-loader": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz",
+      "integrity": "sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA==",
+      "dev": true
+    },
+    "conventional-changelog-writer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.6.tgz",
+      "integrity": "sha512-ou/sbrplJMM6KQpR5rKFYNVQYesFjN7WpNGdudQSWNi6X+RgyFUcSv871YBYkrUYV9EX8ijMohYVzn9RUb+4ag==",
+      "dev": true,
+      "requires": {
+        "compare-func": "^1.3.1",
+        "conventional-commits-filter": "^2.0.2",
+        "dateformat": "^3.0.0",
+        "handlebars": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.2.1",
+        "meow": "^4.0.0",
+        "semver": "^6.0.0",
+        "split": "^1.0.0",
+        "through2": "^3.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist": "^1.1.3",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
+          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+          "dev": true
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "through2": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2 || 3"
+          }
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
+    "conventional-commits-filter": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz",
+      "integrity": "sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==",
+      "dev": true,
+      "requires": {
+        "lodash.ismatch": "^4.4.0",
+        "modify-values": "^1.0.0"
+      }
+    },
+    "conventional-commits-parser": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz",
+      "integrity": "sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==",
+      "dev": true,
+      "requires": {
+        "JSONStream": "^1.0.4",
+        "is-text-path": "^2.0.0",
+        "lodash": "^4.2.1",
+        "meow": "^4.0.0",
+        "split2": "^2.0.0",
+        "through2": "^3.0.0",
+        "trim-off-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist": "^1.1.3",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "through2": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2 || 3"
+          }
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
+    "conventional-recommended-bump": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-5.0.0.tgz",
+      "integrity": "sha512-CsfdICpbUe0pmM4MTG90GPUqnFgB1SWIR2HAh+vS+JhhJdPWvc0brs8oadWoYGhFOQpQwe57JnvzWEWU0m2OSg==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^2.0.0",
+        "conventional-changelog-preset-loader": "^2.1.1",
+        "conventional-commits-filter": "^2.0.2",
+        "conventional-commits-parser": "^3.0.2",
+        "git-raw-commits": "2.0.0",
+        "git-semver-tags": "^2.0.2",
+        "meow": "^4.0.0",
+        "q": "^1.5.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "concat-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+          "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.0.2",
+            "typedarray": "^0.0.6"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist": "^1.1.3",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
     "convert-source-map": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
       "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "~5.1.1"
       }
     },
     "cookie": {
@@ -2953,12 +3829,12 @@
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "fs-write-stream-atomic": "1.0.10",
-        "iferr": "0.1.5",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.3",
-        "run-queue": "1.0.3"
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
       }
     },
     "copy-descriptor": {
@@ -2979,9 +3855,9 @@
       "integrity": "sha512-X0Ch5f6itrHxhg5HSJucX6nNLNAGr+jq+biBh6nPGc3YAWz2a8p/ZIZY8cUkDzSRNG54omAuu3hoEF8qZbu/6Q==",
       "dev": true,
       "requires": {
-        "browserslist": "4.6.0",
+        "browserslist": "^4.6.0",
         "core-js-pure": "3.1.2",
-        "semver": "6.1.0"
+        "semver": "^6.0.0"
       },
       "dependencies": {
         "semver": {
@@ -3010,10 +3886,10 @@
       "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "requires": {
-        "import-fresh": "2.0.0",
-        "is-directory": "0.3.1",
-        "js-yaml": "3.13.1",
-        "parse-json": "4.0.0"
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
       },
       "dependencies": {
         "import-fresh": {
@@ -3022,8 +3898,8 @@
           "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
           "dev": true,
           "requires": {
-            "caller-path": "2.0.0",
-            "resolve-from": "3.0.0"
+            "caller-path": "^2.0.0",
+            "resolve-from": "^3.0.0"
           }
         },
         "resolve-from": {
@@ -3040,8 +3916,8 @@
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "elliptic": "6.4.1"
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
       }
     },
     "create-hash": {
@@ -3050,11 +3926,11 @@
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "inherits": "2.0.3",
-        "md5.js": "1.3.5",
-        "ripemd160": "2.0.2",
-        "sha.js": "2.4.11"
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
       }
     },
     "create-hmac": {
@@ -3063,12 +3939,12 @@
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "create-hash": "1.2.0",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.2",
-        "safe-buffer": "5.1.2",
-        "sha.js": "2.4.11"
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
     "cross-spawn": {
@@ -3077,11 +3953,11 @@
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "requires": {
-        "nice-try": "1.0.5",
-        "path-key": "2.0.1",
-        "semver": "5.7.0",
-        "shebang-command": "1.2.0",
-        "which": "1.3.1"
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
       }
     },
     "crypto-browserify": {
@@ -3090,17 +3966,17 @@
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "1.0.1",
-        "browserify-sign": "4.0.4",
-        "create-ecdh": "4.0.3",
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "diffie-hellman": "5.0.3",
-        "inherits": "2.0.3",
-        "pbkdf2": "3.0.17",
-        "public-encrypt": "4.0.3",
-        "randombytes": "2.1.0",
-        "randomfill": "1.0.4"
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
       }
     },
     "css-loader": {
@@ -3109,17 +3985,17 @@
       "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
       "dev": true,
       "requires": {
-        "camelcase": "5.3.1",
-        "icss-utils": "4.1.0",
-        "loader-utils": "1.2.3",
-        "normalize-path": "3.0.0",
-        "postcss": "7.0.16",
-        "postcss-modules-extract-imports": "2.0.0",
-        "postcss-modules-local-by-default": "2.0.6",
-        "postcss-modules-scope": "2.1.0",
-        "postcss-modules-values": "2.0.0",
-        "postcss-value-parser": "3.3.1",
-        "schema-utils": "1.0.0"
+        "camelcase": "^5.2.0",
+        "icss-utils": "^4.1.0",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.14",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^2.0.6",
+        "postcss-modules-scope": "^2.1.0",
+        "postcss-modules-values": "^2.0.0",
+        "postcss-value-parser": "^3.3.0",
+        "schema-utils": "^1.0.0"
       }
     },
     "cssesc": {
@@ -3134,7 +4010,7 @@
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
-        "array-find-index": "1.0.2"
+        "array-find-index": "^1.0.1"
       }
     },
     "custom-event": {
@@ -3155,7 +4031,16 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.50"
+        "es5-ext": "^0.10.9"
+      }
+    },
+    "dargs": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
+      "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
       }
     },
     "dashdash": {
@@ -3164,7 +4049,7 @@
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
       }
     },
     "date-fns": {
@@ -3185,6 +4070,12 @@
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
       "dev": true
     },
+    "dateformat": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
+      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+      "dev": true
+    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3200,6 +4091,16 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
+    "decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "requires": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      }
+    },
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -3224,7 +4125,7 @@
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dev": true,
       "requires": {
-        "object-keys": "1.1.1"
+        "object-keys": "^1.0.12"
       }
     },
     "define-property": {
@@ -3233,8 +4134,8 @@
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
-        "is-descriptor": "1.0.2",
-        "isobject": "3.0.1"
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -3243,7 +4144,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -3252,7 +4153,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -3261,9 +4162,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -3274,12 +4175,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "6.1.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.1",
-        "p-map": "1.2.0",
-        "pify": "3.0.0",
-        "rimraf": "2.6.3"
+        "globby": "^6.1.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
+        "rimraf": "^2.2.8"
       },
       "dependencies": {
         "pify": {
@@ -3314,8 +4215,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1"
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "detect-file": {
@@ -3330,9 +4231,15 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "2.0.1"
+        "repeating": "^2.0.0"
       }
     },
+    "detect-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.0.0.tgz",
+      "integrity": "sha512-JAP22dVPAqvhdRFFxK1G5GViIokyUn0UWXRNW0ztK96fsqi9cuM8w8ESbSk+T2w5OVorcMcL6m7yUg1RrX+2CA==",
+      "dev": true
+    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -3345,9 +4252,9 @@
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "miller-rabin": "4.0.1",
-        "randombytes": "2.1.0"
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
       }
     },
     "doctrine": {
@@ -3356,7 +4263,7 @@
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "requires": {
-        "esutils": "2.0.2"
+        "esutils": "^2.0.2"
       }
     },
     "dom-serialize": {
@@ -3365,10 +4272,10 @@
       "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
       "dev": true,
       "requires": {
-        "custom-event": "1.0.1",
-        "ent": "2.2.0",
-        "extend": "3.0.2",
-        "void-elements": "2.0.1"
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
       }
     },
     "domain-browser": {
@@ -3377,16 +4284,35 @@
       "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "dev": true
     },
+    "dot-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
+      "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
+      "dev": true,
+      "requires": {
+        "is-obj": "^1.0.0"
+      }
+    },
+    "dotgitignore": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz",
+      "integrity": "sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0",
+        "minimatch": "^3.0.4"
+      }
+    },
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
       "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.1",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6",
-        "stream-shift": "1.0.0"
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
       }
     },
     "ecc-jsbn": {
@@ -3395,8 +4321,8 @@
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "dev": true,
       "requires": {
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2"
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
       }
     },
     "ee-first": {
@@ -3423,13 +4349,13 @@
       "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0",
-        "hash.js": "1.1.7",
-        "hmac-drbg": "1.0.1",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1",
-        "minimalistic-crypto-utils": "1.0.1"
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
       }
     },
     "emoji-regex": {
@@ -3456,7 +4382,7 @@
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "1.4.0"
+        "once": "^1.4.0"
       }
     },
     "engine.io": {
@@ -3465,12 +4391,12 @@
       "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
       "dev": true,
       "requires": {
-        "accepts": "1.3.7",
+        "accepts": "~1.3.4",
         "base64id": "1.0.0",
         "cookie": "0.3.1",
-        "debug": "3.1.0",
-        "engine.io-parser": "2.1.3",
-        "ws": "3.3.3"
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.0",
+        "ws": "~3.3.1"
       },
       "dependencies": {
         "debug": {
@@ -3492,14 +4418,14 @@
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
-        "debug": "3.1.0",
-        "engine.io-parser": "2.1.3",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.1",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "ws": "3.3.3",
-        "xmlhttprequest-ssl": "1.5.5",
+        "ws": "~3.3.1",
+        "xmlhttprequest-ssl": "~1.5.4",
         "yeast": "0.1.2"
       },
       "dependencies": {
@@ -3527,10 +4453,10 @@
       "dev": true,
       "requires": {
         "after": "0.8.2",
-        "arraybuffer.slice": "0.0.7",
+        "arraybuffer.slice": "~0.0.7",
         "base64-arraybuffer": "0.1.5",
         "blob": "0.0.5",
-        "has-binary2": "1.0.3"
+        "has-binary2": "~1.0.2"
       }
     },
     "enhanced-resolve": {
@@ -3539,9 +4465,9 @@
       "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.15",
-        "memory-fs": "0.4.1",
-        "tapable": "1.1.3"
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
       }
     },
     "ent": {
@@ -3556,7 +4482,7 @@
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
-        "prr": "1.0.1"
+        "prr": "~1.0.1"
       }
     },
     "error-ex": {
@@ -3565,7 +4491,7 @@
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
       "requires": {
-        "is-arrayish": "0.2.1"
+        "is-arrayish": "^0.2.1"
       }
     },
     "es-abstract": {
@@ -3574,12 +4500,12 @@
       "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "1.2.0",
-        "function-bind": "1.1.1",
-        "has": "1.0.3",
-        "is-callable": "1.1.4",
-        "is-regex": "1.0.4",
-        "object-keys": "1.1.1"
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-keys": "^1.0.12"
       }
     },
     "es-to-primitive": {
@@ -3588,9 +4514,9 @@
       "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
       "dev": true,
       "requires": {
-        "is-callable": "1.1.4",
-        "is-date-object": "1.0.1",
-        "is-symbol": "1.0.2"
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
       }
     },
     "es5-ext": {
@@ -3599,9 +4525,9 @@
       "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
       "dev": true,
       "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1",
-        "next-tick": "1.0.0"
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "^1.0.0"
       }
     },
     "es6-iterator": {
@@ -3610,9 +4536,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.50",
-        "es6-symbol": "3.1.1"
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
       }
     },
     "es6-symbol": {
@@ -3621,8 +4547,8 @@
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.50"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
     "escape-html": {
@@ -3643,42 +4569,42 @@
       "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.0.0",
-        "ajv": "6.10.0",
-        "chalk": "2.4.2",
-        "cross-spawn": "6.0.5",
-        "debug": "4.1.1",
-        "doctrine": "3.0.0",
-        "eslint-scope": "4.0.3",
-        "eslint-utils": "1.3.1",
-        "eslint-visitor-keys": "1.0.0",
-        "espree": "5.0.1",
-        "esquery": "1.0.1",
-        "esutils": "2.0.2",
-        "file-entry-cache": "5.0.1",
-        "functional-red-black-tree": "1.0.1",
-        "glob": "7.1.4",
-        "globals": "11.12.0",
-        "ignore": "4.0.6",
-        "import-fresh": "3.0.0",
-        "imurmurhash": "0.1.4",
-        "inquirer": "6.3.1",
-        "js-yaml": "3.13.1",
-        "json-stable-stringify-without-jsonify": "1.0.1",
-        "levn": "0.3.0",
-        "lodash": "4.17.11",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "natural-compare": "1.4.0",
-        "optionator": "0.8.2",
-        "path-is-inside": "1.0.2",
-        "progress": "2.0.3",
-        "regexpp": "2.0.1",
-        "semver": "5.7.0",
-        "strip-ansi": "4.0.0",
-        "strip-json-comments": "2.0.1",
-        "table": "5.4.0",
-        "text-table": "0.2.0"
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.9.1",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
+        "eslint-utils": "^1.3.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^5.0.1",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^6.2.2",
+        "js-yaml": "^3.13.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^5.5.1",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "^2.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -3693,7 +4619,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "eslint-scope": {
@@ -3702,8 +4628,8 @@
           "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
           "dev": true,
           "requires": {
-            "esrecurse": "4.2.1",
-            "estraverse": "4.2.0"
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
           }
         },
         "ms": {
@@ -3718,7 +4644,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
@@ -3729,8 +4655,8 @@
       "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
       "dev": true,
       "requires": {
-        "esrecurse": "4.2.1",
-        "estraverse": "4.2.0"
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
       }
     },
     "eslint-utils": {
@@ -3751,9 +4677,9 @@
       "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
       "dev": true,
       "requires": {
-        "acorn": "6.1.1",
-        "acorn-jsx": "5.0.1",
-        "eslint-visitor-keys": "1.0.0"
+        "acorn": "^6.0.7",
+        "acorn-jsx": "^5.0.0",
+        "eslint-visitor-keys": "^1.0.0"
       }
     },
     "esprima": {
@@ -3768,7 +4694,7 @@
       "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0"
+        "estraverse": "^4.0.0"
       }
     },
     "esrecurse": {
@@ -3777,7 +4703,7 @@
       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0"
+        "estraverse": "^4.1.0"
       }
     },
     "estraverse": {
@@ -3810,8 +4736,8 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
-        "md5.js": "1.3.5",
-        "safe-buffer": "5.1.2"
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
       }
     },
     "execa": {
@@ -3820,13 +4746,13 @@
       "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dev": true,
       "requires": {
-        "cross-spawn": "6.0.5",
-        "get-stream": "4.1.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       }
     },
     "expand-brackets": {
@@ -3835,13 +4761,13 @@
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "posix-character-classes": "0.1.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -3850,7 +4776,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "extend-shallow": {
@@ -3859,7 +4785,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -3870,7 +4796,7 @@
       "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "1.0.3"
+        "homedir-polyfill": "^1.0.1"
       }
     },
     "extend": {
@@ -3885,8 +4811,8 @@
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
-        "assign-symbols": "1.0.0",
-        "is-extendable": "1.0.1"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -3895,7 +4821,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "2.0.4"
+            "is-plain-object": "^2.0.4"
           }
         }
       }
@@ -3906,9 +4832,9 @@
       "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
       "dev": true,
       "requires": {
-        "chardet": "0.7.0",
-        "iconv-lite": "0.4.24",
-        "tmp": "0.0.33"
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
       }
     },
     "extglob": {
@@ -3917,14 +4843,14 @@
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
-        "array-unique": "0.3.2",
-        "define-property": "1.0.0",
-        "expand-brackets": "2.1.4",
-        "extend-shallow": "2.0.1",
-        "fragment-cache": "0.2.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -3933,7 +4859,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "extend-shallow": {
@@ -3942,7 +4868,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         },
         "is-accessor-descriptor": {
@@ -3951,7 +4877,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -3960,7 +4886,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -3969,9 +4895,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -3982,10 +4908,10 @@
       "integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
       "dev": true,
       "requires": {
-        "async": "2.6.2",
-        "loader-utils": "1.2.3",
-        "schema-utils": "0.4.7",
-        "webpack-sources": "1.3.0"
+        "async": "^2.4.1",
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.4.5",
+        "webpack-sources": "^1.1.0"
       },
       "dependencies": {
         "schema-utils": {
@@ -3994,8 +4920,8 @@
           "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
           "dev": true,
           "requires": {
-            "ajv": "6.10.0",
-            "ajv-keywords": "3.4.0"
+            "ajv": "^6.1.0",
+            "ajv-keywords": "^3.1.0"
           }
         }
       }
@@ -4036,7 +4962,7 @@
       "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "1.0.5"
+        "escape-string-regexp": "^1.0.5"
       }
     },
     "file-entry-cache": {
@@ -4045,7 +4971,7 @@
       "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
       "dev": true,
       "requires": {
-        "flat-cache": "2.0.1"
+        "flat-cache": "^2.0.1"
       }
     },
     "fill-range": {
@@ -4054,10 +4980,10 @@
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "extend-shallow": "2.0.1",
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1",
-        "to-regex-range": "2.1.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
       "dependencies": {
         "extend-shallow": {
@@ -4066,7 +4992,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -4078,12 +5004,12 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.3",
-        "statuses": "1.5.0",
-        "unpipe": "1.0.0"
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
       }
     },
     "find-cache-dir": {
@@ -4092,9 +5018,9 @@
       "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "dev": true,
       "requires": {
-        "commondir": "1.0.1",
-        "make-dir": "2.1.0",
-        "pkg-dir": "3.0.0"
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
       }
     },
     "find-parent-dir": {
@@ -4109,7 +5035,7 @@
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
       "requires": {
-        "locate-path": "3.0.0"
+        "locate-path": "^3.0.0"
       }
     },
     "findup-sync": {
@@ -4118,10 +5044,10 @@
       "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
       "dev": true,
       "requires": {
-        "detect-file": "1.0.0",
-        "is-glob": "3.1.0",
-        "micromatch": "3.1.10",
-        "resolve-dir": "1.0.1"
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
       },
       "dependencies": {
         "is-glob": {
@@ -4130,7 +5056,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "2.1.1"
+            "is-extglob": "^2.1.0"
           }
         }
       }
@@ -4141,7 +5067,7 @@
       "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
       "dev": true,
       "requires": {
-        "flatted": "2.0.0",
+        "flatted": "^2.0.0",
         "rimraf": "2.6.3",
         "write": "1.0.3"
       }
@@ -4163,8 +5089,8 @@
       "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6"
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
       }
     },
     "fn-name": {
@@ -4179,7 +5105,7 @@
       "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
       "dev": true,
       "requires": {
-        "debug": "3.2.6"
+        "debug": "^3.2.6"
       },
       "dependencies": {
         "debug": {
@@ -4188,7 +5114,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -4211,7 +5137,7 @@
       "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
-        "for-in": "1.0.2"
+        "for-in": "^1.0.1"
       }
     },
     "forever-agent": {
@@ -4226,9 +5152,9 @@
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "dev": true,
       "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.8",
-        "mime-types": "2.1.24"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
       }
     },
     "fragment-cache": {
@@ -4237,7 +5163,7 @@
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
-        "map-cache": "0.2.2"
+        "map-cache": "^0.2.2"
       }
     },
     "from2": {
@@ -4246,8 +5172,8 @@
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6"
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
       }
     },
     "fs-access": {
@@ -4256,7 +5182,7 @@
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
-        "null-check": "1.0.0"
+        "null-check": "^1.0.0"
       }
     },
     "fs-extra": {
@@ -4265,9 +5191,9 @@
       "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.15",
-        "jsonfile": "4.0.0",
-        "universalify": "0.1.2"
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "fs-readdir-recursive": {
@@ -4282,10 +5208,10 @@
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.15",
-        "iferr": "0.1.5",
-        "imurmurhash": "0.1.4",
-        "readable-stream": "2.3.6"
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
       }
     },
     "fs.realpath": {
@@ -4301,8 +5227,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "2.14.0",
-        "node-pre-gyp": "0.12.0"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
       },
       "dependencies": {
         "abbrev": {
@@ -4328,8 +5254,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.6"
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
           }
         },
         "balanced-match": {
@@ -4342,7 +5268,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "balanced-match": "1.0.0",
+            "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
@@ -4379,7 +5305,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "deep-extend": {
@@ -4406,7 +5332,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "2.3.5"
+            "minipass": "^2.2.1"
           }
         },
         "fs.realpath": {
@@ -4421,14 +5347,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "1.2.0",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.3"
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
           }
         },
         "glob": {
@@ -4437,12 +5363,12 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "has-unicode": {
@@ -4457,7 +5383,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safer-buffer": "2.1.2"
+            "safer-buffer": ">= 2.1.2 < 3"
           }
         },
         "ignore-walk": {
@@ -4466,7 +5392,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minimatch": "3.0.4"
+            "minimatch": "^3.0.4"
           }
         },
         "inflight": {
@@ -4475,8 +5401,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "once": "^1.3.0",
+            "wrappy": "1"
           }
         },
         "inherits": {
@@ -4495,7 +5421,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "isarray": {
@@ -4509,7 +5435,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "brace-expansion": "1.1.11"
+            "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
@@ -4522,8 +5448,8 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.2",
-            "yallist": "3.0.3"
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
           }
         },
         "minizlib": {
@@ -4532,7 +5458,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "2.3.5"
+            "minipass": "^2.2.1"
           }
         },
         "mkdirp": {
@@ -4555,9 +5481,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "4.1.1",
-            "iconv-lite": "0.4.24",
-            "sax": "1.2.4"
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
@@ -4566,16 +5492,16 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "detect-libc": "1.0.3",
-            "mkdirp": "0.5.1",
-            "needle": "2.3.0",
-            "nopt": "4.0.1",
-            "npm-packlist": "1.4.1",
-            "npmlog": "4.1.2",
-            "rc": "1.2.8",
-            "rimraf": "2.6.3",
-            "semver": "5.7.0",
-            "tar": "4.4.8"
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
           }
         },
         "nopt": {
@@ -4584,8 +5510,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "abbrev": "1.1.1",
-            "osenv": "0.1.5"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
           }
         },
         "npm-bundled": {
@@ -4600,8 +5526,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "ignore-walk": "3.0.1",
-            "npm-bundled": "1.0.6"
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
           }
         },
         "npmlog": {
@@ -4610,10 +5536,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "1.1.5",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
           }
         },
         "number-is-nan": {
@@ -4632,7 +5558,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "wrappy": "1.0.2"
+            "wrappy": "1"
           }
         },
         "os-homedir": {
@@ -4653,8 +5579,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
           }
         },
         "path-is-absolute": {
@@ -4675,10 +5601,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "0.6.0",
-            "ini": "1.3.5",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -4695,13 +5621,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.2",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "rimraf": {
@@ -4710,7 +5636,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "glob": "7.1.3"
+            "glob": "^7.1.3"
           }
         },
         "safe-buffer": {
@@ -4753,9 +5679,9 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
         "string_decoder": {
@@ -4764,7 +5690,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.1.2"
+            "safe-buffer": "~5.1.0"
           }
         },
         "strip-ansi": {
@@ -4772,7 +5698,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "ansi-regex": "2.1.1"
+            "ansi-regex": "^2.0.0"
           }
         },
         "strip-json-comments": {
@@ -4787,13 +5713,13 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "chownr": "1.1.1",
-            "fs-minipass": "1.2.5",
-            "minipass": "2.3.5",
-            "minizlib": "1.2.1",
-            "mkdirp": "0.5.1",
-            "safe-buffer": "5.1.2",
-            "yallist": "3.0.3"
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
           }
         },
         "util-deprecate": {
@@ -4808,7 +5734,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "1.0.2"
+            "string-width": "^1.0.2 || 2"
           }
         },
         "wrappy": {
@@ -4829,10 +5755,10 @@
       "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.15",
-        "inherits": "2.0.3",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.3"
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
       }
     },
     "function-bind": {
@@ -4853,9 +5779,9 @@
       "integrity": "sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==",
       "dev": true,
       "requires": {
-        "arrify": "1.0.1",
-        "matcher": "1.1.1",
-        "simple-git": "1.113.0"
+        "arrify": "^1.0.1",
+        "matcher": "^1.0.0",
+        "simple-git": "^1.85.0"
       }
     },
     "gauge": {
@@ -4864,14 +5790,14 @@
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "console-control-strings": "1.1.0",
-        "has-unicode": "2.0.1",
-        "object-assign": "4.1.1",
-        "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wide-align": "1.1.3"
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
       },
       "dependencies": {
         "is-fullwidth-code-point": {
@@ -4880,7 +5806,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "string-width": {
@@ -4889,9 +5815,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         }
       }
@@ -4902,7 +5828,7 @@
       "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "dev": true,
       "requires": {
-        "globule": "1.2.1"
+        "globule": "^1.0.0"
       }
     },
     "get-caller-file": {
@@ -4917,6 +5843,19 @@
       "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==",
       "dev": true
     },
+    "get-pkg-repo": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
+      "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "meow": "^3.3.0",
+        "normalize-package-data": "^2.3.0",
+        "parse-github-repo-url": "^1.3.0",
+        "through2": "^2.0.0"
+      }
+    },
     "get-stdin": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
@@ -4929,7 +5868,7 @@
       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
       "dev": true,
       "requires": {
-        "pump": "3.0.0"
+        "pump": "^3.0.0"
       }
     },
     "get-value": {
@@ -4944,7 +5883,391 @@
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "git-raw-commits": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz",
+      "integrity": "sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==",
+      "dev": true,
+      "requires": {
+        "dargs": "^4.0.1",
+        "lodash.template": "^4.0.2",
+        "meow": "^4.0.0",
+        "split2": "^2.0.0",
+        "through2": "^2.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist": "^1.1.3",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
+    "git-remote-origin-url": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
+      "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
+      "dev": true,
+      "requires": {
+        "gitconfiglocal": "^1.0.0",
+        "pify": "^2.3.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "git-semver-tags": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.2.tgz",
+      "integrity": "sha512-34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w==",
+      "dev": true,
+      "requires": {
+        "meow": "^4.0.0",
+        "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist": "^1.1.3",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
+    "gitconfiglocal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
+      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.2"
       }
     },
     "glob": {
@@ -4953,12 +6276,12 @@
       "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
       "dev": true,
       "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
     "glob-parent": {
@@ -4967,8 +6290,8 @@
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
       "requires": {
-        "is-glob": "3.1.0",
-        "path-dirname": "1.0.2"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
       },
       "dependencies": {
         "is-glob": {
@@ -4977,7 +6300,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "2.1.1"
+            "is-extglob": "^2.1.0"
           }
         }
       }
@@ -4988,9 +6311,9 @@
       "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
-        "global-prefix": "1.0.2",
-        "is-windows": "1.0.2",
-        "resolve-dir": "1.0.1"
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
       }
     },
     "global-prefix": {
@@ -4999,11 +6322,11 @@
       "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "homedir-polyfill": "1.0.3",
-        "ini": "1.3.5",
-        "is-windows": "1.0.2",
-        "which": "1.3.1"
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
       }
     },
     "globals": {
@@ -5018,11 +6341,11 @@
       "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
       "dev": true,
       "requires": {
-        "array-union": "1.0.2",
-        "glob": "7.1.4",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       },
       "dependencies": {
         "pify": {
@@ -5039,9 +6362,9 @@
       "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
       "dev": true,
       "requires": {
-        "glob": "7.1.4",
-        "lodash": "4.17.11",
-        "minimatch": "3.0.4"
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
       }
     },
     "graceful-fs": {
@@ -5050,6 +6373,26 @@
       "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
       "dev": true
     },
+    "handlebars": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
+      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
+      "dev": true,
+      "requires": {
+        "neo-async": "^2.6.0",
+        "optimist": "^0.6.1",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -5062,8 +6405,8 @@
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
       "dev": true,
       "requires": {
-        "ajv": "6.10.0",
-        "har-schema": "2.0.0"
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
       }
     },
     "has": {
@@ -5072,7 +6415,7 @@
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
       "requires": {
-        "function-bind": "1.1.1"
+        "function-bind": "^1.1.1"
       }
     },
     "has-ansi": {
@@ -5081,7 +6424,7 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "has-binary2": {
@@ -5131,9 +6474,9 @@
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
-        "get-value": "2.0.6",
-        "has-values": "1.0.0",
-        "isobject": "3.0.1"
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       }
     },
     "has-values": {
@@ -5142,8 +6485,8 @@
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -5152,7 +6495,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -5163,8 +6506,8 @@
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "hash.js": {
@@ -5173,8 +6516,8 @@
       "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1"
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
       }
     },
     "hmac-drbg": {
@@ -5183,9 +6526,9 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "1.1.7",
-        "minimalistic-assert": "1.0.1",
-        "minimalistic-crypto-utils": "1.0.1"
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
     "home-or-tmp": {
@@ -5194,8 +6537,8 @@
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
       }
     },
     "homedir-polyfill": {
@@ -5204,7 +6547,7 @@
       "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "dev": true,
       "requires": {
-        "parse-passwd": "1.0.0"
+        "parse-passwd": "^1.0.0"
       }
     },
     "hosted-git-info": {
@@ -5219,10 +6562,10 @@
       "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "dev": true,
       "requires": {
-        "depd": "1.1.2",
+        "depd": "~1.1.2",
         "inherits": "2.0.3",
         "setprototypeof": "1.1.1",
-        "statuses": "1.5.0",
+        "statuses": ">= 1.5.0 < 2",
         "toidentifier": "1.0.0"
       }
     },
@@ -5232,9 +6575,9 @@
       "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
-        "eventemitter3": "3.1.2",
-        "follow-redirects": "1.7.0",
-        "requires-port": "1.0.0"
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
       }
     },
     "http-signature": {
@@ -5243,9 +6586,9 @@
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.16.1"
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
       }
     },
     "https-browserify": {
@@ -5260,16 +6603,16 @@
       "integrity": "sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "5.2.1",
-        "execa": "1.0.0",
-        "find-up": "3.0.0",
-        "get-stdin": "7.0.0",
-        "is-ci": "2.0.0",
-        "pkg-dir": "4.2.0",
-        "please-upgrade-node": "3.1.1",
-        "read-pkg": "5.1.1",
-        "run-node": "1.0.0",
-        "slash": "3.0.0"
+        "cosmiconfig": "^5.2.0",
+        "execa": "^1.0.0",
+        "find-up": "^3.0.0",
+        "get-stdin": "^7.0.0",
+        "is-ci": "^2.0.0",
+        "pkg-dir": "^4.1.0",
+        "please-upgrade-node": "^3.1.1",
+        "read-pkg": "^5.1.1",
+        "run-node": "^1.0.0",
+        "slash": "^3.0.0"
       },
       "dependencies": {
         "locate-path": {
@@ -5278,7 +6621,7 @@
           "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
           "dev": true,
           "requires": {
-            "p-locate": "4.1.0"
+            "p-locate": "^4.1.0"
           }
         },
         "p-locate": {
@@ -5287,7 +6630,7 @@
           "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
           "dev": true,
           "requires": {
-            "p-limit": "2.2.0"
+            "p-limit": "^2.2.0"
           }
         },
         "pkg-dir": {
@@ -5296,7 +6639,7 @@
           "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
           "dev": true,
           "requires": {
-            "find-up": "4.0.0"
+            "find-up": "^4.0.0"
           },
           "dependencies": {
             "find-up": {
@@ -5305,7 +6648,7 @@
               "integrity": "sha512-zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q==",
               "dev": true,
               "requires": {
-                "locate-path": "5.0.0"
+                "locate-path": "^5.0.0"
               }
             }
           }
@@ -5324,7 +6667,7 @@
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
       "requires": {
-        "safer-buffer": "2.1.2"
+        "safer-buffer": ">= 2.1.2 < 3"
       }
     },
     "icss-replace-symbols": {
@@ -5339,7 +6682,7 @@
       "integrity": "sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ==",
       "dev": true,
       "requires": {
-        "postcss": "7.0.16"
+        "postcss": "^7.0.14"
       }
     },
     "ieee754": {
@@ -5366,7 +6709,7 @@
       "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
       "dev": true,
       "requires": {
-        "import-from": "2.1.0"
+        "import-from": "^2.1.0"
       }
     },
     "import-fresh": {
@@ -5375,8 +6718,8 @@
       "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
       "dev": true,
       "requires": {
-        "parent-module": "1.0.1",
-        "resolve-from": "4.0.0"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
       }
     },
     "import-from": {
@@ -5385,7 +6728,7 @@
       "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
       "dev": true,
       "requires": {
-        "resolve-from": "3.0.0"
+        "resolve-from": "^3.0.0"
       },
       "dependencies": {
         "resolve-from": {
@@ -5402,8 +6745,8 @@
       "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "3.0.0",
-        "resolve-cwd": "2.0.0"
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
       }
     },
     "imurmurhash": {
@@ -5442,8 +6785,8 @@
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
     "inherits": {
@@ -5464,19 +6807,19 @@
       "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "3.2.0",
-        "chalk": "2.4.2",
-        "cli-cursor": "2.1.0",
-        "cli-width": "2.2.0",
-        "external-editor": "3.0.3",
-        "figures": "2.0.0",
-        "lodash": "4.17.11",
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.11",
         "mute-stream": "0.0.7",
-        "run-async": "2.3.0",
-        "rxjs": "6.5.2",
-        "string-width": "2.1.1",
-        "strip-ansi": "5.2.0",
-        "through": "2.3.8"
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-regex": {
@@ -5491,7 +6834,7 @@
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "4.1.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
@@ -5508,7 +6851,7 @@
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "requires": {
-        "loose-envify": "1.4.0"
+        "loose-envify": "^1.0.0"
       }
     },
     "invert-kv": {
@@ -5523,7 +6866,7 @@
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -5532,7 +6875,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -5549,7 +6892,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "1.13.1"
+        "binary-extensions": "^1.0.0"
       }
     },
     "is-buffer": {
@@ -5570,7 +6913,7 @@
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
       "dev": true,
       "requires": {
-        "ci-info": "2.0.0"
+        "ci-info": "^2.0.0"
       }
     },
     "is-data-descriptor": {
@@ -5579,7 +6922,7 @@
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -5588,7 +6931,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -5605,9 +6948,9 @@
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "0.1.6",
-        "is-data-descriptor": "0.1.4",
-        "kind-of": "5.1.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -5642,7 +6985,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-fullwidth-code-point": {
@@ -5657,7 +7000,7 @@
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "dev": true,
       "requires": {
-        "is-extglob": "2.1.1"
+        "is-extglob": "^2.1.1"
       }
     },
     "is-number": {
@@ -5666,7 +7009,7 @@
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -5675,7 +7018,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -5692,7 +7035,7 @@
       "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==",
       "dev": true,
       "requires": {
-        "symbol-observable": "1.2.0"
+        "symbol-observable": "^1.1.0"
       }
     },
     "is-path-cwd": {
@@ -5707,7 +7050,7 @@
       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "1.0.1"
+        "is-path-inside": "^1.0.0"
       }
     },
     "is-path-inside": {
@@ -5716,7 +7059,7 @@
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "1.0.2"
+        "path-is-inside": "^1.0.1"
       }
     },
     "is-plain-obj": {
@@ -5731,7 +7074,7 @@
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.1"
       }
     },
     "is-promise": {
@@ -5746,7 +7089,7 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "1.0.3"
+        "has": "^1.0.1"
       }
     },
     "is-regexp": {
@@ -5767,7 +7110,16 @@
       "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
       "dev": true,
       "requires": {
-        "has-symbols": "1.0.0"
+        "has-symbols": "^1.0.0"
+      }
+    },
+    "is-text-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz",
+      "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==",
+      "dev": true,
+      "requires": {
+        "text-extensions": "^2.0.0"
       }
     },
     "is-typedarray": {
@@ -5806,7 +7158,7 @@
       "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
       "dev": true,
       "requires": {
-        "buffer-alloc": "1.2.0"
+        "buffer-alloc": "^1.2.0"
       }
     },
     "isexe": {
@@ -5857,8 +7209,8 @@
       "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
-        "argparse": "1.0.10",
-        "esprima": "4.0.1"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       }
     },
     "jsbn": {
@@ -5909,7 +7261,7 @@
       "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
       "dev": true,
       "requires": {
-        "minimist": "1.2.0"
+        "minimist": "^1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -5926,7 +7278,7 @@
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.15"
+        "graceful-fs": "^4.1.6"
       }
     },
     "jsonify": {
@@ -5935,6 +7287,12 @@
       "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
       "dev": true
     },
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+      "dev": true
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -5953,31 +7311,31 @@
       "integrity": "sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.5",
-        "body-parser": "1.19.0",
-        "braces": "2.3.2",
-        "chokidar": "2.1.6",
-        "colors": "1.3.3",
-        "connect": "3.7.0",
-        "core-js": "2.6.8",
-        "di": "0.0.1",
-        "dom-serialize": "2.2.1",
-        "flatted": "2.0.0",
-        "glob": "7.1.4",
-        "graceful-fs": "4.1.15",
-        "http-proxy": "1.17.0",
-        "isbinaryfile": "3.0.3",
-        "lodash": "4.17.11",
-        "log4js": "4.3.0",
-        "mime": "2.4.3",
-        "minimatch": "3.0.4",
-        "optimist": "0.6.1",
-        "qjobs": "1.2.0",
-        "range-parser": "1.2.1",
-        "rimraf": "2.6.3",
-        "safe-buffer": "5.1.2",
+        "bluebird": "^3.3.0",
+        "body-parser": "^1.16.1",
+        "braces": "^2.3.2",
+        "chokidar": "^2.0.3",
+        "colors": "^1.1.0",
+        "connect": "^3.6.0",
+        "core-js": "^2.2.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.0",
+        "flatted": "^2.0.0",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "http-proxy": "^1.13.0",
+        "isbinaryfile": "^3.0.0",
+        "lodash": "^4.17.11",
+        "log4js": "^4.0.0",
+        "mime": "^2.3.1",
+        "minimatch": "^3.0.2",
+        "optimist": "^0.6.1",
+        "qjobs": "^1.1.4",
+        "range-parser": "^1.2.0",
+        "rimraf": "^2.6.0",
+        "safe-buffer": "^5.0.1",
         "socket.io": "2.1.1",
-        "source-map": "0.6.1",
+        "source-map": "^0.6.1",
         "tmp": "0.0.33",
         "useragent": "2.3.0"
       },
@@ -5996,8 +7354,8 @@
       "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
       "dev": true,
       "requires": {
-        "fs-access": "1.0.1",
-        "which": "1.3.1"
+        "fs-access": "^1.0.0",
+        "which": "^1.2.1"
       }
     },
     "karma-cli": {
@@ -6006,7 +7364,7 @@
       "integrity": "sha512-1Kb28UILg1ZsfqQmeELbPzuEb5C6GZJfVIk0qOr8LNYQuYWmAaqP16WpbpKEjhejDrDYyYOwwJXSZO6u7q5Pvw==",
       "dev": true,
       "requires": {
-        "resolve": "1.11.0"
+        "resolve": "^1.3.3"
       }
     },
     "karma-jasmine": {
@@ -6015,7 +7373,7 @@
       "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
       "dev": true,
       "requires": {
-        "jasmine-core": "3.4.0"
+        "jasmine-core": "^3.3"
       }
     },
     "karma-jasmine-html-reporter": {
@@ -6030,9 +7388,9 @@
       "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "log-symbols": "2.2.0",
-        "strip-ansi": "4.0.0"
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "strip-ansi": "^4.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -6047,7 +7405,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
@@ -6058,12 +7416,12 @@
       "integrity": "sha512-nRudGJWstvVuA6Tbju9tyGUfXTtI1UXMXoRHVmM2/78D0q6s/Ye2IC157PKNDC15PWFGR0mVIRtWLAdcfsRJoA==",
       "dev": true,
       "requires": {
-        "async": "2.6.2",
-        "babel-runtime": "6.26.0",
-        "loader-utils": "1.2.3",
-        "lodash": "4.17.11",
-        "source-map": "0.5.7",
-        "webpack-dev-middleware": "2.0.6"
+        "async": "^2.0.0",
+        "babel-runtime": "^6.0.0",
+        "loader-utils": "^1.0.0",
+        "lodash": "^4.0.0",
+        "source-map": "^0.5.6",
+        "webpack-dev-middleware": "^2.0.6"
       }
     },
     "kind-of": {
@@ -6078,7 +7436,7 @@
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
-        "invert-kv": "1.0.0"
+        "invert-kv": "^1.0.0"
       }
     },
     "levn": {
@@ -6087,8 +7445,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
       }
     },
     "lint-staged": {
@@ -6097,31 +7455,31 @@
       "integrity": "sha512-egT0goFhIFoOGk6rasPngTFh2qDqxZddM0PwI58oi66RxCDcn5uDwxmiasWIF0qGnchHSYVJ8HPRD5LrFo7TKA==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "commander": "2.20.0",
-        "cosmiconfig": "5.2.1",
-        "debug": "3.2.6",
-        "dedent": "0.7.0",
-        "del": "3.0.0",
-        "execa": "1.0.0",
-        "find-parent-dir": "0.3.0",
-        "g-status": "2.0.2",
-        "is-glob": "4.0.1",
-        "is-windows": "1.0.2",
-        "listr": "0.14.3",
-        "listr-update-renderer": "0.5.0",
-        "lodash": "4.17.11",
-        "log-symbols": "2.2.0",
-        "micromatch": "3.1.10",
-        "npm-which": "3.0.1",
-        "p-map": "1.2.0",
-        "path-is-inside": "1.0.2",
-        "pify": "3.0.0",
-        "please-upgrade-node": "3.1.1",
+        "chalk": "^2.3.1",
+        "commander": "^2.14.1",
+        "cosmiconfig": "^5.2.0",
+        "debug": "^3.1.0",
+        "dedent": "^0.7.0",
+        "del": "^3.0.0",
+        "execa": "^1.0.0",
+        "find-parent-dir": "^0.3.0",
+        "g-status": "^2.0.2",
+        "is-glob": "^4.0.0",
+        "is-windows": "^1.0.2",
+        "listr": "^0.14.2",
+        "listr-update-renderer": "^0.5.0",
+        "lodash": "^4.17.11",
+        "log-symbols": "^2.2.0",
+        "micromatch": "^3.1.8",
+        "npm-which": "^3.0.1",
+        "p-map": "^1.1.1",
+        "path-is-inside": "^1.0.2",
+        "pify": "^3.0.0",
+        "please-upgrade-node": "^3.0.2",
         "staged-git-files": "1.1.2",
-        "string-argv": "0.0.2",
-        "stringify-object": "3.3.0",
-        "yup": "0.27.0"
+        "string-argv": "^0.0.2",
+        "stringify-object": "^3.2.2",
+        "yup": "^0.27.0"
       },
       "dependencies": {
         "debug": {
@@ -6130,7 +7488,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -6153,15 +7511,15 @@
       "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==",
       "dev": true,
       "requires": {
-        "@samverschueren/stream-to-observable": "0.3.0",
-        "is-observable": "1.1.0",
-        "is-promise": "2.1.0",
-        "is-stream": "1.1.0",
-        "listr-silent-renderer": "1.1.1",
-        "listr-update-renderer": "0.5.0",
-        "listr-verbose-renderer": "0.5.0",
-        "p-map": "2.1.0",
-        "rxjs": "6.5.2"
+        "@samverschueren/stream-to-observable": "^0.3.0",
+        "is-observable": "^1.1.0",
+        "is-promise": "^2.1.0",
+        "is-stream": "^1.1.0",
+        "listr-silent-renderer": "^1.1.1",
+        "listr-update-renderer": "^0.5.0",
+        "listr-verbose-renderer": "^0.5.0",
+        "p-map": "^2.0.0",
+        "rxjs": "^6.3.3"
       },
       "dependencies": {
         "p-map": {
@@ -6184,14 +7542,14 @@
       "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "cli-truncate": "0.2.1",
-        "elegant-spinner": "1.0.1",
-        "figures": "1.7.0",
-        "indent-string": "3.2.0",
-        "log-symbols": "1.0.2",
-        "log-update": "2.3.0",
-        "strip-ansi": "3.0.1"
+        "chalk": "^1.1.3",
+        "cli-truncate": "^0.2.1",
+        "elegant-spinner": "^1.0.1",
+        "figures": "^1.7.0",
+        "indent-string": "^3.0.0",
+        "log-symbols": "^1.0.2",
+        "log-update": "^2.3.0",
+        "strip-ansi": "^3.0.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6206,11 +7564,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
           }
         },
         "figures": {
@@ -6219,8 +7577,8 @@
           "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "1.0.5",
-            "object-assign": "4.1.1"
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
           }
         },
         "log-symbols": {
@@ -6229,7 +7587,7 @@
           "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3"
+            "chalk": "^1.0.0"
           }
         },
         "supports-color": {
@@ -6246,10 +7604,10 @@
       "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "cli-cursor": "2.1.0",
-        "date-fns": "1.30.1",
-        "figures": "2.0.0"
+        "chalk": "^2.4.1",
+        "cli-cursor": "^2.1.0",
+        "date-fns": "^1.27.2",
+        "figures": "^2.0.0"
       }
     },
     "load-json-file": {
@@ -6258,11 +7616,11 @@
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.15",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
       },
       "dependencies": {
         "parse-json": {
@@ -6271,7 +7629,7 @@
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
           "requires": {
-            "error-ex": "1.3.2"
+            "error-ex": "^1.2.0"
           }
         },
         "pify": {
@@ -6294,9 +7652,9 @@
       "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
       "dev": true,
       "requires": {
-        "big.js": "5.2.2",
-        "emojis-list": "2.1.0",
-        "json5": "1.0.1"
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
       },
       "dependencies": {
         "json5": {
@@ -6305,7 +7663,7 @@
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "minimist": "1.2.0"
+            "minimist": "^1.2.0"
           }
         },
         "minimist": {
@@ -6322,8 +7680,8 @@
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
       "requires": {
-        "p-locate": "3.0.0",
-        "path-exists": "3.0.0"
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
       }
     },
     "lodash": {
@@ -6332,25 +7690,56 @@
       "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
       "dev": true
     },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
       "dev": true
     },
+    "lodash.ismatch": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz",
+      "integrity": "sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=",
+      "dev": true
+    },
     "lodash.tail": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
       "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
       "dev": true
     },
+    "lodash.template": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
+      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "~3.0.0",
+        "lodash.templatesettings": "^4.0.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
+      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "~3.0.0"
+      }
+    },
     "log-symbols": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
       "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2"
+        "chalk": "^2.0.1"
       }
     },
     "log-update": {
@@ -6359,9 +7748,9 @@
       "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=",
       "dev": true,
       "requires": {
-        "ansi-escapes": "3.2.0",
-        "cli-cursor": "2.1.0",
-        "wrap-ansi": "3.0.1"
+        "ansi-escapes": "^3.0.0",
+        "cli-cursor": "^2.0.0",
+        "wrap-ansi": "^3.0.1"
       }
     },
     "log4js": {
@@ -6370,11 +7759,11 @@
       "integrity": "sha512-ivqZBkBvWLJ8rXfhb4E0979olSwnYBPSZy/5WhLNXwntqRgUhxHnqcXGmVw0t+XmLNTr3GAWEzjqHMzu4KM7rA==",
       "dev": true,
       "requires": {
-        "date-format": "2.0.0",
-        "debug": "4.1.1",
-        "flatted": "2.0.0",
-        "rfdc": "1.1.4",
-        "streamroller": "1.0.5"
+        "date-format": "^2.0.0",
+        "debug": "^4.1.1",
+        "flatted": "^2.0.0",
+        "rfdc": "^1.1.2",
+        "streamroller": "^1.0.5"
       },
       "dependencies": {
         "debug": {
@@ -6383,7 +7772,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -6400,8 +7789,8 @@
       "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
       "dev": true,
       "requires": {
-        "es6-symbol": "3.1.1",
-        "object.assign": "4.1.0"
+        "es6-symbol": "^3.1.1",
+        "object.assign": "^4.1.0"
       }
     },
     "loose-envify": {
@@ -6410,7 +7799,7 @@
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
       "requires": {
-        "js-tokens": "4.0.0"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
     "loud-rejection": {
@@ -6419,8 +7808,8 @@
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
-        "currently-unhandled": "0.4.1",
-        "signal-exit": "3.0.2"
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
       }
     },
     "lru-cache": {
@@ -6429,8 +7818,8 @@
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
     "make-dir": {
@@ -6439,8 +7828,8 @@
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
       "requires": {
-        "pify": "4.0.1",
-        "semver": "5.7.0"
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
       }
     },
     "mamacro": {
@@ -6455,7 +7844,7 @@
       "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
       "dev": true,
       "requires": {
-        "p-defer": "1.0.0"
+        "p-defer": "^1.0.0"
       }
     },
     "map-cache": {
@@ -6476,7 +7865,7 @@
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
-        "object-visit": "1.0.1"
+        "object-visit": "^1.0.0"
       }
     },
     "matcher": {
@@ -6485,7 +7874,7 @@
       "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "1.0.5"
+        "escape-string-regexp": "^1.0.4"
       }
     },
     "md5.js": {
@@ -6494,9 +7883,9 @@
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
       "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       }
     },
     "media-typer": {
@@ -6511,9 +7900,9 @@
       "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
       "dev": true,
       "requires": {
-        "map-age-cleaner": "0.1.3",
-        "mimic-fn": "2.1.0",
-        "p-is-promise": "2.1.0"
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
       },
       "dependencies": {
         "mimic-fn": {
@@ -6530,8 +7919,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "0.1.7",
-        "readable-stream": "2.3.6"
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
       }
     },
     "memorystream": {
@@ -6546,16 +7935,16 @@
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
-        "camelcase-keys": "2.1.0",
-        "decamelize": "1.2.0",
-        "loud-rejection": "1.6.0",
-        "map-obj": "1.0.1",
-        "minimist": "1.2.0",
-        "normalize-package-data": "2.5.0",
-        "object-assign": "4.1.1",
-        "read-pkg-up": "1.0.1",
-        "redent": "1.0.0",
-        "trim-newlines": "1.0.0"
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -6572,19 +7961,19 @@
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "braces": "2.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "extglob": "2.0.4",
-        "fragment-cache": "0.2.1",
-        "kind-of": "6.0.2",
-        "nanomatch": "1.2.13",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       }
     },
     "miller-rabin": {
@@ -6593,8 +7982,8 @@
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0"
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
       }
     },
     "mime": {
@@ -6642,7 +8031,7 @@
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
-        "brace-expansion": "1.1.11"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
@@ -6651,22 +8040,32 @@
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
       "dev": true
     },
+    "minimist-options": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+      "dev": true,
+      "requires": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0"
+      }
+    },
     "mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
       "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.2",
-        "duplexify": "3.7.1",
-        "end-of-stream": "1.4.1",
-        "flush-write-stream": "1.1.1",
-        "from2": "2.3.0",
-        "parallel-transform": "1.1.0",
-        "pump": "3.0.0",
-        "pumpify": "1.5.1",
-        "stream-each": "1.2.3",
-        "through2": "2.0.5"
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
       }
     },
     "mixin-deep": {
@@ -6675,8 +8074,8 @@
       "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
       "dev": true,
       "requires": {
-        "for-in": "1.0.2",
-        "is-extendable": "1.0.1"
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -6685,7 +8084,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "2.0.4"
+            "is-plain-object": "^2.0.4"
           }
         }
       }
@@ -6696,8 +8095,8 @@
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
-        "for-in": "0.1.8",
-        "is-extendable": "0.1.1"
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
       },
       "dependencies": {
         "for-in": {
@@ -6717,18 +8116,24 @@
         "minimist": "0.0.8"
       }
     },
+    "modify-values": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
+      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
+      "dev": true
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "copy-concurrently": "1.0.5",
-        "fs-write-stream-atomic": "1.0.10",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.3",
-        "run-queue": "1.0.3"
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
       }
     },
     "ms": {
@@ -6755,17 +8160,17 @@
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "fragment-cache": "0.2.1",
-        "is-windows": "1.0.2",
-        "kind-of": "6.0.2",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       }
     },
     "natural-compare": {
@@ -6804,18 +8209,18 @@
       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "dev": true,
       "requires": {
-        "fstream": "1.0.12",
-        "glob": "7.1.4",
-        "graceful-fs": "4.1.15",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6",
-        "npmlog": "4.1.2",
-        "osenv": "0.1.5",
-        "request": "2.88.0",
-        "rimraf": "2.6.3",
-        "semver": "5.3.0",
-        "tar": "2.2.2",
-        "which": "1.3.1"
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
       },
       "dependencies": {
         "semver": {
@@ -6832,28 +8237,28 @@
       "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
       "dev": true,
       "requires": {
-        "assert": "1.5.0",
-        "browserify-zlib": "0.2.0",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.12.0",
-        "domain-browser": "1.2.0",
-        "events": "3.0.0",
-        "https-browserify": "1.0.0",
-        "os-browserify": "0.3.0",
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
         "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "2.3.6",
-        "stream-browserify": "2.0.2",
-        "stream-http": "2.8.3",
-        "string_decoder": "1.1.1",
-        "timers-browserify": "2.0.10",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
         "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.11.1",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
@@ -6871,7 +8276,7 @@
       "integrity": "sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q==",
       "dev": true,
       "requires": {
-        "semver": "5.7.0"
+        "semver": "^5.3.0"
       }
     },
     "node-sass": {
@@ -6880,23 +8285,23 @@
       "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
       "dev": true,
       "requires": {
-        "async-foreach": "0.1.3",
-        "chalk": "1.1.3",
-        "cross-spawn": "3.0.1",
-        "gaze": "1.1.3",
-        "get-stdin": "4.0.1",
-        "glob": "7.1.4",
-        "in-publish": "2.0.0",
-        "lodash": "4.17.11",
-        "meow": "3.7.0",
-        "mkdirp": "0.5.1",
-        "nan": "2.14.0",
-        "node-gyp": "3.8.0",
-        "npmlog": "4.1.2",
-        "request": "2.88.0",
-        "sass-graph": "2.2.4",
-        "stdout-stream": "1.4.1",
-        "true-case-path": "1.0.3"
+        "async-foreach": "^0.1.3",
+        "chalk": "^1.1.1",
+        "cross-spawn": "^3.0.0",
+        "gaze": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "glob": "^7.0.3",
+        "in-publish": "^2.0.0",
+        "lodash": "^4.17.11",
+        "meow": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "nan": "^2.13.2",
+        "node-gyp": "^3.8.0",
+        "npmlog": "^4.0.0",
+        "request": "^2.88.0",
+        "sass-graph": "^2.2.4",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^1.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6911,11 +8316,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
           }
         },
         "cross-spawn": {
@@ -6924,8 +8329,8 @@
           "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "dev": true,
           "requires": {
-            "lru-cache": "4.1.5",
-            "which": "1.3.1"
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
           }
         },
         "get-stdin": {
@@ -6948,7 +8353,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.1"
+        "abbrev": "1"
       }
     },
     "normalize-package-data": {
@@ -6957,10 +8362,10 @@
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "2.7.1",
-        "resolve": "1.11.0",
-        "semver": "5.7.0",
-        "validate-npm-package-license": "3.0.4"
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
     "normalize-path": {
@@ -6980,136 +8385,136 @@
       "resolved": "https://registry.npmjs.org/npm/-/npm-6.9.0.tgz",
       "integrity": "sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==",
       "requires": {
-        "JSONStream": "1.3.5",
-        "abbrev": "1.1.1",
-        "ansicolors": "0.3.2",
-        "ansistyles": "0.1.3",
-        "aproba": "2.0.0",
-        "archy": "1.0.0",
-        "bin-links": "1.1.2",
-        "bluebird": "3.5.3",
-        "byte-size": "5.0.1",
-        "cacache": "11.3.2",
-        "call-limit": "1.1.0",
-        "chownr": "1.1.1",
-        "ci-info": "2.0.0",
-        "cli-columns": "3.1.2",
-        "cli-table3": "0.5.1",
-        "cmd-shim": "2.0.2",
-        "columnify": "1.5.4",
-        "config-chain": "1.1.12",
-        "debuglog": "1.0.1",
-        "detect-indent": "5.0.0",
-        "detect-newline": "2.1.0",
-        "dezalgo": "1.0.3",
-        "editor": "1.0.0",
-        "figgy-pudding": "3.5.1",
-        "find-npm-prefix": "1.0.2",
-        "fs-vacuum": "1.2.10",
-        "fs-write-stream-atomic": "1.0.10",
-        "gentle-fs": "2.0.1",
-        "glob": "7.1.3",
-        "graceful-fs": "4.1.15",
-        "has-unicode": "2.0.1",
-        "hosted-git-info": "2.7.1",
-        "iferr": "1.0.2",
-        "imurmurhash": "0.1.4",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "ini": "1.3.5",
-        "init-package-json": "1.10.3",
-        "is-cidr": "3.0.0",
-        "json-parse-better-errors": "1.0.2",
-        "lazy-property": "1.0.0",
-        "libcipm": "3.0.3",
-        "libnpm": "2.0.1",
-        "libnpmaccess": "3.0.1",
-        "libnpmhook": "5.0.2",
-        "libnpmorg": "1.0.0",
-        "libnpmsearch": "2.0.0",
-        "libnpmteam": "1.0.1",
-        "libnpx": "10.2.0",
-        "lock-verify": "2.1.0",
-        "lockfile": "1.0.4",
-        "lodash._baseindexof": "3.1.0",
-        "lodash._baseuniq": "4.6.0",
-        "lodash._bindcallback": "3.0.1",
-        "lodash._cacheindexof": "3.0.2",
-        "lodash._createcache": "3.1.2",
-        "lodash._getnative": "3.9.1",
-        "lodash.clonedeep": "4.5.0",
-        "lodash.restparam": "3.6.1",
-        "lodash.union": "4.6.0",
-        "lodash.uniq": "4.5.0",
-        "lodash.without": "4.4.0",
-        "lru-cache": "4.1.5",
-        "meant": "1.0.1",
-        "mississippi": "3.0.0",
-        "mkdirp": "0.5.1",
-        "move-concurrently": "1.0.1",
-        "node-gyp": "3.8.0",
-        "nopt": "4.0.1",
-        "normalize-package-data": "2.5.0",
-        "npm-audit-report": "1.3.2",
-        "npm-cache-filename": "1.0.2",
-        "npm-install-checks": "3.0.0",
-        "npm-lifecycle": "2.1.0",
-        "npm-package-arg": "6.1.0",
-        "npm-packlist": "1.4.1",
-        "npm-pick-manifest": "2.2.3",
-        "npm-profile": "4.0.1",
-        "npm-registry-fetch": "3.9.0",
-        "npm-user-validate": "1.0.0",
-        "npmlog": "4.1.2",
-        "once": "1.4.0",
-        "opener": "1.5.1",
-        "osenv": "0.1.5",
-        "pacote": "9.5.0",
-        "path-is-inside": "1.0.2",
-        "promise-inflight": "1.0.1",
-        "qrcode-terminal": "0.12.0",
-        "query-string": "6.2.0",
-        "qw": "1.0.1",
-        "read": "1.0.7",
-        "read-cmd-shim": "1.0.1",
-        "read-installed": "4.0.3",
-        "read-package-json": "2.0.13",
-        "read-package-tree": "5.2.2",
-        "readable-stream": "3.1.1",
-        "readdir-scoped-modules": "1.0.2",
-        "request": "2.88.0",
-        "retry": "0.12.0",
-        "rimraf": "2.6.3",
-        "safe-buffer": "5.1.2",
-        "semver": "5.6.0",
-        "sha": "2.0.1",
-        "slide": "1.1.6",
-        "sorted-object": "2.0.1",
-        "sorted-union-stream": "2.1.3",
-        "ssri": "6.0.1",
-        "stringify-package": "1.0.0",
-        "tar": "4.4.8",
-        "text-table": "0.2.0",
-        "tiny-relative-date": "1.3.0",
+        "JSONStream": "^1.3.5",
+        "abbrev": "~1.1.1",
+        "ansicolors": "~0.3.2",
+        "ansistyles": "~0.1.3",
+        "aproba": "^2.0.0",
+        "archy": "~1.0.0",
+        "bin-links": "^1.1.2",
+        "bluebird": "^3.5.3",
+        "byte-size": "^5.0.1",
+        "cacache": "^11.3.2",
+        "call-limit": "~1.1.0",
+        "chownr": "^1.1.1",
+        "ci-info": "^2.0.0",
+        "cli-columns": "^3.1.2",
+        "cli-table3": "^0.5.1",
+        "cmd-shim": "~2.0.2",
+        "columnify": "~1.5.4",
+        "config-chain": "^1.1.12",
+        "debuglog": "*",
+        "detect-indent": "~5.0.0",
+        "detect-newline": "^2.1.0",
+        "dezalgo": "~1.0.3",
+        "editor": "~1.0.0",
+        "figgy-pudding": "^3.5.1",
+        "find-npm-prefix": "^1.0.2",
+        "fs-vacuum": "~1.2.10",
+        "fs-write-stream-atomic": "~1.0.10",
+        "gentle-fs": "^2.0.1",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.1.15",
+        "has-unicode": "~2.0.1",
+        "hosted-git-info": "^2.7.1",
+        "iferr": "^1.0.2",
+        "imurmurhash": "*",
+        "inflight": "~1.0.6",
+        "inherits": "~2.0.3",
+        "ini": "^1.3.5",
+        "init-package-json": "^1.10.3",
+        "is-cidr": "^3.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "lazy-property": "~1.0.0",
+        "libcipm": "^3.0.3",
+        "libnpm": "^2.0.1",
+        "libnpmaccess": "*",
+        "libnpmhook": "^5.0.2",
+        "libnpmorg": "*",
+        "libnpmsearch": "*",
+        "libnpmteam": "*",
+        "libnpx": "^10.2.0",
+        "lock-verify": "^2.1.0",
+        "lockfile": "^1.0.4",
+        "lodash._baseindexof": "*",
+        "lodash._baseuniq": "~4.6.0",
+        "lodash._bindcallback": "*",
+        "lodash._cacheindexof": "*",
+        "lodash._createcache": "*",
+        "lodash._getnative": "*",
+        "lodash.clonedeep": "~4.5.0",
+        "lodash.restparam": "*",
+        "lodash.union": "~4.6.0",
+        "lodash.uniq": "~4.5.0",
+        "lodash.without": "~4.4.0",
+        "lru-cache": "^4.1.5",
+        "meant": "~1.0.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "~0.5.1",
+        "move-concurrently": "^1.0.1",
+        "node-gyp": "^3.8.0",
+        "nopt": "~4.0.1",
+        "normalize-package-data": "^2.5.0",
+        "npm-audit-report": "^1.3.2",
+        "npm-cache-filename": "~1.0.2",
+        "npm-install-checks": "~3.0.0",
+        "npm-lifecycle": "^2.1.0",
+        "npm-package-arg": "^6.1.0",
+        "npm-packlist": "^1.4.1",
+        "npm-pick-manifest": "^2.2.3",
+        "npm-profile": "*",
+        "npm-registry-fetch": "^3.9.0",
+        "npm-user-validate": "~1.0.0",
+        "npmlog": "~4.1.2",
+        "once": "~1.4.0",
+        "opener": "^1.5.1",
+        "osenv": "^0.1.5",
+        "pacote": "^9.5.0",
+        "path-is-inside": "~1.0.2",
+        "promise-inflight": "~1.0.1",
+        "qrcode-terminal": "^0.12.0",
+        "query-string": "^6.2.0",
+        "qw": "~1.0.1",
+        "read": "~1.0.7",
+        "read-cmd-shim": "~1.0.1",
+        "read-installed": "~4.0.3",
+        "read-package-json": "^2.0.13",
+        "read-package-tree": "^5.2.2",
+        "readable-stream": "^3.1.1",
+        "readdir-scoped-modules": "*",
+        "request": "^2.88.0",
+        "retry": "^0.12.0",
+        "rimraf": "^2.6.3",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.6.0",
+        "sha": "~2.0.1",
+        "slide": "~1.1.6",
+        "sorted-object": "~2.0.1",
+        "sorted-union-stream": "~2.1.3",
+        "ssri": "^6.0.1",
+        "stringify-package": "^1.0.0",
+        "tar": "^4.4.8",
+        "text-table": "~0.2.0",
+        "tiny-relative-date": "^1.3.0",
         "uid-number": "0.0.6",
-        "umask": "1.1.0",
-        "unique-filename": "1.1.1",
-        "unpipe": "1.0.0",
-        "update-notifier": "2.5.0",
-        "uuid": "3.3.2",
-        "validate-npm-package-license": "3.0.4",
-        "validate-npm-package-name": "3.0.0",
-        "which": "1.3.1",
-        "worker-farm": "1.6.0",
-        "write-file-atomic": "2.4.2"
+        "umask": "~1.1.0",
+        "unique-filename": "^1.1.1",
+        "unpipe": "~1.0.0",
+        "update-notifier": "^2.5.0",
+        "uuid": "^3.3.2",
+        "validate-npm-package-license": "^3.0.4",
+        "validate-npm-package-name": "~3.0.0",
+        "which": "^1.3.1",
+        "worker-farm": "^1.6.0",
+        "write-file-atomic": "^2.4.2"
       },
       "dependencies": {
         "JSONStream": {
           "version": "1.3.5",
           "bundled": true,
           "requires": {
-            "jsonparse": "1.3.1",
-            "through": "2.3.8"
+            "jsonparse": "^1.2.0",
+            "through": ">=2.2.7 <3"
           }
         },
         "abbrev": {
@@ -7120,31 +8525,31 @@
           "version": "4.2.1",
           "bundled": true,
           "requires": {
-            "es6-promisify": "5.0.0"
+            "es6-promisify": "^5.0.0"
           }
         },
         "agentkeepalive": {
           "version": "3.4.1",
           "bundled": true,
           "requires": {
-            "humanize-ms": "1.2.1"
+            "humanize-ms": "^1.2.1"
           }
         },
         "ajv": {
           "version": "5.5.2",
           "bundled": true,
           "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.1.0",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.3.1"
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
           }
         },
         "ansi-align": {
           "version": "2.0.0",
           "bundled": true,
           "requires": {
-            "string-width": "2.1.1"
+            "string-width": "^2.0.0"
           }
         },
         "ansi-regex": {
@@ -7155,7 +8560,7 @@
           "version": "3.2.1",
           "bundled": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "ansicolors": {
@@ -7178,28 +8583,28 @@
           "version": "1.1.4",
           "bundled": true,
           "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.6"
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -7212,7 +8617,7 @@
           "version": "0.2.4",
           "bundled": true,
           "requires": {
-            "safer-buffer": "2.1.2"
+            "safer-buffer": "~2.1.0"
           }
         },
         "assert-plus": {
@@ -7240,25 +8645,25 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "tweetnacl": "0.14.5"
+            "tweetnacl": "^0.14.3"
           }
         },
         "bin-links": {
           "version": "1.1.2",
           "bundled": true,
           "requires": {
-            "bluebird": "3.5.3",
-            "cmd-shim": "2.0.2",
-            "gentle-fs": "2.0.1",
-            "graceful-fs": "4.1.15",
-            "write-file-atomic": "2.4.2"
+            "bluebird": "^3.5.0",
+            "cmd-shim": "^2.0.2",
+            "gentle-fs": "^2.0.0",
+            "graceful-fs": "^4.1.11",
+            "write-file-atomic": "^2.3.0"
           }
         },
         "block-stream": {
           "version": "0.0.9",
           "bundled": true,
           "requires": {
-            "inherits": "2.0.3"
+            "inherits": "~2.0.0"
           }
         },
         "bluebird": {
@@ -7269,20 +8674,20 @@
           "version": "1.3.0",
           "bundled": true,
           "requires": {
-            "ansi-align": "2.0.0",
-            "camelcase": "4.1.0",
-            "chalk": "2.4.1",
-            "cli-boxes": "1.0.0",
-            "string-width": "2.1.1",
-            "term-size": "1.2.0",
-            "widest-line": "2.0.0"
+            "ansi-align": "^2.0.0",
+            "camelcase": "^4.0.0",
+            "chalk": "^2.0.1",
+            "cli-boxes": "^1.0.0",
+            "string-width": "^2.0.0",
+            "term-size": "^1.2.0",
+            "widest-line": "^2.0.0"
           }
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "requires": {
-            "balanced-match": "1.0.0",
+            "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
@@ -7306,20 +8711,20 @@
           "version": "11.3.2",
           "bundled": true,
           "requires": {
-            "bluebird": "3.5.3",
-            "chownr": "1.1.1",
-            "figgy-pudding": "3.5.1",
-            "glob": "7.1.3",
-            "graceful-fs": "4.1.15",
-            "lru-cache": "5.1.1",
-            "mississippi": "3.0.0",
-            "mkdirp": "0.5.1",
-            "move-concurrently": "1.0.1",
-            "promise-inflight": "1.0.1",
-            "rimraf": "2.6.3",
-            "ssri": "6.0.1",
-            "unique-filename": "1.1.1",
-            "y18n": "4.0.0"
+            "bluebird": "^3.5.3",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.3",
+            "graceful-fs": "^4.1.15",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.2",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
           },
           "dependencies": {
             "chownr": {
@@ -7330,14 +8735,14 @@
               "version": "5.1.1",
               "bundled": true,
               "requires": {
-                "yallist": "3.0.3"
+                "yallist": "^3.0.2"
               }
             },
             "unique-filename": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "unique-slug": "2.0.0"
+                "unique-slug": "^2.0.0"
               }
             },
             "yallist": {
@@ -7366,9 +8771,9 @@
           "version": "2.4.1",
           "bundled": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "chownr": {
@@ -7383,7 +8788,7 @@
           "version": "2.0.10",
           "bundled": true,
           "requires": {
-            "ip-regex": "2.1.0"
+            "ip-regex": "^2.1.0"
           }
         },
         "cli-boxes": {
@@ -7394,26 +8799,26 @@
           "version": "3.1.2",
           "bundled": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "3.0.1"
+            "string-width": "^2.0.0",
+            "strip-ansi": "^3.0.1"
           }
         },
         "cli-table3": {
           "version": "0.5.1",
           "bundled": true,
           "requires": {
-            "colors": "1.3.3",
-            "object-assign": "4.1.1",
-            "string-width": "2.1.1"
+            "colors": "^1.1.2",
+            "object-assign": "^4.1.0",
+            "string-width": "^2.1.1"
           }
         },
         "cliui": {
           "version": "4.1.0",
           "bundled": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           },
           "dependencies": {
             "ansi-regex": {
@@ -7424,7 +8829,7 @@
               "version": "4.0.0",
               "bundled": true,
               "requires": {
-                "ansi-regex": "3.0.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
@@ -7437,8 +8842,8 @@
           "version": "2.0.2",
           "bundled": true,
           "requires": {
-            "graceful-fs": "4.1.15",
-            "mkdirp": "0.5.1"
+            "graceful-fs": "^4.1.2",
+            "mkdirp": "~0.5.0"
           }
         },
         "co": {
@@ -7453,7 +8858,7 @@
           "version": "1.9.1",
           "bundled": true,
           "requires": {
-            "color-name": "1.1.3"
+            "color-name": "^1.1.1"
           }
         },
         "color-name": {
@@ -7469,15 +8874,15 @@
           "version": "1.5.4",
           "bundled": true,
           "requires": {
-            "strip-ansi": "3.0.1",
-            "wcwidth": "1.0.1"
+            "strip-ansi": "^3.0.0",
+            "wcwidth": "^1.0.0"
           }
         },
         "combined-stream": {
           "version": "1.0.6",
           "bundled": true,
           "requires": {
-            "delayed-stream": "1.0.0"
+            "delayed-stream": "~1.0.0"
           }
         },
         "concat-map": {
@@ -7488,30 +8893,30 @@
           "version": "1.6.2",
           "bundled": true,
           "requires": {
-            "buffer-from": "1.0.0",
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.6",
-            "typedarray": "0.0.6"
+            "buffer-from": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^2.2.2",
+            "typedarray": "^0.0.6"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -7520,20 +8925,20 @@
           "version": "1.1.12",
           "bundled": true,
           "requires": {
-            "ini": "1.3.5",
-            "proto-list": "1.2.4"
+            "ini": "^1.3.4",
+            "proto-list": "~1.2.1"
           }
         },
         "configstore": {
           "version": "3.1.2",
           "bundled": true,
           "requires": {
-            "dot-prop": "4.2.0",
-            "graceful-fs": "4.1.15",
-            "make-dir": "1.3.0",
-            "unique-string": "1.0.0",
-            "write-file-atomic": "2.4.2",
-            "xdg-basedir": "3.0.0"
+            "dot-prop": "^4.1.0",
+            "graceful-fs": "^4.1.2",
+            "make-dir": "^1.0.0",
+            "unique-string": "^1.0.0",
+            "write-file-atomic": "^2.0.0",
+            "xdg-basedir": "^3.0.0"
           }
         },
         "console-control-strings": {
@@ -7544,12 +8949,12 @@
           "version": "1.0.5",
           "bundled": true,
           "requires": {
-            "aproba": "1.2.0",
-            "fs-write-stream-atomic": "1.0.10",
-            "iferr": "0.1.5",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.3",
-            "run-queue": "1.0.3"
+            "aproba": "^1.1.1",
+            "fs-write-stream-atomic": "^1.0.8",
+            "iferr": "^0.1.5",
+            "mkdirp": "^0.5.1",
+            "rimraf": "^2.5.4",
+            "run-queue": "^1.0.0"
           },
           "dependencies": {
             "aproba": {
@@ -7570,16 +8975,16 @@
           "version": "3.0.2",
           "bundled": true,
           "requires": {
-            "capture-stack-trace": "1.0.0"
+            "capture-stack-trace": "^1.0.0"
           }
         },
         "cross-spawn": {
           "version": "5.1.0",
           "bundled": true,
           "requires": {
-            "lru-cache": "4.1.5",
-            "shebang-command": "1.2.0",
-            "which": "1.3.1"
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
         "crypto-random-string": {
@@ -7594,7 +8999,7 @@
           "version": "1.14.1",
           "bundled": true,
           "requires": {
-            "assert-plus": "1.0.0"
+            "assert-plus": "^1.0.0"
           }
         },
         "debug": {
@@ -7630,7 +9035,7 @@
           "version": "1.0.3",
           "bundled": true,
           "requires": {
-            "clone": "1.0.4"
+            "clone": "^1.0.2"
           }
         },
         "delayed-stream": {
@@ -7653,15 +9058,15 @@
           "version": "1.0.3",
           "bundled": true,
           "requires": {
-            "asap": "2.0.6",
-            "wrappy": "1.0.2"
+            "asap": "^2.0.0",
+            "wrappy": "1"
           }
         },
         "dot-prop": {
           "version": "4.2.0",
           "bundled": true,
           "requires": {
-            "is-obj": "1.0.1"
+            "is-obj": "^1.0.0"
           }
         },
         "dotenv": {
@@ -7676,30 +9081,30 @@
           "version": "3.6.0",
           "bundled": true,
           "requires": {
-            "end-of-stream": "1.4.1",
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.6",
-            "stream-shift": "1.0.0"
+            "end-of-stream": "^1.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0",
+            "stream-shift": "^1.0.0"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -7709,8 +9114,8 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "jsbn": "0.1.1",
-            "safer-buffer": "2.1.2"
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.1.0"
           }
         },
         "editor": {
@@ -7721,14 +9126,14 @@
           "version": "0.1.12",
           "bundled": true,
           "requires": {
-            "iconv-lite": "0.4.23"
+            "iconv-lite": "~0.4.13"
           }
         },
         "end-of-stream": {
           "version": "1.4.1",
           "bundled": true,
           "requires": {
-            "once": "1.4.0"
+            "once": "^1.4.0"
           }
         },
         "err-code": {
@@ -7739,7 +9144,7 @@
           "version": "0.1.7",
           "bundled": true,
           "requires": {
-            "prr": "1.0.1"
+            "prr": "~1.0.1"
           }
         },
         "es6-promise": {
@@ -7750,7 +9155,7 @@
           "version": "5.0.0",
           "bundled": true,
           "requires": {
-            "es6-promise": "4.2.6"
+            "es6-promise": "^4.0.3"
           }
         },
         "escape-string-regexp": {
@@ -7761,13 +9166,13 @@
           "version": "0.7.0",
           "bundled": true,
           "requires": {
-            "cross-spawn": "5.1.0",
-            "get-stream": "3.0.0",
-            "is-stream": "1.1.0",
-            "npm-run-path": "2.0.2",
-            "p-finally": "1.0.0",
-            "signal-exit": "3.0.2",
-            "strip-eof": "1.0.0"
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
           },
           "dependencies": {
             "get-stream": {
@@ -7804,35 +9209,35 @@
           "version": "2.1.0",
           "bundled": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^2.0.0"
           }
         },
         "flush-write-stream": {
           "version": "1.0.3",
           "bundled": true,
           "requires": {
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.6"
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.4"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -7845,37 +9250,37 @@
           "version": "2.3.2",
           "bundled": true,
           "requires": {
-            "asynckit": "0.4.0",
+            "asynckit": "^0.4.0",
             "combined-stream": "1.0.6",
-            "mime-types": "2.1.19"
+            "mime-types": "^2.1.12"
           }
         },
         "from2": {
           "version": "2.3.0",
           "bundled": true,
           "requires": {
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.6"
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -7884,26 +9289,26 @@
           "version": "1.2.5",
           "bundled": true,
           "requires": {
-            "minipass": "2.3.3"
+            "minipass": "^2.2.1"
           }
         },
         "fs-vacuum": {
           "version": "1.2.10",
           "bundled": true,
           "requires": {
-            "graceful-fs": "4.1.15",
-            "path-is-inside": "1.0.2",
-            "rimraf": "2.6.3"
+            "graceful-fs": "^4.1.2",
+            "path-is-inside": "^1.0.1",
+            "rimraf": "^2.5.2"
           }
         },
         "fs-write-stream-atomic": {
           "version": "1.0.10",
           "bundled": true,
           "requires": {
-            "graceful-fs": "4.1.15",
-            "iferr": "0.1.5",
-            "imurmurhash": "0.1.4",
-            "readable-stream": "2.3.6"
+            "graceful-fs": "^4.1.2",
+            "iferr": "^0.1.5",
+            "imurmurhash": "^0.1.4",
+            "readable-stream": "1 || 2"
           },
           "dependencies": {
             "iferr": {
@@ -7914,20 +9319,20 @@
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -7940,24 +9345,24 @@
           "version": "1.0.11",
           "bundled": true,
           "requires": {
-            "graceful-fs": "4.1.15",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.3"
+            "graceful-fs": "^4.1.2",
+            "inherits": "~2.0.0",
+            "mkdirp": ">=0.5 0",
+            "rimraf": "2"
           }
         },
         "gauge": {
           "version": "2.7.4",
           "bundled": true,
           "requires": {
-            "aproba": "1.2.0",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
           },
           "dependencies": {
             "aproba": {
@@ -7968,9 +9373,9 @@
               "version": "1.0.2",
               "bundled": true,
               "requires": {
-                "code-point-at": "1.1.0",
-                "is-fullwidth-code-point": "1.0.0",
-                "strip-ansi": "3.0.1"
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
               }
             }
           }
@@ -7983,14 +9388,14 @@
           "version": "2.0.1",
           "bundled": true,
           "requires": {
-            "aproba": "1.2.0",
-            "fs-vacuum": "1.2.10",
-            "graceful-fs": "4.1.15",
-            "iferr": "0.1.5",
-            "mkdirp": "0.5.1",
-            "path-is-inside": "1.0.2",
-            "read-cmd-shim": "1.0.1",
-            "slide": "1.1.6"
+            "aproba": "^1.1.2",
+            "fs-vacuum": "^1.2.10",
+            "graceful-fs": "^4.1.11",
+            "iferr": "^0.1.5",
+            "mkdirp": "^0.5.1",
+            "path-is-inside": "^1.0.2",
+            "read-cmd-shim": "^1.0.1",
+            "slide": "^1.1.6"
           },
           "dependencies": {
             "aproba": {
@@ -8011,50 +9416,50 @@
           "version": "4.1.0",
           "bundled": true,
           "requires": {
-            "pump": "3.0.0"
+            "pump": "^3.0.0"
           }
         },
         "getpass": {
           "version": "0.1.7",
           "bundled": true,
           "requires": {
-            "assert-plus": "1.0.0"
+            "assert-plus": "^1.0.0"
           }
         },
         "glob": {
           "version": "7.1.3",
           "bundled": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "global-dirs": {
           "version": "0.1.1",
           "bundled": true,
           "requires": {
-            "ini": "1.3.5"
+            "ini": "^1.3.4"
           }
         },
         "got": {
           "version": "6.7.1",
           "bundled": true,
           "requires": {
-            "create-error-class": "3.0.2",
-            "duplexer3": "0.1.4",
-            "get-stream": "3.0.0",
-            "is-redirect": "1.0.0",
-            "is-retry-allowed": "1.1.0",
-            "is-stream": "1.1.0",
-            "lowercase-keys": "1.0.1",
-            "safe-buffer": "5.1.2",
-            "timed-out": "4.0.1",
-            "unzip-response": "2.0.1",
-            "url-parse-lax": "1.0.0"
+            "create-error-class": "^3.0.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "is-redirect": "^1.0.0",
+            "is-retry-allowed": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "lowercase-keys": "^1.0.0",
+            "safe-buffer": "^5.0.1",
+            "timed-out": "^4.0.0",
+            "unzip-response": "^2.0.1",
+            "url-parse-lax": "^1.0.0"
           },
           "dependencies": {
             "get-stream": {
@@ -8075,8 +9480,8 @@
           "version": "5.1.0",
           "bundled": true,
           "requires": {
-            "ajv": "5.5.2",
-            "har-schema": "2.0.0"
+            "ajv": "^5.3.0",
+            "har-schema": "^2.0.0"
           }
         },
         "has-flag": {
@@ -8099,7 +9504,7 @@
           "version": "2.1.0",
           "bundled": true,
           "requires": {
-            "agent-base": "4.2.1",
+            "agent-base": "4",
             "debug": "3.1.0"
           }
         },
@@ -8107,31 +9512,31 @@
           "version": "1.2.0",
           "bundled": true,
           "requires": {
-            "assert-plus": "1.0.0",
-            "jsprim": "1.4.1",
-            "sshpk": "1.14.2"
+            "assert-plus": "^1.0.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
           }
         },
         "https-proxy-agent": {
           "version": "2.2.1",
           "bundled": true,
           "requires": {
-            "agent-base": "4.2.1",
-            "debug": "3.1.0"
+            "agent-base": "^4.1.0",
+            "debug": "^3.1.0"
           }
         },
         "humanize-ms": {
           "version": "1.2.1",
           "bundled": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.0.0"
           }
         },
         "iconv-lite": {
           "version": "0.4.23",
           "bundled": true,
           "requires": {
-            "safer-buffer": "2.1.2"
+            "safer-buffer": ">= 2.1.2 < 3"
           }
         },
         "iferr": {
@@ -8142,7 +9547,7 @@
           "version": "3.0.1",
           "bundled": true,
           "requires": {
-            "minimatch": "3.0.4"
+            "minimatch": "^3.0.4"
           }
         },
         "import-lazy": {
@@ -8157,8 +9562,8 @@
           "version": "1.0.6",
           "bundled": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "once": "^1.3.0",
+            "wrappy": "1"
           }
         },
         "inherits": {
@@ -8173,14 +9578,14 @@
           "version": "1.10.3",
           "bundled": true,
           "requires": {
-            "glob": "7.1.3",
-            "npm-package-arg": "6.1.0",
-            "promzard": "0.3.0",
-            "read": "1.0.7",
-            "read-package-json": "2.0.13",
-            "semver": "5.6.0",
-            "validate-npm-package-license": "3.0.4",
-            "validate-npm-package-name": "3.0.0"
+            "glob": "^7.1.1",
+            "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+            "promzard": "^0.3.0",
+            "read": "~1.0.1",
+            "read-package-json": "1 || 2",
+            "semver": "2.x || 3.x || 4 || 5",
+            "validate-npm-package-license": "^3.0.1",
+            "validate-npm-package-name": "^3.0.0"
           }
         },
         "invert-kv": {
@@ -8199,7 +9604,7 @@
           "version": "1.1.0",
           "bundled": true,
           "requires": {
-            "ci-info": "1.6.0"
+            "ci-info": "^1.0.0"
           },
           "dependencies": {
             "ci-info": {
@@ -8212,22 +9617,22 @@
           "version": "3.0.0",
           "bundled": true,
           "requires": {
-            "cidr-regex": "2.0.10"
+            "cidr-regex": "^2.0.10"
           }
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "is-installed-globally": {
           "version": "0.1.0",
           "bundled": true,
           "requires": {
-            "global-dirs": "0.1.1",
-            "is-path-inside": "1.0.1"
+            "global-dirs": "^0.1.0",
+            "is-path-inside": "^1.0.0"
           }
         },
         "is-npm": {
@@ -8242,7 +9647,7 @@
           "version": "1.0.1",
           "bundled": true,
           "requires": {
-            "path-is-inside": "1.0.2"
+            "path-is-inside": "^1.0.1"
           }
         },
         "is-redirect": {
@@ -8312,7 +9717,7 @@
           "version": "3.1.0",
           "bundled": true,
           "requires": {
-            "package-json": "4.0.1"
+            "package-json": "^4.0.0"
           }
         },
         "lazy-property": {
@@ -8323,64 +9728,64 @@
           "version": "1.0.0",
           "bundled": true,
           "requires": {
-            "invert-kv": "1.0.0"
+            "invert-kv": "^1.0.0"
           }
         },
         "libcipm": {
           "version": "3.0.3",
           "bundled": true,
           "requires": {
-            "bin-links": "1.1.2",
-            "bluebird": "3.5.3",
-            "figgy-pudding": "3.5.1",
-            "find-npm-prefix": "1.0.2",
-            "graceful-fs": "4.1.15",
-            "ini": "1.3.5",
-            "lock-verify": "2.1.0",
-            "mkdirp": "0.5.1",
-            "npm-lifecycle": "2.1.0",
-            "npm-logical-tree": "1.2.1",
-            "npm-package-arg": "6.1.0",
-            "pacote": "9.5.0",
-            "read-package-json": "2.0.13",
-            "rimraf": "2.6.3",
-            "worker-farm": "1.6.0"
+            "bin-links": "^1.1.2",
+            "bluebird": "^3.5.1",
+            "figgy-pudding": "^3.5.1",
+            "find-npm-prefix": "^1.0.2",
+            "graceful-fs": "^4.1.11",
+            "ini": "^1.3.5",
+            "lock-verify": "^2.0.2",
+            "mkdirp": "^0.5.1",
+            "npm-lifecycle": "^2.0.3",
+            "npm-logical-tree": "^1.2.1",
+            "npm-package-arg": "^6.1.0",
+            "pacote": "^9.1.0",
+            "read-package-json": "^2.0.13",
+            "rimraf": "^2.6.2",
+            "worker-farm": "^1.6.0"
           }
         },
         "libnpm": {
           "version": "2.0.1",
           "bundled": true,
           "requires": {
-            "bin-links": "1.1.2",
-            "bluebird": "3.5.3",
-            "find-npm-prefix": "1.0.2",
-            "libnpmaccess": "3.0.1",
-            "libnpmconfig": "1.2.1",
-            "libnpmhook": "5.0.2",
-            "libnpmorg": "1.0.0",
-            "libnpmpublish": "1.1.1",
-            "libnpmsearch": "2.0.0",
-            "libnpmteam": "1.0.1",
-            "lock-verify": "2.1.0",
-            "npm-lifecycle": "2.1.0",
-            "npm-logical-tree": "1.2.1",
-            "npm-package-arg": "6.1.0",
-            "npm-profile": "4.0.1",
-            "npm-registry-fetch": "3.9.0",
-            "npmlog": "4.1.2",
-            "pacote": "9.5.0",
-            "read-package-json": "2.0.13",
-            "stringify-package": "1.0.0"
+            "bin-links": "^1.1.2",
+            "bluebird": "^3.5.3",
+            "find-npm-prefix": "^1.0.2",
+            "libnpmaccess": "^3.0.1",
+            "libnpmconfig": "^1.2.1",
+            "libnpmhook": "^5.0.2",
+            "libnpmorg": "^1.0.0",
+            "libnpmpublish": "^1.1.0",
+            "libnpmsearch": "^2.0.0",
+            "libnpmteam": "^1.0.1",
+            "lock-verify": "^2.0.2",
+            "npm-lifecycle": "^2.1.0",
+            "npm-logical-tree": "^1.2.1",
+            "npm-package-arg": "^6.1.0",
+            "npm-profile": "^4.0.1",
+            "npm-registry-fetch": "^3.8.0",
+            "npmlog": "^4.1.2",
+            "pacote": "^9.2.3",
+            "read-package-json": "^2.0.13",
+            "stringify-package": "^1.0.0"
           }
         },
         "libnpmaccess": {
           "version": "3.0.1",
           "bundled": true,
           "requires": {
-            "aproba": "2.0.0",
-            "get-stream": "4.1.0",
-            "npm-package-arg": "6.1.0",
-            "npm-registry-fetch": "3.9.0"
+            "aproba": "^2.0.0",
+            "get-stream": "^4.0.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^3.8.0"
           },
           "dependencies": {
             "aproba": {
@@ -8393,38 +9798,38 @@
           "version": "1.2.1",
           "bundled": true,
           "requires": {
-            "figgy-pudding": "3.5.1",
-            "find-up": "3.0.0",
-            "ini": "1.3.5"
+            "figgy-pudding": "^3.5.1",
+            "find-up": "^3.0.0",
+            "ini": "^1.3.5"
           },
           "dependencies": {
             "find-up": {
               "version": "3.0.0",
               "bundled": true,
               "requires": {
-                "locate-path": "3.0.0"
+                "locate-path": "^3.0.0"
               }
             },
             "locate-path": {
               "version": "3.0.0",
               "bundled": true,
               "requires": {
-                "p-locate": "3.0.0",
-                "path-exists": "3.0.0"
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
               }
             },
             "p-limit": {
               "version": "2.1.0",
               "bundled": true,
               "requires": {
-                "p-try": "2.0.0"
+                "p-try": "^2.0.0"
               }
             },
             "p-locate": {
               "version": "3.0.0",
               "bundled": true,
               "requires": {
-                "p-limit": "2.1.0"
+                "p-limit": "^2.0.0"
               }
             },
             "p-try": {
@@ -8437,20 +9842,20 @@
           "version": "5.0.2",
           "bundled": true,
           "requires": {
-            "aproba": "2.0.0",
-            "figgy-pudding": "3.5.1",
-            "get-stream": "4.1.0",
-            "npm-registry-fetch": "3.9.0"
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^3.8.0"
           }
         },
         "libnpmorg": {
           "version": "1.0.0",
           "bundled": true,
           "requires": {
-            "aproba": "2.0.0",
-            "figgy-pudding": "3.5.1",
-            "get-stream": "4.1.0",
-            "npm-registry-fetch": "3.9.0"
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^3.8.0"
           },
           "dependencies": {
             "aproba": {
@@ -8463,34 +9868,34 @@
           "version": "1.1.1",
           "bundled": true,
           "requires": {
-            "aproba": "2.0.0",
-            "figgy-pudding": "3.5.1",
-            "get-stream": "4.1.0",
-            "lodash.clonedeep": "4.5.0",
-            "normalize-package-data": "2.5.0",
-            "npm-package-arg": "6.1.0",
-            "npm-registry-fetch": "3.9.0",
-            "semver": "5.6.0",
-            "ssri": "6.0.1"
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "lodash.clonedeep": "^4.5.0",
+            "normalize-package-data": "^2.4.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-registry-fetch": "^3.8.0",
+            "semver": "^5.5.1",
+            "ssri": "^6.0.1"
           }
         },
         "libnpmsearch": {
           "version": "2.0.0",
           "bundled": true,
           "requires": {
-            "figgy-pudding": "3.5.1",
-            "get-stream": "4.1.0",
-            "npm-registry-fetch": "3.9.0"
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^3.8.0"
           }
         },
         "libnpmteam": {
           "version": "1.0.1",
           "bundled": true,
           "requires": {
-            "aproba": "2.0.0",
-            "figgy-pudding": "3.5.1",
-            "get-stream": "4.1.0",
-            "npm-registry-fetch": "3.9.0"
+            "aproba": "^2.0.0",
+            "figgy-pudding": "^3.4.1",
+            "get-stream": "^4.0.0",
+            "npm-registry-fetch": "^3.8.0"
           },
           "dependencies": {
             "aproba": {
@@ -8503,37 +9908,37 @@
           "version": "10.2.0",
           "bundled": true,
           "requires": {
-            "dotenv": "5.0.1",
-            "npm-package-arg": "6.1.0",
-            "rimraf": "2.6.3",
-            "safe-buffer": "5.1.2",
-            "update-notifier": "2.5.0",
-            "which": "1.3.1",
-            "y18n": "4.0.0",
-            "yargs": "11.0.0"
+            "dotenv": "^5.0.1",
+            "npm-package-arg": "^6.0.0",
+            "rimraf": "^2.6.2",
+            "safe-buffer": "^5.1.0",
+            "update-notifier": "^2.3.0",
+            "which": "^1.3.0",
+            "y18n": "^4.0.0",
+            "yargs": "^11.0.0"
           }
         },
         "locate-path": {
           "version": "2.0.0",
           "bundled": true,
           "requires": {
-            "p-locate": "2.0.0",
-            "path-exists": "3.0.0"
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
           }
         },
         "lock-verify": {
           "version": "2.1.0",
           "bundled": true,
           "requires": {
-            "npm-package-arg": "6.1.0",
-            "semver": "5.6.0"
+            "npm-package-arg": "^6.1.0",
+            "semver": "^5.4.1"
           }
         },
         "lockfile": {
           "version": "1.0.4",
           "bundled": true,
           "requires": {
-            "signal-exit": "3.0.2"
+            "signal-exit": "^3.0.2"
           }
         },
         "lodash._baseindexof": {
@@ -8544,8 +9949,8 @@
           "version": "4.6.0",
           "bundled": true,
           "requires": {
-            "lodash._createset": "4.0.3",
-            "lodash._root": "3.0.1"
+            "lodash._createset": "~4.0.0",
+            "lodash._root": "~3.0.0"
           }
         },
         "lodash._bindcallback": {
@@ -8560,7 +9965,7 @@
           "version": "3.1.2",
           "bundled": true,
           "requires": {
-            "lodash._getnative": "3.9.1"
+            "lodash._getnative": "^3.0.0"
           }
         },
         "lodash._createset": {
@@ -8603,32 +10008,32 @@
           "version": "4.1.5",
           "bundled": true,
           "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
           }
         },
         "make-dir": {
           "version": "1.3.0",
           "bundled": true,
           "requires": {
-            "pify": "3.0.0"
+            "pify": "^3.0.0"
           }
         },
         "make-fetch-happen": {
           "version": "4.0.1",
           "bundled": true,
           "requires": {
-            "agentkeepalive": "3.4.1",
-            "cacache": "11.3.2",
-            "http-cache-semantics": "3.8.1",
-            "http-proxy-agent": "2.1.0",
-            "https-proxy-agent": "2.2.1",
-            "lru-cache": "4.1.5",
-            "mississippi": "3.0.0",
-            "node-fetch-npm": "2.0.2",
-            "promise-retry": "1.1.1",
-            "socks-proxy-agent": "4.0.1",
-            "ssri": "6.0.1"
+            "agentkeepalive": "^3.4.1",
+            "cacache": "^11.0.1",
+            "http-cache-semantics": "^3.8.1",
+            "http-proxy-agent": "^2.1.0",
+            "https-proxy-agent": "^2.2.1",
+            "lru-cache": "^4.1.2",
+            "mississippi": "^3.0.0",
+            "node-fetch-npm": "^2.0.2",
+            "promise-retry": "^1.1.1",
+            "socks-proxy-agent": "^4.0.0",
+            "ssri": "^6.0.0"
           }
         },
         "meant": {
@@ -8639,7 +10044,7 @@
           "version": "1.1.0",
           "bundled": true,
           "requires": {
-            "mimic-fn": "1.2.0"
+            "mimic-fn": "^1.0.0"
           }
         },
         "mime-db": {
@@ -8650,7 +10055,7 @@
           "version": "2.1.19",
           "bundled": true,
           "requires": {
-            "mime-db": "1.35.0"
+            "mime-db": "~1.35.0"
           }
         },
         "mimic-fn": {
@@ -8661,7 +10066,7 @@
           "version": "3.0.4",
           "bundled": true,
           "requires": {
-            "brace-expansion": "1.1.11"
+            "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
@@ -8672,8 +10077,8 @@
           "version": "2.3.3",
           "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.2",
-            "yallist": "3.0.2"
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
           },
           "dependencies": {
             "yallist": {
@@ -8686,23 +10091,23 @@
           "version": "1.1.1",
           "bundled": true,
           "requires": {
-            "minipass": "2.3.3"
+            "minipass": "^2.2.1"
           }
         },
         "mississippi": {
           "version": "3.0.0",
           "bundled": true,
           "requires": {
-            "concat-stream": "1.6.2",
-            "duplexify": "3.6.0",
-            "end-of-stream": "1.4.1",
-            "flush-write-stream": "1.0.3",
-            "from2": "2.3.0",
-            "parallel-transform": "1.1.0",
-            "pump": "3.0.0",
-            "pumpify": "1.5.1",
-            "stream-each": "1.2.2",
-            "through2": "2.0.3"
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
           }
         },
         "mkdirp": {
@@ -8716,12 +10121,12 @@
           "version": "1.0.1",
           "bundled": true,
           "requires": {
-            "aproba": "1.2.0",
-            "copy-concurrently": "1.0.5",
-            "fs-write-stream-atomic": "1.0.10",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.3",
-            "run-queue": "1.0.3"
+            "aproba": "^1.1.1",
+            "copy-concurrently": "^1.0.0",
+            "fs-write-stream-atomic": "^1.0.8",
+            "mkdirp": "^0.5.1",
+            "rimraf": "^2.5.4",
+            "run-queue": "^1.0.3"
           },
           "dependencies": {
             "aproba": {
@@ -8742,34 +10147,34 @@
           "version": "2.0.2",
           "bundled": true,
           "requires": {
-            "encoding": "0.1.12",
-            "json-parse-better-errors": "1.0.2",
-            "safe-buffer": "5.1.2"
+            "encoding": "^0.1.11",
+            "json-parse-better-errors": "^1.0.0",
+            "safe-buffer": "^5.1.1"
           }
         },
         "node-gyp": {
           "version": "3.8.0",
           "bundled": true,
           "requires": {
-            "fstream": "1.0.11",
-            "glob": "7.1.3",
-            "graceful-fs": "4.1.15",
-            "mkdirp": "0.5.1",
-            "nopt": "3.0.6",
-            "npmlog": "4.1.2",
-            "osenv": "0.1.5",
-            "request": "2.88.0",
-            "rimraf": "2.6.3",
-            "semver": "5.3.0",
-            "tar": "2.2.1",
-            "which": "1.3.1"
+            "fstream": "^1.0.0",
+            "glob": "^7.0.3",
+            "graceful-fs": "^4.1.2",
+            "mkdirp": "^0.5.0",
+            "nopt": "2 || 3",
+            "npmlog": "0 || 1 || 2 || 3 || 4",
+            "osenv": "0",
+            "request": "^2.87.0",
+            "rimraf": "2",
+            "semver": "~5.3.0",
+            "tar": "^2.0.0",
+            "which": "1"
           },
           "dependencies": {
             "nopt": {
               "version": "3.0.6",
               "bundled": true,
               "requires": {
-                "abbrev": "1.1.1"
+                "abbrev": "1"
               }
             },
             "semver": {
@@ -8780,9 +10185,9 @@
               "version": "2.2.1",
               "bundled": true,
               "requires": {
-                "block-stream": "0.0.9",
-                "fstream": "1.0.11",
-                "inherits": "2.0.3"
+                "block-stream": "*",
+                "fstream": "^1.0.2",
+                "inherits": "2"
               }
             }
           }
@@ -8791,25 +10196,25 @@
           "version": "4.0.1",
           "bundled": true,
           "requires": {
-            "abbrev": "1.1.1",
-            "osenv": "0.1.5"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
           }
         },
         "normalize-package-data": {
           "version": "2.5.0",
           "bundled": true,
           "requires": {
-            "hosted-git-info": "2.7.1",
-            "resolve": "1.10.0",
-            "semver": "5.6.0",
-            "validate-npm-package-license": "3.0.4"
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
           },
           "dependencies": {
             "resolve": {
               "version": "1.10.0",
               "bundled": true,
               "requires": {
-                "path-parse": "1.0.6"
+                "path-parse": "^1.0.6"
               }
             }
           }
@@ -8818,8 +10223,8 @@
           "version": "1.3.2",
           "bundled": true,
           "requires": {
-            "cli-table3": "0.5.1",
-            "console-control-strings": "1.1.0"
+            "cli-table3": "^0.5.0",
+            "console-control-strings": "^1.1.0"
           }
         },
         "npm-bundled": {
@@ -8834,21 +10239,21 @@
           "version": "3.0.0",
           "bundled": true,
           "requires": {
-            "semver": "5.6.0"
+            "semver": "^2.3.0 || 3.x || 4 || 5"
           }
         },
         "npm-lifecycle": {
           "version": "2.1.0",
           "bundled": true,
           "requires": {
-            "byline": "5.0.0",
-            "graceful-fs": "4.1.15",
-            "node-gyp": "3.8.0",
-            "resolve-from": "4.0.0",
-            "slide": "1.1.6",
+            "byline": "^5.0.0",
+            "graceful-fs": "^4.1.11",
+            "node-gyp": "^3.8.0",
+            "resolve-from": "^4.0.0",
+            "slide": "^1.1.6",
             "uid-number": "0.0.6",
-            "umask": "1.1.0",
-            "which": "1.3.1"
+            "umask": "^1.1.0",
+            "which": "^1.3.1"
           }
         },
         "npm-logical-tree": {
@@ -8859,55 +10264,55 @@
           "version": "6.1.0",
           "bundled": true,
           "requires": {
-            "hosted-git-info": "2.7.1",
-            "osenv": "0.1.5",
-            "semver": "5.6.0",
-            "validate-npm-package-name": "3.0.0"
+            "hosted-git-info": "^2.6.0",
+            "osenv": "^0.1.5",
+            "semver": "^5.5.0",
+            "validate-npm-package-name": "^3.0.0"
           }
         },
         "npm-packlist": {
           "version": "1.4.1",
           "bundled": true,
           "requires": {
-            "ignore-walk": "3.0.1",
-            "npm-bundled": "1.0.6"
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
           }
         },
         "npm-pick-manifest": {
           "version": "2.2.3",
           "bundled": true,
           "requires": {
-            "figgy-pudding": "3.5.1",
-            "npm-package-arg": "6.1.0",
-            "semver": "5.6.0"
+            "figgy-pudding": "^3.5.1",
+            "npm-package-arg": "^6.0.0",
+            "semver": "^5.4.1"
           }
         },
         "npm-profile": {
           "version": "4.0.1",
           "bundled": true,
           "requires": {
-            "aproba": "2.0.0",
-            "figgy-pudding": "3.5.1",
-            "npm-registry-fetch": "3.9.0"
+            "aproba": "^1.1.2 || 2",
+            "figgy-pudding": "^3.4.1",
+            "npm-registry-fetch": "^3.8.0"
           }
         },
         "npm-registry-fetch": {
           "version": "3.9.0",
           "bundled": true,
           "requires": {
-            "JSONStream": "1.3.5",
-            "bluebird": "3.5.3",
-            "figgy-pudding": "3.5.1",
-            "lru-cache": "4.1.5",
-            "make-fetch-happen": "4.0.1",
-            "npm-package-arg": "6.1.0"
+            "JSONStream": "^1.3.4",
+            "bluebird": "^3.5.1",
+            "figgy-pudding": "^3.4.1",
+            "lru-cache": "^4.1.3",
+            "make-fetch-happen": "^4.0.1",
+            "npm-package-arg": "^6.1.0"
           }
         },
         "npm-run-path": {
           "version": "2.0.2",
           "bundled": true,
           "requires": {
-            "path-key": "2.0.1"
+            "path-key": "^2.0.0"
           }
         },
         "npm-user-validate": {
@@ -8918,10 +10323,10 @@
           "version": "4.1.2",
           "bundled": true,
           "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
           }
         },
         "number-is-nan": {
@@ -8940,7 +10345,7 @@
           "version": "1.4.0",
           "bundled": true,
           "requires": {
-            "wrappy": "1.0.2"
+            "wrappy": "1"
           }
         },
         "opener": {
@@ -8955,9 +10360,9 @@
           "version": "2.1.0",
           "bundled": true,
           "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
           }
         },
         "os-tmpdir": {
@@ -8968,8 +10373,8 @@
           "version": "0.1.5",
           "bundled": true,
           "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
           }
         },
         "p-finally": {
@@ -8980,14 +10385,14 @@
           "version": "1.2.0",
           "bundled": true,
           "requires": {
-            "p-try": "1.0.0"
+            "p-try": "^1.0.0"
           }
         },
         "p-locate": {
           "version": "2.0.0",
           "bundled": true,
           "requires": {
-            "p-limit": "1.2.0"
+            "p-limit": "^1.1.0"
           }
         },
         "p-try": {
@@ -8998,58 +10403,58 @@
           "version": "4.0.1",
           "bundled": true,
           "requires": {
-            "got": "6.7.1",
-            "registry-auth-token": "3.3.2",
-            "registry-url": "3.1.0",
-            "semver": "5.6.0"
+            "got": "^6.7.1",
+            "registry-auth-token": "^3.0.1",
+            "registry-url": "^3.0.3",
+            "semver": "^5.1.0"
           }
         },
         "pacote": {
           "version": "9.5.0",
           "bundled": true,
           "requires": {
-            "bluebird": "3.5.3",
-            "cacache": "11.3.2",
-            "figgy-pudding": "3.5.1",
-            "get-stream": "4.1.0",
-            "glob": "7.1.3",
-            "lru-cache": "5.1.1",
-            "make-fetch-happen": "4.0.1",
-            "minimatch": "3.0.4",
-            "minipass": "2.3.5",
-            "mississippi": "3.0.0",
-            "mkdirp": "0.5.1",
-            "normalize-package-data": "2.5.0",
-            "npm-package-arg": "6.1.0",
-            "npm-packlist": "1.4.1",
-            "npm-pick-manifest": "2.2.3",
-            "npm-registry-fetch": "3.9.0",
-            "osenv": "0.1.5",
-            "promise-inflight": "1.0.1",
-            "promise-retry": "1.1.1",
-            "protoduck": "5.0.1",
-            "rimraf": "2.6.3",
-            "safe-buffer": "5.1.2",
-            "semver": "5.6.0",
-            "ssri": "6.0.1",
-            "tar": "4.4.8",
-            "unique-filename": "1.1.1",
-            "which": "1.3.1"
+            "bluebird": "^3.5.3",
+            "cacache": "^11.3.2",
+            "figgy-pudding": "^3.5.1",
+            "get-stream": "^4.1.0",
+            "glob": "^7.1.3",
+            "lru-cache": "^5.1.1",
+            "make-fetch-happen": "^4.0.1",
+            "minimatch": "^3.0.4",
+            "minipass": "^2.3.5",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "normalize-package-data": "^2.4.0",
+            "npm-package-arg": "^6.1.0",
+            "npm-packlist": "^1.1.12",
+            "npm-pick-manifest": "^2.2.3",
+            "npm-registry-fetch": "^3.8.0",
+            "osenv": "^0.1.5",
+            "promise-inflight": "^1.0.1",
+            "promise-retry": "^1.1.1",
+            "protoduck": "^5.0.1",
+            "rimraf": "^2.6.2",
+            "safe-buffer": "^5.1.2",
+            "semver": "^5.6.0",
+            "ssri": "^6.0.1",
+            "tar": "^4.4.8",
+            "unique-filename": "^1.1.1",
+            "which": "^1.3.1"
           },
           "dependencies": {
             "lru-cache": {
               "version": "5.1.1",
               "bundled": true,
               "requires": {
-                "yallist": "3.0.3"
+                "yallist": "^3.0.2"
               }
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2",
-                "yallist": "3.0.3"
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
               }
             },
             "yallist": {
@@ -9062,29 +10467,29 @@
           "version": "1.1.0",
           "bundled": true,
           "requires": {
-            "cyclist": "0.2.2",
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.6"
+            "cyclist": "~0.2.2",
+            "inherits": "^2.0.3",
+            "readable-stream": "^2.1.5"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -9133,8 +10538,8 @@
           "version": "1.1.1",
           "bundled": true,
           "requires": {
-            "err-code": "1.1.2",
-            "retry": "0.10.1"
+            "err-code": "^1.0.0",
+            "retry": "^0.10.0"
           },
           "dependencies": {
             "retry": {
@@ -9147,7 +10552,7 @@
           "version": "0.3.0",
           "bundled": true,
           "requires": {
-            "read": "1.0.7"
+            "read": "1"
           }
         },
         "proto-list": {
@@ -9158,7 +10563,7 @@
           "version": "5.0.1",
           "bundled": true,
           "requires": {
-            "genfun": "5.0.0"
+            "genfun": "^5.0.0"
           }
         },
         "prr": {
@@ -9177,25 +10582,25 @@
           "version": "3.0.0",
           "bundled": true,
           "requires": {
-            "end-of-stream": "1.4.1",
-            "once": "1.4.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         },
         "pumpify": {
           "version": "1.5.1",
           "bundled": true,
           "requires": {
-            "duplexify": "3.6.0",
-            "inherits": "2.0.3",
-            "pump": "2.0.1"
+            "duplexify": "^3.6.0",
+            "inherits": "^2.0.3",
+            "pump": "^2.0.0"
           },
           "dependencies": {
             "pump": {
               "version": "2.0.1",
               "bundled": true,
               "requires": {
-                "end-of-stream": "1.4.1",
-                "once": "1.4.0"
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
               }
             }
           }
@@ -9216,8 +10621,8 @@
           "version": "6.2.0",
           "bundled": true,
           "requires": {
-            "decode-uri-component": "0.2.0",
-            "strict-uri-encode": "2.0.0"
+            "decode-uri-component": "^0.2.0",
+            "strict-uri-encode": "^2.0.0"
           }
         },
         "qw": {
@@ -9228,10 +10633,10 @@
           "version": "1.2.7",
           "bundled": true,
           "requires": {
-            "deep-extend": "0.5.1",
-            "ini": "1.3.5",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
+            "deep-extend": "^0.5.1",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -9244,109 +10649,109 @@
           "version": "1.0.7",
           "bundled": true,
           "requires": {
-            "mute-stream": "0.0.7"
+            "mute-stream": "~0.0.4"
           }
         },
         "read-cmd-shim": {
           "version": "1.0.1",
           "bundled": true,
           "requires": {
-            "graceful-fs": "4.1.15"
+            "graceful-fs": "^4.1.2"
           }
         },
         "read-installed": {
           "version": "4.0.3",
           "bundled": true,
           "requires": {
-            "debuglog": "1.0.1",
-            "graceful-fs": "4.1.15",
-            "read-package-json": "2.0.13",
-            "readdir-scoped-modules": "1.0.2",
-            "semver": "5.6.0",
-            "slide": "1.1.6",
-            "util-extend": "1.0.3"
+            "debuglog": "^1.0.1",
+            "graceful-fs": "^4.1.2",
+            "read-package-json": "^2.0.0",
+            "readdir-scoped-modules": "^1.0.0",
+            "semver": "2 || 3 || 4 || 5",
+            "slide": "~1.1.3",
+            "util-extend": "^1.0.1"
           }
         },
         "read-package-json": {
           "version": "2.0.13",
           "bundled": true,
           "requires": {
-            "glob": "7.1.3",
-            "graceful-fs": "4.1.15",
-            "json-parse-better-errors": "1.0.2",
-            "normalize-package-data": "2.5.0",
-            "slash": "1.0.0"
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.1.2",
+            "json-parse-better-errors": "^1.0.1",
+            "normalize-package-data": "^2.0.0",
+            "slash": "^1.0.0"
           }
         },
         "read-package-tree": {
           "version": "5.2.2",
           "bundled": true,
           "requires": {
-            "debuglog": "1.0.1",
-            "dezalgo": "1.0.3",
-            "once": "1.4.0",
-            "read-package-json": "2.0.13",
-            "readdir-scoped-modules": "1.0.2"
+            "debuglog": "^1.0.1",
+            "dezalgo": "^1.0.0",
+            "once": "^1.3.0",
+            "read-package-json": "^2.0.0",
+            "readdir-scoped-modules": "^1.0.0"
           }
         },
         "readable-stream": {
           "version": "3.1.1",
           "bundled": true,
           "requires": {
-            "inherits": "2.0.3",
-            "string_decoder": "1.2.0",
-            "util-deprecate": "1.0.2"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         },
         "readdir-scoped-modules": {
           "version": "1.0.2",
           "bundled": true,
           "requires": {
-            "debuglog": "1.0.1",
-            "dezalgo": "1.0.3",
-            "graceful-fs": "4.1.15",
-            "once": "1.4.0"
+            "debuglog": "^1.0.1",
+            "dezalgo": "^1.0.0",
+            "graceful-fs": "^4.1.2",
+            "once": "^1.3.0"
           }
         },
         "registry-auth-token": {
           "version": "3.3.2",
           "bundled": true,
           "requires": {
-            "rc": "1.2.7",
-            "safe-buffer": "5.1.2"
+            "rc": "^1.1.6",
+            "safe-buffer": "^5.0.1"
           }
         },
         "registry-url": {
           "version": "3.1.0",
           "bundled": true,
           "requires": {
-            "rc": "1.2.7"
+            "rc": "^1.0.1"
           }
         },
         "request": {
           "version": "2.88.0",
           "bundled": true,
           "requires": {
-            "aws-sign2": "0.7.0",
-            "aws4": "1.8.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.6",
-            "extend": "3.0.2",
-            "forever-agent": "0.6.1",
-            "form-data": "2.3.2",
-            "har-validator": "5.1.0",
-            "http-signature": "1.2.0",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.19",
-            "oauth-sign": "0.9.0",
-            "performance-now": "2.1.0",
-            "qs": "6.5.2",
-            "safe-buffer": "5.1.2",
-            "tough-cookie": "2.4.3",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.3.2"
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.0",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.4.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
           }
         },
         "require-directory": {
@@ -9369,14 +10774,14 @@
           "version": "2.6.3",
           "bundled": true,
           "requires": {
-            "glob": "7.1.3"
+            "glob": "^7.1.3"
           }
         },
         "run-queue": {
           "version": "1.0.3",
           "bundled": true,
           "requires": {
-            "aproba": "1.2.0"
+            "aproba": "^1.1.1"
           },
           "dependencies": {
             "aproba": {
@@ -9401,7 +10806,7 @@
           "version": "2.1.0",
           "bundled": true,
           "requires": {
-            "semver": "5.6.0"
+            "semver": "^5.0.3"
           }
         },
         "set-blocking": {
@@ -9412,28 +10817,28 @@
           "version": "2.0.1",
           "bundled": true,
           "requires": {
-            "graceful-fs": "4.1.15",
-            "readable-stream": "2.3.6"
+            "graceful-fs": "^4.1.2",
+            "readable-stream": "^2.0.2"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -9442,7 +10847,7 @@
           "version": "1.2.0",
           "bundled": true,
           "requires": {
-            "shebang-regex": "1.0.0"
+            "shebang-regex": "^1.0.0"
           }
         },
         "shebang-regex": {
@@ -9469,16 +10874,16 @@
           "version": "2.2.0",
           "bundled": true,
           "requires": {
-            "ip": "1.1.5",
-            "smart-buffer": "4.0.1"
+            "ip": "^1.1.5",
+            "smart-buffer": "^4.0.1"
           }
         },
         "socks-proxy-agent": {
           "version": "4.0.1",
           "bundled": true,
           "requires": {
-            "agent-base": "4.2.1",
-            "socks": "2.2.0"
+            "agent-base": "~4.2.0",
+            "socks": "~2.2.0"
           }
         },
         "sorted-object": {
@@ -9489,16 +10894,16 @@
           "version": "2.1.3",
           "bundled": true,
           "requires": {
-            "from2": "1.3.0",
-            "stream-iterate": "1.2.0"
+            "from2": "^1.3.0",
+            "stream-iterate": "^1.1.0"
           },
           "dependencies": {
             "from2": {
               "version": "1.3.0",
               "bundled": true,
               "requires": {
-                "inherits": "2.0.3",
-                "readable-stream": "1.1.14"
+                "inherits": "~2.0.1",
+                "readable-stream": "~1.1.10"
               }
             },
             "isarray": {
@@ -9509,10 +10914,10 @@
               "version": "1.1.14",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.1",
                 "isarray": "0.0.1",
-                "string_decoder": "0.10.31"
+                "string_decoder": "~0.10.x"
               }
             },
             "string_decoder": {
@@ -9525,8 +10930,8 @@
           "version": "3.0.0",
           "bundled": true,
           "requires": {
-            "spdx-expression-parse": "3.0.0",
-            "spdx-license-ids": "3.0.3"
+            "spdx-expression-parse": "^3.0.0",
+            "spdx-license-ids": "^3.0.0"
           }
         },
         "spdx-exceptions": {
@@ -9537,8 +10942,8 @@
           "version": "3.0.0",
           "bundled": true,
           "requires": {
-            "spdx-exceptions": "2.1.0",
-            "spdx-license-ids": "3.0.3"
+            "spdx-exceptions": "^2.1.0",
+            "spdx-license-ids": "^3.0.0"
           }
         },
         "spdx-license-ids": {
@@ -9549,58 +10954,58 @@
           "version": "1.14.2",
           "bundled": true,
           "requires": {
-            "asn1": "0.2.4",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.2",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.2",
-            "getpass": "0.1.7",
-            "jsbn": "0.1.1",
-            "safer-buffer": "2.1.2",
-            "tweetnacl": "0.14.5"
+            "asn1": "~0.2.3",
+            "assert-plus": "^1.0.0",
+            "bcrypt-pbkdf": "^1.0.0",
+            "dashdash": "^1.12.0",
+            "ecc-jsbn": "~0.1.1",
+            "getpass": "^0.1.1",
+            "jsbn": "~0.1.0",
+            "safer-buffer": "^2.0.2",
+            "tweetnacl": "~0.14.0"
           }
         },
         "ssri": {
           "version": "6.0.1",
           "bundled": true,
           "requires": {
-            "figgy-pudding": "3.5.1"
+            "figgy-pudding": "^3.5.1"
           }
         },
         "stream-each": {
           "version": "1.2.2",
           "bundled": true,
           "requires": {
-            "end-of-stream": "1.4.1",
-            "stream-shift": "1.0.0"
+            "end-of-stream": "^1.1.0",
+            "stream-shift": "^1.0.0"
           }
         },
         "stream-iterate": {
           "version": "1.2.0",
           "bundled": true,
           "requires": {
-            "readable-stream": "2.3.6",
-            "stream-shift": "1.0.0"
+            "readable-stream": "^2.1.5",
+            "stream-shift": "^1.0.0"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -9617,8 +11022,8 @@
           "version": "2.1.1",
           "bundled": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           },
           "dependencies": {
             "ansi-regex": {
@@ -9633,7 +11038,7 @@
               "version": "4.0.0",
               "bundled": true,
               "requires": {
-                "ansi-regex": "3.0.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
@@ -9642,7 +11047,7 @@
           "version": "1.2.0",
           "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.2"
+            "safe-buffer": "~5.1.0"
           }
         },
         "stringify-package": {
@@ -9653,7 +11058,7 @@
           "version": "3.0.1",
           "bundled": true,
           "requires": {
-            "ansi-regex": "2.1.1"
+            "ansi-regex": "^2.0.0"
           }
         },
         "strip-eof": {
@@ -9668,20 +11073,20 @@
           "version": "5.4.0",
           "bundled": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         },
         "tar": {
           "version": "4.4.8",
           "bundled": true,
           "requires": {
-            "chownr": "1.1.1",
-            "fs-minipass": "1.2.5",
-            "minipass": "2.3.5",
-            "minizlib": "1.1.1",
-            "mkdirp": "0.5.1",
-            "safe-buffer": "5.1.2",
-            "yallist": "3.0.3"
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
           },
           "dependencies": {
             "chownr": {
@@ -9692,8 +11097,8 @@
               "version": "2.3.5",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2",
-                "yallist": "3.0.3"
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
               }
             },
             "yallist": {
@@ -9706,7 +11111,7 @@
           "version": "1.2.0",
           "bundled": true,
           "requires": {
-            "execa": "0.7.0"
+            "execa": "^0.7.0"
           }
         },
         "text-table": {
@@ -9721,28 +11126,28 @@
           "version": "2.0.3",
           "bundled": true,
           "requires": {
-            "readable-stream": "2.3.6",
-            "xtend": "4.0.1"
+            "readable-stream": "^2.1.5",
+            "xtend": "~4.0.1"
           },
           "dependencies": {
             "readable-stream": {
               "version": "2.3.6",
               "bundled": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "1.0.0",
-                "process-nextick-args": "2.0.0",
-                "safe-buffer": "5.1.2",
-                "string_decoder": "1.1.1",
-                "util-deprecate": "1.0.2"
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
               "requires": {
-                "safe-buffer": "5.1.2"
+                "safe-buffer": "~5.1.0"
               }
             }
           }
@@ -9759,15 +11164,15 @@
           "version": "2.4.3",
           "bundled": true,
           "requires": {
-            "psl": "1.1.29",
-            "punycode": "1.4.1"
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
           }
         },
         "tunnel-agent": {
           "version": "0.6.0",
           "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.2"
+            "safe-buffer": "^5.0.1"
           }
         },
         "tweetnacl": {
@@ -9791,21 +11196,21 @@
           "version": "1.1.1",
           "bundled": true,
           "requires": {
-            "unique-slug": "2.0.0"
+            "unique-slug": "^2.0.0"
           }
         },
         "unique-slug": {
           "version": "2.0.0",
           "bundled": true,
           "requires": {
-            "imurmurhash": "0.1.4"
+            "imurmurhash": "^0.1.4"
           }
         },
         "unique-string": {
           "version": "1.0.0",
           "bundled": true,
           "requires": {
-            "crypto-random-string": "1.0.0"
+            "crypto-random-string": "^1.0.0"
           }
         },
         "unpipe": {
@@ -9820,23 +11225,23 @@
           "version": "2.5.0",
           "bundled": true,
           "requires": {
-            "boxen": "1.3.0",
-            "chalk": "2.4.1",
-            "configstore": "3.1.2",
-            "import-lazy": "2.1.0",
-            "is-ci": "1.1.0",
-            "is-installed-globally": "0.1.0",
-            "is-npm": "1.0.0",
-            "latest-version": "3.1.0",
-            "semver-diff": "2.1.0",
-            "xdg-basedir": "3.0.0"
+            "boxen": "^1.2.1",
+            "chalk": "^2.0.1",
+            "configstore": "^3.0.0",
+            "import-lazy": "^2.1.0",
+            "is-ci": "^1.0.10",
+            "is-installed-globally": "^0.1.0",
+            "is-npm": "^1.0.0",
+            "latest-version": "^3.0.0",
+            "semver-diff": "^2.0.0",
+            "xdg-basedir": "^3.0.0"
           }
         },
         "url-parse-lax": {
           "version": "1.0.0",
           "bundled": true,
           "requires": {
-            "prepend-http": "1.0.4"
+            "prepend-http": "^1.0.1"
           }
         },
         "util-deprecate": {
@@ -9855,38 +11260,38 @@
           "version": "3.0.4",
           "bundled": true,
           "requires": {
-            "spdx-correct": "3.0.0",
-            "spdx-expression-parse": "3.0.0"
+            "spdx-correct": "^3.0.0",
+            "spdx-expression-parse": "^3.0.0"
           }
         },
         "validate-npm-package-name": {
           "version": "3.0.0",
           "bundled": true,
           "requires": {
-            "builtins": "1.0.3"
+            "builtins": "^1.0.3"
           }
         },
         "verror": {
           "version": "1.10.0",
           "bundled": true,
           "requires": {
-            "assert-plus": "1.0.0",
+            "assert-plus": "^1.0.0",
             "core-util-is": "1.0.2",
-            "extsprintf": "1.3.0"
+            "extsprintf": "^1.2.0"
           }
         },
         "wcwidth": {
           "version": "1.0.1",
           "bundled": true,
           "requires": {
-            "defaults": "1.0.3"
+            "defaults": "^1.0.3"
           }
         },
         "which": {
           "version": "1.3.1",
           "bundled": true,
           "requires": {
-            "isexe": "2.0.0"
+            "isexe": "^2.0.0"
           }
         },
         "which-module": {
@@ -9897,16 +11302,16 @@
           "version": "1.1.2",
           "bundled": true,
           "requires": {
-            "string-width": "1.0.2"
+            "string-width": "^1.0.2"
           },
           "dependencies": {
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
               "requires": {
-                "code-point-at": "1.1.0",
-                "is-fullwidth-code-point": "1.0.0",
-                "strip-ansi": "3.0.1"
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
               }
             }
           }
@@ -9915,31 +11320,31 @@
           "version": "2.0.0",
           "bundled": true,
           "requires": {
-            "string-width": "2.1.1"
+            "string-width": "^2.1.1"
           }
         },
         "worker-farm": {
           "version": "1.6.0",
           "bundled": true,
           "requires": {
-            "errno": "0.1.7"
+            "errno": "~0.1.7"
           }
         },
         "wrap-ansi": {
           "version": "2.1.0",
           "bundled": true,
           "requires": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1"
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
           },
           "dependencies": {
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
               "requires": {
-                "code-point-at": "1.1.0",
-                "is-fullwidth-code-point": "1.0.0",
-                "strip-ansi": "3.0.1"
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
               }
             }
           }
@@ -9952,9 +11357,9 @@
           "version": "2.4.2",
           "bundled": true,
           "requires": {
-            "graceful-fs": "4.1.15",
-            "imurmurhash": "0.1.4",
-            "signal-exit": "3.0.2"
+            "graceful-fs": "^4.1.11",
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.2"
           }
         },
         "xdg-basedir": {
@@ -9977,18 +11382,18 @@
           "version": "11.0.0",
           "bundled": true,
           "requires": {
-            "cliui": "4.1.0",
-            "decamelize": "1.2.0",
-            "find-up": "2.1.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "9.0.2"
+            "cliui": "^4.0.0",
+            "decamelize": "^1.1.1",
+            "find-up": "^2.1.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^9.0.2"
           },
           "dependencies": {
             "y18n": {
@@ -10001,7 +11406,7 @@
           "version": "9.0.2",
           "bundled": true,
           "requires": {
-            "camelcase": "4.1.0"
+            "camelcase": "^4.1.0"
           }
         }
       }
@@ -10012,7 +11417,7 @@
       "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==",
       "dev": true,
       "requires": {
-        "which": "1.3.1"
+        "which": "^1.2.10"
       }
     },
     "npm-run-all": {
@@ -10021,15 +11426,15 @@
       "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "3.2.1",
-        "chalk": "2.4.2",
-        "cross-spawn": "6.0.5",
-        "memorystream": "0.3.1",
-        "minimatch": "3.0.4",
-        "pidtree": "0.3.0",
-        "read-pkg": "3.0.0",
-        "shell-quote": "1.6.1",
-        "string.prototype.padend": "3.0.0"
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "memorystream": "^0.3.1",
+        "minimatch": "^3.0.4",
+        "pidtree": "^0.3.0",
+        "read-pkg": "^3.0.0",
+        "shell-quote": "^1.6.1",
+        "string.prototype.padend": "^3.0.0"
       },
       "dependencies": {
         "load-json-file": {
@@ -10038,10 +11443,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.15",
-            "parse-json": "4.0.0",
-            "pify": "3.0.0",
-            "strip-bom": "3.0.0"
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
           }
         },
         "path-type": {
@@ -10050,7 +11455,7 @@
           "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "dev": true,
           "requires": {
-            "pify": "3.0.0"
+            "pify": "^3.0.0"
           }
         },
         "pify": {
@@ -10065,9 +11470,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "4.0.0",
-            "normalize-package-data": "2.5.0",
-            "path-type": "3.0.0"
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
           }
         },
         "strip-bom": {
@@ -10084,7 +11489,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "2.0.1"
+        "path-key": "^2.0.0"
       }
     },
     "npm-which": {
@@ -10093,9 +11498,9 @@
       "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=",
       "dev": true,
       "requires": {
-        "commander": "2.20.0",
-        "npm-path": "2.0.4",
-        "which": "1.3.1"
+        "commander": "^2.9.0",
+        "npm-path": "^2.0.2",
+        "which": "^1.2.10"
       }
     },
     "npmlog": {
@@ -10104,10 +11509,10 @@
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "1.1.5",
-        "console-control-strings": "1.1.0",
-        "gauge": "2.7.4",
-        "set-blocking": "2.0.0"
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
       }
     },
     "null-check": {
@@ -10122,8 +11527,8 @@
       "integrity": "sha512-PhEeA3v/tAacxC5dNO1i2yXzGVWWrZ9jTx+TMEJ716amvnBXzvrxIwy9HW7MyJsHe8ACQzpiQgbrAjDRMA7gcg==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "schema-utils": "1.0.0"
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^1.0.0"
       }
     },
     "num2fraction": {
@@ -10162,9 +11567,9 @@
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
-        "copy-descriptor": "0.1.1",
-        "define-property": "0.2.5",
-        "kind-of": "3.2.2"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
       },
       "dependencies": {
         "define-property": {
@@ -10173,7 +11578,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "kind-of": {
@@ -10182,7 +11587,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -10199,7 +11604,7 @@
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.0"
       }
     },
     "object.assign": {
@@ -10208,10 +11613,10 @@
       "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.3",
-        "function-bind": "1.1.1",
-        "has-symbols": "1.0.0",
-        "object-keys": "1.1.1"
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
       }
     },
     "object.pick": {
@@ -10220,7 +11625,7 @@
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.1"
       }
     },
     "on-finished": {
@@ -10238,7 +11643,7 @@
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
-        "wrappy": "1.0.2"
+        "wrappy": "1"
       }
     },
     "onetime": {
@@ -10247,7 +11652,7 @@
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "dev": true,
       "requires": {
-        "mimic-fn": "1.2.0"
+        "mimic-fn": "^1.0.0"
       }
     },
     "optimist": {
@@ -10256,8 +11661,8 @@
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "dev": true,
       "requires": {
-        "minimist": "0.0.8",
-        "wordwrap": "0.0.3"
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
       },
       "dependencies": {
         "wordwrap": {
@@ -10274,12 +11679,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
       }
     },
     "os-browserify": {
@@ -10300,7 +11705,7 @@
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
-        "lcid": "1.0.0"
+        "lcid": "^1.0.0"
       }
     },
     "os-tmpdir": {
@@ -10315,8 +11720,8 @@
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
       }
     },
     "output-file-sync": {
@@ -10325,9 +11730,9 @@
       "integrity": "sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.15",
-        "is-plain-obj": "1.1.0",
-        "mkdirp": "0.5.1"
+        "graceful-fs": "^4.1.11",
+        "is-plain-obj": "^1.1.0",
+        "mkdirp": "^0.5.1"
       }
     },
     "p-defer": {
@@ -10354,7 +11759,7 @@
       "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
       "dev": true,
       "requires": {
-        "p-try": "2.2.0"
+        "p-try": "^2.0.0"
       }
     },
     "p-locate": {
@@ -10363,7 +11768,7 @@
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
       "requires": {
-        "p-limit": "2.2.0"
+        "p-limit": "^2.0.0"
       }
     },
     "p-map": {
@@ -10390,9 +11795,9 @@
       "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
       "dev": true,
       "requires": {
-        "cyclist": "0.2.2",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6"
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
       }
     },
     "parent-module": {
@@ -10401,7 +11806,7 @@
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
       "requires": {
-        "callsites": "3.1.0"
+        "callsites": "^3.0.0"
       }
     },
     "parse-asn1": {
@@ -10410,22 +11815,28 @@
       "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
       "dev": true,
       "requires": {
-        "asn1.js": "4.10.1",
-        "browserify-aes": "1.2.0",
-        "create-hash": "1.2.0",
-        "evp_bytestokey": "1.0.3",
-        "pbkdf2": "3.0.17",
-        "safe-buffer": "5.1.2"
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
       }
     },
+    "parse-github-repo-url": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
+      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
+      "dev": true
+    },
     "parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
       "dev": true,
       "requires": {
-        "error-ex": "1.3.2",
-        "json-parse-better-errors": "1.0.2"
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
       }
     },
     "parse-passwd": {
@@ -10440,7 +11851,7 @@
       "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "dev": true,
       "requires": {
-        "better-assert": "1.0.2"
+        "better-assert": "~1.0.0"
       }
     },
     "parseuri": {
@@ -10449,7 +11860,7 @@
       "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
       "dev": true,
       "requires": {
-        "better-assert": "1.0.2"
+        "better-assert": "~1.0.0"
       }
     },
     "parseurl": {
@@ -10512,9 +11923,9 @@
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.15",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       },
       "dependencies": {
         "pify": {
@@ -10531,11 +11942,11 @@
       "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
       "dev": true,
       "requires": {
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "ripemd160": "2.0.2",
-        "safe-buffer": "5.1.2",
-        "sha.js": "2.4.11"
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
     "performance-now": {
@@ -10568,7 +11979,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "2.0.4"
+        "pinkie": "^2.0.0"
       }
     },
     "pkg-dir": {
@@ -10577,7 +11988,7 @@
       "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
       "requires": {
-        "find-up": "3.0.0"
+        "find-up": "^3.0.0"
       }
     },
     "please-upgrade-node": {
@@ -10586,7 +11997,7 @@
       "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==",
       "dev": true,
       "requires": {
-        "semver-compare": "1.0.0"
+        "semver-compare": "^1.0.0"
       }
     },
     "posix-character-classes": {
@@ -10601,9 +12012,9 @@
       "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "source-map": "0.6.1",
-        "supports-color": "6.1.0"
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
       },
       "dependencies": {
         "source-map": {
@@ -10618,7 +12029,7 @@
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -10629,8 +12040,8 @@
       "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "4.0.0",
-        "import-cwd": "2.1.0"
+        "cosmiconfig": "^4.0.0",
+        "import-cwd": "^2.0.0"
       },
       "dependencies": {
         "cosmiconfig": {
@@ -10639,10 +12050,10 @@
           "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
           "dev": true,
           "requires": {
-            "is-directory": "0.3.1",
-            "js-yaml": "3.13.1",
-            "parse-json": "4.0.0",
-            "require-from-string": "2.0.2"
+            "is-directory": "^0.3.1",
+            "js-yaml": "^3.9.0",
+            "parse-json": "^4.0.0",
+            "require-from-string": "^2.0.1"
           }
         }
       }
@@ -10653,10 +12064,10 @@
       "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "postcss": "7.0.16",
-        "postcss-load-config": "2.0.0",
-        "schema-utils": "1.0.0"
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
       }
     },
     "postcss-modules-extract-imports": {
@@ -10665,7 +12076,7 @@
       "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
       "dev": true,
       "requires": {
-        "postcss": "7.0.16"
+        "postcss": "^7.0.5"
       }
     },
     "postcss-modules-local-by-default": {
@@ -10674,9 +12085,9 @@
       "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
       "dev": true,
       "requires": {
-        "postcss": "7.0.16",
-        "postcss-selector-parser": "6.0.2",
-        "postcss-value-parser": "3.3.1"
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0",
+        "postcss-value-parser": "^3.3.1"
       }
     },
     "postcss-modules-scope": {
@@ -10685,8 +12096,8 @@
       "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
       "dev": true,
       "requires": {
-        "postcss": "7.0.16",
-        "postcss-selector-parser": "6.0.2"
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
       }
     },
     "postcss-modules-values": {
@@ -10695,8 +12106,8 @@
       "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
       "dev": true,
       "requires": {
-        "icss-replace-symbols": "1.1.0",
-        "postcss": "7.0.16"
+        "icss-replace-symbols": "^1.1.0",
+        "postcss": "^7.0.6"
       }
     },
     "postcss-selector-parser": {
@@ -10705,9 +12116,9 @@
       "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
       "dev": true,
       "requires": {
-        "cssesc": "3.0.0",
-        "indexes-of": "1.0.1",
-        "uniq": "1.0.1"
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
       }
     },
     "postcss-value-parser": {
@@ -10782,12 +12193,12 @@
       "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.2.0",
-        "parse-asn1": "5.1.4",
-        "randombytes": "2.1.0",
-        "safe-buffer": "5.1.2"
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       }
     },
     "pump": {
@@ -10796,8 +12207,8 @@
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.1",
-        "once": "1.4.0"
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
       }
     },
     "pumpify": {
@@ -10806,9 +12217,9 @@
       "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "dev": true,
       "requires": {
-        "duplexify": "3.7.1",
-        "inherits": "2.0.3",
-        "pump": "2.0.1"
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
       },
       "dependencies": {
         "pump": {
@@ -10817,8 +12228,8 @@
           "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
           "dev": true,
           "requires": {
-            "end-of-stream": "1.4.1",
-            "once": "1.4.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         }
       }
@@ -10829,6 +12240,12 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
+    },
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
@@ -10853,13 +12270,19 @@
       "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
       "dev": true
     },
+    "quick-lru": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+      "dev": true
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "^5.1.0"
       }
     },
     "randomfill": {
@@ -10868,8 +12291,8 @@
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
-        "randombytes": "2.1.0",
-        "safe-buffer": "5.1.2"
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
       }
     },
     "range-parser": {
@@ -10896,10 +12319,10 @@
       "integrity": "sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==",
       "dev": true,
       "requires": {
-        "@types/normalize-package-data": "2.4.0",
-        "normalize-package-data": "2.5.0",
-        "parse-json": "4.0.0",
-        "type-fest": "0.4.1"
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^4.0.0",
+        "type-fest": "^0.4.1"
       }
     },
     "read-pkg-up": {
@@ -10908,8 +12331,8 @@
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
       },
       "dependencies": {
         "find-up": {
@@ -10918,8 +12341,8 @@
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
-            "path-exists": "2.1.0",
-            "pinkie-promise": "2.0.1"
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
           }
         },
         "path-exists": {
@@ -10928,7 +12351,7 @@
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
-            "pinkie-promise": "2.0.1"
+            "pinkie-promise": "^2.0.0"
           }
         },
         "read-pkg": {
@@ -10937,9 +12360,9 @@
           "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
           "dev": true,
           "requires": {
-            "load-json-file": "1.1.0",
-            "normalize-package-data": "2.5.0",
-            "path-type": "1.1.0"
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
           }
         }
       }
@@ -10950,13 +12373,13 @@
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "dev": true,
       "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "2.0.0",
-        "safe-buffer": "5.1.2",
-        "string_decoder": "1.1.1",
-        "util-deprecate": "1.0.2"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
     "readdirp": {
@@ -10965,9 +12388,9 @@
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.15",
-        "micromatch": "3.1.10",
-        "readable-stream": "2.3.6"
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       }
     },
     "redent": {
@@ -10976,8 +12399,8 @@
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
-        "indent-string": "2.1.0",
-        "strip-indent": "1.0.1"
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
       },
       "dependencies": {
         "indent-string": {
@@ -10986,7 +12409,7 @@
           "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
           "dev": true,
           "requires": {
-            "repeating": "2.0.1"
+            "repeating": "^2.0.0"
           }
         }
       }
@@ -11003,7 +12426,7 @@
       "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
       "dev": true,
       "requires": {
-        "regenerate": "1.4.0"
+        "regenerate": "^1.4.0"
       }
     },
     "regenerator-runtime": {
@@ -11018,7 +12441,7 @@
       "integrity": "sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==",
       "dev": true,
       "requires": {
-        "private": "0.1.8"
+        "private": "^0.1.6"
       }
     },
     "regex-not": {
@@ -11027,8 +12450,8 @@
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "extend-shallow": "3.0.2",
-        "safe-regex": "1.1.0"
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "regexp-tree": {
@@ -11049,12 +12472,12 @@
       "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
       "dev": true,
       "requires": {
-        "regenerate": "1.4.0",
-        "regenerate-unicode-properties": "8.1.0",
-        "regjsgen": "0.5.0",
-        "regjsparser": "0.6.0",
-        "unicode-match-property-ecmascript": "1.0.4",
-        "unicode-match-property-value-ecmascript": "1.1.0"
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.0.2",
+        "regjsgen": "^0.5.0",
+        "regjsparser": "^0.6.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.1.0"
       }
     },
     "regjsgen": {
@@ -11069,7 +12492,7 @@
       "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
       "dev": true,
       "requires": {
-        "jsesc": "0.5.0"
+        "jsesc": "~0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -11104,7 +12527,7 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "1.0.2"
+        "is-finite": "^1.0.0"
       }
     },
     "request": {
@@ -11113,26 +12536,26 @@
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "dev": true,
       "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.8.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.8",
-        "extend": "3.0.2",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.3",
-        "har-validator": "5.1.3",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.24",
-        "oauth-sign": "0.9.0",
-        "performance-now": "2.1.0",
-        "qs": "6.5.2",
-        "safe-buffer": "5.1.2",
-        "tough-cookie": "2.4.3",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.3.2"
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
       },
       "dependencies": {
         "qs": {
@@ -11173,7 +12596,7 @@
       "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
       "dev": true,
       "requires": {
-        "path-parse": "1.0.6"
+        "path-parse": "^1.0.6"
       }
     },
     "resolve-cwd": {
@@ -11182,7 +12605,7 @@
       "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "requires": {
-        "resolve-from": "3.0.0"
+        "resolve-from": "^3.0.0"
       },
       "dependencies": {
         "resolve-from": {
@@ -11199,8 +12622,8 @@
       "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "global-modules": "1.0.0"
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
       }
     },
     "resolve-from": {
@@ -11221,8 +12644,8 @@
       "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "dev": true,
       "requires": {
-        "onetime": "2.0.1",
-        "signal-exit": "3.0.2"
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
       }
     },
     "ret": {
@@ -11243,7 +12666,7 @@
       "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "dev": true,
       "requires": {
-        "glob": "7.1.4"
+        "glob": "^7.1.3"
       }
     },
     "ripemd160": {
@@ -11252,8 +12675,8 @@
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
       }
     },
     "run-async": {
@@ -11262,7 +12685,7 @@
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "dev": true,
       "requires": {
-        "is-promise": "2.1.0"
+        "is-promise": "^2.1.0"
       }
     },
     "run-node": {
@@ -11277,7 +12700,7 @@
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0"
+        "aproba": "^1.1.1"
       }
     },
     "rxjs": {
@@ -11286,7 +12709,7 @@
       "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
       "dev": true,
       "requires": {
-        "tslib": "1.9.3"
+        "tslib": "^1.9.0"
       }
     },
     "safe-buffer": {
@@ -11301,7 +12724,7 @@
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
-        "ret": "0.1.15"
+        "ret": "~0.1.10"
       }
     },
     "safer-buffer": {
@@ -11316,10 +12739,10 @@
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
-        "glob": "7.1.4",
-        "lodash": "4.17.11",
-        "scss-tokenizer": "0.2.3",
-        "yargs": "7.1.0"
+        "glob": "^7.0.0",
+        "lodash": "^4.0.0",
+        "scss-tokenizer": "^0.2.3",
+        "yargs": "^7.0.0"
       }
     },
     "sass-loader": {
@@ -11328,12 +12751,12 @@
       "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
       "dev": true,
       "requires": {
-        "clone-deep": "2.0.2",
-        "loader-utils": "1.2.3",
-        "lodash.tail": "4.1.1",
-        "neo-async": "2.6.1",
-        "pify": "3.0.0",
-        "semver": "5.7.0"
+        "clone-deep": "^2.0.1",
+        "loader-utils": "^1.0.1",
+        "lodash.tail": "^4.1.1",
+        "neo-async": "^2.5.0",
+        "pify": "^3.0.0",
+        "semver": "^5.5.0"
       },
       "dependencies": {
         "pify": {
@@ -11350,9 +12773,9 @@
       "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
       "requires": {
-        "ajv": "6.10.0",
-        "ajv-errors": "1.0.1",
-        "ajv-keywords": "3.4.0"
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
       }
     },
     "scss-tokenizer": {
@@ -11361,8 +12784,8 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "2.5.1",
-        "source-map": "0.4.4"
+        "js-base64": "^2.1.8",
+        "source-map": "^0.4.2"
       },
       "dependencies": {
         "source-map": {
@@ -11371,7 +12794,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
@@ -11406,10 +12829,10 @@
       "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
       "requires": {
-        "extend-shallow": "2.0.1",
-        "is-extendable": "0.1.1",
-        "is-plain-object": "2.0.4",
-        "split-string": "3.1.0"
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -11418,7 +12841,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -11441,8 +12864,8 @@
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "shallow-clone": {
@@ -11451,9 +12874,9 @@
       "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
-        "is-extendable": "0.1.1",
-        "kind-of": "5.1.0",
-        "mixin-object": "2.0.1"
+        "is-extendable": "^0.1.1",
+        "kind-of": "^5.0.0",
+        "mixin-object": "^2.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -11470,7 +12893,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "1.0.0"
+        "shebang-regex": "^1.0.0"
       }
     },
     "shebang-regex": {
@@ -11485,10 +12908,10 @@
       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
       "dev": true,
       "requires": {
-        "array-filter": "0.0.1",
-        "array-map": "0.0.0",
-        "array-reduce": "0.0.0",
-        "jsonify": "0.0.0"
+        "array-filter": "~0.0.0",
+        "array-map": "~0.0.0",
+        "array-reduce": "~0.0.0",
+        "jsonify": "~0.0.0"
       }
     },
     "signal-exit": {
@@ -11503,7 +12926,7 @@
       "integrity": "sha512-i9WVsrK2u0G/cASI9nh7voxOk9mhanWY9eGtWBDSYql6m49Yk5/Fan6uZsDr/xmzv8n+eQ8ahKCoEr8cvU3h+g==",
       "dev": true,
       "requires": {
-        "debug": "4.1.1"
+        "debug": "^4.0.1"
       },
       "dependencies": {
         "debug": {
@@ -11512,7 +12935,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -11535,9 +12958,9 @@
       "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "3.2.1",
-        "astral-regex": "1.0.0",
-        "is-fullwidth-code-point": "2.0.0"
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
       }
     },
     "snapdragon": {
@@ -11546,14 +12969,14 @@
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
-        "base": "0.11.2",
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "map-cache": "0.2.2",
-        "source-map": "0.5.7",
-        "source-map-resolve": "0.5.2",
-        "use": "3.1.1"
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -11562,7 +12985,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "extend-shallow": {
@@ -11571,7 +12994,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -11582,9 +13005,9 @@
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "snapdragon-util": "3.0.1"
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -11593,7 +13016,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "is-accessor-descriptor": {
@@ -11602,7 +13025,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -11611,7 +13034,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -11620,9 +13043,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -11633,7 +13056,7 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.2.0"
       },
       "dependencies": {
         "kind-of": {
@@ -11642,7 +13065,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -11653,12 +13076,12 @@
       "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
       "dev": true,
       "requires": {
-        "debug": "3.1.0",
-        "engine.io": "3.2.1",
-        "has-binary2": "1.0.3",
-        "socket.io-adapter": "1.1.1",
+        "debug": "~3.1.0",
+        "engine.io": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "socket.io-adapter": "~1.1.0",
         "socket.io-client": "2.1.1",
-        "socket.io-parser": "3.2.0"
+        "socket.io-parser": "~3.2.0"
       },
       "dependencies": {
         "debug": {
@@ -11688,15 +13111,15 @@
         "base64-arraybuffer": "0.1.5",
         "component-bind": "1.0.0",
         "component-emitter": "1.2.1",
-        "debug": "3.1.0",
-        "engine.io-client": "3.2.1",
-        "has-binary2": "1.0.3",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.2.0",
+        "has-binary2": "~1.0.2",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "object-component": "0.0.3",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "socket.io-parser": "3.2.0",
+        "socket.io-parser": "~3.2.0",
         "to-array": "0.1.4"
       },
       "dependencies": {
@@ -11724,7 +13147,7 @@
       "dev": true,
       "requires": {
         "component-emitter": "1.2.1",
-        "debug": "3.1.0",
+        "debug": "~3.1.0",
         "isarray": "2.0.1"
       },
       "dependencies": {
@@ -11769,11 +13192,11 @@
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "dev": true,
       "requires": {
-        "atob": "2.1.2",
-        "decode-uri-component": "0.2.0",
-        "resolve-url": "0.2.1",
-        "source-map-url": "0.4.0",
-        "urix": "0.1.0"
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
       }
     },
     "source-map-support": {
@@ -11782,7 +13205,7 @@
       "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "source-map": "^0.5.6"
       }
     },
     "source-map-url": {
@@ -11797,8 +13220,8 @@
       "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "dev": true,
       "requires": {
-        "spdx-expression-parse": "3.0.0",
-        "spdx-license-ids": "3.0.4"
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-exceptions": {
@@ -11813,8 +13236,8 @@
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
       "dev": true,
       "requires": {
-        "spdx-exceptions": "2.2.0",
-        "spdx-license-ids": "3.0.4"
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-license-ids": {
@@ -11823,13 +13246,31 @@
       "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
       "dev": true
     },
+    "split": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "dev": true,
+      "requires": {
+        "through": "2"
+      }
+    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "3.0.2"
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "split2": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+      "dev": true,
+      "requires": {
+        "through2": "^2.0.2"
       }
     },
     "sprintf-js": {
@@ -11844,15 +13285,15 @@
       "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "dev": true,
       "requires": {
-        "asn1": "0.2.4",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.2",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.2",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2",
-        "tweetnacl": "0.14.5"
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
       }
     },
     "ssri": {
@@ -11861,7 +13302,7 @@
       "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "3.5.1"
+        "figgy-pudding": "^3.5.1"
       }
     },
     "staged-git-files": {
@@ -11870,14 +13311,251 @@
       "integrity": "sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==",
       "dev": true
     },
+    "standard-version": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-6.0.1.tgz",
+      "integrity": "sha512-+09AwTbyLKyUwefiZSccgarp24okvH9A229NOVSpYTKWcxBxqZqdYmtQaJ8UET9mjPXRxP84vonJU4YMqCyBTQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.4.2",
+        "conventional-changelog": "3.1.8",
+        "conventional-changelog-config-spec": "1.0.0",
+        "conventional-recommended-bump": "5.0.0",
+        "detect-indent": "6.0.0",
+        "detect-newline": "3.0.0",
+        "dotgitignore": "2.1.0",
+        "figures": "3.0.0",
+        "find-up": "3.0.0",
+        "fs-access": "1.0.1",
+        "git-semver-tags": "2.0.2",
+        "semver": "6.0.0",
+        "stringify-package": "1.0.0",
+        "yargs": "13.2.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+              "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+              "dev": true,
+              "requires": {
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^4.0.0"
+              }
+            }
+          }
+        },
+        "detect-indent": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz",
+          "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==",
+          "dev": true
+        },
+        "figures": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz",
+          "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+          "dev": true
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "dev": true,
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "dev": true,
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "dev": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            }
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "13.2.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
+          "integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
-        "define-property": "0.2.5",
-        "object-copy": "0.1.0"
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -11886,7 +13564,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         }
       }
@@ -11903,7 +13581,7 @@
       "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.6"
+        "readable-stream": "^2.0.1"
       }
     },
     "stream-browserify": {
@@ -11912,8 +13590,8 @@
       "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6"
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
       }
     },
     "stream-each": {
@@ -11922,8 +13600,8 @@
       "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.1",
-        "stream-shift": "1.0.0"
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
       }
     },
     "stream-http": {
@@ -11932,11 +13610,11 @@
       "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "3.0.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6",
-        "to-arraybuffer": "1.0.1",
-        "xtend": "4.0.1"
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "stream-shift": {
@@ -11951,11 +13629,11 @@
       "integrity": "sha512-iGVaMcyF5PcUY0cPbW3xFQUXnr9O4RZXNBBjhuLZgrjLO4XCLLGfx4T2sGqygSeylUjwgWRsnNbT9aV0Zb8AYw==",
       "dev": true,
       "requires": {
-        "async": "2.6.2",
-        "date-format": "2.0.0",
-        "debug": "3.2.6",
-        "fs-extra": "7.0.1",
-        "lodash": "4.17.11"
+        "async": "^2.6.2",
+        "date-format": "^2.0.0",
+        "debug": "^3.2.6",
+        "fs-extra": "^7.0.1",
+        "lodash": "^4.17.11"
       },
       "dependencies": {
         "debug": {
@@ -11964,7 +13642,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -11987,8 +13665,8 @@
       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
       "requires": {
-        "is-fullwidth-code-point": "2.0.0",
-        "strip-ansi": "4.0.0"
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -12003,7 +13681,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
@@ -12014,9 +13692,9 @@
       "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.3",
-        "es-abstract": "1.13.0",
-        "function-bind": "1.1.1"
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.4.3",
+        "function-bind": "^1.0.2"
       }
     },
     "string_decoder": {
@@ -12025,7 +13703,7 @@
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "~5.1.0"
       }
     },
     "stringify-object": {
@@ -12034,18 +13712,24 @@
       "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
       "dev": true,
       "requires": {
-        "get-own-enumerable-property-symbols": "3.0.0",
-        "is-obj": "1.0.1",
-        "is-regexp": "1.0.0"
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
       }
     },
+    "stringify-package": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.0.tgz",
+      "integrity": "sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==",
+      "dev": true
+    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
@@ -12054,7 +13738,7 @@
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "is-utf8": "0.2.1"
+        "is-utf8": "^0.2.0"
       }
     },
     "strip-eof": {
@@ -12069,7 +13753,7 @@
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
       "requires": {
-        "get-stdin": "4.0.1"
+        "get-stdin": "^4.0.1"
       },
       "dependencies": {
         "get-stdin": {
@@ -12092,8 +13776,8 @@
       "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "schema-utils": "1.0.0"
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0"
       }
     },
     "supports-color": {
@@ -12102,7 +13786,7 @@
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "requires": {
-        "has-flag": "3.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "symbol-observable": {
@@ -12123,10 +13807,10 @@
       "integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
       "dev": true,
       "requires": {
-        "ajv": "6.10.0",
-        "lodash": "4.17.11",
-        "slice-ansi": "2.1.0",
-        "string-width": "3.1.0"
+        "ajv": "^6.9.1",
+        "lodash": "^4.17.11",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -12141,9 +13825,9 @@
           "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "emoji-regex": "7.0.3",
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "5.2.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
         "strip-ansi": {
@@ -12152,7 +13836,7 @@
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "4.1.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
@@ -12169,9 +13853,9 @@
       "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "dev": true,
       "requires": {
-        "block-stream": "0.0.9",
-        "fstream": "1.0.12",
-        "inherits": "2.0.3"
+        "block-stream": "*",
+        "fstream": "^1.0.12",
+        "inherits": "2"
       }
     },
     "terser": {
@@ -12180,9 +13864,9 @@
       "integrity": "sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==",
       "dev": true,
       "requires": {
-        "commander": "2.20.0",
-        "source-map": "0.6.1",
-        "source-map-support": "0.5.12"
+        "commander": "^2.19.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.10"
       },
       "dependencies": {
         "source-map": {
@@ -12197,8 +13881,8 @@
           "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
           "dev": true,
           "requires": {
-            "buffer-from": "1.1.1",
-            "source-map": "0.6.1"
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
           }
         }
       }
@@ -12209,16 +13893,16 @@
       "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
       "dev": true,
       "requires": {
-        "cacache": "11.3.2",
-        "find-cache-dir": "2.1.0",
-        "is-wsl": "1.1.0",
-        "loader-utils": "1.2.3",
-        "schema-utils": "1.0.0",
-        "serialize-javascript": "1.7.0",
-        "source-map": "0.6.1",
-        "terser": "4.0.0",
-        "webpack-sources": "1.3.0",
-        "worker-farm": "1.7.0"
+        "cacache": "^11.3.2",
+        "find-cache-dir": "^2.0.0",
+        "is-wsl": "^1.1.0",
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.0.0",
+        "webpack-sources": "^1.3.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
         "source-map": {
@@ -12229,6 +13913,12 @@
         }
       }
     },
+    "text-extensions": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.0.0.tgz",
+      "integrity": "sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==",
+      "dev": true
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -12247,8 +13937,8 @@
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.6",
-        "xtend": "4.0.1"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
     "timers-browserify": {
@@ -12257,7 +13947,7 @@
       "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
       "dev": true,
       "requires": {
-        "setimmediate": "1.0.5"
+        "setimmediate": "^1.0.4"
       }
     },
     "tmp": {
@@ -12266,7 +13956,7 @@
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
-        "os-tmpdir": "1.0.2"
+        "os-tmpdir": "~1.0.2"
       }
     },
     "to-array": {
@@ -12293,7 +13983,7 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -12302,7 +13992,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -12313,10 +14003,10 @@
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "regex-not": "1.0.2",
-        "safe-regex": "1.1.0"
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "to-regex-range": {
@@ -12325,8 +14015,8 @@
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       }
     },
     "toidentifier": {
@@ -12347,8 +14037,8 @@
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
       "dev": true,
       "requires": {
-        "psl": "1.1.32",
-        "punycode": "1.4.1"
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
       },
       "dependencies": {
         "punycode": {
@@ -12365,6 +14055,12 @@
       "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
       "dev": true
     },
+    "trim-off-newlines": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz",
+      "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
+      "dev": true
+    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -12377,7 +14073,7 @@
       "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
       "dev": true,
       "requires": {
-        "glob": "7.1.4"
+        "glob": "^7.1.2"
       }
     },
     "tslib": {
@@ -12398,7 +14094,7 @@
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "^5.0.1"
       }
     },
     "tweetnacl": {
@@ -12413,7 +14109,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2"
+        "prelude-ls": "~1.1.2"
       }
     },
     "type-fest": {
@@ -12429,7 +14125,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.24"
+        "mime-types": "~2.1.24"
       }
     },
     "typedarray": {
@@ -12444,8 +14140,8 @@
       "integrity": "sha512-fe7aYFotptIddkwcm6YuA0HmknBZ52ZzOsUxZEdhhkSsz7RfjHDX2QDxwKTiv4JQ5t5NhfmpgAK+J7LiDhKSqg==",
       "dev": true,
       "requires": {
-        "commander": "2.20.0",
-        "source-map": "0.6.1"
+        "commander": "~2.20.0",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -12462,15 +14158,15 @@
       "integrity": "sha512-/lRkCaFbI6pT3CxsQHDhBcqB6tocOnqba0vJqJ2DzSWFLRgOIiip8q0nVFydyXk+n8UtF7ZuS6hvWopcYH5FuA==",
       "dev": true,
       "requires": {
-        "cacache": "11.3.2",
-        "find-cache-dir": "2.1.0",
-        "is-wsl": "1.1.0",
-        "schema-utils": "1.0.0",
-        "serialize-javascript": "1.7.0",
-        "source-map": "0.6.1",
-        "uglify-js": "3.5.15",
-        "webpack-sources": "1.3.0",
-        "worker-farm": "1.7.0"
+        "cacache": "^11.3.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.5.12",
+        "webpack-sources": "^1.3.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
         "source-map": {
@@ -12499,8 +14195,8 @@
       "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
       "dev": true,
       "requires": {
-        "unicode-canonical-property-names-ecmascript": "1.0.4",
-        "unicode-property-aliases-ecmascript": "1.0.5"
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
       }
     },
     "unicode-match-property-value-ecmascript": {
@@ -12521,10 +14217,10 @@
       "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
       "dev": true,
       "requires": {
-        "arr-union": "3.1.0",
-        "get-value": "2.0.6",
-        "is-extendable": "0.1.1",
-        "set-value": "0.4.3"
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
       },
       "dependencies": {
         "extend-shallow": {
@@ -12533,7 +14229,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         },
         "set-value": {
@@ -12542,10 +14238,10 @@
           "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
           "dev": true,
           "requires": {
-            "extend-shallow": "2.0.1",
-            "is-extendable": "0.1.1",
-            "is-plain-object": "2.0.4",
-            "to-object-path": "0.3.0"
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
           }
         }
       }
@@ -12562,7 +14258,7 @@
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "dev": true,
       "requires": {
-        "unique-slug": "2.0.1"
+        "unique-slug": "^2.0.0"
       }
     },
     "unique-slug": {
@@ -12571,7 +14267,7 @@
       "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
       "dev": true,
       "requires": {
-        "imurmurhash": "0.1.4"
+        "imurmurhash": "^0.1.4"
       }
     },
     "universalify": {
@@ -12592,8 +14288,8 @@
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
-        "has-value": "0.3.1",
-        "isobject": "3.0.1"
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
       },
       "dependencies": {
         "has-value": {
@@ -12602,9 +14298,9 @@
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
-            "get-value": "2.0.6",
-            "has-values": "0.1.4",
-            "isobject": "2.1.0"
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
           },
           "dependencies": {
             "isobject": {
@@ -12638,7 +14334,7 @@
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "dev": true,
       "requires": {
-        "punycode": "2.1.1"
+        "punycode": "^2.1.0"
       }
     },
     "urix": {
@@ -12683,8 +14379,8 @@
       "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.5",
-        "tmp": "0.0.33"
+        "lru-cache": "4.1.x",
+        "tmp": "0.0.x"
       }
     },
     "util": {
@@ -12726,8 +14422,8 @@
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
       "requires": {
-        "spdx-correct": "3.1.0",
-        "spdx-expression-parse": "3.0.0"
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
     "verror": {
@@ -12736,9 +14432,9 @@
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0",
+        "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
+        "extsprintf": "^1.2.0"
       }
     },
     "vm-browserify": {
@@ -12762,9 +14458,9 @@
       "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
-        "chokidar": "2.1.6",
-        "graceful-fs": "4.1.15",
-        "neo-async": "2.6.1"
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
       }
     },
     "webpack": {
@@ -12777,26 +14473,26 @@
         "@webassemblyjs/helper-module-context": "1.8.5",
         "@webassemblyjs/wasm-edit": "1.8.5",
         "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "6.1.1",
-        "acorn-dynamic-import": "4.0.0",
-        "ajv": "6.10.0",
-        "ajv-keywords": "3.4.0",
-        "chrome-trace-event": "1.0.1",
-        "enhanced-resolve": "4.1.0",
-        "eslint-scope": "4.0.3",
-        "json-parse-better-errors": "1.0.2",
-        "loader-runner": "2.4.0",
-        "loader-utils": "1.2.3",
-        "memory-fs": "0.4.1",
-        "micromatch": "3.1.10",
-        "mkdirp": "0.5.1",
-        "neo-async": "2.6.1",
-        "node-libs-browser": "2.2.0",
-        "schema-utils": "1.0.0",
-        "tapable": "1.1.3",
-        "terser-webpack-plugin": "1.3.0",
-        "watchpack": "1.6.0",
-        "webpack-sources": "1.3.0"
+        "acorn": "^6.0.5",
+        "acorn-dynamic-import": "^4.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.0",
+        "terser-webpack-plugin": "^1.1.0",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.3.0"
       },
       "dependencies": {
         "eslint-scope": {
@@ -12805,8 +14501,8 @@
           "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
           "dev": true,
           "requires": {
-            "esrecurse": "4.2.1",
-            "estraverse": "4.2.0"
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
           }
         }
       }
@@ -12817,17 +14513,17 @@
       "integrity": "sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "cross-spawn": "6.0.5",
-        "enhanced-resolve": "4.1.0",
-        "findup-sync": "2.0.0",
-        "global-modules": "1.0.0",
-        "import-local": "2.0.0",
-        "interpret": "1.2.0",
-        "loader-utils": "1.2.3",
-        "supports-color": "5.5.0",
-        "v8-compile-cache": "2.0.3",
-        "yargs": "12.0.5"
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "enhanced-resolve": "^4.1.0",
+        "findup-sync": "^2.0.0",
+        "global-modules": "^1.0.0",
+        "import-local": "^2.0.0",
+        "interpret": "^1.1.0",
+        "loader-utils": "^1.1.0",
+        "supports-color": "^5.5.0",
+        "v8-compile-cache": "^2.0.2",
+        "yargs": "^12.0.5"
       },
       "dependencies": {
         "ansi-regex": {
@@ -12842,9 +14538,9 @@
           "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           }
         },
         "invert-kv": {
@@ -12859,7 +14555,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "lcid": {
@@ -12868,7 +14564,7 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "2.0.0"
+            "invert-kv": "^2.0.0"
           }
         },
         "os-locale": {
@@ -12877,9 +14573,9 @@
           "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
-            "execa": "1.0.0",
-            "lcid": "2.0.0",
-            "mem": "4.3.0"
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -12888,7 +14584,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "which-module": {
@@ -12903,8 +14599,8 @@
           "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
           "dev": true,
           "requires": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1"
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
           },
           "dependencies": {
             "ansi-regex": {
@@ -12919,9 +14615,9 @@
               "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
               "dev": true,
               "requires": {
-                "code-point-at": "1.1.0",
-                "is-fullwidth-code-point": "1.0.0",
-                "strip-ansi": "3.0.1"
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
               }
             },
             "strip-ansi": {
@@ -12930,7 +14626,7 @@
               "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "2.1.1"
+                "ansi-regex": "^2.0.0"
               }
             }
           }
@@ -12941,18 +14637,18 @@
           "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
           "dev": true,
           "requires": {
-            "cliui": "4.1.0",
-            "decamelize": "1.2.0",
-            "find-up": "3.0.0",
-            "get-caller-file": "1.0.3",
-            "os-locale": "3.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "11.1.1"
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
           }
         },
         "yargs-parser": {
@@ -12961,8 +14657,8 @@
           "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
           "dev": true,
           "requires": {
-            "camelcase": "5.3.1",
-            "decamelize": "1.2.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
@@ -12973,13 +14669,13 @@
       "integrity": "sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==",
       "dev": true,
       "requires": {
-        "loud-rejection": "1.6.0",
-        "memory-fs": "0.4.1",
-        "mime": "2.4.3",
-        "path-is-absolute": "1.0.1",
-        "range-parser": "1.2.1",
-        "url-join": "2.0.5",
-        "webpack-log": "1.2.0"
+        "loud-rejection": "^1.6.0",
+        "memory-fs": "~0.4.1",
+        "mime": "^2.1.0",
+        "path-is-absolute": "^1.0.0",
+        "range-parser": "^1.0.3",
+        "url-join": "^2.0.2",
+        "webpack-log": "^1.0.1"
       }
     },
     "webpack-log": {
@@ -12988,10 +14684,10 @@
       "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "log-symbols": "2.2.0",
-        "loglevelnext": "1.0.5",
-        "uuid": "3.3.2"
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "loglevelnext": "^1.0.1",
+        "uuid": "^3.1.0"
       }
     },
     "webpack-sources": {
@@ -13000,8 +14696,8 @@
       "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
       "dev": true,
       "requires": {
-        "source-list-map": "2.0.1",
-        "source-map": "0.6.1"
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -13018,7 +14714,7 @@
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
-        "isexe": "2.0.0"
+        "isexe": "^2.0.0"
       }
     },
     "which-module": {
@@ -13033,7 +14729,7 @@
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
       "requires": {
-        "string-width": "2.1.1"
+        "string-width": "^1.0.2 || 2"
       }
     },
     "wordwrap": {
@@ -13048,7 +14744,7 @@
       "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
       "dev": true,
       "requires": {
-        "errno": "0.1.7"
+        "errno": "~0.1.7"
       }
     },
     "wrap-ansi": {
@@ -13057,8 +14753,8 @@
       "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=",
       "dev": true,
       "requires": {
-        "string-width": "2.1.1",
-        "strip-ansi": "4.0.0"
+        "string-width": "^2.1.1",
+        "strip-ansi": "^4.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -13073,7 +14769,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
@@ -13090,7 +14786,7 @@
       "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
       "requires": {
-        "mkdirp": "0.5.1"
+        "mkdirp": "^0.5.1"
       }
     },
     "ws": {
@@ -13099,9 +14795,9 @@
       "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
-        "async-limiter": "1.0.0",
-        "safe-buffer": "5.1.2",
-        "ultron": "1.1.1"
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
       }
     },
     "xmlhttprequest-ssl": {
@@ -13134,19 +14830,19 @@
       "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
       "dev": true,
       "requires": {
-        "camelcase": "3.0.0",
-        "cliui": "3.2.0",
-        "decamelize": "1.2.0",
-        "get-caller-file": "1.0.3",
-        "os-locale": "1.4.0",
-        "read-pkg-up": "1.0.1",
-        "require-directory": "2.1.1",
-        "require-main-filename": "1.0.1",
-        "set-blocking": "2.0.0",
-        "string-width": "1.0.2",
-        "which-module": "1.0.0",
-        "y18n": "3.2.1",
-        "yargs-parser": "5.0.0"
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -13161,7 +14857,7 @@
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "string-width": {
@@ -13170,9 +14866,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         }
       }
@@ -13183,7 +14879,7 @@
       "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
       "dev": true,
       "requires": {
-        "camelcase": "3.0.0"
+        "camelcase": "^3.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -13206,12 +14902,12 @@
       "integrity": "sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "7.4.5",
-        "fn-name": "2.0.1",
-        "lodash": "4.17.11",
-        "property-expr": "1.5.1",
-        "synchronous-promise": "2.0.9",
-        "toposort": "2.0.2"
+        "@babel/runtime": "^7.0.0",
+        "fn-name": "~2.0.1",
+        "lodash": "^4.17.11",
+        "property-expr": "^1.5.0",
+        "synchronous-promise": "^2.0.6",
+        "toposort": "^2.0.2"
       }
     }
   }
diff --git a/package.json b/package.json
index 315c21ea7..b86b46851 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,8 @@
     "frontend:test": "karma start --conf karma.conf.js",
     "frontend:test:watch": "karma start --conf karma.conf.js --single-run false",
     "frontend:build": "webpack",
-    "frontend:build:watch": "webpack --watch"
+    "frontend:build:watch": "webpack --watch",
+    "release": "standard-version"
   },
   "husky": {
     "hooks": {
@@ -65,6 +66,7 @@
     "null-loader": "^2.0.0",
     "postcss-loader": "^3.0.0",
     "sass-loader": "^7.1.0",
+    "standard-version": "^6.0.1",
     "style-loader": "^0.23.1",
     "uglifyjs-webpack-plugin": "^2.1.3",
     "webpack": "^4.32.2",

From 718a2b026cb2333c079a7c37bcc95e4c34205873 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 14 Jun 2019 17:05:45 +0200
Subject: [PATCH 451/519] Correction stats coded, but not yet used online

---
 .vscode/tasks.json               |   5 ++
 messages/uniworx/de.msg          |  10 ++-
 models/sheets                    |   2 +-
 src/Handler/Corrections.hs       | 142 +++++++++++++++++++++++++++++--
 src/Handler/Tutorial.hs          |   4 +-
 src/Handler/Utils/Corrections.hs |  45 ++++++++++
 src/Handler/Utils/DateTime.hs    |  33 ++++++-
 src/Utils.hs                     |  23 +++--
 8 files changed, 248 insertions(+), 16 deletions(-)
 create mode 100644 src/Handler/Utils/Corrections.hs

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index a2b36e1b4..1c0b71c32 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -58,6 +58,11 @@
       "type": "npm",
       "script": "start",
       "problemMatcher": []
+    },
+    {
+      "type": "npm",
+      "script": "frontend:lint",
+      "problemMatcher": []
     }
   ]
 }
\ No newline at end of file
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 5415d7578..570730adf 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -394,14 +394,21 @@ UpdatedAssignedCorrectorsAuto num@Int64: #{display num} Abgaben wurden unter den
 CouldNotAssignCorrectorsAuto num@Int64: #{display num} Abgaben konnten nicht automatisch zugewiesen werden:
 SelfCorrectors num@Int64: #{display num} Abgaben wurden Abgebenden als eigenem Korrektor zugeteilt!
 
+
+CorrectionSheets: Übersicht Korrekturen nach Blättern
+CorrectionCorrectors: Übersicht Korrekturen nach Korrektoren
 AssignSubmissionExceptionNoCorrectors: Es sind keine Korrektoren eingestellt
 AssignSubmissionExceptionNoCorrectorsByProportion: Es sind keine Korrektoren mit Anteil ungleich Null eingestellt
 AssignSubmissionExceptionSubmissionsNotFound n@Int: #{tshow n} Abgaben konnten nicht gefunden werden
+NrSubmittorsTotal: Abgebende
 NrSubmissionsTotal: Abgaben
 NrSubmissionsUnassigned: Ohne Korrektor
+NoCorrectorAssigned: Ohne Korrektor
 NrCorrectors: Korrektoren
 NrSubmissionsNewlyAssigned: Neu zugeteilt
 NrSubmissionsNotAssigned: Nicht zugeteilt
+NrSubmissionsNotCorrected: Unkorrigiert
+CorrectionTime: Korrekturdauer (Min/Avg/Max)
 
 CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
 NoCorrectionsUploaded: In der hochgeladenen Datei wurden keine Korrekturen gefunden.
@@ -971,7 +978,7 @@ TutorialDelete: Löschen
 
 CourseTutorials: Übungen
 
-ParticipantsN n@Int: Teilnehmer
+ParticipantsN n@Int: #{tshow n} Teilnehmer
 TutorialDeleteQuestion: Wollen Sie das unten aufgeführte Tutorium wirklich löschen?
 TutorialDeleted: Tutorium gelöscht
 
@@ -1007,6 +1014,7 @@ HealthLDAPAdmins: Anteil der Administratoren, die im LDAP-Verzeichnis gefunden w
 HealthSMTPConnect: SMTP-Server kann erreicht werden
 HealthWidgetMemcached: Memcached-Server liefert Widgets korrekt aus
 
+CourseParticipants n@Int: Derzeit #{tshow n} angemeldete Kursteilnehmer
 CourseParticipantsInvited n@Int: #{tshow n} #{pluralDE n "Einladung" "Einladungen"} per E-Mail verschickt
 CourseParticipantsAlreadyRegistered n@Int: #{tshow n} Teilnehmer #{pluralDE n "ist" "sind"} bereits angemeldet
 CourseParticipantsRegisteredWithoutField n@Int: #{tshow n} Teilnehmer #{pluralDE n "wurde ohne assoziiertes Hauptfach" "wurden assoziierte Hauptfächer"} angemeldet, da #{pluralDE n "kein eindeutiges Hauptfach bestimmt werden konnte" "keine eindeutigen Hauptfächer bestimmt werden konnten"}
diff --git a/models/sheets b/models/sheets
index f8d21a6c2..138b50bf1 100644
--- a/models/sheets
+++ b/models/sheets
@@ -4,7 +4,7 @@ Sheet   -- exercise sheet for a given course
     description     Html Maybe
     type            SheetType        -- Does it count towards overall course grade?
     grouping        SheetGroup       -- May participants submit in groups of certain sizes?
-    markingText     Html Maybe       -- Instructions for correctors, included in marking templates
+    markingText     Html Maybe       -- Instructons for correctors, included in marking templates
     visibleFrom     UTCTime Maybe    -- Invisible to enrolled participants before
     activeFrom      UTCTime          -- Download of questions and submission is permitted afterwards
     activeTo        UTCTime          -- Submission is only permitted before
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index b865ee96e..0e2f70e21 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -5,6 +5,7 @@ import Import
 
 import Jobs
 import Handler.Utils
+import Handler.Utils.Corrections
 import Handler.Utils.Submission
 import Handler.Utils.Table.Cells
 import Handler.Utils.SheetType
@@ -13,11 +14,11 @@ import Handler.Utils.Delete
 
 import Utils.Lens
 
-import Data.List (nub)
+import Data.List as List (nub, foldl, foldr)
 import Data.Set (Set)
 import qualified Data.Set as Set
-import Data.Map (Map, (!))
-import qualified Data.Map as Map
+import Data.Map.Strict (Map, (!))
+import qualified Data.Map.Strict as Map
 
 import qualified Data.Text as Text
 import qualified Data.CaseInsensitive as CI
@@ -250,7 +251,7 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
           E.orderBy [E.asc $ user E.^. UserSurname, E.asc $ user E.^. UserDisplayName]
           return (user, pseudonym E.?. SheetPseudonymPseudonym)
         let
-          submittorMap = foldr (\(Entity userId user, E.Value pseudo) -> Map.insert userId (user, pseudo)) Map.empty submittors
+          submittorMap = List.foldr (\(Entity userId user, E.Value pseudo) -> Map.insert userId (user, pseudo)) Map.empty submittors
         dbtProj' (submission, sheet, (courseName, courseShorthand, courseTerm, courseSchool), mCorrector, mbLastEdit, submittorMap)
   dbTable psValidator DBTable
     { dbtSQLQuery
@@ -1035,7 +1036,7 @@ embedRenderMessage ''UniWorX ''ButtonSubmissionsAssign id
 instance Button UniWorX ButtonSubmissionsAssign where
   btnClasses BtnSubmissionsAssign = [BCIsButton, BCPrimary]
 
--- | Gather info about corrector assignment per sheet
+-- | DEPRECATED use CorrectorInfo instead. Gather info about corrector assignment per sheet
 data SubAssignInfo = SubAssignInfo { saiName :: SheetName, saiSubmissionNr, saiCorrectorNr, saiUnassignedNr :: Int }
 
 getCAssignR, postCAssignR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
@@ -1092,3 +1093,134 @@ assignHandler tid ssh csh rawSids = do
       then linkBack  -- TODO: convenience link might be unnecessary: either via breadcrumb or closing model. Remove, if modal works fine. Otherwise change to PrimaryAction?
       else btnForm
 
+
+assignHandler' :: TermId -> SchoolId -> CourseShorthand -> [SheetId] -> Handler Html
+assignHandler' tid ssh csh _rawSids = do
+  -- gather data
+  (nrParticipants, groupsPossible, infoMap, correctorMap) <- runDB $ do
+      cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+      nrParticipants <- count [CourseParticipantCourse ==. cid]
+
+      sheetList <- selectList [SheetCourse ==. cid] [Asc SheetName]
+      let sheets = entities2map sheetList
+          sheetIds = Map.keys sheets
+          groupsPossible :: Bool
+          groupsPossible =
+            let foldFun (Entity _ Sheet{sheetGrouping=sgr}) acc = acc || sgr /= NoGroups
+            in  List.foldr foldFun False sheetList
+
+      correctors <- E.select . E.from $ \(corrector `E.InnerJoin` user) -> do
+          E.on $ corrector E.^. SheetCorrectorUser E.==. user E.^. UserId
+          E.where_ $ corrector E.^. SheetCorrectorSheet `E.in_` E.valList sheetIds
+          return (corrector, user)
+      let correctorMap :: Map UserId (SheetCorrector,User)
+          correctorMap = foldl (\m (Entity _ corr, Entity uid user)-> Map.insert uid (corr,user) m) Map.empty correctors
+
+      submissions <- E.select . E.from $ \submission -> do
+          E.where_ $ submission E.^. SubmissionSheet `E.in_` E.valList sheetIds
+          let numSubmittors = E.sub_select . E.from $ \subUser -> do
+                E.where_ $ submission E.^. SubmissionId E.==. subUser E.^. SubmissionUserSubmission
+                return E.countRows
+          return (submission, numSubmittors)
+      -- prepare map
+      let infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo)
+          infoMap  = List.foldl (flip buildS) emptySheets submissions
+
+          -- ensure that all sheets are shown, including those without any submissions
+          emptySheets = foldl (\m sid -> Map.insert (sheetName $ sheets ! sid) Map.empty m) Map.empty sheetIds
+
+          buildS :: (Entity Submission, E.Value Int64) -> Map SheetName (Map (Maybe UserId) CorrectionInfo) -> Map SheetName (Map (Maybe UserId) CorrectionInfo)
+          buildS (Entity _sheetId Submission{..}, E.Value nrSbmtrs) m =
+              let shnm    = sheetName $ sheets ! submissionSheet
+                  corTime = diffUTCTime <$> submissionRatingTime <*> submissionRatingAssigned
+                  cinf    = Map.singleton submissionRatingBy $ CorrectionInfo
+                            { ciSubmittors  = fromIntegral nrSbmtrs
+                            , ciSubmissions = 1
+                            , ciAssigned    = maybe 0 (const 1) submissionRatingBy
+                            , ciCorrected   = maybe 0 (const 1) submissionRatingTime
+                            , ciCorrector   = submissionRatingBy
+                            , ciMin = corTime
+                            , ciTot = corTime
+                            , ciMax = corTime
+                            }
+              in Map.insertWith (Map.unionWith (<>)) shnm cinf m
+      return (nrParticipants, groupsPossible, infoMap, correctorMap)
+
+  let -- create aggregate maps
+      sheetMap :: Map SheetName CorrectionInfo
+      sheetMap = Map.map fold infoMap
+      corrMap  :: Map (Maybe UserId) CorrectionInfo
+      corrMap  = Map.unionsWith (<>) $ Map.elems infoMap
+      sheetNames = Map.keys infoMap
+  let -- whamlet convenience functions
+      showCorrector :: Maybe UserId -> Widget
+      showCorrector (Just uid)
+        | Just (_,User{..}) <- Map.lookup uid correctorMap
+        = nameEmailWidget userEmail userDisplayName userSurname
+      showCorrector _ = [whamlet|_{MsgNoCorrectorAssigned}|]
+      showDiffDays :: Maybe NominalDiffTime -> Text
+      showDiffDays = foldMap formatDiffDays
+      showAvgsDays :: Maybe NominalDiffTime -> Integer -> Text
+      showAvgsDays Nothing   _ = mempty
+      showAvgsDays (Just dt) n = formatDiffDays $ dt / fromIntegral n
+  let headingShort = MsgMenuCorrectionsAssign
+      headingLong = prependCourseTitle tid ssh csh MsgMenuCorrectionsAssign
+  siteLayoutMsg headingShort $ do
+    setTitleI headingLong
+    -- TODO: Move whamlet into separate Widget-File, once completed
+    [whamlet|
+      <div>
+          <h2>_{MsgCorrectionSheets}
+          _{MsgCourseParticipants nrParticipants}
+          <table .table .table--striped .table--hover>
+            <tr .table__row .table__row--head>
+              <th .table__th>_{MsgSheet}
+              $if groupsPossible
+                <th .table__th>_{MsgNrSubmittorsTotal}
+              <th .table__th>_{MsgNrSubmissionsTotal}
+              <th .table__th>_{MsgNrSubmissionsNotAssigned}
+              <th .table__th>_{MsgNrSubmissionsNotCorrected}
+              <th .table__th colspan=3>_{MsgCorrectionTime}
+            $forall (sheetName, CorrectionInfo{ciSubmittors, ciSubmissions, ciAssigned, ciCorrected, ciMin, ciTot, ciMax}) <- Map.toList sheetMap
+              <tr .table__row>
+                <td .table__td>^{simpleLink (toWidget sheetName) (CSheetR tid ssh csh sheetName SSubsR)}
+                $if groupsPossible
+                  <td .table__td>#{ciSubmittors}
+                <td .table__td>#{ciSubmissions}
+                <td .table__td>#{ciSubmissions - ciAssigned}
+                <td .table__td>#{ciSubmissions - ciCorrected}
+                <td .table__td>#{showDiffDays ciMin}
+                <td .table__td>#{showAvgsDays ciTot ciCorrected}
+                <td .table__td>#{showDiffDays ciMax}
+      <div>
+          <h2>_{MsgCorrectionCorrectors}
+          <table .table .table--striped .table--hover>
+            <tr .table__row .table__row--head>
+              <th .table__th>_{MsgCorrector}
+              <th .table__th>_{MsgNrSubmissionsTotal}
+              <th .table__th>_{MsgNrSubmissionsNotCorrected}
+              <th .table__th colspan=3>_{MsgCorrectionTime}
+              $forall shn <- sheetNames
+                <th .table__th colspan=3>#{shn}
+            $forall (CorrectionInfo{ciCorrector, ciSubmissions, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
+              <tr .table__row>
+                <td .table__td>^{showCorrector ciCorrector}
+                <td .table__td>#{ciSubmissions}
+                <td .table__td>#{ciSubmissions - ciCorrected}
+                <td .table__td>#{showDiffDays ciMin}
+                <td .table__td>#{showAvgsDays ciTot ciCorrected}
+                <td .table__td>#{showDiffDays ciMax}
+                $forall shn <- sheetNames
+                  $maybe smap <- Map.lookup shn infoMap
+                    $maybe CorrectionInfo{ciAssigned,ciCorrected,ciTot} <- Map.lookup ciCorrector smap
+                      <td .table__td>#{ciAssigned}
+                      <td .table__td>#{ciAssigned - ciCorrected}
+                      <td .table__td>#{showAvgsDays ciTot ciCorrected}
+                    $nothing
+                      <td .table__td colspan=3>
+                  $nothing
+                    <td .table__td colspan=3>
+    |]
+
+
+
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 2a98110c1..caeeb11c1 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -136,7 +136,7 @@ postTDeleteR tid ssh csh tutn = do
               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})|]
+        return [whamlet|_{prependCourseTitle courseTerm courseSchool courseShorthand (CI.original tutorialName)} (_{MsgParticipantsN ps})|]
     , drRecordConfirmString = \(Entity _ Course{..}, Entity _ Tutorial{..}, E.Value ps) ->
         return [st|#{termToText (unTermKey courseTerm)}/#{unSchoolKey courseSchool}/#{courseShorthand}/#{tutorialName}+#{tshow ps}|]
     , drCaption = SomeMessage MsgTutorialDeleteQuestion
@@ -199,7 +199,7 @@ postTCommR tid ssh csh tutn = do
         [E.Value isTutorialUser] <- E.select . return . E.exists . E.from $ \tutorialUser ->
           E.where_ $ tutorialUser E.^. TutorialParticipantUser E.==. E.val uid
                E.&&. tutorialUser E.^. TutorialParticipantTutorial E.==. E.val tutid
-        
+
         isAssociatedCorrector <- evalAccessForDB (Just uid) (CourseR tid ssh csh CNotesR) False
         isAssociatedTutor <- evalAccessForDB (Just uid) (CourseR tid ssh csh CTutorialListR) False
 
diff --git a/src/Handler/Utils/Corrections.hs b/src/Handler/Utils/Corrections.hs
new file mode 100644
index 000000000..ca5d433d7
--- /dev/null
+++ b/src/Handler/Utils/Corrections.hs
@@ -0,0 +1,45 @@
+module Handler.Utils.Corrections where
+
+import Import
+
+
+-- CorrectionInfo has seeming redundancies, but these are useful for aggregation
+-- INVARIANT: isJust ciTot `implies` ciCorrected > 0
+data CorrectionInfo = CorrectionInfo
+      { ciSubmittors, ciSubmissions, ciAssigned, ciCorrected :: Integer
+      , ciCorrector :: Maybe UserId
+      , ciTot, ciMin,  ciMax :: Maybe NominalDiffTime
+      }
+
+instance Semigroup CorrectionInfo where
+  corrA <> corrB =
+        assert (isJust (ciTot corrA) `implies` (ciCorrected corrA > 0)) $
+        assert (isJust (ciTot corrB) `implies` (ciCorrected corrB > 0))
+        CorrectionInfo
+          { ciSubmittors  = ciSubmittors  `mergeWith` (+)
+          , ciSubmissions = ciSubmissions `mergeWith` (+)
+          , ciAssigned    = ciAssigned    `mergeWith` (+)
+          , ciCorrected   = ciCorrected   `mergeWith` (+)
+          , ciCorrector   = ciCorrector   `mergeWith` keepEqual
+          , ciTot         = ciTot `mergeWith` ignoreNothing (+)
+          , ciMin         = ciMin `mergeWith` ignoreNothing min
+          , ciMax         = ciMax `mergeWith` ignoreNothing max
+          }
+    where
+      mergeWith :: (CorrectionInfo -> a) -> (a -> a -> c) -> c
+      mergeWith prj f = on f prj corrA corrB
+
+      keepEqual (Just x) (Just y) | x==y = Just x
+      keepEqual _ _ = Nothing
+
+instance Monoid CorrectionInfo where
+  mappend = (<>)
+  mempty  = CorrectionInfo  { ciSubmittors  = 0
+                            , ciSubmissions = 0
+                            , ciAssigned    = 0
+                            , ciCorrected   = 0
+                            , ciCorrector   = Nothing
+                            , ciMin         = Nothing
+                            , ciTot         = Nothing
+                            , ciMax         = Nothing
+                            }
diff --git a/src/Handler/Utils/DateTime.hs b/src/Handler/Utils/DateTime.hs
index 16ab29afa..8297f7266 100644
--- a/src/Handler/Utils/DateTime.hs
+++ b/src/Handler/Utils/DateTime.hs
@@ -2,6 +2,7 @@ module Handler.Utils.DateTime
   ( utcToLocalTime
   , localTimeToUTC, TZ.LocalToUTCResult(..)
   , toMidnight, beforeMidnight, toMidday, toMorning
+  , formatDiffDays
   , formatTime, formatTime', formatTimeW
   , getTimeLocale, getDateTimeFormat
   , validDateTimeFormats, dateTimeFormatOptions
@@ -29,6 +30,37 @@ import qualified Data.Set as Set
 import Data.Time.Clock.System (systemEpochDay)
 
 
+
+--------------------
+-- NominalDiffTime
+
+-- | One hour in 'NominalDiffTime'.
+nominalHour :: NominalDiffTime
+nominalHour = 3600
+
+-- | One minute in 'NominalDiffTime'.
+nominalMinute :: NominalDiffTime
+nominalMinute= 60
+
+formatDiffDays :: NominalDiffTime -> Text
+formatDiffDays t
+  | t > nominalDay    = inDays    <> "d"
+  | t > nominalHour   = inHours   <> "h"
+  | t > nominalMinute = inMinutes <> "m"
+  | otherwise         = tshow $ roundToDigits 0 t
+  where
+    convertBy :: NominalDiffTime -> Double
+    convertBy len = realToFrac $ roundToDigits 1 $ t / len
+    inDays    = tshow $ convertBy nominalDay
+    inHours   = tshow $ convertBy nominalHour
+    inMinutes = tshow $ convertBy nominalMinute
+
+
+
+------------
+-- UTCTime
+
+
 utcToLocalTime :: UTCTime -> LocalTime
 utcToLocalTime = TZ.utcToLocalTimeTZ appTZ
 
@@ -52,7 +84,6 @@ toMorning :: Day -> UTCTime
 toMorning      d = localTimeToUTCTZ appTZ $ LocalTime d $ TimeOfDay 6 0 0
 
 
-
 class FormatTime t => HasLocalTime t where
   toLocalTime :: t -> LocalTime
 
diff --git a/src/Utils.hs b/src/Utils.hs
index e8f0d27f5..22e5b3b91 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -343,6 +343,17 @@ notUsedT = notUsed
 
 
 
+----------
+-- Bool --
+----------
+
+-- | Logical implication, readable synonym for (<=) which appears the wrong way around
+implies :: Bool -> Bool -> Bool
+implies True x = x
+implies _    _ = True
+
+
+
 -------------
 -- Numeric --
 -------------
@@ -523,12 +534,6 @@ flipMaybe :: b -> Maybe a -> 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
-maybeAdd x Nothing  = x
-
 -- | Deep alternative to avoid any occurrence of Nothing at all costs, left-biased
 deepAlt :: Maybe (Maybe a) -> Maybe (Maybe a) -> Maybe (Maybe a)
 deepAlt Nothing        altSnd  = altSnd
@@ -574,6 +579,12 @@ mcons :: Maybe a -> [a] -> [a]
 mcons Nothing  xs = xs
 mcons (Just x) xs = x:xs
 
+-- | apply binary function to maybes, but ignores Nothing by using id if possible, unlike fmap/ap
+ignoreNothing :: (a -> a -> a) -> Maybe a -> Maybe a -> Maybe a
+ignoreNothing _ Nothing y = y
+ignoreNothing _ x Nothing = x
+ignoreNothing f (Just x) (Just y) = Just $ f x y
+
 newtype NTop a = NTop { nBot :: a } -- treat Nothing as Top for Ord (Maybe a); default implementation treats Nothing as bottom
 
 instance Eq a  => Eq (NTop (Maybe a)) where

From e33704dca43ecdd9e3b61f4e67cdbc501b946ab6 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 14 Jun 2019 20:43:14 +0200
Subject: [PATCH 452/519] Implementation okay, but throws NoCorrectors (FIXME)

---
 src/Handler/Corrections.hs            | 110 +++++++++++---------------
 src/Handler/Utils/Submission.hs       |  14 +++-
 src/Utils.hs                          |   5 ++
 src/Utils/Form.hs                     |  32 +++++++-
 templates/corrections-overview.hamlet |  69 ++++++++++++++++
 5 files changed, 159 insertions(+), 71 deletions(-)
 create mode 100644 templates/corrections-overview.hamlet

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 0e2f70e21..6a9c1b7aa 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1042,19 +1042,21 @@ data SubAssignInfo = SubAssignInfo { saiName :: SheetName, saiSubmissionNr, saiC
 getCAssignR, postCAssignR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCAssignR = postCAssignR
 postCAssignR tid ssh csh = do
-  shids <- runDB $ do
+  (shids,cid) <- runDB $ do
     cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-    selectKeysList [SheetCourse ==. cid] [Asc SheetActiveTo]
-  assignHandler tid ssh csh shids
+    shids <- selectKeysList [SheetCourse ==. cid] [Asc SheetActiveTo]
+    return (shids,cid)
+  assignHandler tid ssh csh cid shids
 
 getSAssignR, postSAssignR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSAssignR = postSAssignR
 postSAssignR tid ssh csh shn = do
-  shid <- runDB $ fetchSheetId tid ssh csh shn
-  assignHandler tid ssh csh [shid]
+  (shid,cid) <- runDB $ fetchSheetIdCourseId tid ssh csh shn
+  assignHandler tid ssh csh cid [shid]
 
-assignHandler :: TermId -> SchoolId -> CourseShorthand -> [SheetId] -> Handler Html
-assignHandler tid ssh csh rawSids = do
+-- DEPRECATED assignHandler'
+assignHandler' :: TermId -> SchoolId -> CourseShorthand -> CourseId -> [SheetId] -> Handler Html
+assignHandler' tid ssh csh _cid rawSids = do
   -- gather data
   openSubs <- runDB $ (\f -> foldM f Map.empty rawSids) $
       \acc sid -> maybeT (return acc) $ do
@@ -1094,11 +1096,28 @@ assignHandler tid ssh csh rawSids = do
       else btnForm
 
 
-assignHandler' :: TermId -> SchoolId -> CourseShorthand -> [SheetId] -> Handler Html
-assignHandler' tid ssh csh _rawSids = do
+{- TODO: make buttons for each sheet, so that users see which sheet is assigned
+data ButtonCorrectionsAssign = BtnCorrectionsAssignAll | BtnCorrectionsAssignSheet SheetName
+  deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
+instance Button UniWorX ButtonCorrectionsAssign
+-- Are those needed any more?
+instance Universe ButtonCorrectionsAssign
+instance Finite   ButtonCorrectionsAssign
+nullaryPathPiece ''ButtonCorrectionsAssign camelToPathPiece
+embedRenderMessage ''UniWorX ''ButtonCorrectionsAssign id
+instance Button UniWorX ButtonCorrectionsAssign where
+  btnClasses BtnCorrectionsAssign = [BCIsButton, BCPrimary]
+-- use runButtonForm' instead later on
+-}
+
+assignHandler :: TermId -> SchoolId -> CourseShorthand -> CourseId -> [SheetId] -> Handler Html
+assignHandler tid ssh csh cid assignSids = do
+  -- evaluate form first, since it affects DB action
+  (btnWdgt, btnResult) <- runButtonForm FIDAssignSubmissions
+
   -- gather data
-  (nrParticipants, groupsPossible, infoMap, correctorMap) <- runDB $ do
-      cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+  (nrParticipants, groupsPossible, infoMap, correctorMap, assignment) <- runDB $ do
+      -- cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
       nrParticipants <- count [CourseParticipantCourse ==. cid]
 
       sheetList <- selectList [SheetCourse ==. cid] [Asc SheetName]
@@ -1144,7 +1163,19 @@ assignHandler' tid ssh csh _rawSids = do
                             , ciMax = corTime
                             }
               in Map.insertWith (Map.unionWith (<>)) shnm cinf m
-      return (nrParticipants, groupsPossible, infoMap, correctorMap)
+      -- plan or assign unassigned submissions for given sheets
+      -- assignment :: Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int)
+      assignment <- fmap Map.fromList $ forM assignSids $ \sid -> do
+          plan <- planSubmissions sid Nothing
+          let shn = sheetName $ sheets ! sid
+          status <- case btnResult of
+            Nothing -> return (Set.empty, Set.empty)
+            (Just BtnSubmissionsAssign) -> writeSubmissionPlan plan
+          return (shn, (status, countMapElems plan))
+
+      return (nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
+
+
 
   let -- create aggregate maps
       sheetMap :: Map SheetName CorrectionInfo
@@ -1167,60 +1198,7 @@ assignHandler' tid ssh csh _rawSids = do
       headingLong = prependCourseTitle tid ssh csh MsgMenuCorrectionsAssign
   siteLayoutMsg headingShort $ do
     setTitleI headingLong
-    -- TODO: Move whamlet into separate Widget-File, once completed
-    [whamlet|
-      <div>
-          <h2>_{MsgCorrectionSheets}
-          _{MsgCourseParticipants nrParticipants}
-          <table .table .table--striped .table--hover>
-            <tr .table__row .table__row--head>
-              <th .table__th>_{MsgSheet}
-              $if groupsPossible
-                <th .table__th>_{MsgNrSubmittorsTotal}
-              <th .table__th>_{MsgNrSubmissionsTotal}
-              <th .table__th>_{MsgNrSubmissionsNotAssigned}
-              <th .table__th>_{MsgNrSubmissionsNotCorrected}
-              <th .table__th colspan=3>_{MsgCorrectionTime}
-            $forall (sheetName, CorrectionInfo{ciSubmittors, ciSubmissions, ciAssigned, ciCorrected, ciMin, ciTot, ciMax}) <- Map.toList sheetMap
-              <tr .table__row>
-                <td .table__td>^{simpleLink (toWidget sheetName) (CSheetR tid ssh csh sheetName SSubsR)}
-                $if groupsPossible
-                  <td .table__td>#{ciSubmittors}
-                <td .table__td>#{ciSubmissions}
-                <td .table__td>#{ciSubmissions - ciAssigned}
-                <td .table__td>#{ciSubmissions - ciCorrected}
-                <td .table__td>#{showDiffDays ciMin}
-                <td .table__td>#{showAvgsDays ciTot ciCorrected}
-                <td .table__td>#{showDiffDays ciMax}
-      <div>
-          <h2>_{MsgCorrectionCorrectors}
-          <table .table .table--striped .table--hover>
-            <tr .table__row .table__row--head>
-              <th .table__th>_{MsgCorrector}
-              <th .table__th>_{MsgNrSubmissionsTotal}
-              <th .table__th>_{MsgNrSubmissionsNotCorrected}
-              <th .table__th colspan=3>_{MsgCorrectionTime}
-              $forall shn <- sheetNames
-                <th .table__th colspan=3>#{shn}
-            $forall (CorrectionInfo{ciCorrector, ciSubmissions, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
-              <tr .table__row>
-                <td .table__td>^{showCorrector ciCorrector}
-                <td .table__td>#{ciSubmissions}
-                <td .table__td>#{ciSubmissions - ciCorrected}
-                <td .table__td>#{showDiffDays ciMin}
-                <td .table__td>#{showAvgsDays ciTot ciCorrected}
-                <td .table__td>#{showDiffDays ciMax}
-                $forall shn <- sheetNames
-                  $maybe smap <- Map.lookup shn infoMap
-                    $maybe CorrectionInfo{ciAssigned,ciCorrected,ciTot} <- Map.lookup ciCorrector smap
-                      <td .table__td>#{ciAssigned}
-                      <td .table__td>#{ciAssigned - ciCorrected}
-                      <td .table__td>#{showAvgsDays ciTot ciCorrected}
-                    $nothing
-                      <td .table__td colspan=3>
-                  $nothing
-                    <td .table__td colspan=3>
-    |]
+    $(widgetFile "corrections-overview")
 
 
 
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index dc55df410..61bb7ee53 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -1,6 +1,6 @@
 module Handler.Utils.Submission
   ( AssignSubmissionException(..)
-  , assignSubmissions
+  , assignSubmissions, writeSubmissionPlan, planSubmissions
   , submissionBlacklist, filterSubmission, extractRatings, extractRatingsMsg
   , submissionFileSource, submissionFileQuery
   , submissionMultiArchive
@@ -66,8 +66,15 @@ assignSubmissions :: SheetId -- ^ Sheet to distribute to correctors
                   -> YesodDB UniWorX ( Set SubmissionId
                                      , Set SubmissionId
                                      ) -- ^ Returns assigned and unassigned submissions; unassigned submissions occur only if no tutors have an assigned load
-assignSubmissions sid restriction = do
-    newSubmissionData <- planSubmissions sid restriction
+assignSubmissions sid restriction = planSubmissions sid restriction >>= writeSubmissionPlan
+
+-- | Assigns all submissions according to an already given assignment plan
+writeSubmissionPlan :: Map SubmissionId (Maybe UserId)
+                  -- ^ map that assigns submissions to correctors
+                  -> YesodDB UniWorX ( Set SubmissionId
+                                     , Set SubmissionId
+                                     ) -- ^ Returns assigned and unassigned submissions; unassigned submissions occur only if no tutors have an assigned load
+writeSubmissionPlan newSubmissionData = do
     now <- liftIO getCurrentTime
     execWriterT . forM_ (Map.toList newSubmissionData) $ \(subId, mCorrector) -> case mCorrector of
       Just corrector -> do
@@ -78,7 +85,6 @@ assignSubmissions sid restriction = do
       Nothing ->
         tell (mempty, Set.singleton subId)
 
-
 -- | Compute a map that shows which submissions ought the be assigned to each corrector according to sheet corrector loads, but does not alter database yet!
 planSubmissions :: SheetId -- ^ Sheet to distribute to correctors
                   -> Maybe (Set SubmissionId) -- ^ Optionally restrict submission to consider
diff --git a/src/Utils.hs b/src/Utils.hs
index 22e5b3b91..da5d7f0c4 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -500,6 +500,11 @@ partMap = Map.fromListWith mappend
 invertMap :: (Ord k, Ord v) => Map k v -> Map v (Set k)
 invertMap = groupMap . map swap . Map.toList
 
+-- | Counts how often a value appears in a map (not derived from invertMap for efficiency reasons)
+countMapElems :: (Ord v) => Map k v -> Map v Int
+countMapElems = Map.fromListWith (+) . map (\(_k,v)->(v,1)) . Map.toList
+
+
 
 ---------------
 -- Functions --
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index ec6e12730..69eb65254 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -356,10 +356,11 @@ buttonView btn = do
   fieldView bField btnId "" mempty (Right btn) False
 
 
-
+-- | generate a form that only shows a finite amount of buttons
 buttonForm :: (Button site a, Finite a) => Html -> MForm (HandlerT site IO) (FormResult a, WidgetT site IO ())
 buttonForm = buttonForm' universeF
 
+-- | like `buttonForm`, but for a given list of buttons, i.e. a subset or for buttons outside the Finite typeclass
 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 ""
@@ -370,6 +371,35 @@ buttonForm' btns csrf = do
         ^{fvInput bView}
     |])
 
+-- | buttons-only form complete with widget-generation and evaluation; return type determines buttons shown.
+runButtonForm ::(PathPiece ident, Eq ident, RenderMessage site FormMessage,
+                Button site ButtonSubmit, Button site a, Finite a)
+  => ident -> HandlerT site IO (WidgetT site IO (), Maybe a)
+runButtonForm fid = do
+  currentRoute <- getCurrentRoute
+  ((btnResult, btnWdgt), btnEnctype) <- runFormPost $ identifyForm fid buttonForm
+  let btnForm = wrapForm btnWdgt def  { formAction = SomeRoute <$> currentRoute
+                                      , formEncoding = btnEnctype
+                                      , formSubmit = FormNoSubmit
+                                      }
+  res <- formResultMaybe btnResult (return . Just)
+  return (btnForm, res)
+
+-- | like `runButtonForm` but showing only a given list of buttons, especially for buttons that are not in the Finite typeclass.
+runButtonForm' ::(PathPiece ident, Eq ident, RenderMessage site FormMessage,
+                Button site ButtonSubmit, Button site a)
+  => [a] -> ident -> HandlerT site IO (WidgetT site IO (), Maybe a)
+runButtonForm' btns fid = do
+  currentRoute <- getCurrentRoute
+  ((btnResult, btnWdgt), btnEnctype) <- runFormPost $ identifyForm fid $ buttonForm' btns
+  let btnForm = wrapForm btnWdgt def  { formAction = SomeRoute <$> currentRoute
+                                      , formEncoding = btnEnctype
+                                      , formSubmit = FormNoSubmit
+                                      }
+  res <- formResultMaybe btnResult (return . Just)
+  return (btnForm, res)
+
+
 -------------------
 -- Custom Fields --
 -------------------
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
new file mode 100644
index 000000000..595b28a80
--- /dev/null
+++ b/templates/corrections-overview.hamlet
@@ -0,0 +1,69 @@
+<div>
+  <h2>_{MsgCorrectionSheets}
+  _{MsgCourseParticipants nrParticipants}
+  <table .table .table--striped .table--hover>
+    <tr .table__row .table__row--head>
+      <th .table__th>_{MsgSheet}
+      $if groupsPossible
+        <th .table__th>_{MsgNrSubmittorsTotal}
+      <th .table__th colspan=2>_{MsgNrSubmissionsTotal}
+      <th .table__th colspan=2>_{MsgNrSubmissionsNotAssigned}
+      <th .table__th>_{MsgNrSubmissionsNotCorrected}
+      <th .table__th colspan=3>_{MsgCorrectionTime}
+    $forall (sheetName, CorrectionInfo{ciSubmittors, ciSubmissions, ciAssigned, ciCorrected, ciMin, ciTot, ciMax}) <- Map.toList sheetMap
+      <tr .table__row>
+        <td .table__td>^{simpleLink (toWidget sheetName) (CSheetR tid ssh csh sheetName SSubsR)}
+        $if groupsPossible
+          <td .table__td>#{ciSubmittors}
+        $maybe ((splus,sfailed),_) <- Map.lookup sheetName assignment
+          <td .table__td>#{ciSubmissions}
+          <td .table__td .alert-success>(+#{show (Set.size splus)})
+          <td .table__td>#{ciSubmissions - ciAssigned}
+          <td .table__td .alert-danger>(#{show (Set.size sfailed)})
+        $nothing
+          <td .table__td colspan=2>#{ciSubmissions}
+          <td .table__td colspan=2>#{ciSubmissions - ciAssigned}
+        <td .table__td>#{ciSubmissions - ciCorrected}
+        <td .table__td>#{showDiffDays ciMin}
+        <td .table__td>#{showAvgsDays ciTot ciCorrected}
+        <td .table__td>#{showDiffDays ciMax}
+<div>
+  <h2>_{MsgCorrectionCorrectors}
+  <table .table .table--striped .table--hover>
+    <tr .table__row .table__row--head>
+      <th .table__th>_{MsgCorrector}
+      <th .table__th>_{MsgNrSubmissionsTotal}
+      <th .table__th>_{MsgNrSubmissionsNotCorrected}
+      <th .table__th colspan=3>_{MsgCorrectionTime}
+      $forall shn <- sheetNames
+        <th .table__th colspan=4>#{shn}
+    $forall (CorrectionInfo{ciCorrector, ciSubmissions, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
+      <tr .table__row>
+        <td .table__td>^{showCorrector ciCorrector}
+        <td .table__td>#{ciSubmissions}
+        <td .table__td>#{ciSubmissions - ciCorrected}
+        <td .table__td>#{showDiffDays ciMin}
+        <td .table__td>#{showAvgsDays ciTot ciCorrected}
+        <td .table__td>#{showDiffDays ciMax}
+        $forall shn <- sheetNames
+          $maybe smap <- Map.lookup shn infoMap
+            $maybe CorrectionInfo{ciAssigned,ciCorrected,ciTot} <- Map.lookup ciCorrector smap
+              $maybe (_,cass) <- Map.lookup shn assignment
+                $maybe nrNew <- Map.lookup ciCorrector cass
+                  <td .table__td>#{ciAssigned}
+                  <td .table__td .alert-success>(+#{nrNew})
+                  <td .table__td>#{ciAssigned - ciCorrected}
+                  <td .table__td>#{showAvgsDays ciTot ciCorrected}
+                $nothing
+                  <td .table__td colspan=2>#{ciAssigned}
+                  <td .table__td>#{ciAssigned - ciCorrected}
+                  <td .table__td>#{showAvgsDays ciTot ciCorrected}
+              $nothing
+                <td .table__td colspan=2>#{ciAssigned}
+                <td .table__td>#{ciAssigned - ciCorrected}
+                <td .table__td>#{showAvgsDays ciTot ciCorrected}
+            $nothing
+              <td .table__td colspan=4>
+          $nothing
+            <td .table__td colspan=4>
+  ^{btnWdgt}
\ No newline at end of file

From b09b876969f43cc0d21af9f9c0057c1285811e3c Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 14 Jun 2019 22:13:00 +0200
Subject: [PATCH 453/519] feat(fe-heatmap): add css class heated for heatmap
 elements

relates to #405
---
 templates/default-layout.lucius | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 8e9b86452..ed7950f98 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -606,3 +606,29 @@ section {
 .notification__content {
   color: var(--color-font);
 }
+
+
+
+
+/*
+  "Heated" element.
+  Set custom property "--hotness" to a value from 0 to 1 to turn
+  the element's background to a color on a gradient from green to red.
+
+  TBD:
+  - move to a proper place
+  - think about font-weight...
+
+  Example:
+  <div .heated style="--hotness: 0.2">Lorem ipsum
+*/
+
+.heated {
+  --hotness: 0;
+  --red: calc(var(--hotness) * 200);
+  --green: calc(255 - calc(var(--hotness) * 255));
+  --opacity: calc(calc(var(--red) / 600) + 0.1);
+
+  font-weight: var(--weight, 600);
+  background-color: rgba(var(--red), var(--green), 0, var(--opacity));
+}

From 28dcc8dc377c5a7c942daad7743f473208f5b99c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 15 Jun 2019 12:27:51 +0200
Subject: [PATCH 454/519] fix(fe-async-table): Emulate no-js behaviour when
 handling pagesize

---
 frontend/src/utils/async-table/async-table.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
index ee662229d..26dfb5624 100644
--- a/frontend/src/utils/async-table/async-table.js
+++ b/frontend/src/utils/async-table/async-table.js
@@ -297,19 +297,17 @@ export class AsyncTable {
   }
 
   _changePagesizeHandler = (event) => {
-    const paginationParamKey = this._asyncTableId + '-pagination';
-    const pagesizeParamKey = this._asyncTableId + '-pagesize';
-    const pageParamKey = this._asyncTableId + '-page';
-
-    const paginationParamEl = this._pagesizeForm.querySelector('[name="' + paginationParamKey + '"]');
     const url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
-    url.searchParams.set(pagesizeParamKey, event.target.value);
-    url.searchParams.set(pageParamKey, 0);
+    const formData = new FormData(this._pagesizeForm);
 
-    if (paginationParamEl) {
-      const encodedValue = encodeURIComponent(paginationParamEl.value);
-      url.searchParams.set(paginationParamKey, encodedValue);
+    for (var k of url.searchParams.keys()) {
+      url.searchParams.delete(k);
     }
+
+    for (var kv of formData.entries()) {
+      url.searchParams.append(kv[0], kv[1]);
+    }
+
     this._updateTableFrom(url.href);
   }
 

From fc80f087242201ddcf2509dbed1f6034dc5ea73e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 15 Jun 2019 12:46:36 +0200
Subject: [PATCH 455/519] fix(fe): style notifications acceptably for now

---
 templates/default-layout.lucius | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 8e9b86452..b6236c080 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -565,6 +565,7 @@ section {
   color: var(--color-dark);
   box-shadow: 0 0 4px 2px inset currentColor;
   padding-left: 20%;
+  min-height: 100px;
 
   &::before {
     content: 'i';
@@ -579,6 +580,10 @@ section {
     justify-content: center;
   }
 }
+  
+.form-group__input > .notification {
+  margin: 0;
+}
 
 @media (max-width: 768px) {
 

From 4f1b2886cdb60cdd0ac79fd0d008b685d98c743f Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sun, 16 Jun 2019 13:16:01 +0200
Subject: [PATCH 456/519] guards added as needed for plan generartion without
 exceptions

---
 src/Handler/Corrections.hs      | 33 +++++++++++++++++++++++++--------
 src/Handler/Utils/Submission.hs |  1 +
 src/Utils.hs                    | 13 +++++++++++++
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 6a9c1b7aa..a251ddf56 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1164,14 +1164,29 @@ assignHandler tid ssh csh cid assignSids = do
                             }
               in Map.insertWith (Map.unionWith (<>)) shnm cinf m
       -- plan or assign unassigned submissions for given sheets
-      -- assignment :: Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int)
-      assignment <- fmap Map.fromList $ forM assignSids $ \sid -> do
-          plan <- planSubmissions sid Nothing
-          let shn = sheetName $ sheets ! sid
-          status <- case btnResult of
-            Nothing -> return (Set.empty, Set.empty)
-            (Just BtnSubmissionsAssign) -> writeSubmissionPlan plan
-          return (shn, (status, countMapElems plan))
+      let buildA :: (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int)) -> SheetId -> DB (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int))
+          buildA acc sid = maybeT (return acc) $ do
+            let shn = sheetName $ sheets ! sid
+            -- is sheet closed?
+            guardM $ lift $ hasWriteAccessTo $ CSheetR tid ssh csh shn SAssignR  -- we must check, whether the submission is already closed and thus assignable
+            -- has at least one submisison?
+            [E.Value hasSubmission] <- lift $ E.select $ return $ E.exists $ E.from $ \submission ->
+              E.where_ $ submission E.^. SubmissionSheet    E.==. E.val sid
+            guard hasSubmission
+            -- has at least one active corrector?
+            [E.Value hasCorrector] <- lift $ E.select $ return $ E.exists $ E.from $ \corrector -> do
+              E.where_ $ corrector E.^. SheetCorrectorSheet E.==. E.val sid
+              E.where_ $ corrector E.^. SheetCorrectorState E.==. E.val CorrectorNormal
+              -- E.where_ $ corrector E.^. SheetCorrectorLoad  E./=. E.val (Load {byTutorial = Nothing, byProportion = 0})
+            guard hasCorrector
+            -- TODO: Refactor guards above! We already have these informations, but forcing the maps inside the DB acces might not be a good idea
+            -- TODO: Maybe refactor planSubmissions instead to not throw exceptions, but signal "ok" or "not possible" instead!
+            plan <- lift $ planSubmissions sid Nothing
+            status <- lift $ case btnResult of
+              Nothing -> return (Set.empty, Set.empty)
+              (Just BtnSubmissionsAssign) -> writeSubmissionPlan plan
+            return $ Map.insert shn (status, countMapElems plan) acc
+      assignment <- foldM buildA Map.empty assignSids
 
       return (nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
 
@@ -1194,6 +1209,8 @@ assignHandler tid ssh csh cid assignSids = do
       showAvgsDays :: Maybe NominalDiffTime -> Integer -> Text
       showAvgsDays Nothing   _ = mempty
       showAvgsDays (Just dt) n = formatDiffDays $ dt / fromIntegral n
+      heat :: Double -> Double -> Double
+      heat achieved full = roundToDigits 3 $ cutOffPercent 0.4 full achieved
   let headingShort = MsgMenuCorrectionsAssign
       headingLong = prependCourseTitle tid ssh csh MsgMenuCorrectionsAssign
   siteLayoutMsg headingShort $ do
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 61bb7ee53..7cb28cfa5 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -86,6 +86,7 @@ writeSubmissionPlan newSubmissionData = do
         tell (mempty, Set.singleton subId)
 
 -- | Compute a map that shows which submissions ought the be assigned to each corrector according to sheet corrector loads, but does not alter database yet!
+--   May throw an exception if there are no suitable correctors
 planSubmissions :: SheetId -- ^ Sheet to distribute to correctors
                   -> Maybe (Set SubmissionId) -- ^ Optionally restrict submission to consider
                   -> YesodDB UniWorX (Map SubmissionId (Maybe UserId))
diff --git a/src/Utils.hs b/src/Utils.hs
index da5d7f0c4..a6fa63d38 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -379,6 +379,19 @@ roundDiv :: (Integral a, Integral b, RealFrac c) => Int -> a -> b -> c
 roundDiv digits numerator denominator
   = roundToDigits digits $ fromIntegral numerator / fromIntegral denominator
 
+-- | A value between 0 and 1, measuring how close `achieved` is to `full`; 0 meaning very and 1 meaning not at all
+--   `offset` specifies minimum result value, unless the goal is already achieved )i.e. full <= max(0,achieved)
+--   Useful for heat maps, with offset giving a visual step between completed and not yet completed
+cutOffPercent :: Double -> Double -> Double -> Double
+cutOffPercent offset full achieved
+  | full <= achieved = 0
+  | full <= 0        = 0
+  | otherwise        = offset + (1-offset * (1 - percent))
+  where
+    percent = achieved / full
+
+
+
 ------------
 -- Monoid --
 ------------

From af00b061300a3a5efc79e0dae58a5e7105b98823 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sun, 16 Jun 2019 16:38:28 +0200
Subject: [PATCH 457/519] Compiles and works, but still needs some minor fixes

---
 src/Handler/Corrections.hs            | 8 +++-----
 templates/corrections-overview.hamlet | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index a251ddf56..eb9be55a3 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1134,6 +1134,7 @@ assignHandler tid ssh csh cid assignSids = do
           return (corrector, user)
       let correctorMap :: Map UserId (SheetCorrector,User)
           correctorMap = foldl (\m (Entity _ corr, Entity uid user)-> Map.insert uid (corr,user) m) Map.empty correctors
+          -- TODO: CorrectorMap should contain Map SheetId SheetCorrector
 
       submissions <- E.select . E.from $ \submission -> do
           E.where_ $ submission E.^. SubmissionSheet `E.in_` E.valList sheetIds
@@ -1187,11 +1188,8 @@ assignHandler tid ssh csh cid assignSids = do
               (Just BtnSubmissionsAssign) -> writeSubmissionPlan plan
             return $ Map.insert shn (status, countMapElems plan) acc
       assignment <- foldM buildA Map.empty assignSids
-
       return (nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
 
-
-
   let -- create aggregate maps
       sheetMap :: Map SheetName CorrectionInfo
       sheetMap = Map.map fold infoMap
@@ -1209,8 +1207,8 @@ assignHandler tid ssh csh cid assignSids = do
       showAvgsDays :: Maybe NominalDiffTime -> Integer -> Text
       showAvgsDays Nothing   _ = mempty
       showAvgsDays (Just dt) n = formatDiffDays $ dt / fromIntegral n
-      heat :: Double -> Double -> Double
-      heat achieved full = roundToDigits 3 $ cutOffPercent 0.4 full achieved
+      heat :: Integer -> Integer -> Double
+      heat full achieved = roundToDigits 3 $ cutOffPercent 0.4 (fromIntegral full) (fromIntegral achieved)
   let headingShort = MsgMenuCorrectionsAssign
       headingLong = prependCourseTitle tid ssh csh MsgMenuCorrectionsAssign
   siteLayoutMsg headingShort $ do
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index 595b28a80..88deec48a 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -41,7 +41,7 @@
       <tr .table__row>
         <td .table__td>^{showCorrector ciCorrector}
         <td .table__td>#{ciSubmissions}
-        <td .table__td>#{ciSubmissions - ciCorrected}
+        <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciSubmissions - ciCorrected}
         <td .table__td>#{showDiffDays ciMin}
         <td .table__td>#{showAvgsDays ciTot ciCorrected}
         <td .table__td>#{showDiffDays ciMax}
@@ -52,7 +52,7 @@
                 $maybe nrNew <- Map.lookup ciCorrector cass
                   <td .table__td>#{ciAssigned}
                   <td .table__td .alert-success>(+#{nrNew})
-                  <td .table__td>#{ciAssigned - ciCorrected}
+                  <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciAssigned - ciCorrected}
                   <td .table__td>#{showAvgsDays ciTot ciCorrected}
                 $nothing
                   <td .table__td colspan=2>#{ciAssigned}

From 8201aa84e5e2328c0e229c776dd035125fcac6b1 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Mon, 17 Jun 2019 08:33:15 +0200
Subject: [PATCH 458/519] Bugfix: only attemp to assign unassigned submissions

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

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index eb9be55a3..58e775dea 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1171,8 +1171,9 @@ assignHandler tid ssh csh cid assignSids = do
             -- is sheet closed?
             guardM $ lift $ hasWriteAccessTo $ CSheetR tid ssh csh shn SAssignR  -- we must check, whether the submission is already closed and thus assignable
             -- has at least one submisison?
-            [E.Value hasSubmission] <- lift $ E.select $ return $ E.exists $ E.from $ \submission ->
+            [E.Value hasSubmission] <- lift $ E.select $ return $ E.exists $ E.from $ \submission -> do
               E.where_ $ submission E.^. SubmissionSheet    E.==. E.val sid
+              E.where_ $ E.isNothing $ submission E.^. SubmissionRatingBy
             guard hasSubmission
             -- has at least one active corrector?
             [E.Value hasCorrector] <- lift $ E.select $ return $ E.exists $ E.from $ \corrector -> do

From d5b094d6b442883c197b219cc9e1c6eb9c84d6eb Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Mon, 17 Jun 2019 09:47:50 +0200
Subject: [PATCH 459/519] Corrector loads shown; BUG preview somehow missing
 now

---
 src/Handler/Corrections.hs            | 37 +++++++++++++++------
 src/Model/Types/Sheet.hs              | 12 +++++++
 templates/corrections-overview.hamlet | 47 ++++++++++++---------------
 3 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 58e775dea..547dd8447 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1082,7 +1082,7 @@ assignHandler' tid ssh csh _cid rawSids = do
         \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing
       -- Too much important information for an alert message. Display proper info page instead
   let btnForm = wrapForm btnWdgt def
-                { formAction = SomeRoute <$> currentRoute -- TODO: should be a modal route
+                { formAction = SomeRoute <$> currentRoute
                 , formEncoding = btnEnctype
                 , formSubmit = FormNoSubmit
                 }
@@ -1132,9 +1132,11 @@ assignHandler tid ssh csh cid assignSids = do
           E.on $ corrector E.^. SheetCorrectorUser E.==. user E.^. UserId
           E.where_ $ corrector E.^. SheetCorrectorSheet `E.in_` E.valList sheetIds
           return (corrector, user)
-      let correctorMap :: Map UserId (SheetCorrector,User)
-          correctorMap = foldl (\m (Entity _ corr, Entity uid user)-> Map.insert uid (corr,user) m) Map.empty correctors
-          -- TODO: CorrectorMap should contain Map SheetId SheetCorrector
+      let correctorMap :: Map UserId (User, Map SheetName SheetCorrector)
+          correctorMap = (\f -> foldl f Map.empty correctors) (\acc (Entity _ sheetcorr@SheetCorrector{sheetCorrectorSheet}, Entity uid user) ->
+              let shn = sheetName $ sheets ! sheetCorrectorSheet
+              in  Map.insertWith (\(usr, ma) (_, mb) -> (usr, Map.union ma mb))  uid (user, Map.singleton shn sheetcorr) acc
+            )
 
       submissions <- E.select . E.from $ \submission -> do
           E.where_ $ submission E.^. SubmissionSheet `E.in_` E.valList sheetIds
@@ -1191,18 +1193,33 @@ assignHandler tid ssh csh cid assignSids = do
       assignment <- foldM buildA Map.empty assignSids
       return (nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
 
-  let -- create aggregate maps
+  let -- infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo) -- repeated here for easier reference
+      -- create aggregate maps
       sheetMap :: Map SheetName CorrectionInfo
       sheetMap = Map.map fold infoMap
       corrMap  :: Map (Maybe UserId) CorrectionInfo
       corrMap  = Map.unionsWith (<>) $ Map.elems infoMap
       sheetNames = Map.keys infoMap
   let -- whamlet convenience functions
-      showCorrector :: Maybe UserId -> Widget
-      showCorrector (Just uid)
-        | Just (_,User{..}) <- Map.lookup uid correctorMap
-        = nameEmailWidget userEmail userDisplayName userSurname
-      showCorrector _ = [whamlet|_{MsgNoCorrectorAssigned}|]
+      -- avoid nestes hamelt $maybe with duplicated $nothing
+      getCorrector :: Maybe UserId -> (Widget,Map SheetName SheetCorrector)
+      getCorrector (Just uid)
+        | Just (User{..},loadMap) <- Map.lookup uid correctorMap
+        = (nameEmailWidget userEmail userDisplayName userSurname, loadMap)
+      getCorrector _ = ([whamlet|_{MsgNoCorrectorAssigned}|], mempty)
+      -- avoid nestes hamelt $maybe with duplicated $nothing
+      getCorrSheetStatus :: Maybe UserId -> SheetName -> Maybe CorrectionInfo
+      getCorrSheetStatus corr shn
+        | (Just smap) <- Map.lookup shn infoMap
+        = Map.lookup corr smap
+      getCorrSheetStatus _ _ = Nothing
+      -- avoid nestes hamelt $maybe with duplicated $nothing
+      getCorrNewAssignment :: Maybe UserId -> SheetName -> Maybe Int
+      getCorrNewAssignment corr shn
+        | (Just (_,cass)) <- Map.lookup shn assignment
+        = Map.lookup corr cass
+      getCorrNewAssignment _ _ = Nothing
+
       showDiffDays :: Maybe NominalDiffTime -> Text
       showDiffDays = foldMap formatDiffDays
       showAvgsDays :: Maybe NominalDiffTime -> Integer -> Text
diff --git a/src/Model/Types/Sheet.hs b/src/Model/Types/Sheet.hs
index 74fb91dc1..5e971fb1d 100644
--- a/src/Model/Types/Sheet.hs
+++ b/src/Model/Types/Sheet.hs
@@ -305,3 +305,15 @@ instance Hashable CorrectorState
 nullaryPathPiece ''CorrectorState (camelToPathPiece' 1)
 
 derivePersistField "CorrectorState"
+
+showCompactCorrectorLoad :: Load -> CorrectorState -> Text
+showCompactCorrectorLoad load     CorrectorMissing = "[" <> showCompactCorrectorLoad load CorrectorNormal <> "]"
+showCompactCorrectorLoad load     CorrectorExcused = "{" <> showCompactCorrectorLoad load CorrectorNormal <> "}"
+showCompactCorrectorLoad Load{..} CorrectorNormal  =        proportionText <> tutorialText
+  where
+    proportionText = let propDbl :: Double
+                         propDbl = fromRational byProportion
+                     in  tshow $ roundToDigits 2 propDbl
+    tutorialText = case byTutorial of Nothing    -> mempty
+                                      Just True  -> " (T)"
+                                      Just False -> " +T "
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index 88deec48a..76ac17905 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -36,34 +36,29 @@
       <th .table__th>_{MsgNrSubmissionsNotCorrected}
       <th .table__th colspan=3>_{MsgCorrectionTime}
       $forall shn <- sheetNames
-        <th .table__th colspan=4>#{shn}
+        <th .table__th colspan=5>#{shn}
     $forall (CorrectionInfo{ciCorrector, ciSubmissions, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
-      <tr .table__row>
-        <td .table__td>^{showCorrector ciCorrector}
-        <td .table__td>#{ciSubmissions}
-        <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciSubmissions - ciCorrected}
-        <td .table__td>#{showDiffDays ciMin}
-        <td .table__td>#{showAvgsDays ciTot ciCorrected}
-        <td .table__td>#{showDiffDays ciMax}
-        $forall shn <- sheetNames
-          $maybe smap <- Map.lookup shn infoMap
-            $maybe CorrectionInfo{ciAssigned,ciCorrected,ciTot} <- Map.lookup ciCorrector smap
-              $maybe (_,cass) <- Map.lookup shn assignment
-                $maybe nrNew <- Map.lookup ciCorrector cass
-                  <td .table__td>#{ciAssigned}
-                  <td .table__td .alert-success>(+#{nrNew})
-                  <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciAssigned - ciCorrected}
-                  <td .table__td>#{showAvgsDays ciTot ciCorrected}
-                $nothing
-                  <td .table__td colspan=2>#{ciAssigned}
-                  <td .table__td>#{ciAssigned - ciCorrected}
-                  <td .table__td>#{showAvgsDays ciTot ciCorrected}
+      $with (nameW,loadM) <- getCorrector ciCorrector
+        <tr .table__row>
+          <td .table__td>^{nameW}
+          <td .table__td>#{ciSubmissions}
+          <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciSubmissions - ciCorrected}
+          <td .table__td>#{showDiffDays ciMin}
+          <td .table__td>#{showAvgsDays ciTot ciCorrected}
+          <td .table__td>#{showDiffDays ciMax}
+          $forall shn <- sheetNames
+            $maybe SheetCorrector{sheetCorrectorLoad, sheetCorrectorState} <- Map.lookup shn loadM
+              <td .table__td>#{showCompactCorrectorLoad sheetCorrectorLoad sheetCorrectorState}
+            $nothing
+              <td .table__td>
+            $maybe CorrectionInfo{ciAssigned,ciCorrected,ciTot} <- getCorrSheetStatus ciCorrector shn
+              $maybe nrNew <- getCorrNewAssignment ciCorrector shn
+                <td .table__td>#{ciAssigned}
+                <td .table__td .alert-success>(+#{nrNew})
               $nothing
                 <td .table__td colspan=2>#{ciAssigned}
-                <td .table__td>#{ciAssigned - ciCorrected}
-                <td .table__td>#{showAvgsDays ciTot ciCorrected}
+              <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciAssigned - ciCorrected}
+              <td .table__td>#{showAvgsDays ciTot ciCorrected}
             $nothing
-              <td .table__td colspan=4>
-          $nothing
-            <td .table__td colspan=4>
+              <td .table__td colspan=5>
   ^{btnWdgt}
\ No newline at end of file

From 55cd175f06e1bf55de097d343188116b4075377e Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Mon, 17 Jun 2019 09:55:02 +0200
Subject: [PATCH 460/519] Minor Bugfix

---
 src/Handler/Corrections.hs            | 52 ++++++++++++++-------------
 templates/corrections-overview.hamlet |  2 +-
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 547dd8447..35cc932c8 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1128,6 +1128,32 @@ assignHandler tid ssh csh cid assignSids = do
             let foldFun (Entity _ Sheet{sheetGrouping=sgr}) acc = acc || sgr /= NoGroups
             in  List.foldr foldFun False sheetList
 
+      -- plan or assign unassigned submissions for given sheets
+      let buildA :: (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int)) -> SheetId -> DB (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int))
+          buildA acc sid = maybeT (return acc) $ do
+            let shn = sheetName $ sheets ! sid
+            -- is sheet closed?
+            guardM $ lift $ hasWriteAccessTo $ CSheetR tid ssh csh shn SAssignR  -- we must check, whether the submission is already closed and thus assignable
+            -- has at least one submisison?
+            [E.Value hasSubmission] <- lift $ E.select $ return $ E.exists $ E.from $ \submission -> do
+              E.where_ $ submission E.^. SubmissionSheet    E.==. E.val sid
+              E.where_ $ E.isNothing $ submission E.^. SubmissionRatingBy
+            guard hasSubmission
+            -- has at least one active corrector?
+            [E.Value hasCorrector] <- lift $ E.select $ return $ E.exists $ E.from $ \corrector -> do
+              E.where_ $ corrector E.^. SheetCorrectorSheet E.==. E.val sid
+              E.where_ $ corrector E.^. SheetCorrectorState E.==. E.val CorrectorNormal
+              -- E.where_ $ corrector E.^. SheetCorrectorLoad  E./=. E.val (Load {byTutorial = Nothing, byProportion = 0})
+            guard hasCorrector
+            -- TODO: Refactor guards above! We already have these informations, but forcing the maps inside the DB acces might not be a good idea
+            -- TODO: Maybe refactor planSubmissions instead to not throw exceptions, but signal "ok" or "not possible" instead!
+            plan <- lift $ planSubmissions sid Nothing
+            status <- lift $ case btnResult of
+              Nothing -> return (Set.empty, Set.empty)
+              (Just BtnSubmissionsAssign) -> writeSubmissionPlan plan -- TODO: this comes to late!!
+            return $ Map.insert shn (status, countMapElems plan) acc
+      assignment <- foldM buildA Map.empty assignSids
+
       correctors <- E.select . E.from $ \(corrector `E.InnerJoin` user) -> do
           E.on $ corrector E.^. SheetCorrectorUser E.==. user E.^. UserId
           E.where_ $ corrector E.^. SheetCorrectorSheet `E.in_` E.valList sheetIds
@@ -1166,31 +1192,7 @@ assignHandler tid ssh csh cid assignSids = do
                             , ciMax = corTime
                             }
               in Map.insertWith (Map.unionWith (<>)) shnm cinf m
-      -- plan or assign unassigned submissions for given sheets
-      let buildA :: (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int)) -> SheetId -> DB (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int))
-          buildA acc sid = maybeT (return acc) $ do
-            let shn = sheetName $ sheets ! sid
-            -- is sheet closed?
-            guardM $ lift $ hasWriteAccessTo $ CSheetR tid ssh csh shn SAssignR  -- we must check, whether the submission is already closed and thus assignable
-            -- has at least one submisison?
-            [E.Value hasSubmission] <- lift $ E.select $ return $ E.exists $ E.from $ \submission -> do
-              E.where_ $ submission E.^. SubmissionSheet    E.==. E.val sid
-              E.where_ $ E.isNothing $ submission E.^. SubmissionRatingBy
-            guard hasSubmission
-            -- has at least one active corrector?
-            [E.Value hasCorrector] <- lift $ E.select $ return $ E.exists $ E.from $ \corrector -> do
-              E.where_ $ corrector E.^. SheetCorrectorSheet E.==. E.val sid
-              E.where_ $ corrector E.^. SheetCorrectorState E.==. E.val CorrectorNormal
-              -- E.where_ $ corrector E.^. SheetCorrectorLoad  E./=. E.val (Load {byTutorial = Nothing, byProportion = 0})
-            guard hasCorrector
-            -- TODO: Refactor guards above! We already have these informations, but forcing the maps inside the DB acces might not be a good idea
-            -- TODO: Maybe refactor planSubmissions instead to not throw exceptions, but signal "ok" or "not possible" instead!
-            plan <- lift $ planSubmissions sid Nothing
-            status <- lift $ case btnResult of
-              Nothing -> return (Set.empty, Set.empty)
-              (Just BtnSubmissionsAssign) -> writeSubmissionPlan plan
-            return $ Map.insert shn (status, countMapElems plan) acc
-      assignment <- foldM buildA Map.empty assignSids
+
       return (nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
 
   let -- infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo) -- repeated here for easier reference
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index 76ac17905..33f5b1e0a 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -60,5 +60,5 @@
               <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciAssigned - ciCorrected}
               <td .table__td>#{showAvgsDays ciTot ciCorrected}
             $nothing
-              <td .table__td colspan=5>
+              <td .table__td colspan=4>
   ^{btnWdgt}
\ No newline at end of file

From fedcc9a2ad76cc2cdfa234621ac7752db06ab0b3 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Mon, 17 Jun 2019 16:30:04 +0200
Subject: [PATCH 461/519] Overview Corrections working now

---
 messages/uniworx/de.msg               |  4 ++-
 src/Foundation.hs                     |  2 +-
 src/Handler/Corrections.hs            | 13 +++++++---
 templates/corrections-overview.hamlet | 35 ++++++++++++++++++---------
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 570730adf..22c502e1f 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -409,6 +409,7 @@ NrSubmissionsNewlyAssigned: Neu zugeteilt
 NrSubmissionsNotAssigned: Nicht zugeteilt
 NrSubmissionsNotCorrected: Unkorrigiert
 CorrectionTime: Korrekturdauer (Min/Avg/Max)
+AssignSubmissionsRandomWarning: Die Zuteilungsvorschau kann geringfügig von der tatsächlichen Zuteilung abweichen, da die Zuteilung ein randomisierter Prozess ist. Mehrfaches neues Laden dieser Seite vor Betätigung des Zuteilungsknopfes kann dies sichtbar machen.
 
 CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
 NoCorrectionsUploaded: In der hochgeladenen Datei wurden keine Korrekturen gefunden.
@@ -836,7 +837,8 @@ MenuCorrectionsUpload: Korrekturen hochladen
 MenuCorrectionsDownload: Offene Abgaben herunterladen
 MenuCorrectionsCreate: Abgaben registrieren
 MenuCorrectionsGrade: Abgaben online korrigieren
-MenuCorrectionsAssign: Abgaben automatisch zuteilen
+MenuCorrectionsAssign: Zuteilung Korrekturen
+MenuCorrectionsAssignSheet name@Text: Zuteilung Korrekturen von #{name}
 MenuAuthPreds: Authorisierungseinstellungen
 MenuTutorialDelete: Tutorium löschen
 MenuTutorialEdit: Tutorium editieren
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 7ce7a5eed..ad0d88b3c 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1427,7 +1427,7 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (CourseR tid ssh csh CInviteR)   = return ("Einladung", Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh (CUserR _)) = return ("Teilnehmer" , Just $ CourseR tid ssh csh CUsersR)
   breadcrumb (CourseR tid ssh csh CCorrectionsR) = return ("Abgaben" , Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CAssignR)   = return ("Zuteilen"   , Just $ CourseR tid ssh csh CCorrectionsR)
+  breadcrumb (CourseR tid ssh csh CAssignR)   = return ("Korrektur"  , Just $ CourseR tid ssh csh CCorrectionsR)
   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 SheetCurrentR) = return ("Aktuelles Blatt", Just $ CourseR tid ssh csh SheetListR)
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 35cc932c8..b64959f0c 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1054,7 +1054,7 @@ postSAssignR tid ssh csh shn = do
   (shid,cid) <- runDB $ fetchSheetIdCourseId tid ssh csh shn
   assignHandler tid ssh csh cid [shid]
 
--- DEPRECATED assignHandler'
+-- DEPRECATED assignHandler', delete me soonish
 assignHandler' :: TermId -> SchoolId -> CourseShorthand -> CourseId -> [SheetId] -> Handler Html
 assignHandler' tid ssh csh _cid rawSids = do
   -- gather data
@@ -1175,7 +1175,10 @@ assignHandler tid ssh csh cid assignSids = do
           infoMap  = List.foldl (flip buildS) emptySheets submissions
 
           -- ensure that all sheets are shown, including those without any submissions
-          emptySheets = foldl (\m sid -> Map.insert (sheetName $ sheets ! sid) Map.empty m) Map.empty sheetIds
+          emptySheets = foldl (\m sid -> Map.insert (sheetName $ sheets ! sid) emptyCorrs m) Map.empty sheetIds
+          emptyCorrs  = foldl (\m uid -> let cic = Just uid in
+                                         Map.insert cic mempty{ciCorrector=cic} m) Map.empty $ Map.keys correctorMap
+
 
           buildS :: (Entity Submission, E.Value Int64) -> Map SheetName (Map (Maybe UserId) CorrectionInfo) -> Map SheetName (Map (Maybe UserId) CorrectionInfo)
           buildS (Entity _sheetId Submission{..}, E.Value nrSbmtrs) m =
@@ -1184,7 +1187,7 @@ assignHandler tid ssh csh cid assignSids = do
                   cinf    = Map.singleton submissionRatingBy $ CorrectionInfo
                             { ciSubmittors  = fromIntegral nrSbmtrs
                             , ciSubmissions = 1
-                            , ciAssigned    = maybe 0 (const 1) submissionRatingBy
+                            , ciAssigned    = maybe 0 (const 1) submissionRatingBy   -- only used in sheetMap
                             , ciCorrected   = maybe 0 (const 1) submissionRatingTime
                             , ciCorrector   = submissionRatingBy
                             , ciMin = corTime
@@ -1229,7 +1232,9 @@ assignHandler tid ssh csh cid assignSids = do
       showAvgsDays (Just dt) n = formatDiffDays $ dt / fromIntegral n
       heat :: Integer -> Integer -> Double
       heat full achieved = roundToDigits 3 $ cutOffPercent 0.4 (fromIntegral full) (fromIntegral achieved)
-  let headingShort = MsgMenuCorrectionsAssign
+  let headingShort
+        | 0 < Map.size assignment = MsgMenuCorrectionsAssignSheet $ Text.intercalate ", " $ fmap CI.original $ Map.keys assignment
+        | otherwise               = MsgMenuCorrectionsAssign
       headingLong = prependCourseTitle tid ssh csh MsgMenuCorrectionsAssign
   siteLayoutMsg headingShort $ do
     setTitleI headingLong
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index 33f5b1e0a..19d13e265 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -6,7 +6,7 @@
       <th .table__th>_{MsgSheet}
       $if groupsPossible
         <th .table__th>_{MsgNrSubmittorsTotal}
-      <th .table__th colspan=2>_{MsgNrSubmissionsTotal}
+      <th .table__th >_{MsgNrSubmissionsTotal}
       <th .table__th colspan=2>_{MsgNrSubmissionsNotAssigned}
       <th .table__th>_{MsgNrSubmissionsNotCorrected}
       <th .table__th colspan=3>_{MsgCorrectionTime}
@@ -15,13 +15,17 @@
         <td .table__td>^{simpleLink (toWidget sheetName) (CSheetR tid ssh csh sheetName SSubsR)}
         $if groupsPossible
           <td .table__td>#{ciSubmittors}
+        <td .table__td>#{ciSubmissions}
         $maybe ((splus,sfailed),_) <- Map.lookup sheetName assignment
-          <td .table__td>#{ciSubmissions}
-          <td .table__td .alert-success>(+#{show (Set.size splus)})
-          <td .table__td>#{ciSubmissions - ciAssigned}
-          <td .table__td .alert-danger>(#{show (Set.size sfailed)})
+          $if 0 < Set.size sfailed
+            <td .table__td>#{ciSubmissions - ciAssigned}
+            <td .table__td .alert-danger>(-#{show (Set.size splus)}, failed: #{show (Set.size sfailed)})
+          $elseif 0 < Set.size splus
+            <td .table__td>#{ciSubmissions - ciAssigned}
+            <td .table__td .alert-success>(-#{show (Set.size splus)})
+          $else
+            <td .table__td colspan=2>#{ciSubmissions - ciAssigned}
         $nothing
-          <td .table__td colspan=2>#{ciSubmissions}
           <td .table__td colspan=2>#{ciSubmissions - ciAssigned}
         <td .table__td>#{ciSubmissions - ciCorrected}
         <td .table__td>#{showDiffDays ciMin}
@@ -37,6 +41,7 @@
       <th .table__th colspan=3>_{MsgCorrectionTime}
       $forall shn <- sheetNames
         <th .table__th colspan=5>#{shn}
+        $# ^{simpleLinkI (SomeMessage MsgMenuCorrectors) (CSheetR tid ssh csh shn SCorrR)}
     $forall (CorrectionInfo{ciCorrector, ciSubmissions, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
       $with (nameW,loadM) <- getCorrector ciCorrector
         <tr .table__row>
@@ -51,14 +56,22 @@
               <td .table__td>#{showCompactCorrectorLoad sheetCorrectorLoad sheetCorrectorState}
             $nothing
               <td .table__td>
-            $maybe CorrectionInfo{ciAssigned,ciCorrected,ciTot} <- getCorrSheetStatus ciCorrector shn
+            $maybe CorrectionInfo{ciSubmissions,ciCorrected,ciTot} <- getCorrSheetStatus ciCorrector shn
               $maybe nrNew <- getCorrNewAssignment ciCorrector shn
-                <td .table__td>#{ciAssigned}
+                <td .table__td>#{ciSubmissions}
+                $# <td .table__td>#{ciAssigned} `ciSubmissions` is here always identical to `ciAssigned` and also works for `ciCorrector == Nothing`. ciAssigned only useful in aggregate maps like `sheetMap`
                 <td .table__td .alert-success>(+#{nrNew})
               $nothing
-                <td .table__td colspan=2>#{ciAssigned}
-              <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciAssigned - ciCorrected}
+                <td .table__td colspan=2>#{ciSubmissions}
+              <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciSubmissions - ciCorrected}
               <td .table__td>#{showAvgsDays ciTot ciCorrected}
             $nothing
               <td .table__td colspan=4>
-  ^{btnWdgt}
\ No newline at end of file
+    $if 0 < length sheetNames
+      <tr .table__row>
+        <td colspan=6>
+        $forall shn <- sheetNames
+          <td .table__td colspan=5>^{simpleLinkI (SomeMessage MsgMenuCorrectors) (CSheetR tid ssh csh shn SCorrR)}
+  ^{btnWdgt}
+ <div>
+  <p>_{MsgAssignSubmissionsRandomWarning}
\ No newline at end of file

From 3a1a7bbd65d6f66ddef7ed2f875d7774a6061e36 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 14 Jun 2019 00:29:31 +0200
Subject: [PATCH 462/519] chore: housekeeping, updating npm packages

---
 package-lock.json | 132 +++++++++++++++++++++++++++++-----------------
 package.json      |  12 ++---
 2 files changed, 89 insertions(+), 55 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eab845d32..bb2760cb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1411,17 +1411,54 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.1.tgz",
-      "integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.0.tgz",
+      "integrity": "sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.5.4",
-        "caniuse-lite": "^1.0.30000957",
+        "browserslist": "^4.6.1",
+        "caniuse-lite": "^1.0.30000971",
+        "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.14",
+        "postcss": "^7.0.16",
         "postcss-value-parser": "^3.3.1"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "4.6.2",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.2.tgz",
+          "integrity": "sha512-2neU/V0giQy9h3XMPwLhEY3+Ao0uHSwHvU8Q1Ea6AgLVL1sXbX3dzPrJ8NWe5Hi4PoTkCYXOtVR9rfRLI0J/8Q==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30000974",
+            "electron-to-chromium": "^1.3.150",
+            "node-releases": "^1.1.23"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30000974",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz",
+              "integrity": "sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==",
+              "dev": true
+            }
+          }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.158",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.158.tgz",
+          "integrity": "sha512-wJsJaWsViNQ129XPGmyO5gGs1jPMHr9vffjHAhUje1xZbEzQcqbENdvfyRD9q8UF0TgFQFCCUbaIpJarFbvsIg==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.23",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz",
+          "integrity": "sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==",
+          "dev": true,
+          "requires": {
+            "semver": "^5.3.0"
+          }
+        }
       }
     },
     "aws-sign2": {
@@ -5023,12 +5060,6 @@
         "pkg-dir": "^3.0.0"
       }
     },
-    "find-parent-dir": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
-      "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
-      "dev": true
-    },
     "find-up": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
@@ -5073,9 +5104,9 @@
       }
     },
     "flatpickr": {
-      "version": "4.5.7",
-      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.5.7.tgz",
-      "integrity": "sha512-JqPfihUc9A/j9QAsh6otoARmMyUauPE17vRBEG+ThJwbl8zAq4ssGpxlPK3wWM/i8EFxkHg9UuVo0ds7XluKxw=="
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.1.tgz",
+      "integrity": "sha512-3ULSxbXmcMIRzer/2jLNweoqHpwDvsjEawO2FUd9UFR8uPwLM+LruZcPDpuZStcEgbQKhuFOfXo4nYdGladSNw=="
     },
     "flatted": {
       "version": "2.0.0",
@@ -6598,9 +6629,9 @@
       "dev": true
     },
     "husky": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-2.3.0.tgz",
-      "integrity": "sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-2.4.1.tgz",
+      "integrity": "sha512-ZRwMWHr7QruR22dQ5l3rEGXQ7rAQYsJYqaeCd+NyOsIFczAtqaApZQP3P4HwLZjCtFbm3SUNYoKuoBXX3AYYfw==",
       "dev": true,
       "requires": {
         "cosmiconfig": "^5.2.0",
@@ -7450,9 +7481,9 @@
       }
     },
     "lint-staged": {
-      "version": "8.1.7",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-8.1.7.tgz",
-      "integrity": "sha512-egT0goFhIFoOGk6rasPngTFh2qDqxZddM0PwI58oi66RxCDcn5uDwxmiasWIF0qGnchHSYVJ8HPRD5LrFo7TKA==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-8.2.1.tgz",
+      "integrity": "sha512-n0tDGR/rTCgQNwXnUf/eWIpPNddGWxC32ANTNYsj2k02iZb7Cz5ox2tytwBu+2r0zDXMEMKw7Y9OD/qsav561A==",
       "dev": true,
       "requires": {
         "chalk": "^2.3.1",
@@ -7462,7 +7493,6 @@
         "dedent": "^0.7.0",
         "del": "^3.0.0",
         "execa": "^1.0.0",
-        "find-parent-dir": "^0.3.0",
         "g-status": "^2.0.2",
         "is-glob": "^4.0.0",
         "is-windows": "^1.0.2",
@@ -7492,9 +7522,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "pify": {
@@ -8232,9 +8262,9 @@
       }
     },
     "node-libs-browser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
-      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
       "dev": true,
       "requires": {
         "assert": "^1.1.1",
@@ -8247,7 +8277,7 @@
         "events": "^3.0.0",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.0",
+        "path-browserify": "0.0.1",
         "process": "^0.11.10",
         "punycode": "^1.2.4",
         "querystring-es3": "^0.2.0",
@@ -8259,7 +8289,7 @@
         "tty-browserify": "0.0.0",
         "url": "^0.11.0",
         "util": "^0.11.0",
-        "vm-browserify": "0.0.4"
+        "vm-browserify": "^1.0.1"
       },
       "dependencies": {
         "punycode": {
@@ -11876,9 +11906,9 @@
       "dev": true
     },
     "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
       "dev": true
     },
     "path-dirname": {
@@ -12133,6 +12163,12 @@
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
       "dev": true
     },
+    "prettier": {
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz",
+      "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==",
+      "dev": true
+    },
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -12939,9 +12975,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -14438,13 +14474,10 @@
       }
     },
     "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
+      "dev": true
     },
     "void-elements": {
       "version": "2.0.1",
@@ -14464,9 +14497,9 @@
       }
     },
     "webpack": {
-      "version": "4.32.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.32.2.tgz",
-      "integrity": "sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.34.0.tgz",
+      "integrity": "sha512-ry2IQy1wJjOefLe1uJLzn5tG/DdIKzQqNlIAd2L84kcaADqNvQDTBlo8UcCNyDaT5FiaB+16jhAkb63YeG3H8Q==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
@@ -14508,9 +14541,9 @@
       }
     },
     "webpack-cli": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.2.tgz",
-      "integrity": "sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.4.tgz",
+      "integrity": "sha512-ubJGQEKMtBSpT+LiL5hXvn2GIOWiRWItR1DGUqJRhwRBeGhpRXjvF5f0erqdRJLErkfqS5/Ldkkedh4AL5Q1ZQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.1",
@@ -14521,6 +14554,7 @@
         "import-local": "^2.0.0",
         "interpret": "^1.1.0",
         "loader-utils": "^1.1.0",
+        "prettier": "^1.17.0",
         "supports-color": "^5.5.0",
         "v8-compile-cache": "^2.0.2",
         "yargs": "^12.0.5"
diff --git a/package.json b/package.json
index b86b46851..c03bfc07c 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "@babel/plugin-proposal-class-properties": "^7.4.4",
     "@babel/plugin-proposal-decorators": "^7.4.4",
     "@babel/preset-env": "^7.4.5",
-    "autoprefixer": "^9.5.1",
+    "autoprefixer": "^9.6.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.6",
@@ -50,7 +50,7 @@
     "css-loader": "^2.1.1",
     "eslint": "^5.16.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "husky": "^2.3.0",
+    "husky": "^2.4.1",
     "jasmine-core": "^3.4.0",
     "karma": "^4.1.0",
     "karma-chrome-launcher": "^2.2.0",
@@ -59,7 +59,7 @@
     "karma-jasmine-html-reporter": "^1.4.2",
     "karma-mocha-reporter": "^2.2.5",
     "karma-webpack": "^3.0.5",
-    "lint-staged": "^8.1.7",
+    "lint-staged": "^8.2.1",
     "lodash.debounce": "^4.0.8",
     "node-sass": "^4.12.0",
     "npm-run-all": "^4.1.5",
@@ -69,11 +69,11 @@
     "standard-version": "^6.0.1",
     "style-loader": "^0.23.1",
     "uglifyjs-webpack-plugin": "^2.1.3",
-    "webpack": "^4.32.2",
-    "webpack-cli": "^3.3.2"
+    "webpack": "^4.34.0",
+    "webpack-cli": "^3.3.4"
   },
   "dependencies": {
-    "flatpickr": "^4.5.7",
+    "flatpickr": "^4.6.1",
     "npm": "^6.9.0"
   }
 }

From 1256325a3e395c4aca4d1ba3cfb50b8b3738700a Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 14 Jun 2019 00:37:47 +0200
Subject: [PATCH 463/519] chore: rename german ChangeLog.md to ChangeLog_de.md

---
 ChangeLog.md => ChangeLog_de.md | 0
 src/Handler/Info.hs             | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename ChangeLog.md => ChangeLog_de.md (100%)

diff --git a/ChangeLog.md b/ChangeLog_de.md
similarity index 100%
rename from ChangeLog.md
rename to ChangeLog_de.md
diff --git a/src/Handler/Info.hs b/src/Handler/Info.hs
index 9790ed143..0ef2f3572 100644
--- a/src/Handler/Info.hs
+++ b/src/Handler/Info.hs
@@ -36,10 +36,10 @@ getInfoR = do
     let features = $(widgetFile "featureList")
         gitInfo :: Text
         gitInfo  = $gitDescribe <> " (" <> $gitCommitDate <> ")"
-    changeLog <- withUrlRenderer $(textFile "ChangeLog.md")
+    changeLog <- withUrlRenderer $(textFile "ChangeLog_de.md")
     $(widgetFile "versionHistory")
 
-  
+
 getInfoLecturerR :: Handler Html
 getInfoLecturerR =
   siteLayoutMsg' MsgInfoLecturerTitle $ do

From dd528c13aa28ecf882ee311aa2a22389b24c9585 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 14 Jun 2019 00:41:23 +0200
Subject: [PATCH 464/519] feat(development): add commitlint to ensure proper
 commit msgs

---
 commitlint.config.js |   1 +
 package-lock.json    | 848 +++++++++++++++++++++++++++++++++++++++++++
 package.json         |   5 +-
 3 files changed, 853 insertions(+), 1 deletion(-)
 create mode 100644 commitlint.config.js

diff --git a/commitlint.config.js b/commitlint.config.js
new file mode 100644
index 000000000..28fe5c5bf
--- /dev/null
+++ b/commitlint.config.js
@@ -0,0 +1 @@
+module.exports = {extends: ['@commitlint/config-conventional']}
diff --git a/package-lock.json b/package-lock.json
index bb2760cb1..e5fc63c13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -869,6 +869,817 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@commitlint/cli": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-8.0.0.tgz",
+      "integrity": "sha512-wFu+g9v73I2rMRTv27ItIbcrhWqge0ZpUNUIJ9fw8TF7XpmhaUFvGqa2kU6st1F0TyEOrq5ZMzwI8kQZNVLuXg==",
+      "dev": true,
+      "requires": {
+        "@commitlint/format": "^8.0.0",
+        "@commitlint/lint": "^8.0.0",
+        "@commitlint/load": "^8.0.0",
+        "@commitlint/read": "^8.0.0",
+        "babel-polyfill": "6.26.0",
+        "chalk": "2.3.1",
+        "get-stdin": "7.0.0",
+        "lodash": "4.17.11",
+        "meow": "5.0.0",
+        "resolve-from": "5.0.0",
+        "resolve-global": "1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+          "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.2.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz",
+          "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0",
+            "yargs-parser": "^10.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+          "dev": true
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        },
+        "yargs-parser": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
+    "@commitlint/config-conventional": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-8.0.0.tgz",
+      "integrity": "sha512-umg1irroowOV+x8oZPBw8woCogZO5MFKUYQq+fRZvhowoSwDHXYILP3ETcdHUgvytw/K/a8Xvu7iCypK6oZQ+g==",
+      "dev": true
+    },
+    "@commitlint/ensure": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-8.0.0.tgz",
+      "integrity": "sha512-rhBO79L9vXeb26JU+14cxZQq46KyyVqlo31C33VIe7oJndUtWrDhZTvMjJeB1pdXh4EU4XWdMo+yzBmuypFgig==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.11"
+      }
+    },
+    "@commitlint/execute-rule": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-8.0.0.tgz",
+      "integrity": "sha512-E/A2xHqx3syclXAFl8vJY2o/+xtL9axrqbFFF42Bzke+Eflf0mOJviPxDodu2xP0wXMRQ9UokAi/reK9dMtA/A==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "@commitlint/format": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-8.0.0.tgz",
+      "integrity": "sha512-dFxKGLp1T4obi7+YZ2NcSAebJA/dBQwnerRJGz0hWtsO6pheJRe+qC50+GCb2fYGWUc5lIWawaRts0m7RkFGUw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1"
+      }
+    },
+    "@commitlint/is-ignored": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-8.0.0.tgz",
+      "integrity": "sha512-geWr/NXGMrZ3qc3exDM+S1qV+nMDxp1LwN3rLpEN2gXTwW3rIXq49RQQUkn0n3BHcpqJJ9EBhjqFoMU1TYx7Ng==",
+      "dev": true,
+      "requires": {
+        "semver": "6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+          "dev": true
+        }
+      }
+    },
+    "@commitlint/lint": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-8.0.0.tgz",
+      "integrity": "sha512-5nKiJpBDR2iei+fre4+6M7FUrSX1cIMoxXKdrnb1GMOXkw9CsZSF5OvdrX08zHAFmOAeDaohoCV+XN/UN/vWYg==",
+      "dev": true,
+      "requires": {
+        "@commitlint/is-ignored": "^8.0.0",
+        "@commitlint/parse": "^8.0.0",
+        "@commitlint/rules": "^8.0.0",
+        "babel-runtime": "^6.23.0",
+        "lodash": "4.17.11"
+      }
+    },
+    "@commitlint/load": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-8.0.0.tgz",
+      "integrity": "sha512-JXC3YjO7hN7Rv2Z/SaYz+oIvShsQWLL7gnOCe8+YgI1EusBqjV4mPI0HnBXVe9volfdxbl+Af/GoQZs2dvyOFA==",
+      "dev": true,
+      "requires": {
+        "@commitlint/execute-rule": "^8.0.0",
+        "@commitlint/resolve-extends": "^8.0.0",
+        "babel-runtime": "^6.23.0",
+        "cosmiconfig": "^5.2.0",
+        "lodash": "4.17.11",
+        "resolve-from": "^5.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+          "dev": true
+        }
+      }
+    },
+    "@commitlint/message": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-8.0.0.tgz",
+      "integrity": "sha512-2oGUV8630nzsj17t6akq3mFguzWePADO069IwKJi+CN5L0YRBQj9zGRCB0P+zvh4EngjqMnuMwhEhaBEM8TTzA==",
+      "dev": true
+    },
+    "@commitlint/parse": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-8.0.0.tgz",
+      "integrity": "sha512-6CyweJrBkI+Jqx7qkpYgVx2muBMoUZAZHWhUTgqHIDDmI+3d4UPZ2plGS2G0969KkHCgjtlwnwTjWqA9HLMwPA==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-angular": "^1.3.3",
+        "conventional-commits-parser": "^2.1.0",
+        "lodash": "^4.17.11"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "conventional-changelog-angular": {
+          "version": "1.6.6",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz",
+          "integrity": "sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==",
+          "dev": true,
+          "requires": {
+            "compare-func": "^1.3.1",
+            "q": "^1.5.1"
+          }
+        },
+        "conventional-commits-parser": {
+          "version": "2.1.7",
+          "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz",
+          "integrity": "sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==",
+          "dev": true,
+          "requires": {
+            "JSONStream": "^1.0.4",
+            "is-text-path": "^1.0.0",
+            "lodash": "^4.2.1",
+            "meow": "^4.0.0",
+            "split2": "^2.0.0",
+            "through2": "^2.0.0",
+            "trim-off-newlines": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "is-text-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
+          "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
+          "dev": true,
+          "requires": {
+            "text-extensions": "^1.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist": "^1.1.3",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "text-extensions": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
+          "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
+          "dev": true
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
+    "@commitlint/read": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-8.0.0.tgz",
+      "integrity": "sha512-IhNMiKPqkB5yxphe/FiOKgX2uCysbR8fGK6KOXON3uJaVND0dctxnfdv+vY9gDv2CtjIXgNFO+v6FLnqMfIvwA==",
+      "dev": true,
+      "requires": {
+        "@commitlint/top-level": "^8.0.0",
+        "@marionebl/sander": "^0.6.0",
+        "babel-runtime": "^6.23.0",
+        "git-raw-commits": "^1.3.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "git-raw-commits": {
+          "version": "1.3.6",
+          "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.6.tgz",
+          "integrity": "sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==",
+          "dev": true,
+          "requires": {
+            "dargs": "^4.0.1",
+            "lodash.template": "^4.0.2",
+            "meow": "^4.0.0",
+            "split2": "^2.0.0",
+            "through2": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist": "^1.1.3",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
+    "@commitlint/resolve-extends": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-8.0.0.tgz",
+      "integrity": "sha512-SPkH+dXMCpYboVwpIhtOhpg1xYdE7L77fuHmEJWveXSmgfi0GosFm4aJ7Cer9DjNjW+KbD0TUfzZU0TrYUESjQ==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "import-fresh": "^3.0.0",
+        "lodash": "4.17.11",
+        "resolve-from": "^5.0.0",
+        "resolve-global": "^1.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+          "dev": true
+        }
+      }
+    },
+    "@commitlint/rules": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-8.0.0.tgz",
+      "integrity": "sha512-s9BehZQP5uAc/V4lMaUxwxFabVZTw5fZ18Ase1e5tbMKVIwq/7E00Ny1czN7xSFXfgffukWznsexpfFXYpbVsg==",
+      "dev": true,
+      "requires": {
+        "@commitlint/ensure": "^8.0.0",
+        "@commitlint/message": "^8.0.0",
+        "@commitlint/to-lines": "^8.0.0",
+        "babel-runtime": "^6.23.0"
+      }
+    },
+    "@commitlint/to-lines": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-8.0.0.tgz",
+      "integrity": "sha512-qqgNeyj+NJ1Xffwv6hGsipKlVFj30NmfPup751MS/me0GV8IBd//njTjiqHvf/3sKm/OcGn4Re4D7YXwTcC2RA==",
+      "dev": true
+    },
+    "@commitlint/top-level": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-8.0.0.tgz",
+      "integrity": "sha512-If9hwfISHV8HXGKeXUKsUvOo4DuISWiU/VC2qHsKpeHSREAxkWESmQzzwYvOtyBjMiOTfAXfzgth18g36Fz2ow==",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        }
+      }
+    },
+    "@marionebl/sander": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@marionebl/sander/-/sander-0.6.1.tgz",
+      "integrity": "sha1-GViWWHTyS8Ub5Ih1/rUNZC/EH3s=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.3",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.2"
+      }
+    },
     "@samverschueren/stream-to-observable": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz",
@@ -2051,6 +2862,25 @@
         "babel-types": "^6.24.1"
       }
     },
+    "babel-polyfill": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "regenerator-runtime": "^0.10.5"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+          "dev": true
+        }
+      }
+    },
     "babel-preset-es2015": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
@@ -6336,6 +7166,15 @@
         }
       }
     },
+    "global-dirs": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.4"
+      }
+    },
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -12668,6 +13507,15 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
+    "resolve-global": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz",
+      "integrity": "sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==",
+      "dev": true,
+      "requires": {
+        "global-dirs": "^0.1.1"
+      }
+    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
diff --git a/package.json b/package.json
index c03bfc07c..299e3c355 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged"
+      "pre-commit": "lint-staged",
+      "commit-msg": "commitlint --edit $HUSKY_GIT_PARAMS"
     }
   },
   "lint-staged": {
@@ -42,6 +43,8 @@
     "@babel/preset-env": "^7.4.5",
     "autoprefixer": "^9.6.0",
     "babel-core": "^6.26.3",
+    "@commitlint/cli": "^8.0.0",
+    "@commitlint/config-conventional": "^8.0.0",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.6",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",

From 7b8a3979bde5fab04d4ebc08c80dc9e4aa428014 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 14 Jun 2019 01:18:03 +0200
Subject: [PATCH 465/519] chore: rename german changelog file to all uppercase

---
 ChangeLog_de.md => CHANGELOG_DE.md | 0
 src/Handler/Info.hs                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename ChangeLog_de.md => CHANGELOG_DE.md (100%)

diff --git a/ChangeLog_de.md b/CHANGELOG_DE.md
similarity index 100%
rename from ChangeLog_de.md
rename to CHANGELOG_DE.md
diff --git a/src/Handler/Info.hs b/src/Handler/Info.hs
index 0ef2f3572..6f4dc74fb 100644
--- a/src/Handler/Info.hs
+++ b/src/Handler/Info.hs
@@ -36,7 +36,7 @@ getInfoR = do
     let features = $(widgetFile "featureList")
         gitInfo :: Text
         gitInfo  = $gitDescribe <> " (" <> $gitCommitDate <> ")"
-    changeLog <- withUrlRenderer $(textFile "ChangeLog_de.md")
+    changeLog <- withUrlRenderer $(textFile "CHANGELOG_DE.md")
     $(widgetFile "versionHistory")
 
 

From 5c44b670839801a2b3e13ed169d539da4be0a0fd Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 14 Jun 2019 20:26:43 +0200
Subject: [PATCH 466/519] chore: updated german changelog file

---
 CHANGELOG_DE.md | 140 +++++++++++++++++++++++++-----------------------
 1 file changed, 74 insertions(+), 66 deletions(-)

diff --git a/CHANGELOG_DE.md b/CHANGELOG_DE.md
index 64cf0b8f7..4256cf240 100644
--- a/CHANGELOG_DE.md
+++ b/CHANGELOG_DE.md
@@ -1,111 +1,119 @@
-  * Version 20.05.2019
-  
-    Komplett überarbeitete Funktionalität zur automatischen Verteilung von Korrekturen
+# Changelog
 
-  * Version 13.05.2019
-  
-    Kursverwalter können Teilnehmer hinzufügen
+## [1.1.0](https://gitlab.cip.ifi.lmu.de///compare/v1.0.0...v1.1.0) (2019-06-13)
 
-  * Version 10.05.2019
-  
-    Besseres Interface zum Einstellen von Abgebenden
-    
-    Download von allen Dateien pro Kursmaterial/Übungsblatt
-    
-  * Version 04.05.2019
-  
-    Kursmaterial
 
-  * Version 29.04.2019
-  
-    Tutorien
-    
-    Anzeige von Korrektoren auf den Kursseiten
+### Bug Fixes
 
-  * Version 20.04.2019
-  
-    Versand von Benachrichtigungen an Kursteilnehmer
-    
-    Eintragen von Korrektoren und Kursverwaltern auch ohne bestehenden Account
+* "Check All Checkbox" repariert
 
-  * Version 27.03.2019
 
-    Kurse Veranstalter können nun mehrere Dozenten und Assistenten selbst eintragen
 
-    Erfassung Studiengangsdaten
+## 1.0.0 (2019-06-13)
 
-  * Version 20.03.2019
+### Features
 
-    Kursanmeldung benötigen assoziertes Hauptfach (für Studierende mit mehreren Hauptfächern)
+* Das Ändern der Seitengröße bei langen Tabellen erfolgt nun ohne Neuladen der Seite
+* Diese automatisch generierte Changelog-Datei wurde ins Leben gerufen
 
-  * Version 30.01.2019
 
-    Designänderungen
 
-  * Version 16.01.2019
+## Pre 1.0.0
 
-    Links für Bequemlichkeiten hinzugefügt (z.B. aktuelles Übungsblatt)
 
-    Liste zugewiesener Abgaben lassen sich nun filtern
+### Version 20.05.2019
 
-    Bugfix: Wenn zwischen Anzeige und Empfang eines Tabellen-Formulars Zeilen verschwinden wird nun eine sinnvolle Fehlermeldung angezeigt
+- Komplett überarbeitete Funktionalität zur automatischen Verteilung von Korrekturen
 
-  * Version 30.11.2018
+### Version 13.05.2019
 
-    Bugfix: Übungsblätter im "bestehen nach Punkten"-Modus werden wieder korrekt gespeichert
+- Kursverwalter können Teilnehmer hinzufügen
 
-  * Version 29.11.2018
+### Version 10.05.2019
 
-    Bugfix: Formulare innerhalb von Tabellen funktionieren nun auch nach Javascript-Seitenwechsel oder Ändern der Sortierung
+- Besseres Interface zum Einstellen von Abgebenden
+- Download von allen Dateien pro Kursmaterial/Übungsblatt
 
-  * Version 09.11.2018
+### Version 04.05.2019
 
-    Bugfix: Zahlreiche Knöpfe/Formulare funktionieren wieder bei eingeschaltetem Javascript
+- Kursmaterial
 
-    Verschiedene Verbesserungen für Korrektoren
+### Version 29.04.2019
 
-  * Version 19.10.2018
+- Tutorien
+- Anzeige von Korrektoren auf den Kursseiten
 
-    Benutzer können sich in der Testphase komplett selbst löschen
+### Version 20.04.2019
 
-    Hilfe Widget
+- Versand von Benachrichtigungen an Kursteilnehmer
+- Eintragen von Korrektoren und Kursverwaltern auch ohne bestehenden Account
 
-    Benachrichtigungen per eMail für einige Ereignisse
+### Version 27.03.2019
 
-  * Version 18.09.2018
+- Kurse Veranstalter können nun mehrere Dozenten und Assistenten selbst eintragen
+- Erfassung Studiengangsdaten
 
-    Tooltips funktionieren auch ohne JavaScript
+### Version 20.03.2019
 
-    Kurskürzel müssen nur innerhalb eines Instituts eindeutig sein
+- Kursanmeldung benötigen assoziertes Hauptfach (für Studierende mit mehreren Hauptfächern)
 
-    User Data zeigt nun alle momentan gespeicherten Datensätze an
+### Version 30.01.2019
 
-    Unterstützung von Tabellenzusammenfassungen, z.B. Punktsummen
+- Designänderungen
 
-    Intelligente Verteilung von Abgaben auf Korrektoren (z.B. bei Krankheit)
+### Version 16.01.2019
 
-    Übungsblätter können Abgabe von Dateien verbieten und angeben ob ZIP-Archive entpackt werden sollen
+- Links für Bequemlichkeiten hinzugefügt (z.B. aktuelles Übungsblatt)
+- Liste zugewiesener Abgaben lassen sich nun filtern
+- Bugfix: Wenn zwischen Anzeige und Empfang eines Tabellen-Formulars Zeilen verschwinden wird nun eine sinnvolle Fehlermeldung angezeigt
 
-  * Version 06.08.2018
+### Version 30.11.2018
 
-    Einführung einer Option, ob Dateien automatisch heruntergeladen werden sollen
+- Bugfix: Übungsblätter im "bestehen nach Punkten"-Modus werden wieder korrekt gespeichert
 
-  * Version 01.08.2018
+### Version 29.11.2018
 
-    Verbesserter Campus-Login
-    (Ersatz einer C-Bibliothek mit undokumentierter Abhängigkeit durch selbst entwickelten Haskell-Code erlaubt nun auch Umlaute.)
+- Bugfix: Formulare innerhalb von Tabellen funktionieren nun auch nach Javascript-Seitenwechsel oder Ändern der Sortierung
 
-  * Version 31.07.2018
+### Version 09.11.2018
 
-    Viele Verbesserung zur Anzeige von Korrekturen
+- Bugfix: Zahlreiche Knöpfe/Formulare funktionieren wieder bei eingeschaltetem Javascript
+- Verschiedene Verbesserungen für Korrektoren
 
-    Kursliste über alle Semester hinweg (Top-Level-Navigation "Kurse"), wird in Zukunft Filter/Suchfunktion erhalten
+### Version 19.10.2018
 
-  * Version 10.07.2018
+- Benutzer können sich in der Testphase komplett selbst löschen
+- Hilfe Widget
+- Benachrichtigungen per eMail für einige Ereignisse
 
-    Bugfixes, wählbares Format für Datum
+### Version 18.09.2018
 
-  * Version 03.07.2018
+- Tooltips funktionieren auch ohne JavaScript
+- Kurskürzel müssen nur innerhalb eines Instituts eindeutig sein
+- User Data zeigt nun alle momentan gespeicherten Datensätze an
+- Unterstützung von Tabellenzusammenfassungen, z.B. Punktsummen
+- Intelligente Verteilung von Abgaben auf Korrektoren (z.B. bei Krankheit)
+- Übungsblätter können Abgabe von Dateien verbieten und angeben ob ZIP-Archive entpackt werden sollen
 
-    Willkommen bei Uni2work aka "You-need-to-work!"
+### Version 06.08.2018
+
+- Einführung einer Option, ob Dateien automatisch heruntergeladen werden sollen
+
+### Version 01.08.2018
+
+- Verbesserter Campus-Login
+- (Ersatz einer C-Bibliothek mit undokumentierter Abhängigkeit durch selbst entwickelten Haskell-Code erlaubt nun auch Umlaute.)
+
+### Version 31.07.2018
+
+- Viele Verbesserung zur Anzeige von Korrekturen
+- Kursliste über alle Semester hinweg (Top-Level-Navigation "Kurse"), wird in Zukunft Filter/Suchfunktion erhalten
+
+### Version 10.07.2018
+
+- Bugfixes, wählbares Format für Datum
+
+### Version 03.07.2018
+
+- Willkommen bei Uni2work aka "You-need-to-work!"
 

From dcdf56af12f4c96487a74994014065d20b28e8eb Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 17 Jun 2019 21:50:57 +0200
Subject: [PATCH 467/519] chore: update npm packages and standard-version
 config

---
 package-lock.json | 3710 +++------------------------------------------
 package.json      |   63 +-
 2 files changed, 313 insertions(+), 3460 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e5fc63c13..f7ba10d64 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1175,213 +1175,6 @@
         "conventional-changelog-angular": "^1.3.3",
         "conventional-commits-parser": "^2.1.0",
         "lodash": "^4.17.11"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "camelcase-keys": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
-          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0",
-            "map-obj": "^2.0.0",
-            "quick-lru": "^1.0.0"
-          }
-        },
-        "conventional-changelog-angular": {
-          "version": "1.6.6",
-          "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz",
-          "integrity": "sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==",
-          "dev": true,
-          "requires": {
-            "compare-func": "^1.3.1",
-            "q": "^1.5.1"
-          }
-        },
-        "conventional-commits-parser": {
-          "version": "2.1.7",
-          "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz",
-          "integrity": "sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==",
-          "dev": true,
-          "requires": {
-            "JSONStream": "^1.0.4",
-            "is-text-path": "^1.0.0",
-            "lodash": "^4.2.1",
-            "meow": "^4.0.0",
-            "split2": "^2.0.0",
-            "through2": "^2.0.0",
-            "trim-off-newlines": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "is-text-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
-          "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
-          "dev": true,
-          "requires": {
-            "text-extensions": "^1.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "map-obj": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-          "dev": true
-        },
-        "meow": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
-          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
-          "dev": true,
-          "requires": {
-            "camelcase-keys": "^4.0.0",
-            "decamelize-keys": "^1.0.0",
-            "loud-rejection": "^1.0.0",
-            "minimist": "^1.1.3",
-            "minimist-options": "^3.0.1",
-            "normalize-package-data": "^2.3.4",
-            "read-pkg-up": "^3.0.0",
-            "redent": "^2.0.0",
-            "trim-newlines": "^2.0.0"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
-          }
-        },
-        "redent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-          "dev": true,
-          "requires": {
-            "indent-string": "^3.0.0",
-            "strip-indent": "^2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "strip-indent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
-          "dev": true
-        },
-        "text-extensions": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
-          "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
-          "dev": true
-        },
-        "trim-newlines": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
-          "dev": true
-        }
       }
     },
     "@commitlint/read": {
@@ -1394,186 +1187,6 @@
         "@marionebl/sander": "^0.6.0",
         "babel-runtime": "^6.23.0",
         "git-raw-commits": "^1.3.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "camelcase-keys": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
-          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0",
-            "map-obj": "^2.0.0",
-            "quick-lru": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "git-raw-commits": {
-          "version": "1.3.6",
-          "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.6.tgz",
-          "integrity": "sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==",
-          "dev": true,
-          "requires": {
-            "dargs": "^4.0.1",
-            "lodash.template": "^4.0.2",
-            "meow": "^4.0.0",
-            "split2": "^2.0.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "map-obj": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
-          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
-          "dev": true
-        },
-        "meow": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
-          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
-          "dev": true,
-          "requires": {
-            "camelcase-keys": "^4.0.0",
-            "decamelize-keys": "^1.0.0",
-            "loud-rejection": "^1.0.0",
-            "minimist": "^1.1.3",
-            "minimist-options": "^3.0.1",
-            "normalize-package-data": "^2.3.4",
-            "read-pkg-up": "^3.0.0",
-            "redent": "^2.0.0",
-            "trim-newlines": "^2.0.0"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
-          }
-        },
-        "redent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
-          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
-          "dev": true,
-          "requires": {
-            "indent-string": "^3.0.0",
-            "strip-indent": "^2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "strip-indent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
-          "dev": true
-        },
-        "trim-newlines": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
-          "dev": true
-        }
       }
     },
     "@commitlint/resolve-extends": {
@@ -2256,9 +1869,9 @@
           }
         },
         "electron-to-chromium": {
-          "version": "1.3.158",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.158.tgz",
-          "integrity": "sha512-wJsJaWsViNQ129XPGmyO5gGs1jPMHr9vffjHAhUje1xZbEzQcqbENdvfyRD9q8UF0TgFQFCCUbaIpJarFbvsIg==",
+          "version": "1.3.164",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.164.tgz",
+          "integrity": "sha512-VLlalqUeduN4+fayVtRZvGP2Hl1WrRxlwzh2XVVMJym3IFrQUS29BFQ1GP/BxOJXJI1OFCrJ5BnFEsAe8NHtOg==",
           "dev": true
         },
         "node-releases": {
@@ -2370,9 +1983,9 @@
       }
     },
     "babel-eslint": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
-      "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.2.tgz",
+      "integrity": "sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -3841,12 +3454,24 @@
         "conventional-changelog-jquery": "^3.0.4",
         "conventional-changelog-jshint": "^2.0.1",
         "conventional-changelog-preset-loader": "^2.1.1"
+      },
+      "dependencies": {
+        "conventional-changelog-angular": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz",
+          "integrity": "sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==",
+          "dev": true,
+          "requires": {
+            "compare-func": "^1.3.1",
+            "q": "^1.5.1"
+          }
+        }
       }
     },
     "conventional-changelog-angular": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz",
-      "integrity": "sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==",
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz",
+      "integrity": "sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==",
       "dev": true,
       "requires": {
         "compare-func": "^1.3.1",
@@ -3908,6 +3533,38 @@
         "through2": "^3.0.0"
       },
       "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "conventional-commits-parser": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz",
+          "integrity": "sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==",
+          "dev": true,
+          "requires": {
+            "JSONStream": "^1.0.4",
+            "is-text-path": "^2.0.0",
+            "lodash": "^4.2.1",
+            "meow": "^4.0.0",
+            "split2": "^2.0.0",
+            "through2": "^3.0.0",
+            "trim-off-newlines": "^1.0.0"
+          }
+        },
         "find-up": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -3917,6 +3574,40 @@
             "locate-path": "^2.0.0"
           }
         },
+        "git-raw-commits": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz",
+          "integrity": "sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==",
+          "dev": true,
+          "requires": {
+            "dargs": "^4.0.1",
+            "lodash.template": "^4.0.2",
+            "meow": "^4.0.0",
+            "split2": "^2.0.0",
+            "through2": "^2.0.0"
+          },
+          "dependencies": {
+            "through2": {
+              "version": "2.0.5",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+              "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+              "dev": true,
+              "requires": {
+                "readable-stream": "~2.3.6",
+                "xtend": "~4.0.1"
+              }
+            }
+          }
+        },
+        "is-text-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz",
+          "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==",
+          "dev": true,
+          "requires": {
+            "text-extensions": "^2.0.0"
+          }
+        },
         "load-json-file": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -3939,6 +3630,35 @@
             "path-exists": "^3.0.0"
           }
         },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist": "^1.1.3",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
         "p-limit": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
@@ -3999,12 +3719,34 @@
             "read-pkg": "^3.0.0"
           }
         },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
         },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "text-extensions": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.0.0.tgz",
+          "integrity": "sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==",
+          "dev": true
+        },
         "through2": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
@@ -4013,6 +3755,12 @@
           "requires": {
             "readable-stream": "2 || 3"
           }
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
         }
       }
     },
@@ -4279,17 +4027,17 @@
       }
     },
     "conventional-commits-parser": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz",
-      "integrity": "sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz",
+      "integrity": "sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==",
       "dev": true,
       "requires": {
         "JSONStream": "^1.0.4",
-        "is-text-path": "^2.0.0",
+        "is-text-path": "^1.0.0",
         "lodash": "^4.2.1",
         "meow": "^4.0.0",
         "split2": "^2.0.0",
-        "through2": "^3.0.0",
+        "through2": "^2.0.0",
         "trim-off-newlines": "^1.0.0"
       },
       "dependencies": {
@@ -4452,15 +4200,6 @@
           "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
           "dev": true
         },
-        "through2": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "2 || 3"
-          }
-        },
         "trim-newlines": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
@@ -4514,6 +4253,21 @@
             "typedarray": "^0.0.6"
           }
         },
+        "conventional-commits-parser": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz",
+          "integrity": "sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==",
+          "dev": true,
+          "requires": {
+            "JSONStream": "^1.0.4",
+            "is-text-path": "^2.0.0",
+            "lodash": "^4.2.1",
+            "meow": "^4.0.0",
+            "split2": "^2.0.0",
+            "through2": "^3.0.0",
+            "trim-off-newlines": "^1.0.0"
+          }
+        },
         "find-up": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -4523,6 +4277,55 @@
             "locate-path": "^2.0.0"
           }
         },
+        "git-raw-commits": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz",
+          "integrity": "sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==",
+          "dev": true,
+          "requires": {
+            "dargs": "^4.0.1",
+            "lodash.template": "^4.0.2",
+            "meow": "^4.0.0",
+            "split2": "^2.0.0",
+            "through2": "^2.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.6",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+              "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "through2": {
+              "version": "2.0.5",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+              "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+              "dev": true,
+              "requires": {
+                "readable-stream": "~2.3.6",
+                "xtend": "~4.0.1"
+              }
+            }
+          }
+        },
+        "is-text-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz",
+          "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==",
+          "dev": true,
+          "requires": {
+            "text-extensions": "^2.0.0"
+          }
+        },
         "load-json-file": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -4667,6 +4470,21 @@
           "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
           "dev": true
         },
+        "text-extensions": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.0.0.tgz",
+          "integrity": "sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2 || 3"
+          }
+        },
         "trim-newlines": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
@@ -6748,9 +6566,9 @@
       }
     },
     "git-raw-commits": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz",
-      "integrity": "sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.6.tgz",
+      "integrity": "sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==",
       "dev": true,
       "requires": {
         "dargs": "^4.0.1",
@@ -7503,6 +7321,12 @@
             "p-limit": "^2.2.0"
           }
         },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
         "pkg-dir": {
           "version": "4.2.0",
           "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -7513,12 +7337,13 @@
           },
           "dependencies": {
             "find-up": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.0.0.tgz",
-              "integrity": "sha512-zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q==",
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+              "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
               "dev": true,
               "requires": {
-                "locate-path": "^5.0.0"
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
               }
             }
           }
@@ -7984,12 +7809,12 @@
       }
     },
     "is-text-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz",
-      "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
+      "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
       "dev": true,
       "requires": {
-        "text-extensions": "^2.0.0"
+        "text-extensions": "^1.0.0"
       }
     },
     "is-typedarray": {
@@ -9249,3037 +9074,6 @@
       "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "dev": true
     },
-    "npm": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-6.9.0.tgz",
-      "integrity": "sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==",
-      "requires": {
-        "JSONStream": "^1.3.5",
-        "abbrev": "~1.1.1",
-        "ansicolors": "~0.3.2",
-        "ansistyles": "~0.1.3",
-        "aproba": "^2.0.0",
-        "archy": "~1.0.0",
-        "bin-links": "^1.1.2",
-        "bluebird": "^3.5.3",
-        "byte-size": "^5.0.1",
-        "cacache": "^11.3.2",
-        "call-limit": "~1.1.0",
-        "chownr": "^1.1.1",
-        "ci-info": "^2.0.0",
-        "cli-columns": "^3.1.2",
-        "cli-table3": "^0.5.1",
-        "cmd-shim": "~2.0.2",
-        "columnify": "~1.5.4",
-        "config-chain": "^1.1.12",
-        "debuglog": "*",
-        "detect-indent": "~5.0.0",
-        "detect-newline": "^2.1.0",
-        "dezalgo": "~1.0.3",
-        "editor": "~1.0.0",
-        "figgy-pudding": "^3.5.1",
-        "find-npm-prefix": "^1.0.2",
-        "fs-vacuum": "~1.2.10",
-        "fs-write-stream-atomic": "~1.0.10",
-        "gentle-fs": "^2.0.1",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.1.15",
-        "has-unicode": "~2.0.1",
-        "hosted-git-info": "^2.7.1",
-        "iferr": "^1.0.2",
-        "imurmurhash": "*",
-        "inflight": "~1.0.6",
-        "inherits": "~2.0.3",
-        "ini": "^1.3.5",
-        "init-package-json": "^1.10.3",
-        "is-cidr": "^3.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "lazy-property": "~1.0.0",
-        "libcipm": "^3.0.3",
-        "libnpm": "^2.0.1",
-        "libnpmaccess": "*",
-        "libnpmhook": "^5.0.2",
-        "libnpmorg": "*",
-        "libnpmsearch": "*",
-        "libnpmteam": "*",
-        "libnpx": "^10.2.0",
-        "lock-verify": "^2.1.0",
-        "lockfile": "^1.0.4",
-        "lodash._baseindexof": "*",
-        "lodash._baseuniq": "~4.6.0",
-        "lodash._bindcallback": "*",
-        "lodash._cacheindexof": "*",
-        "lodash._createcache": "*",
-        "lodash._getnative": "*",
-        "lodash.clonedeep": "~4.5.0",
-        "lodash.restparam": "*",
-        "lodash.union": "~4.6.0",
-        "lodash.uniq": "~4.5.0",
-        "lodash.without": "~4.4.0",
-        "lru-cache": "^4.1.5",
-        "meant": "~1.0.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "~0.5.1",
-        "move-concurrently": "^1.0.1",
-        "node-gyp": "^3.8.0",
-        "nopt": "~4.0.1",
-        "normalize-package-data": "^2.5.0",
-        "npm-audit-report": "^1.3.2",
-        "npm-cache-filename": "~1.0.2",
-        "npm-install-checks": "~3.0.0",
-        "npm-lifecycle": "^2.1.0",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.4.1",
-        "npm-pick-manifest": "^2.2.3",
-        "npm-profile": "*",
-        "npm-registry-fetch": "^3.9.0",
-        "npm-user-validate": "~1.0.0",
-        "npmlog": "~4.1.2",
-        "once": "~1.4.0",
-        "opener": "^1.5.1",
-        "osenv": "^0.1.5",
-        "pacote": "^9.5.0",
-        "path-is-inside": "~1.0.2",
-        "promise-inflight": "~1.0.1",
-        "qrcode-terminal": "^0.12.0",
-        "query-string": "^6.2.0",
-        "qw": "~1.0.1",
-        "read": "~1.0.7",
-        "read-cmd-shim": "~1.0.1",
-        "read-installed": "~4.0.3",
-        "read-package-json": "^2.0.13",
-        "read-package-tree": "^5.2.2",
-        "readable-stream": "^3.1.1",
-        "readdir-scoped-modules": "*",
-        "request": "^2.88.0",
-        "retry": "^0.12.0",
-        "rimraf": "^2.6.3",
-        "safe-buffer": "^5.1.2",
-        "semver": "^5.6.0",
-        "sha": "~2.0.1",
-        "slide": "~1.1.6",
-        "sorted-object": "~2.0.1",
-        "sorted-union-stream": "~2.1.3",
-        "ssri": "^6.0.1",
-        "stringify-package": "^1.0.0",
-        "tar": "^4.4.8",
-        "text-table": "~0.2.0",
-        "tiny-relative-date": "^1.3.0",
-        "uid-number": "0.0.6",
-        "umask": "~1.1.0",
-        "unique-filename": "^1.1.1",
-        "unpipe": "~1.0.0",
-        "update-notifier": "^2.5.0",
-        "uuid": "^3.3.2",
-        "validate-npm-package-license": "^3.0.4",
-        "validate-npm-package-name": "~3.0.0",
-        "which": "^1.3.1",
-        "worker-farm": "^1.6.0",
-        "write-file-atomic": "^2.4.2"
-      },
-      "dependencies": {
-        "JSONStream": {
-          "version": "1.3.5",
-          "bundled": true,
-          "requires": {
-            "jsonparse": "^1.2.0",
-            "through": ">=2.2.7 <3"
-          }
-        },
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "agent-base": {
-          "version": "4.2.1",
-          "bundled": true,
-          "requires": {
-            "es6-promisify": "^5.0.0"
-          }
-        },
-        "agentkeepalive": {
-          "version": "3.4.1",
-          "bundled": true,
-          "requires": {
-            "humanize-ms": "^1.2.1"
-          }
-        },
-        "ajv": {
-          "version": "5.5.2",
-          "bundled": true,
-          "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "ansi-align": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "string-width": "^2.0.0"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "bundled": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "ansicolors": {
-          "version": "0.3.2",
-          "bundled": true
-        },
-        "ansistyles": {
-          "version": "0.1.3",
-          "bundled": true
-        },
-        "aproba": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "archy": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "asap": {
-          "version": "2.0.6",
-          "bundled": true
-        },
-        "asn1": {
-          "version": "0.2.4",
-          "bundled": true,
-          "requires": {
-            "safer-buffer": "~2.1.0"
-          }
-        },
-        "assert-plus": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true
-        },
-        "aws-sign2": {
-          "version": "0.7.0",
-          "bundled": true
-        },
-        "aws4": {
-          "version": "1.8.0",
-          "bundled": true
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "^0.14.3"
-          }
-        },
-        "bin-links": {
-          "version": "1.1.2",
-          "bundled": true,
-          "requires": {
-            "bluebird": "^3.5.0",
-            "cmd-shim": "^2.0.2",
-            "gentle-fs": "^2.0.0",
-            "graceful-fs": "^4.1.11",
-            "write-file-atomic": "^2.3.0"
-          }
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "requires": {
-            "inherits": "~2.0.0"
-          }
-        },
-        "bluebird": {
-          "version": "3.5.3",
-          "bundled": true
-        },
-        "boxen": {
-          "version": "1.3.0",
-          "bundled": true,
-          "requires": {
-            "ansi-align": "^2.0.0",
-            "camelcase": "^4.0.0",
-            "chalk": "^2.0.1",
-            "cli-boxes": "^1.0.0",
-            "string-width": "^2.0.0",
-            "term-size": "^1.2.0",
-            "widest-line": "^2.0.0"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-from": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "builtins": {
-          "version": "1.0.3",
-          "bundled": true
-        },
-        "byline": {
-          "version": "5.0.0",
-          "bundled": true
-        },
-        "byte-size": {
-          "version": "5.0.1",
-          "bundled": true
-        },
-        "cacache": {
-          "version": "11.3.2",
-          "bundled": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.1.15",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          },
-          "dependencies": {
-            "chownr": {
-              "version": "1.1.1",
-              "bundled": true
-            },
-            "lru-cache": {
-              "version": "5.1.1",
-              "bundled": true,
-              "requires": {
-                "yallist": "^3.0.2"
-              }
-            },
-            "unique-filename": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "unique-slug": "^2.0.0"
-              }
-            },
-            "yallist": {
-              "version": "3.0.3",
-              "bundled": true
-            }
-          }
-        },
-        "call-limit": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "bundled": true
-        },
-        "capture-stack-trace": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true
-        },
-        "chalk": {
-          "version": "2.4.1",
-          "bundled": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "chownr": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "ci-info": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "cidr-regex": {
-          "version": "2.0.10",
-          "bundled": true,
-          "requires": {
-            "ip-regex": "^2.1.0"
-          }
-        },
-        "cli-boxes": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "cli-columns": {
-          "version": "3.1.2",
-          "bundled": true,
-          "requires": {
-            "string-width": "^2.0.0",
-            "strip-ansi": "^3.0.1"
-          }
-        },
-        "cli-table3": {
-          "version": "0.5.1",
-          "bundled": true,
-          "requires": {
-            "colors": "^1.1.2",
-            "object-assign": "^4.1.0",
-            "string-width": "^2.1.1"
-          }
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "bundled": true,
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "bundled": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "bundled": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "clone": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "cmd-shim": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "~0.5.0"
-          }
-        },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "color-convert": {
-          "version": "1.9.1",
-          "bundled": true,
-          "requires": {
-            "color-name": "^1.1.1"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "bundled": true
-        },
-        "colors": {
-          "version": "1.3.3",
-          "bundled": true,
-          "optional": true
-        },
-        "columnify": {
-          "version": "1.5.4",
-          "bundled": true,
-          "requires": {
-            "strip-ansi": "^3.0.0",
-            "wcwidth": "^1.0.0"
-          }
-        },
-        "combined-stream": {
-          "version": "1.0.6",
-          "bundled": true,
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true
-        },
-        "concat-stream": {
-          "version": "1.6.2",
-          "bundled": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.2.2",
-            "typedarray": "^0.0.6"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "config-chain": {
-          "version": "1.1.12",
-          "bundled": true,
-          "requires": {
-            "ini": "^1.3.4",
-            "proto-list": "~1.2.1"
-          }
-        },
-        "configstore": {
-          "version": "3.1.2",
-          "bundled": true,
-          "requires": {
-            "dot-prop": "^4.1.0",
-            "graceful-fs": "^4.1.2",
-            "make-dir": "^1.0.0",
-            "unique-string": "^1.0.0",
-            "write-file-atomic": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
-          }
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "copy-concurrently": {
-          "version": "1.0.5",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.1",
-            "fs-write-stream-atomic": "^1.0.8",
-            "iferr": "^0.1.5",
-            "mkdirp": "^0.5.1",
-            "rimraf": "^2.5.4",
-            "run-queue": "^1.0.0"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            },
-            "iferr": {
-              "version": "0.1.5",
-              "bundled": true
-            }
-          }
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "create-error-class": {
-          "version": "3.0.2",
-          "bundled": true,
-          "requires": {
-            "capture-stack-trace": "^1.0.0"
-          }
-        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "bundled": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "crypto-random-string": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "cyclist": {
-          "version": "0.2.2",
-          "bundled": true
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          }
-        },
-        "debug": {
-          "version": "3.1.0",
-          "bundled": true,
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "debuglog": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "decamelize": {
-          "version": "1.2.0",
-          "bundled": true
-        },
-        "decode-uri-component": {
-          "version": "0.2.0",
-          "bundled": true
-        },
-        "deep-extend": {
-          "version": "0.5.1",
-          "bundled": true
-        },
-        "defaults": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "clone": "^1.0.2"
-          }
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "detect-indent": {
-          "version": "5.0.0",
-          "bundled": true
-        },
-        "detect-newline": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "dezalgo": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "asap": "^2.0.0",
-            "wrappy": "1"
-          }
-        },
-        "dot-prop": {
-          "version": "4.2.0",
-          "bundled": true,
-          "requires": {
-            "is-obj": "^1.0.0"
-          }
-        },
-        "dotenv": {
-          "version": "5.0.1",
-          "bundled": true
-        },
-        "duplexer3": {
-          "version": "0.1.4",
-          "bundled": true
-        },
-        "duplexify": {
-          "version": "3.6.0",
-          "bundled": true,
-          "requires": {
-            "end-of-stream": "^1.0.0",
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.0",
-            "stream-shift": "^1.0.0"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "ecc-jsbn": {
-          "version": "0.1.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.1.0"
-          }
-        },
-        "editor": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "encoding": {
-          "version": "0.1.12",
-          "bundled": true,
-          "requires": {
-            "iconv-lite": "~0.4.13"
-          }
-        },
-        "end-of-stream": {
-          "version": "1.4.1",
-          "bundled": true,
-          "requires": {
-            "once": "^1.4.0"
-          }
-        },
-        "err-code": {
-          "version": "1.1.2",
-          "bundled": true
-        },
-        "errno": {
-          "version": "0.1.7",
-          "bundled": true,
-          "requires": {
-            "prr": "~1.0.1"
-          }
-        },
-        "es6-promise": {
-          "version": "4.2.6",
-          "bundled": true
-        },
-        "es6-promisify": {
-          "version": "5.0.0",
-          "bundled": true,
-          "requires": {
-            "es6-promise": "^4.0.3"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "bundled": true
-        },
-        "execa": {
-          "version": "0.7.0",
-          "bundled": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          },
-          "dependencies": {
-            "get-stream": {
-              "version": "3.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "extend": {
-          "version": "3.0.2",
-          "bundled": true
-        },
-        "extsprintf": {
-          "version": "1.3.0",
-          "bundled": true
-        },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "fast-json-stable-stringify": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "figgy-pudding": {
-          "version": "3.5.1",
-          "bundled": true
-        },
-        "find-npm-prefix": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "flush-write-stream": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.4"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true
-        },
-        "form-data": {
-          "version": "2.3.2",
-          "bundled": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "from2": {
-          "version": "2.3.0",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.0"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "fs-minipass": {
-          "version": "1.2.5",
-          "bundled": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "fs-vacuum": {
-          "version": "1.2.10",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "path-is-inside": "^1.0.1",
-            "rimraf": "^2.5.2"
-          }
-        },
-        "fs-write-stream-atomic": {
-          "version": "1.0.10",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "iferr": "^0.1.5",
-            "imurmurhash": "^0.1.4",
-            "readable-stream": "1 || 2"
-          },
-          "dependencies": {
-            "iferr": {
-              "version": "0.1.5",
-              "bundled": true
-            },
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "genfun": {
-          "version": "5.0.0",
-          "bundled": true
-        },
-        "gentle-fs": {
-          "version": "2.0.1",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.2",
-            "fs-vacuum": "^1.2.10",
-            "graceful-fs": "^4.1.11",
-            "iferr": "^0.1.5",
-            "mkdirp": "^0.5.1",
-            "path-is-inside": "^1.0.2",
-            "read-cmd-shim": "^1.0.1",
-            "slide": "^1.1.6"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            },
-            "iferr": {
-              "version": "0.1.5",
-              "bundled": true
-            }
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "bundled": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "bundled": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "global-dirs": {
-          "version": "0.1.1",
-          "bundled": true,
-          "requires": {
-            "ini": "^1.3.4"
-          }
-        },
-        "got": {
-          "version": "6.7.1",
-          "bundled": true,
-          "requires": {
-            "create-error-class": "^3.0.0",
-            "duplexer3": "^0.1.4",
-            "get-stream": "^3.0.0",
-            "is-redirect": "^1.0.0",
-            "is-retry-allowed": "^1.0.0",
-            "is-stream": "^1.0.0",
-            "lowercase-keys": "^1.0.0",
-            "safe-buffer": "^5.0.1",
-            "timed-out": "^4.0.0",
-            "unzip-response": "^2.0.1",
-            "url-parse-lax": "^1.0.0"
-          },
-          "dependencies": {
-            "get-stream": {
-              "version": "3.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.15",
-          "bundled": true
-        },
-        "har-schema": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "har-validator": {
-          "version": "5.1.0",
-          "bundled": true,
-          "requires": {
-            "ajv": "^5.3.0",
-            "har-schema": "^2.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "hosted-git-info": {
-          "version": "2.7.1",
-          "bundled": true
-        },
-        "http-cache-semantics": {
-          "version": "3.8.1",
-          "bundled": true
-        },
-        "http-proxy-agent": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "agent-base": "4",
-            "debug": "3.1.0"
-          }
-        },
-        "http-signature": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "2.2.1",
-          "bundled": true,
-          "requires": {
-            "agent-base": "^4.1.0",
-            "debug": "^3.1.0"
-          }
-        },
-        "humanize-ms": {
-          "version": "1.2.1",
-          "bundled": true,
-          "requires": {
-            "ms": "^2.0.0"
-          }
-        },
-        "iconv-lite": {
-          "version": "0.4.23",
-          "bundled": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "iferr": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "import-lazy": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "bundled": true
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true
-        },
-        "init-package-json": {
-          "version": "1.10.3",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.1",
-            "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
-            "promzard": "^0.3.0",
-            "read": "~1.0.1",
-            "read-package-json": "1 || 2",
-            "semver": "2.x || 3.x || 4 || 5",
-            "validate-npm-package-license": "^3.0.1",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "invert-kv": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "ip": {
-          "version": "1.1.5",
-          "bundled": true
-        },
-        "ip-regex": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "is-ci": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "ci-info": "^1.0.0"
-          },
-          "dependencies": {
-            "ci-info": {
-              "version": "1.6.0",
-              "bundled": true
-            }
-          }
-        },
-        "is-cidr": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "cidr-regex": "^2.0.10"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "is-installed-globally": {
-          "version": "0.1.0",
-          "bundled": true,
-          "requires": {
-            "global-dirs": "^0.1.0",
-            "is-path-inside": "^1.0.0"
-          }
-        },
-        "is-npm": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "is-obj": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "is-path-inside": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "path-is-inside": "^1.0.1"
-          }
-        },
-        "is-redirect": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "is-retry-allowed": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "isexe": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "json-parse-better-errors": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true
-        },
-        "json-schema-traverse": {
-          "version": "0.3.1",
-          "bundled": true
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true
-        },
-        "jsonparse": {
-          "version": "1.3.1",
-          "bundled": true
-        },
-        "jsprim": {
-          "version": "1.4.1",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.3.0",
-            "json-schema": "0.2.3",
-            "verror": "1.10.0"
-          }
-        },
-        "latest-version": {
-          "version": "3.1.0",
-          "bundled": true,
-          "requires": {
-            "package-json": "^4.0.0"
-          }
-        },
-        "lazy-property": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "lcid": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "invert-kv": "^1.0.0"
-          }
-        },
-        "libcipm": {
-          "version": "3.0.3",
-          "bundled": true,
-          "requires": {
-            "bin-links": "^1.1.2",
-            "bluebird": "^3.5.1",
-            "figgy-pudding": "^3.5.1",
-            "find-npm-prefix": "^1.0.2",
-            "graceful-fs": "^4.1.11",
-            "ini": "^1.3.5",
-            "lock-verify": "^2.0.2",
-            "mkdirp": "^0.5.1",
-            "npm-lifecycle": "^2.0.3",
-            "npm-logical-tree": "^1.2.1",
-            "npm-package-arg": "^6.1.0",
-            "pacote": "^9.1.0",
-            "read-package-json": "^2.0.13",
-            "rimraf": "^2.6.2",
-            "worker-farm": "^1.6.0"
-          }
-        },
-        "libnpm": {
-          "version": "2.0.1",
-          "bundled": true,
-          "requires": {
-            "bin-links": "^1.1.2",
-            "bluebird": "^3.5.3",
-            "find-npm-prefix": "^1.0.2",
-            "libnpmaccess": "^3.0.1",
-            "libnpmconfig": "^1.2.1",
-            "libnpmhook": "^5.0.2",
-            "libnpmorg": "^1.0.0",
-            "libnpmpublish": "^1.1.0",
-            "libnpmsearch": "^2.0.0",
-            "libnpmteam": "^1.0.1",
-            "lock-verify": "^2.0.2",
-            "npm-lifecycle": "^2.1.0",
-            "npm-logical-tree": "^1.2.1",
-            "npm-package-arg": "^6.1.0",
-            "npm-profile": "^4.0.1",
-            "npm-registry-fetch": "^3.8.0",
-            "npmlog": "^4.1.2",
-            "pacote": "^9.2.3",
-            "read-package-json": "^2.0.13",
-            "stringify-package": "^1.0.0"
-          }
-        },
-        "libnpmaccess": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "get-stream": "^4.0.0",
-            "npm-package-arg": "^6.1.0",
-            "npm-registry-fetch": "^3.8.0"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "2.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "libnpmconfig": {
-          "version": "1.2.1",
-          "bundled": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1",
-            "find-up": "^3.0.0",
-            "ini": "^1.3.5"
-          },
-          "dependencies": {
-            "find-up": {
-              "version": "3.0.0",
-              "bundled": true,
-              "requires": {
-                "locate-path": "^3.0.0"
-              }
-            },
-            "locate-path": {
-              "version": "3.0.0",
-              "bundled": true,
-              "requires": {
-                "p-locate": "^3.0.0",
-                "path-exists": "^3.0.0"
-              }
-            },
-            "p-limit": {
-              "version": "2.1.0",
-              "bundled": true,
-              "requires": {
-                "p-try": "^2.0.0"
-              }
-            },
-            "p-locate": {
-              "version": "3.0.0",
-              "bundled": true,
-              "requires": {
-                "p-limit": "^2.0.0"
-              }
-            },
-            "p-try": {
-              "version": "2.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "libnpmhook": {
-          "version": "5.0.2",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.4.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^3.8.0"
-          }
-        },
-        "libnpmorg": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.4.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^3.8.0"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "2.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "libnpmpublish": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.5.1",
-            "get-stream": "^4.0.0",
-            "lodash.clonedeep": "^4.5.0",
-            "normalize-package-data": "^2.4.0",
-            "npm-package-arg": "^6.1.0",
-            "npm-registry-fetch": "^3.8.0",
-            "semver": "^5.5.1",
-            "ssri": "^6.0.1"
-          }
-        },
-        "libnpmsearch": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^3.8.0"
-          }
-        },
-        "libnpmteam": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.4.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^3.8.0"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "2.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "libnpx": {
-          "version": "10.2.0",
-          "bundled": true,
-          "requires": {
-            "dotenv": "^5.0.1",
-            "npm-package-arg": "^6.0.0",
-            "rimraf": "^2.6.2",
-            "safe-buffer": "^5.1.0",
-            "update-notifier": "^2.3.0",
-            "which": "^1.3.0",
-            "y18n": "^4.0.0",
-            "yargs": "^11.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "lock-verify": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "npm-package-arg": "^6.1.0",
-            "semver": "^5.4.1"
-          }
-        },
-        "lockfile": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "lodash._baseindexof": {
-          "version": "3.1.0",
-          "bundled": true
-        },
-        "lodash._baseuniq": {
-          "version": "4.6.0",
-          "bundled": true,
-          "requires": {
-            "lodash._createset": "~4.0.0",
-            "lodash._root": "~3.0.0"
-          }
-        },
-        "lodash._bindcallback": {
-          "version": "3.0.1",
-          "bundled": true
-        },
-        "lodash._cacheindexof": {
-          "version": "3.0.2",
-          "bundled": true
-        },
-        "lodash._createcache": {
-          "version": "3.1.2",
-          "bundled": true,
-          "requires": {
-            "lodash._getnative": "^3.0.0"
-          }
-        },
-        "lodash._createset": {
-          "version": "4.0.3",
-          "bundled": true
-        },
-        "lodash._getnative": {
-          "version": "3.9.1",
-          "bundled": true
-        },
-        "lodash._root": {
-          "version": "3.0.1",
-          "bundled": true
-        },
-        "lodash.clonedeep": {
-          "version": "4.5.0",
-          "bundled": true
-        },
-        "lodash.restparam": {
-          "version": "3.6.1",
-          "bundled": true
-        },
-        "lodash.union": {
-          "version": "4.6.0",
-          "bundled": true
-        },
-        "lodash.uniq": {
-          "version": "4.5.0",
-          "bundled": true
-        },
-        "lodash.without": {
-          "version": "4.4.0",
-          "bundled": true
-        },
-        "lowercase-keys": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "bundled": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "make-dir": {
-          "version": "1.3.0",
-          "bundled": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "make-fetch-happen": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "agentkeepalive": "^3.4.1",
-            "cacache": "^11.0.1",
-            "http-cache-semantics": "^3.8.1",
-            "http-proxy-agent": "^2.1.0",
-            "https-proxy-agent": "^2.2.1",
-            "lru-cache": "^4.1.2",
-            "mississippi": "^3.0.0",
-            "node-fetch-npm": "^2.0.2",
-            "promise-retry": "^1.1.1",
-            "socks-proxy-agent": "^4.0.0",
-            "ssri": "^6.0.0"
-          }
-        },
-        "meant": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "mem": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "mimic-fn": "^1.0.0"
-          }
-        },
-        "mime-db": {
-          "version": "1.35.0",
-          "bundled": true
-        },
-        "mime-types": {
-          "version": "2.1.19",
-          "bundled": true,
-          "requires": {
-            "mime-db": "~1.35.0"
-          }
-        },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "bundled": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true
-        },
-        "minipass": {
-          "version": "2.3.3",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          },
-          "dependencies": {
-            "yallist": {
-              "version": "3.0.2",
-              "bundled": true
-            }
-          }
-        },
-        "minizlib": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "mississippi": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "move-concurrently": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.1",
-            "copy-concurrently": "^1.0.0",
-            "fs-write-stream-atomic": "^1.0.8",
-            "mkdirp": "^0.5.1",
-            "rimraf": "^2.5.4",
-            "run-queue": "^1.0.3"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            }
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "mute-stream": {
-          "version": "0.0.7",
-          "bundled": true
-        },
-        "node-fetch-npm": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "encoding": "^0.1.11",
-            "json-parse-better-errors": "^1.0.0",
-            "safe-buffer": "^5.1.1"
-          }
-        },
-        "node-gyp": {
-          "version": "3.8.0",
-          "bundled": true,
-          "requires": {
-            "fstream": "^1.0.0",
-            "glob": "^7.0.3",
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "^0.5.0",
-            "nopt": "2 || 3",
-            "npmlog": "0 || 1 || 2 || 3 || 4",
-            "osenv": "0",
-            "request": "^2.87.0",
-            "rimraf": "2",
-            "semver": "~5.3.0",
-            "tar": "^2.0.0",
-            "which": "1"
-          },
-          "dependencies": {
-            "nopt": {
-              "version": "3.0.6",
-              "bundled": true,
-              "requires": {
-                "abbrev": "1"
-              }
-            },
-            "semver": {
-              "version": "5.3.0",
-              "bundled": true
-            },
-            "tar": {
-              "version": "2.2.1",
-              "bundled": true,
-              "requires": {
-                "block-stream": "*",
-                "fstream": "^1.0.2",
-                "inherits": "2"
-              }
-            }
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "bundled": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          },
-          "dependencies": {
-            "resolve": {
-              "version": "1.10.0",
-              "bundled": true,
-              "requires": {
-                "path-parse": "^1.0.6"
-              }
-            }
-          }
-        },
-        "npm-audit-report": {
-          "version": "1.3.2",
-          "bundled": true,
-          "requires": {
-            "cli-table3": "^0.5.0",
-            "console-control-strings": "^1.1.0"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.0.6",
-          "bundled": true
-        },
-        "npm-cache-filename": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "npm-install-checks": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "semver": "^2.3.0 || 3.x || 4 || 5"
-          }
-        },
-        "npm-lifecycle": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "byline": "^5.0.0",
-            "graceful-fs": "^4.1.11",
-            "node-gyp": "^3.8.0",
-            "resolve-from": "^4.0.0",
-            "slide": "^1.1.6",
-            "uid-number": "0.0.6",
-            "umask": "^1.1.0",
-            "which": "^1.3.1"
-          }
-        },
-        "npm-logical-tree": {
-          "version": "1.2.1",
-          "bundled": true
-        },
-        "npm-package-arg": {
-          "version": "6.1.0",
-          "bundled": true,
-          "requires": {
-            "hosted-git-info": "^2.6.0",
-            "osenv": "^0.1.5",
-            "semver": "^5.5.0",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "npm-packlist": {
-          "version": "1.4.1",
-          "bundled": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npm-pick-manifest": {
-          "version": "2.2.3",
-          "bundled": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1",
-            "npm-package-arg": "^6.0.0",
-            "semver": "^5.4.1"
-          }
-        },
-        "npm-profile": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.2 || 2",
-            "figgy-pudding": "^3.4.1",
-            "npm-registry-fetch": "^3.8.0"
-          }
-        },
-        "npm-registry-fetch": {
-          "version": "3.9.0",
-          "bundled": true,
-          "requires": {
-            "JSONStream": "^1.3.4",
-            "bluebird": "^3.5.1",
-            "figgy-pudding": "^3.4.1",
-            "lru-cache": "^4.1.3",
-            "make-fetch-happen": "^4.0.1",
-            "npm-package-arg": "^6.1.0"
-          }
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        },
-        "npm-user-validate": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "bundled": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "opener": {
-          "version": "1.5.1",
-          "bundled": true
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "os-locale": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
-          }
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "p-finally": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "p-limit": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "package-json": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "got": "^6.7.1",
-            "registry-auth-token": "^3.0.1",
-            "registry-url": "^3.0.3",
-            "semver": "^5.1.0"
-          }
-        },
-        "pacote": {
-          "version": "9.5.0",
-          "bundled": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "cacache": "^11.3.2",
-            "figgy-pudding": "^3.5.1",
-            "get-stream": "^4.1.0",
-            "glob": "^7.1.3",
-            "lru-cache": "^5.1.1",
-            "make-fetch-happen": "^4.0.1",
-            "minimatch": "^3.0.4",
-            "minipass": "^2.3.5",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "normalize-package-data": "^2.4.0",
-            "npm-package-arg": "^6.1.0",
-            "npm-packlist": "^1.1.12",
-            "npm-pick-manifest": "^2.2.3",
-            "npm-registry-fetch": "^3.8.0",
-            "osenv": "^0.1.5",
-            "promise-inflight": "^1.0.1",
-            "promise-retry": "^1.1.1",
-            "protoduck": "^5.0.1",
-            "rimraf": "^2.6.2",
-            "safe-buffer": "^5.1.2",
-            "semver": "^5.6.0",
-            "ssri": "^6.0.1",
-            "tar": "^4.4.8",
-            "unique-filename": "^1.1.1",
-            "which": "^1.3.1"
-          },
-          "dependencies": {
-            "lru-cache": {
-              "version": "5.1.1",
-              "bundled": true,
-              "requires": {
-                "yallist": "^3.0.2"
-              }
-            },
-            "minipass": {
-              "version": "2.3.5",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            },
-            "yallist": {
-              "version": "3.0.3",
-              "bundled": true
-            }
-          }
-        },
-        "parallel-transform": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "cyclist": "~0.2.2",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.1.5"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "path-is-inside": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "path-parse": {
-          "version": "1.0.6",
-          "bundled": true
-        },
-        "performance-now": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "pify": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "prepend-http": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "promise-inflight": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "promise-retry": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "err-code": "^1.0.0",
-            "retry": "^0.10.0"
-          },
-          "dependencies": {
-            "retry": {
-              "version": "0.10.1",
-              "bundled": true
-            }
-          }
-        },
-        "promzard": {
-          "version": "0.3.0",
-          "bundled": true,
-          "requires": {
-            "read": "1"
-          }
-        },
-        "proto-list": {
-          "version": "1.2.4",
-          "bundled": true
-        },
-        "protoduck": {
-          "version": "5.0.1",
-          "bundled": true,
-          "requires": {
-            "genfun": "^5.0.0"
-          }
-        },
-        "prr": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "pseudomap": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "psl": {
-          "version": "1.1.29",
-          "bundled": true
-        },
-        "pump": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
-        "pumpify": {
-          "version": "1.5.1",
-          "bundled": true,
-          "requires": {
-            "duplexify": "^3.6.0",
-            "inherits": "^2.0.3",
-            "pump": "^2.0.0"
-          },
-          "dependencies": {
-            "pump": {
-              "version": "2.0.1",
-              "bundled": true,
-              "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-              }
-            }
-          }
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true
-        },
-        "qrcode-terminal": {
-          "version": "0.12.0",
-          "bundled": true
-        },
-        "qs": {
-          "version": "6.5.2",
-          "bundled": true
-        },
-        "query-string": {
-          "version": "6.2.0",
-          "bundled": true,
-          "requires": {
-            "decode-uri-component": "^0.2.0",
-            "strict-uri-encode": "^2.0.0"
-          }
-        },
-        "qw": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "rc": {
-          "version": "1.2.7",
-          "bundled": true,
-          "requires": {
-            "deep-extend": "^0.5.1",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true
-            }
-          }
-        },
-        "read": {
-          "version": "1.0.7",
-          "bundled": true,
-          "requires": {
-            "mute-stream": "~0.0.4"
-          }
-        },
-        "read-cmd-shim": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2"
-          }
-        },
-        "read-installed": {
-          "version": "4.0.3",
-          "bundled": true,
-          "requires": {
-            "debuglog": "^1.0.1",
-            "graceful-fs": "^4.1.2",
-            "read-package-json": "^2.0.0",
-            "readdir-scoped-modules": "^1.0.0",
-            "semver": "2 || 3 || 4 || 5",
-            "slide": "~1.1.3",
-            "util-extend": "^1.0.1"
-          }
-        },
-        "read-package-json": {
-          "version": "2.0.13",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.1.2",
-            "json-parse-better-errors": "^1.0.1",
-            "normalize-package-data": "^2.0.0",
-            "slash": "^1.0.0"
-          }
-        },
-        "read-package-tree": {
-          "version": "5.2.2",
-          "bundled": true,
-          "requires": {
-            "debuglog": "^1.0.1",
-            "dezalgo": "^1.0.0",
-            "once": "^1.3.0",
-            "read-package-json": "^2.0.0",
-            "readdir-scoped-modules": "^1.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.1.1",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "readdir-scoped-modules": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "debuglog": "^1.0.1",
-            "dezalgo": "^1.0.0",
-            "graceful-fs": "^4.1.2",
-            "once": "^1.3.0"
-          }
-        },
-        "registry-auth-token": {
-          "version": "3.3.2",
-          "bundled": true,
-          "requires": {
-            "rc": "^1.1.6",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "registry-url": {
-          "version": "3.1.0",
-          "bundled": true,
-          "requires": {
-            "rc": "^1.0.1"
-          }
-        },
-        "request": {
-          "version": "2.88.0",
-          "bundled": true,
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          }
-        },
-        "require-directory": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "resolve-from": {
-          "version": "4.0.0",
-          "bundled": true
-        },
-        "retry": {
-          "version": "0.12.0",
-          "bundled": true
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "run-queue": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.1"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            }
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true
-        },
-        "semver": {
-          "version": "5.6.0",
-          "bundled": true
-        },
-        "semver-diff": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "semver": "^5.0.3"
-          }
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "sha": {
-          "version": "2.0.1",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "readable-stream": "^2.0.2"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true
-        },
-        "slash": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "slide": {
-          "version": "1.1.6",
-          "bundled": true
-        },
-        "smart-buffer": {
-          "version": "4.0.1",
-          "bundled": true
-        },
-        "socks": {
-          "version": "2.2.0",
-          "bundled": true,
-          "requires": {
-            "ip": "^1.1.5",
-            "smart-buffer": "^4.0.1"
-          }
-        },
-        "socks-proxy-agent": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "agent-base": "~4.2.0",
-            "socks": "~2.2.0"
-          }
-        },
-        "sorted-object": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "sorted-union-stream": {
-          "version": "2.1.3",
-          "bundled": true,
-          "requires": {
-            "from2": "^1.3.0",
-            "stream-iterate": "^1.1.0"
-          },
-          "dependencies": {
-            "from2": {
-              "version": "1.3.0",
-              "bundled": true,
-              "requires": {
-                "inherits": "~2.0.1",
-                "readable-stream": "~1.1.10"
-              }
-            },
-            "isarray": {
-              "version": "0.0.1",
-              "bundled": true
-            },
-            "readable-stream": {
-              "version": "1.1.14",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "0.0.1",
-                "string_decoder": "~0.10.x"
-              }
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "bundled": true
-            }
-          }
-        },
-        "spdx-correct": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "spdx-expression-parse": "^3.0.0",
-            "spdx-license-ids": "^3.0.0"
-          }
-        },
-        "spdx-exceptions": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "spdx-expression-parse": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "spdx-exceptions": "^2.1.0",
-            "spdx-license-ids": "^3.0.0"
-          }
-        },
-        "spdx-license-ids": {
-          "version": "3.0.3",
-          "bundled": true
-        },
-        "sshpk": {
-          "version": "1.14.2",
-          "bundled": true,
-          "requires": {
-            "asn1": "~0.2.3",
-            "assert-plus": "^1.0.0",
-            "bcrypt-pbkdf": "^1.0.0",
-            "dashdash": "^1.12.0",
-            "ecc-jsbn": "~0.1.1",
-            "getpass": "^0.1.1",
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.0.2",
-            "tweetnacl": "~0.14.0"
-          }
-        },
-        "ssri": {
-          "version": "6.0.1",
-          "bundled": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "stream-each": {
-          "version": "1.2.2",
-          "bundled": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "stream-shift": "^1.0.0"
-          }
-        },
-        "stream-iterate": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "readable-stream": "^2.1.5",
-            "stream-shift": "^1.0.0"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "stream-shift": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "strict-uri-encode": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "bundled": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "bundled": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "2.0.0",
-              "bundled": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "bundled": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "string_decoder": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "stringify-package": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-eof": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "supports-color": {
-          "version": "5.4.0",
-          "bundled": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "tar": {
-          "version": "4.4.8",
-          "bundled": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
-          },
-          "dependencies": {
-            "chownr": {
-              "version": "1.1.1",
-              "bundled": true
-            },
-            "minipass": {
-              "version": "2.3.5",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            },
-            "yallist": {
-              "version": "3.0.3",
-              "bundled": true
-            }
-          }
-        },
-        "term-size": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "execa": "^0.7.0"
-          }
-        },
-        "text-table": {
-          "version": "0.2.0",
-          "bundled": true
-        },
-        "through": {
-          "version": "2.3.8",
-          "bundled": true
-        },
-        "through2": {
-          "version": "2.0.3",
-          "bundled": true,
-          "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "timed-out": {
-          "version": "4.0.1",
-          "bundled": true
-        },
-        "tiny-relative-date": {
-          "version": "1.3.0",
-          "bundled": true
-        },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "bundled": true,
-          "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "optional": true
-        },
-        "typedarray": {
-          "version": "0.0.6",
-          "bundled": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true
-        },
-        "umask": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "unique-filename": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "unique-slug": "^2.0.0"
-          }
-        },
-        "unique-slug": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "imurmurhash": "^0.1.4"
-          }
-        },
-        "unique-string": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "crypto-random-string": "^1.0.0"
-          }
-        },
-        "unpipe": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "unzip-response": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "update-notifier": {
-          "version": "2.5.0",
-          "bundled": true,
-          "requires": {
-            "boxen": "^1.2.1",
-            "chalk": "^2.0.1",
-            "configstore": "^3.0.0",
-            "import-lazy": "^2.1.0",
-            "is-ci": "^1.0.10",
-            "is-installed-globally": "^0.1.0",
-            "is-npm": "^1.0.0",
-            "latest-version": "^3.0.0",
-            "semver-diff": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
-          }
-        },
-        "url-parse-lax": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "prepend-http": "^1.0.1"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "util-extend": {
-          "version": "1.0.3",
-          "bundled": true
-        },
-        "uuid": {
-          "version": "3.3.2",
-          "bundled": true
-        },
-        "validate-npm-package-license": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "spdx-correct": "^3.0.0",
-            "spdx-expression-parse": "^3.0.0"
-          }
-        },
-        "validate-npm-package-name": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "builtins": "^1.0.3"
-          }
-        },
-        "verror": {
-          "version": "1.10.0",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "core-util-is": "1.0.2",
-            "extsprintf": "^1.2.0"
-          }
-        },
-        "wcwidth": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "defaults": "^1.0.3"
-          }
-        },
-        "which": {
-          "version": "1.3.1",
-          "bundled": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "requires": {
-            "string-width": "^1.0.2"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "widest-line": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "string-width": "^2.1.1"
-          }
-        },
-        "worker-farm": {
-          "version": "1.6.0",
-          "bundled": true,
-          "requires": {
-            "errno": "~0.1.7"
-          }
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "write-file-atomic": {
-          "version": "2.4.2",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "imurmurhash": "^0.1.4",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "xdg-basedir": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "bundled": true
-        },
-        "y18n": {
-          "version": "4.0.0",
-          "bundled": true
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "bundled": true
-        },
-        "yargs": {
-          "version": "11.0.0",
-          "bundled": true,
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.1.1",
-            "find-up": "^2.1.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^9.0.2"
-          },
-          "dependencies": {
-            "y18n": {
-              "version": "3.2.1",
-              "bundled": true
-            }
-          }
-        },
-        "yargs-parser": {
-          "version": "9.0.2",
-          "bundled": true,
-          "requires": {
-            "camelcase": "^4.1.0"
-          }
-        }
-      }
-    },
     "npm-path": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz",
@@ -13805,9 +10599,9 @@
       "dev": true
     },
     "simple-git": {
-      "version": "1.113.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.113.0.tgz",
-      "integrity": "sha512-i9WVsrK2u0G/cASI9nh7voxOk9mhanWY9eGtWBDSYql6m49Yk5/Fan6uZsDr/xmzv8n+eQ8ahKCoEr8cvU3h+g==",
+      "version": "1.115.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.115.0.tgz",
+      "integrity": "sha512-PXcDVDgXifUE7/M2xUfQQ8uG3r73+kYRyPmsbc/iWwUrPbOASHt8p+HEbu85k546qmXixbcSPDg83kegw1vqcA==",
       "dev": true,
       "requires": {
         "debug": "^4.0.1"
@@ -14798,9 +11592,9 @@
       }
     },
     "text-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.0.0.tgz",
-      "integrity": "sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
+      "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
       "dev": true
     },
     "text-table": {
diff --git a/package.json b/package.json
index 299e3c355..0f27854a4 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,66 @@
   "browserslist": [
     "defaults"
   ],
+  "commitlint": {
+    "rules": {
+      "type-enum": [
+        2,
+        "always",
+        [
+          "feat",
+          "fix",
+          "chore",
+          "docs",
+          "style",
+          "refactor",
+          "perf",
+          "test",
+          "cl"
+        ]
+      ]
+    }
+  },
+  "standard-version": {
+    "header": "",
+    "types": [
+      {
+        "type": "feat",
+        "hidden": true
+      },
+      {
+        "type": "fix",
+        "hidden": true
+      },
+      {
+        "type": "chore",
+        "hidden": true
+      },
+      {
+        "type": "docs",
+        "hidden": true
+      },
+      {
+        "type": "style",
+        "hidden": true
+      },
+      {
+        "type": "refactor",
+        "hidden": true
+      },
+      {
+        "type": "perf",
+        "hidden": true
+      },
+      {
+        "type": "test",
+        "hidden": true
+      },
+      {
+        "type": "cl",
+        "section": "Important changes"
+      }
+    ]
+  },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
     "@babel/core": "^7.4.5",
@@ -76,7 +136,6 @@
     "webpack-cli": "^3.3.4"
   },
   "dependencies": {
-    "flatpickr": "^4.6.1",
-    "npm": "^6.9.0"
+    "flatpickr": "^4.5.7"
   }
 }

From 61de15d1e6873091316e84fa57ef108fd8e7772d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 17 Jun 2019 22:41:19 +0200
Subject: [PATCH 468/519] docs: remove generated part from changelogs

---
 CHANGELOG.md    |  5 +++++
 CHANGELOG_DE.md | 21 ---------------------
 2 files changed, 5 insertions(+), 21 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..03894d85d
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Changelog
+
+## Previously
+
+A lot happened before we started maintaining this auto-generated changelog file. German speaking readers can take a look at [CHANGELOG_DE.md](CHANGELOG_DE.md) to travel further back in time.
diff --git a/CHANGELOG_DE.md b/CHANGELOG_DE.md
index 4256cf240..b99c31205 100644
--- a/CHANGELOG_DE.md
+++ b/CHANGELOG_DE.md
@@ -1,26 +1,5 @@
 # Changelog
 
-## [1.1.0](https://gitlab.cip.ifi.lmu.de///compare/v1.0.0...v1.1.0) (2019-06-13)
-
-
-### Bug Fixes
-
-* "Check All Checkbox" repariert
-
-
-
-## 1.0.0 (2019-06-13)
-
-### Features
-
-* Das Ändern der Seitengröße bei langen Tabellen erfolgt nun ohne Neuladen der Seite
-* Diese automatisch generierte Changelog-Datei wurde ins Leben gerufen
-
-
-
-## Pre 1.0.0
-
-
 ### Version 20.05.2019
 
 - Komplett überarbeitete Funktionalität zur automatischen Verteilung von Korrekturen

From 091e3a2aa7d4132b02b8abadb6519d0ab51492e4 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 17 Jun 2019 22:41:43 +0200
Subject: [PATCH 469/519] chore: remove commit-lint and standard-version config
 from packge.json

---
 package.json | 62 +---------------------------------------------------
 1 file changed, 1 insertion(+), 61 deletions(-)

diff --git a/package.json b/package.json
index 0f27854a4..0e81207eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "description": "",
   "keywords": [],
   "author": "",
@@ -35,66 +35,6 @@
   "browserslist": [
     "defaults"
   ],
-  "commitlint": {
-    "rules": {
-      "type-enum": [
-        2,
-        "always",
-        [
-          "feat",
-          "fix",
-          "chore",
-          "docs",
-          "style",
-          "refactor",
-          "perf",
-          "test",
-          "cl"
-        ]
-      ]
-    }
-  },
-  "standard-version": {
-    "header": "",
-    "types": [
-      {
-        "type": "feat",
-        "hidden": true
-      },
-      {
-        "type": "fix",
-        "hidden": true
-      },
-      {
-        "type": "chore",
-        "hidden": true
-      },
-      {
-        "type": "docs",
-        "hidden": true
-      },
-      {
-        "type": "style",
-        "hidden": true
-      },
-      {
-        "type": "refactor",
-        "hidden": true
-      },
-      {
-        "type": "perf",
-        "hidden": true
-      },
-      {
-        "type": "test",
-        "hidden": true
-      },
-      {
-        "type": "cl",
-        "section": "Important changes"
-      }
-    ]
-  },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
     "@babel/core": "^7.4.5",

From 17429193da3e97ef93f044b40a964d1d6eefbb34 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 18 Jun 2019 20:20:31 +0200
Subject: [PATCH 470/519] =?UTF-8?q?docs:=20re-add=20the=20README=20file=20?=
 =?UTF-8?q?=F0=9F=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 000000000..f61775faa
--- /dev/null
+++ b/README.md
@@ -0,0 +1,130 @@
+# "Quick Start" Guide
+
+The following description applies to Ubuntu and similar debian based Linux distributions.
+
+## Prerequisites
+These are the things you need to do/install before you can get started working on Uni2work.
+
+### Clone repository
+Clone this repository and navigate into it
+```sh
+$ git clone https://gitlab.cip.ifi.lmu.de/jost/UniWorX.git && cd UniWorX
+```
+
+### `LDAP`
+LDAP is needed to handle logins.
+
+Install:
+```sh
+sudo apt-get install slapd ldap-utils
+```
+
+### `PostgreSQL`
+PostgreSQL will serve as database for Uni2work.
+
+Install:
+```sh
+$ sudo apt-get install postgresql
+```
+
+Switch to user *postgres* (got created during installation):
+```sh
+$ sudo -i -u postgres
+```
+
+Add new database user *uniworx*:
+```sh
+$ createuser --interactive
+```
+
+You'll get a prompt:
+
+```sh
+Enter name of role to add: uniworx
+Shall the new role be a superuser? (y/n)  [not exactly sure. Guess not?]
+Password: uniworx
+...
+```
+
+Create database *uniworx*:
+```sh
+$ psql -c 'create database uniworx owner uniworx'
+$ psql -c 'create database uniworx_test owner uniworx'
+```
+
+After you added the database switch back to your own user with `Ctrl + D`.
+
+To properly access the database you now need to add a new linux user called *uniworx*. Enter "uniworx" as the password.
+```sh
+$ sudo adduser uniworx
+```
+
+### `Stack`
+Stack is a toolbox for "Haskellers" to aid in developing Haskell projects.
+
+Install:
+```sh
+$ curl -sSL https://get.haskellstack.org/ | sh
+```
+
+Setup stack and install dependencies. This needs to be run from inside the directory you cloned this repository to:
+```sh
+$ stack setup
+```
+
+During this step or the next you might get an error that says something about missing C libraries for `ldap` and `lber`. You can install these using
+```sh
+$ sudo apt-get install libsasl2-dev libldap2-dev
+```
+
+If you get an error that says *You need to install postgresql-server-dev-X.Y for building a server-side extension or libpq-dev for building a client-side application.*
+Go ahead and install `libpq-dev` with
+```sh
+$ sudo apt-get install libpq-dev
+```
+
+Other packages you might need to install during this process:
+```sh
+$ sudo apt-get install pkg-config
+$ sudo apt-get install libsodium-dev
+```
+
+Build the app:
+```sh
+$ stack build
+```
+
+This might take a few minutes... if not hours... be prepared.
+
+install yesod:
+```sh
+$ stack install yesod-bin --install-ghc
+```
+
+### `Node` & `npm`
+Node and Npm are needed to compile the frontend.
+
+Install:
+```sh
+$ curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
+$ sudo apt-get install -y nodejs
+```
+
+### Add dummy data to the database
+After building the app you can prepare the database and add some dummy data:
+```sh
+$ ./db.sh -f
+```
+
+## Run Uni2work
+```sh
+$ npm start
+```
+
+This will compile both frontend and backend and will start Uni2work in development mode (might take a few minutes the first time). It will keep running and will watch any file changes to automatically re-compile the application if necessary.
+
+If you followed the steps above you should now be able to visit http://localhost:3000 and login as one of the accounts from the Development-Logins dropdown.
+
+## Troubleshooting
+
+Please see the [wiki](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/wikis/home) for more infos.

From 55468496e0842ca014af6d6b93e87c1c0f46f222 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 19 Jun 2019 09:53:01 +0200
Subject: [PATCH 471/519] fix: minor heat correction for correction overview

---
 messages/uniworx/de.msg               | 2 +-
 src/Foundation.hs                     | 2 +-
 src/Handler/Corrections.hs            | 5 +++--
 src/Utils.hs                          | 2 +-
 templates/corrections-overview.hamlet | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 22c502e1f..8057ca78a 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -409,7 +409,7 @@ NrSubmissionsNewlyAssigned: Neu zugeteilt
 NrSubmissionsNotAssigned: Nicht zugeteilt
 NrSubmissionsNotCorrected: Unkorrigiert
 CorrectionTime: Korrekturdauer (Min/Avg/Max)
-AssignSubmissionsRandomWarning: Die Zuteilungsvorschau kann geringfügig von der tatsächlichen Zuteilung abweichen, da die Zuteilung ein randomisierter Prozess ist. Mehrfaches neues Laden dieser Seite vor Betätigung des Zuteilungsknopfes kann dies sichtbar machen.
+AssignSubmissionsRandomWarning: Die Zuteilungsvorschau kann von der tatsächlichen Zuteilung abweichen, wenn mehrere Blätter auf einmal zugeteilt werden, da beim Ausgleich der Kontigente nur bereits zugeteilte Abgaben berücksichtigt werden. Da es ein randomisierte Prozess ist, kann es auch bei einzelnen Blättern gerinfgügige Abweichungen geben.
 
 CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
 NoCorrectionsUploaded: In der hochgeladenen Datei wurden keine Korrekturen gefunden.
diff --git a/src/Foundation.hs b/src/Foundation.hs
index ad0d88b3c..3be718bb7 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1427,7 +1427,7 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (CourseR tid ssh csh CInviteR)   = return ("Einladung", Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh (CUserR _)) = return ("Teilnehmer" , Just $ CourseR tid ssh csh CUsersR)
   breadcrumb (CourseR tid ssh csh CCorrectionsR) = return ("Abgaben" , Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CAssignR)   = return ("Korrektur"  , Just $ CourseR tid ssh csh CCorrectionsR)
+  breadcrumb (CourseR tid ssh csh CAssignR)   = return ("Zuteilung"  , Just $ CourseR tid ssh csh CCorrectionsR)
   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 SheetCurrentR) = return ("Aktuelles Blatt", Just $ CourseR tid ssh csh SheetListR)
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index b64959f0c..26ba218cc 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1134,10 +1134,11 @@ assignHandler tid ssh csh cid assignSids = do
             let shn = sheetName $ sheets ! sid
             -- is sheet closed?
             guardM $ lift $ hasWriteAccessTo $ CSheetR tid ssh csh shn SAssignR  -- we must check, whether the submission is already closed and thus assignable
-            -- has at least one submisison?
+            -- has at least one uncorrected / unassigned submisison?
             [E.Value hasSubmission] <- lift $ E.select $ return $ E.exists $ E.from $ \submission -> do
               E.where_ $ submission E.^. SubmissionSheet    E.==. E.val sid
-              E.where_ $ E.isNothing $ submission E.^. SubmissionRatingBy
+              E.where_ $ E.isNothing $ submission E.^. SubmissionRatingBy   -- no corrector
+              E.where_ $ E.isNothing $ submission E.^. SubmissionRatingTime -- not done
             guard hasSubmission
             -- has at least one active corrector?
             [E.Value hasCorrector] <- lift $ E.select $ return $ E.exists $ E.from $ \corrector -> do
diff --git a/src/Utils.hs b/src/Utils.hs
index a6fa63d38..4f565befe 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -386,7 +386,7 @@ cutOffPercent :: Double -> Double -> Double -> Double
 cutOffPercent offset full achieved
   | full <= achieved = 0
   | full <= 0        = 0
-  | otherwise        = offset + (1-offset * (1 - percent))
+  | otherwise        = offset + (1-offset) * (1 - percent)
   where
     percent = achieved / full
 
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index 19d13e265..621ffd51e 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -22,7 +22,7 @@
             <td .table__td .alert-danger>(-#{show (Set.size splus)}, failed: #{show (Set.size sfailed)})
           $elseif 0 < Set.size splus
             <td .table__td>#{ciSubmissions - ciAssigned}
-            <td .table__td .alert-success>(-#{show (Set.size splus)})
+            <td .table__td .alert-info>(-#{show (Set.size splus)})
           $else
             <td .table__td colspan=2>#{ciSubmissions - ciAssigned}
         $nothing
@@ -60,7 +60,7 @@
               $maybe nrNew <- getCorrNewAssignment ciCorrector shn
                 <td .table__td>#{ciSubmissions}
                 $# <td .table__td>#{ciAssigned} `ciSubmissions` is here always identical to `ciAssigned` and also works for `ciCorrector == Nothing`. ciAssigned only useful in aggregate maps like `sheetMap`
-                <td .table__td .alert-success>(+#{nrNew})
+                <td .table__td .alert-info>(+#{nrNew})
               $nothing
                 <td .table__td colspan=2>#{ciSubmissions}
               <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciSubmissions - ciCorrected}

From ef73431f7b93e975a9c56ef34bdc2f5e2b84b064 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 19 Jun 2019 10:24:13 +0200
Subject: [PATCH 472/519] Added dev login

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

diff --git a/test/Database.hs b/test/Database.hs
index ea044ac75..5c4abe89f 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -176,6 +176,24 @@ fillDb = do
     , userMailLanguages = MailLanguages ["de"]
     , userNotificationSettings = def
     }
+  svaupel <- insert User
+    { userIdent  = "vaupel.sarah@campus.lmu.de"
+    , userAuthentication = AuthLDAP
+    , userLastAuthentication = Nothing
+    , userTokensIssuedAfter = Nothing
+    , userMatrikelnummer = Nothing
+    , userEmail  = "vaupel.sarah@campus.lmu.de"
+    , userDisplayName = "Sarah Vaupel"
+    , userSurname = "Vaupel"
+    , userMaxFavourites = 14
+    , userTheme = ThemeMossGreen
+    , userDateTimeFormat = userDefaultDateTimeFormat
+    , userDateFormat = userDefaultDateFormat
+    , userTimeFormat = userDefaultTimeFormat
+    , userDownloadFiles = userDefaultDownloadFiles
+    , userMailLanguages = MailLanguages ["de"]
+    , userNotificationSettings = def
+    }
   void . repsert (TermKey summer2017) $ Term
     { termName     = summer2017
     , termStart    = fromGregorian 2017 04 09
@@ -210,9 +228,12 @@ fillDb = do
   void . insert' $ UserAdmin fhamann ifi
   void . insert' $ UserAdmin jost ifi
   void . insert' $ UserAdmin jost mi
+  void . insert' $ UserAdmin svaupel ifi
+  void . insert' $ UserAdmin svaupel mi
   void . insert' $ UserLecturer gkleen ifi
   void . insert' $ UserLecturer fhamann ifi
   void . insert' $ UserLecturer jost ifi
+  void . insert' $ UserLecturer svaupel ifi
   let
     sdBsc = StudyDegreeKey' 82
     sdMst = StudyDegreeKey' 88

From 3bded5071bf0e32a6d4df0dcc49f6039f283785e Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 19 Jun 2019 10:49:22 +0200
Subject: [PATCH 473/519] fix: filter submission by not having corrector

---
 messages/uniworx/de.msg       |  1 +
 src/Handler/Corrections.hs    | 18 +++++++++++++-----
 templates/table/layout.hamlet |  4 ++++
 templates/table/layout.lucius |  7 +++++++
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 8057ca78a..c0ee216ae 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -415,6 +415,7 @@ CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
 NoCorrectionsUploaded: In der hochgeladenen Datei wurden keine Korrekturen gefunden.
 
 RatingBy: Korrigiert von
+HasCorrector: Korrektor zugeteilt
 AssignedTime: Zuteilung
 AchievedBonusPoints: Erreichte Bonuspunkte
 AchievedNormalPoints: Erreichte Punkte
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 26ba218cc..dc8cb791e 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -334,6 +334,12 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
             | otherwise       -> corrector E.?. UserEmail `E.in_` E.justList (E.valList . catMaybes $ Set.toList emails)
                            E.||. (if Nothing `Set.member` emails then E.isNothing (corrector E.?. UserEmail) else E.val False)
         )
+      , ( "isassigned"
+        , FilterColumn $  \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) criterion -> case getLast (criterion :: Last Bool) of
+            Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
+            Just True -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingBy
+            Just False-> E.isNothing $ submission E.^. SubmissionRatingBy
+        )
       , ( "israted"
         , FilterColumn $  \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) criterion -> case getLast (criterion :: Last Bool) of
             Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
@@ -636,10 +642,11 @@ postCCorrectionsR tid ssh csh = do
       filterUI = Just $ \mPrev -> mconcat
         [ prismAForm (singletonFilter "user-name-email")      mPrev $ aopt textField (fslI MsgCourseMembers)
         , prismAForm (singletonFilter "user-matriclenumber")  mPrev $ aopt textField (fslI MsgMatrikelNr)
-        , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
-          -- "pseudonym" TODO DB only stores Word24
+        -- "pseudonym" TODO DB only stores Word24
         , Map.singleton "sheet-search" . maybeToList <$> aopt textField (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
-        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField             (fslI MsgRatingTime)
+        , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
+        , prismAForm (singletonFilter "isassigned" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgHasCorrector)
+        , prismAForm (singletonFilter "israted"    . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgRatingTime)
         ]
       psValidator = def & defaultPagesize PagesizeAll -- Assisstant always want to see them all at once anyway
   correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
@@ -669,8 +676,9 @@ postSSubsR tid ssh csh shn = do
         [ prismAForm (singletonFilter "user-name-email")      mPrev $ aopt textField (fslI MsgCourseMembers)
         , prismAForm (singletonFilter "user-matriclenumber")  mPrev $ aopt textField (fslI MsgMatrikelNr)
         , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
-          -- "pseudonym" TODO DB only stores Word24
-        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField             (fslI MsgRatingTime)
+        , prismAForm (singletonFilter "isassigned" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgHasCorrector)
+        , prismAForm (singletonFilter "israted"    . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgRatingTime)
+        -- "pseudonym" TODO DB only stores Word24
         ]
       psValidator = def & defaultPagesize PagesizeAll -- Assisstant always want to see them all at once anyway
   correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
diff --git a/templates/table/layout.hamlet b/templates/table/layout.hamlet
index b292cee5c..eb8baadcb 100644
--- a/templates/table/layout.hamlet
+++ b/templates/table/layout.hamlet
@@ -2,6 +2,10 @@ $newline never
 $if null rows && (dbsEmptyStyle == DBESNoHeading)
   _{dbsEmptyMessage}
 $else
+  <div .table-header>
+    <div .table__row-count>
+      _{MsgRowCount rowCount}
+
   ^{table}
 
   <div .table-footer>
diff --git a/templates/table/layout.lucius b/templates/table/layout.lucius
index c03851b27..0c402442b 100644
--- a/templates/table/layout.lucius
+++ b/templates/table/layout.lucius
@@ -1,3 +1,10 @@
+/* TABLE HEADER */
+.table-header {
+  display: flex;
+  flex-flow: row-reverse;
+  justify-content: space-between;
+}
+
 /* TABLE FOOTER */
 .table-footer {
   display: flex;

From 4423817ef536f9ee0844059b82f3eedd6a604206 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 19 Jun 2019 10:55:59 +0200
Subject: [PATCH 474/519] fix build: linting javascript

---
 .vscode/tasks.json                            | 5 +++++
 frontend/src/utils/async-table/async-table.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 1c0b71c32..fabc6a5d5 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -63,6 +63,11 @@
       "type": "npm",
       "script": "frontend:lint",
       "problemMatcher": []
+    },
+    {
+      "type": "npm",
+      "script": "lint",
+      "problemMatcher": []
     }
   ]
 }
\ No newline at end of file
diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js
index 26dfb5624..0c9e9cb04 100644
--- a/frontend/src/utils/async-table/async-table.js
+++ b/frontend/src/utils/async-table/async-table.js
@@ -296,7 +296,7 @@ export class AsyncTable {
     return el.getAttribute('href') || el.querySelector('a').getAttribute('href');
   }
 
-  _changePagesizeHandler = (event) => {
+  _changePagesizeHandler = () => {
     const url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
     const formData = new FormData(this._pagesizeForm);
 

From 782110a824405143f35ef13ab56e0c45d14b3435 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 19 Jun 2019 11:11:55 +0200
Subject: [PATCH 475/519] feat minor: E.isJust added

---
 src/Database/Esqueleto/Utils.hs | 7 ++++++-
 src/Handler/Corrections.hs      | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Database/Esqueleto/Utils.hs b/src/Database/Esqueleto/Utils.hs
index 38105a37a..bd8120ba7 100644
--- a/src/Database/Esqueleto/Utils.hs
+++ b/src/Database/Esqueleto/Utils.hs
@@ -2,6 +2,7 @@
 
 module Database.Esqueleto.Utils
   ( true, false
+  , isJust
   , isInfixOf, hasInfix
   , any, all
   , SqlIn(..)
@@ -11,7 +12,7 @@ module Database.Esqueleto.Utils
   , anyFilter, allFilter
   ) where
 
-import ClassyPrelude.Yesod hiding (isInfixOf, any, all)
+import ClassyPrelude.Yesod hiding (isInfixOf, any, all, isJust)
 import qualified Data.Set as Set
 import qualified Data.Foldable as F
 import qualified Database.Esqueleto as E
@@ -34,6 +35,10 @@ true  = E.val True
 false :: E.SqlExpr (E.Value Bool)
 false = E.val False
 
+-- | Negation of `isNothing` which is missing
+isJust :: (E.Esqueleto query expr backend, PersistField typ) => expr (E.Value (Maybe typ)) -> expr (E.Value Bool)
+isJust = E.not_ . E.isNothing
+
 -- | Check if the first string is contained in the text derived from the second argument
 isInfixOf :: (E.Esqueleto query expr backend, E.SqlString s2) =>
    Text -> expr (E.Value s2) -> expr (E.Value Bool)
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index dc8cb791e..92a60d00e 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -337,13 +337,13 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
       , ( "isassigned"
         , FilterColumn $  \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) criterion -> case getLast (criterion :: Last Bool) of
             Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
-            Just True -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingBy
+            Just True -> E.isJust    $ submission E.^. SubmissionRatingBy
             Just False-> E.isNothing $ submission E.^. SubmissionRatingBy
         )
       , ( "israted"
         , FilterColumn $  \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) criterion -> case getLast (criterion :: Last Bool) of
             Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
-            Just True -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingTime
+            Just True -> E.isJust    $ submission E.^. SubmissionRatingTime
             Just False-> E.isNothing $ submission E.^. SubmissionRatingTime
         )
       , ( "corrector-name-email" -- corrector filter does not work for text-filtering

From 67a50c9e87d3368aafe7f52a3b81e580713e6c24 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 19 Jun 2019 15:34:09 +0200
Subject: [PATCH 476/519] feat(exams): CRU (no D) for exams

---
 messages/uniworx/de.msg                       |  26 +-
 models/exams                                  |  14 +-
 routes                                        |   1 +
 src/CryptoID.hs                               |   2 +
 src/Foundation.hs                             |  26 +-
 src/Handler/Course.hs                         |  43 +++
 src/Handler/Exam.hs                           | 309 +++++++++++++++++-
 src/Handler/Tutorial.hs                       |   2 +-
 src/Handler/Utils/Form.hs                     |   3 +-
 src/Model.hs                                  |   1 +
 src/Model/Types/Exam.hs                       |  22 +-
 src/Utils/Lens.hs                             |   2 +
 templates/course.hamlet                       |   4 +
 templates/exam-edit.hamlet                    |   2 +
 templates/exam-show.cassius                   |   6 +
 templates/exam-show.hamlet                    | 149 +++++++++
 templates/widgets/bonusRule.hamlet            |   8 +
 templates/widgets/gradingKey.hamlet           |   4 +-
 .../widgets/massinput/examParts/form.hamlet   |   2 +-
 .../widgets/massinput/examRooms/form.hamlet   |   2 +-
 20 files changed, 599 insertions(+), 29 deletions(-)
 create mode 100644 templates/exam-edit.hamlet
 create mode 100644 templates/exam-show.cassius
 create mode 100644 templates/exam-show.hamlet
 create mode 100644 templates/widgets/bonusRule.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 5dfe93c8c..0594a3462 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -839,6 +839,7 @@ MenuTutorialEdit: Tutorium editieren
 MenuTutorialComm: Mitteilung an Teilnehmer
 MenuExamList: Klausuren
 MenuExamNew: Neue Klausur anlegen
+MenuExamEdit: Bearbeiten
 
 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
@@ -979,6 +980,7 @@ TutorialsHeading: Tutorien
 TutorialEdit: Bearbeiten
 TutorialDelete: Löschen
 
+CourseExams: Klausuren
 CourseTutorials: Übungen
 
 ParticipantsN n@Int: Teilnehmer
@@ -1000,6 +1002,7 @@ TutorialNew: Neues Tutorium
 
 TutorialNameTaken tutn@TutorialName: Es existiert bereits anderes Tutorium mit Namen #{tutn}
 TutorialCreated tutn@TutorialName: Tutorium #{tutn} erfolgreich angelegt
+TutorialEdited tutn@TutorialName: Tutiorium #{tutn} erfolgreich bearbeitet
 
 TutorialEditHeading tutn@TutorialName: #{tutn} bearbeiten
 
@@ -1037,10 +1040,14 @@ ExamRegisterFromTip: Zeitpunkt ab dem sich Kursteilnehmer selbständig zur Klaus
 ExamRegisterTo: Anmeldung bis
 ExamDeregisterUntil: Abmeldung bis
 ExamPublishOccurrenceAssignments: Terminzuteilung den Teilnehmern mitteilen um
+ExamPublishOccurrenceAssignmentsParticipant: Terminzuteilung einsehbar ab
 ExamFinished: Bewertung abgeschlossen ab
+ExamFinishedParticipant: Bewertung vorrausichtlich abgeschlossen
 ExamFinishedTip: Zeitpunkt zu dem Klausurergebnisse den Teilnehmern gemeldet werden
 ExamClosed: Noten stehen fest ab
 ExamClosedTip: Zeitpunkt ab dem keine Änderungen an den Ergebnissen zulässig sind; Prüfungsämter bekommen Einsicht
+ExamShowGrades: Noten anzeigen
+ExamShowGradesTip: Soll den Teilnehmern ihre genaue Note angezeigt werden, oder sollen sie nur informiert werden, ob sie bestanden haben?
 ExamPublicStatistics: Statistik veröffentlichen
 ExamPublicStatisticsTip: Soll die statistische Auswertung auch den Teilnehmer angezeigt werden, sobald diese ihre Noten einsehen können?
 ExamGradingRule: Notenberechnung
@@ -1057,11 +1064,14 @@ ExamBonusRule: Klausurbonus aus Übungsbetrieb
 ExamNoBonus': Kein Bonus
 ExamBonusPoints': Umrechnung von Übungspunkten
 
+ExamEditHeading examn@ExamName: #{examn} bearbeiten
+
 ExamBonusMaxPoints: Maximal erreichbare Klausur-Bonuspunkte
 ExamBonusMaxPointsNonPositive: Maximaler Klausurbonus muss positiv und größer null sein
 ExamBonusOnlyPassed: Bonus nur nach Bestehen anrechnen
 
 ExamOccurrenceRule: Automatische Terminzuteilung
+ExamOccurrenceRuleParticipant: Terminzuteilung
 ExamRoomManual': Keine automatische Zuteilung
 ExamRoomSurname': Nach Nachname
 ExamRoomMatriculation': Nach Matrikelnummer
@@ -1072,10 +1082,12 @@ ExamRoomAlreadyExists: Prüfung ist bereits eingetragen
 ExamRoom: Raum
 ExamRoomCapacity: Kapazität
 ExamRoomCapacityNonPositive: Kapazität muss positiv und größer null sein
+ExamRoomTime: Termin
 ExamRoomStart: Beginn
 ExamRoomEnd: Ende
 ExamRoomDescription: Beschreibung
 ExamTimeTip: Nur zur Information der Studierenden, die tatsächliche Zeitangabe erfolgt pro Prüfung
+ExamRoomRegistered: Zugeteilt
 
 ExamFormTimes: Zeiten
 ExamFormOccurrences: Prüfungstermine
@@ -1092,6 +1104,18 @@ ExamPartAlreadyExists: Teilaufgabe mit diesem Namen existiert bereits
 ExamPartName: Name
 ExamPartMaxPoints: Maximalpunktzahl
 ExamPartWeight: Gewichtung
+ExamPartResultPoints: Erreichte Punkte
 
 ExamNameTaken exam@ExamName: Es existiert bereits eine Klausur mit Namen #{exam}
-ExamCreated exam@ExamName: Klausur #{exam} erfolgreich angelegt
\ No newline at end of file
+ExamCreated exam@ExamName: Klausur #{exam} erfolgreich angelegt
+ExamEdited exam@ExamName: Klausur #{exam} erfolgreich bearbeitet
+
+ExamNoShow: Nicht erschienen
+ExamVoided: Entwertet
+
+ExamBonusPoints possible@Points: Maximal #{showFixed True possible} Klausurpunkte
+ExamBonusPointsPassed possible@Points: Maximal #{showFixed True possible} Klausurpunkte, falls die Klausur auch ohne Bonus bereits bestanden ist
+
+ExamPassed: Bestanden
+ExamNotPassed: Nicht bestanden
+ExamResult: Klausurergebnis
\ No newline at end of file
diff --git a/models/exams b/models/exams
index b6ed523e2..365862929 100644
--- a/models/exams
+++ b/models/exams
@@ -14,6 +14,7 @@ Exam
   finished UTCTime Maybe -- Grades shown to students, `ExamCorrector`s locked out
   closed UTCTime Maybe -- Prüfungsamt hat Einsicht (notification)
   publicStatistics Bool
+  showGrades Bool
   description Html Maybe
   UniqueExam course name
 ExamPart
@@ -32,13 +33,18 @@ ExamOccurrence
 ExamRegistration
   exam ExamId
   user UserId
-  occurance ExamOccurrenceId Maybe
+  occurrence ExamOccurrenceId Maybe
   UniqueExamRegistration exam user
-ExamResult
+ExamPartResult
   examPart ExamPartId
   user UserId
-  result ExamPartResult
-  UniqueExamResult examPart user
+  result ExamResultPoints
+  UniqueExamPartResult examPart user
+ExamResult
+  exam ExamId
+  user UserId
+  result ExamResultGrade
+  UniqueExamResult exam user
 ExamCorrector
   exam ExamId
   user UserId
diff --git a/routes b/routes
index 17d24e02c..9d35caa33 100644
--- a/routes
+++ b/routes
@@ -141,6 +141,7 @@
   /exams/new                    CExamNewR      GET POST
   /exams/#ExamName ExamR:
     /show                       EShowR         GET             !time
+    /edit                       EEditR         GET POST
     /corrector-invite           ECInviteR      GET POST
 
 
diff --git a/src/CryptoID.hs b/src/CryptoID.hs
index 59b925060..f170302a0 100644
--- a/src/CryptoID.hs
+++ b/src/CryptoID.hs
@@ -43,6 +43,8 @@ decCryptoIDs [ ''SubmissionId
              , ''SystemMessageId
              , ''SystemMessageTranslationId
              , ''StudyFeaturesId
+             , ''ExamOccurrenceId
+             , ''ExamPartId
              ]
 
 instance {-# OVERLAPS #-} namespace ~ CryptoIDNamespace (CI FilePath) SubmissionId => PathPiece (E.CryptoID namespace (CI FilePath)) where
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 2808e6180..84bac443b 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1456,6 +1456,7 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (CourseR tid ssh csh CExamNewR) = return ("Anlegen", Just $ CourseR tid ssh csh CExamListR)
 
   breadcrumb (CExamR tid ssh csh examn EShowR) = return (CI.original examn, Just $ CourseR tid ssh csh CExamListR)
+  breadcrumb (CExamR tid ssh csh examn EEditR) = return ("Bearbeiten", Just $ CExamR tid ssh csh examn EShowR)
 
   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)
@@ -1885,7 +1886,7 @@ pageActions (CourseR tid ssh csh CShowR) =
                         E.&&.  course   E.^. CourseSchool    E.==. E.val ssh
                         E.&&.  course   E.^. CourseShorthand E.==. E.val csh
                     return $ sheet E.^. SheetName
-                  anyM sheetNames (sheetAccess . E.unValue)
+                  anyM sheetNames $ sheetAccess . E.unValue
           in runDB $ lecturerAccess `or2M` existsVisible
       }
   ] ++ pageActions (CourseR tid ssh csh SheetListR) ++
@@ -1903,7 +1904,18 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh CExamListR
       , menuItemModal = False
-      , menuItemAccessCallback' = return True
+      , menuItemAccessCallback' =
+          let lecturerAccess   = hasWriteAccessTo $ CourseR tid ssh csh CExamNewR
+              examAccess examn = hasReadAccessTo  $ CExamR tid ssh csh examn EShowR
+              existsVisible = do
+                examNames <- E.select . E.from $ \(course `E.InnerJoin` exam) -> do
+                  E.on     $ course   E.^. CourseId E.==. exam E.^. ExamCourse
+                  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 $ exam E.^. ExamName
+                anyM examNames $ examAccess . E.unValue
+           in runDB $ lecturerAccess `or2M` existsVisible
       }
   , MenuItem
       { menuItemType = PageActionSecondary
@@ -2119,6 +2131,16 @@ pageActions (CourseR tid ssh csh CExamListR) =
       , menuItemAccessCallback' = return True
       }
   ]
+pageActions (CExamR tid ssh csh examn EShowR) =
+  [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuExamEdit
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CExamR tid ssh csh examn EEditR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
 pageActions (CSheetR tid ssh csh shn SShowR) =
   [ MenuItem
       { menuItemType = PageActionPrime
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index c31b7048c..f849fb282 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -407,6 +407,49 @@ getCShowR tid ssh csh = do
       & defaultSorting [SortAscBy "type", SortAscBy "name"]
   (Any hasTutorials, tutorialTable) <- runDB $ dbTable tutorialDBTableValidator tutorialDBTable
 
+  let
+    examDBTable = DBTable{..}
+      where
+        dbtSQLQuery exam = do
+          E.where_ $ exam E.^. ExamCourse E.==. E.val cid
+          return exam
+        dbtRowKey = (E.^. ExamId)
+        dbtProj r@DBRow{ dbrOutput = Entity _ Exam{..} } = do
+          guardM . hasReadAccessTo $ CExamR tid ssh csh examName EShowR
+          return r
+        dbtColonnade = dbColonnade $ mconcat
+          [ sortable (Just "name") (i18nCell MsgExamName) $ \DBRow{ dbrOutput = Entity _ Exam{..} } -> indicatorCell <> anchorCell (CExamR tid ssh csh examName EShowR) (toWidget examName)
+          , sortable (Just "register-from") (i18nCell MsgExamRegisterFrom) $ \DBRow { dbrOutput = Entity _ Exam{..} } -> maybe mempty dateTimeCell examRegisterFrom
+          , sortable (Just "register-to") (i18nCell MsgExamRegisterTo) $ \DBRow { dbrOutput = Entity _ Exam{..} } -> maybe mempty dateTimeCell examRegisterTo
+          , sortable (Just "time") (i18nCell MsgExamTime) $ \DBRow{ dbrOutput = Entity _ Exam{..} } -> cell $ do
+              startT <- formatTime SelFormatDateTime examStart
+              endT <- traverse (\examEnd' -> formatTime (bool SelFormatDateTime SelFormatTime $ ((==) `on` utctDay) examStart examEnd') examEnd') examEnd
+              [whamlet|
+                $newline never
+                #{startT}
+                $maybe endT' <- endT
+                  \ – #{endT'}
+              |]
+
+          ]
+        dbtSorting = Map.fromList
+          [ ("name", SortColumn $ \exam -> exam E.^. ExamName )
+          , ("time", SortColumn $ \exam -> exam E.^. ExamStart )
+          , ("register-from", SortColumn $ \exam -> exam E.^. ExamRegisterFrom )
+          , ("register-to", SortColumn $ \exam -> exam E.^. ExamRegisterTo )
+          , ("visible", SortColumn $ \exam -> exam E.^. ExamVisibleFrom )
+          ]
+        dbtFilter = Map.empty
+        dbtFilterUI = const mempty
+        dbtStyle = def
+        dbtParams = def
+        dbtIdent :: Text
+        dbtIdent = "exams"
+
+    examDBTableValidator = def
+      & defaultSorting [SortAscBy "time"]
+  (Any hasExams, examTable) <- runDB $ dbTable examDBTableValidator examDBTable
+
   siteLayout (toWgt $ courseName course) $ do
     setTitleI $ prependCourseTitle tid ssh csh (""::Text)
     $(widgetFile "course")
diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
index 5def10ff3..dffde8e32 100644
--- a/src/Handler/Exam.hs
+++ b/src/Handler/Exam.hs
@@ -10,11 +10,12 @@ import Handler.Utils.Invitations
 import Handler.Utils.Table.Cells
 import Jobs.Queue
 
-import Utils.Lens
+import Utils.Lens hiding (parts)
 
 import qualified Database.Esqueleto as E
+import qualified Database.Esqueleto.Utils as E
 
-import Data.Map ((!))
+import Data.Map ((!), (!?))
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 
@@ -22,6 +23,8 @@ import Data.Aeson hiding (Result(..))
 import Text.Hamlet (ihamlet)
 import Text.Blaze.Html.Renderer.String (renderHtml)
 
+import qualified Data.CaseInsensitive as CI
+
 
 getCExamListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCExamListR tid ssh csh = do
@@ -57,6 +60,9 @@ getCExamListR tid ssh csh = do
         dbtSorting = Map.fromList
           [ ("name", SortColumn $ \exam -> exam E.^. ExamName )
           , ("time", SortColumn $ \exam -> exam E.^. ExamStart )
+          , ("register-from", SortColumn $ \exam -> exam E.^. ExamRegisterFrom )
+          , ("register-to", SortColumn $ \exam -> exam E.^. ExamRegisterTo )
+          , ("visible", SortColumn $ \exam -> exam E.^. ExamVisibleFrom )
           ]
         dbtFilter = Map.empty
         dbtFilterUI = const mempty
@@ -147,6 +153,7 @@ data ExamForm = ExamForm
   , efFinished :: Maybe UTCTime
   , efClosed :: Maybe UTCTime
   , efOccurrences :: Set ExamOccurrenceForm
+  , efShowGrades :: Bool
   , efPublicStatistics :: Bool
   , efGradingRule :: ExamGradingRule
   , efBonusRule :: ExamBonusRule
@@ -156,7 +163,8 @@ data ExamForm = ExamForm
   }
 
 data ExamOccurrenceForm = ExamOccurrenceForm
-  { eofRoom :: Text
+  { eofId :: Maybe CryptoUUIDExamOccurrence
+  , eofRoom :: Text
   , eofCapacity :: Natural
   , eofStart :: UTCTime
   , eofEnd :: Maybe UTCTime
@@ -164,7 +172,8 @@ data ExamOccurrenceForm = ExamOccurrenceForm
   } deriving (Read, Show, Eq, Ord, Generic, Typeable)
 
 data ExamPartForm = ExamPartForm
-  { epfName :: ExamPartName
+  { epfId :: Maybe CryptoUUIDExamPart
+  , epfName :: ExamPartName
   , epfMaxPoints :: Maybe Points
   , epfWeight :: Rational
   } deriving (Read, Show, Eq, Ord, Generic, Typeable)
@@ -198,6 +207,7 @@ examForm template html = do
     <*  aformSection MsgExamFormOccurrences
     <*> examOccurrenceForm (efOccurrences <$> template)
     <*  aformSection MsgExamFormAutomaticFunctions
+    <*> (fromMaybe False <$> aopt checkBoxField (fslI MsgExamShowGrades & setTooltip MsgExamShowGradesTip) (Just . efShowGrades <$> template))
     <*> (fromMaybe False <$> aopt checkBoxField (fslI MsgExamPublicStatistics & setTooltip MsgExamPublicStatisticsTip) (Just . efPublicStatistics <$> template))
     <*> examGradingRuleForm (efGradingRule <$> template)
     <*> bonusRuleForm (efBonusRule <$> template)
@@ -263,6 +273,7 @@ examOccurrenceForm prev = wFormToAForm $ do
   fmap (fmap Set.fromList) . massInputAccumEditW miAdd' miCell' miButtonAction' miLayout' miIdent' (fslI MsgExamOccurrences & setTooltip MsgMassInputTip) True $ Set.toList <$> prev
   where
     examOccurrenceForm' nudge mPrev csrf = do
+      (eofIdRes, eofIdView) <- mopt hiddenField ("" & addName (nudge "id")) (Just $ eofId =<< mPrev)
       (eofRoomRes, eofRoomView) <- mpreq textField ("" & addName (nudge "name")) (eofRoom <$> mPrev)
       (eofCapacityRes, eofCapacityView) <- mpreq (posIntFieldI MsgExamRoomCapacityNonPositive) ("" & addName (nudge "capacity")) (eofCapacity <$> mPrev)
       (eofStartRes, eofStartView) <- mpreq utcTimeField ("" & addName (nudge "start")) (eofStart <$> mPrev)
@@ -270,7 +281,8 @@ examOccurrenceForm prev = wFormToAForm $ do
       (eofDescRes, eofDescView) <- mopt htmlFieldSmall ("" & addName (nudge "description")) (eofDescription <$> mPrev)
 
       return ( ExamOccurrenceForm
-                 <$> eofRoomRes
+                 <$> eofIdRes
+                 <*> eofRoomRes
                  <*> eofCapacityRes
                  <*> eofStartRes
                  <*> eofEndRes
@@ -301,12 +313,14 @@ examPartsForm prev = wFormToAForm $ do
   fmap (fmap Set.fromList) . massInputAccumEditW miAdd' miCell' miButtonAction' miLayout' miIdent' (fslI MsgExamParts & setTooltip MsgMassInputTip) True $ Set.toList <$> prev
   where
     examPartForm' nudge mPrev csrf = do
+      (epfIdRes, epfIdView) <- mopt hiddenField ("" & addName (nudge "id")) (Just $ epfId =<< mPrev)
       (epfNameRes, epfNameView) <- mpreq ciField ("" & addName (nudge "name")) (epfName <$> mPrev)
       (epfMaxPointsRes, epfMaxPointsView) <- mopt pointsField ("" & addName (nudge "max-points")) (epfMaxPoints <$> mPrev)
       (epfWeightRes, epfWeightView) <- mpreq (checkBool (>= 0) MsgExamPartWeightNegative rationalField) ("" & addName (nudge "weight")) (epfWeight <$> mPrev <|> Just 1)
 
       return ( ExamPartForm
-                 <$> epfNameRes
+                 <$> epfIdRes
+                 <*> epfNameRes
                  <*> epfMaxPointsRes
                  <*> epfWeightRes
              , $(widgetFile "widgets/massinput/examParts/form")
@@ -325,12 +339,114 @@ examPartsForm prev = wFormToAForm $ do
     miIdent' :: Text
     miIdent' = "exam-parts"   
 
+examFormTemplate :: Entity Exam -> DB ExamForm
+examFormTemplate (Entity eId Exam{..}) = do
+  parts <- selectList [ ExamPartExam ==. eId ] []
+  occurrences <- selectList [ ExamOccurrenceExam ==. eId ] []
+  correctors <- selectList [ ExamCorrectorExam ==. eId ] []
+  invitations <- map (\(email, InvDBDataExamCorrector) -> email) <$> sourceInvitationsList eId
+
+  parts' <- forM parts $ \(Entity pid part) -> (,) <$> encrypt pid <*> pure part
+  occurrences' <- forM occurrences $ \(Entity oid occ) -> (,) <$> encrypt oid <*> pure occ
+
+  return ExamForm
+    { efName             = examName
+    , efGradingRule      = examGradingRule
+    , efBonusRule        = examBonusRule
+    , efOccurrenceRule   = examOccurrenceRule
+    , efVisibleFrom      = examVisibleFrom
+    , efRegisterFrom     = examRegisterFrom
+    , efRegisterTo       = examRegisterTo
+    , efDeregisterUntil  = examDeregisterUntil
+    , efPublishOccurrenceAssignments = examPublishOccurrenceAssignments
+    , efStart            = examStart
+    , efEnd              = examEnd
+    , efFinished         = examFinished
+    , efClosed           = examClosed
+    , efShowGrades       = examShowGrades
+    , efPublicStatistics = examPublicStatistics
+    , efDescription      = examDescription
+    , efOccurrences      = Set.fromList $ do
+        (Just -> eofId, ExamOccurrence{..}) <- occurrences'
+        return ExamOccurrenceForm
+          { eofId
+          , eofRoom        = examOccurrenceRoom
+          , eofCapacity    = examOccurrenceCapacity
+          , eofStart       = examOccurrenceStart
+          , eofEnd         = examOccurrenceEnd
+          , eofDescription = examOccurrenceDescription
+          }
+    , efExamParts        = Set.fromList $ do
+        (Just -> epfId, ExamPart{..}) <- parts'
+        return ExamPartForm
+          { epfId
+          , epfName      = examPartName
+          , epfMaxPoints = examPartMaxPoints
+          , epfWeight    = examPartWeight
+          }
+    , efCorrectors       = Set.unions
+      [ Set.fromList $ map Left invitations
+      , Set.fromList . map Right $ do
+          Entity _ ExamCorrector{..} <- correctors
+          return examCorrectorUser
+      ]
+    }
+
+examTemplate :: CourseId -> DB (Maybe ExamForm)
+examTemplate cid = runMaybeT $ do
+  newCourse <- MaybeT $ get cid
+  
+  [(Entity _ oldCourse, Entity _ oldExam)] <- lift . E.select . E.from $ \(course `E.InnerJoin` exam) -> do
+    E.on $ course E.^. CourseId E.==. exam E.^. ExamCourse
+    E.where_ $ (       course E.^. CourseShorthand E.==. E.val (courseShorthand newCourse)
+                 E.||. course E.^. CourseName E.==. E.val (courseName newCourse)
+               )
+         E.&&. course E.^. CourseSchool E.==. E.val (courseSchool newCourse)
+    E.where_ . E.not_ . E.exists . E.from $ \exam' -> do
+      E.where_ $ exam' E.^. ExamCourse E.==. E.val cid
+      E.where_ $ exam E.^. ExamName E.==. exam' E.^. ExamName
+    E.where_ . E.not_ . E.isNothing $ exam E.^. ExamVisibleFrom
+    E.limit 1
+    E.orderBy [ E.desc $ course E.^. CourseTerm, E.asc $ exam E.^. ExamVisibleFrom ]
+    return (course, exam)
+
+  oldTerm <- MaybeT . get $ courseTerm oldCourse
+  newTerm <- MaybeT . get $ courseTerm newCourse
+
+  let
+    dateOffset = over _utctDay . addDays $ (diffDays `on` termLectureEnd) newTerm oldTerm 
+
+  return ExamForm
+    { efName             = examName oldExam
+    , efGradingRule      = examGradingRule oldExam
+    , efBonusRule        = examBonusRule oldExam
+    , efOccurrenceRule   = examOccurrenceRule oldExam
+    , efVisibleFrom      = dateOffset <$> examVisibleFrom oldExam
+    , efRegisterFrom     = dateOffset <$> examRegisterFrom oldExam
+    , efRegisterTo       = dateOffset <$> examRegisterTo oldExam
+    , efDeregisterUntil  = dateOffset <$> examDeregisterUntil oldExam
+    , efPublishOccurrenceAssignments = dateOffset $ examPublishOccurrenceAssignments oldExam
+    , efStart            = dateOffset $ examStart oldExam
+    , efEnd              = dateOffset <$> examEnd oldExam
+    , efFinished         = dateOffset <$> examFinished oldExam
+    , efClosed           = dateOffset <$> examClosed oldExam
+    , efShowGrades       = examShowGrades oldExam
+    , efPublicStatistics = examPublicStatistics oldExam
+    , efDescription      = examDescription oldExam
+    , efOccurrences      = Set.empty
+    , efExamParts        = Set.empty
+    , efCorrectors       = Set.empty
+    }
+
 getCExamNewR, postCExamNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCExamNewR = postCExamNewR
 postCExamNewR tid ssh csh = do
-  cid <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+  (cid, template) <- runDB $ do
+    cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+    template <- examTemplate cid
+    return (cid, template)
   
-  ((newExamResult, newExamWidget), newExamEnctype) <- runFormPost $ examForm Nothing
+  ((newExamResult, newExamWidget), newExamEnctype) <- runFormPost $ examForm template
 
   formResult newExamResult $ \ExamForm{..} -> do
     insertRes <- runDBJobs $ do
@@ -349,6 +465,7 @@ postCExamNewR tid ssh csh = do
         , examEnd                          = efEnd
         , examFinished                     = efFinished
         , examClosed                       = efClosed
+        , examShowGrades                   = efShowGrades
         , examPublicStatistics             = efPublicStatistics
         , examDescription                  = efDescription
         }
@@ -398,5 +515,179 @@ postCExamNewR tid ssh csh = do
         }
     $(widgetFile "exam-new")
 
+getEEditR, postEEditR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
+getEEditR = postEEditR
+postEEditR tid ssh csh examn = do
+  (cid, eId, template) <- runDB $ do
+    (cid, exam@(Entity eId _)) <- fetchCourseIdExam tid ssh csh examn
+
+    template <- examFormTemplate exam
+
+    return (cid, eId, template)
+
+  ((editExamResult, editExamWidget), editExamEnctype) <- runFormPost . examForm $ Just template
+
+  formResult editExamResult $ \ExamForm{..} -> do
+    insertRes <- runDBJobs $ do
+      insertRes <- myReplaceUnique eId Exam
+        { examCourse           = cid
+        , examName             = efName
+        , examGradingRule      = efGradingRule
+        , examBonusRule        = efBonusRule
+        , examOccurrenceRule   = efOccurrenceRule
+        , examVisibleFrom      = efVisibleFrom
+        , examRegisterFrom     = efRegisterFrom
+        , examRegisterTo       = efRegisterTo
+        , examDeregisterUntil  = efDeregisterUntil
+        , examPublishOccurrenceAssignments = efPublishOccurrenceAssignments
+        , examStart            = efStart
+        , examEnd              = efEnd
+        , examFinished         = efFinished
+        , examClosed           = efClosed
+        , examPublicStatistics = efPublicStatistics
+        , examShowGrades       = efShowGrades
+        , examDescription      = efDescription
+        }
+
+      when (is _Nothing insertRes) $ do
+        occIds <- fmap catMaybes . forM (Set.toList efOccurrences) $ traverse decrypt . eofId
+        deleteWhere [ ExamOccurrenceExam ==. eId, ExamOccurrenceId /<-. occIds ]
+        forM_ (Set.toList efOccurrences) $ \case
+          ExamOccurrenceForm{ eofId = Nothing, .. } -> insert_
+            ExamOccurrence
+              { examOccurrenceExam = eId
+              , examOccurrenceRoom = eofRoom
+              , examOccurrenceCapacity = eofCapacity
+              , examOccurrenceStart = eofStart
+              , examOccurrenceEnd = eofEnd
+              , examOccurrenceDescription = eofDescription
+              }
+          ExamOccurrenceForm{ .. } -> void . runMaybeT $ do
+            cID <- hoistMaybe eofId
+            eofId' <- decrypt cID
+            oldOcc <- MaybeT $ get eofId'
+            guard $ examOccurrenceExam oldOcc == eId
+            lift $ replace eofId' ExamOccurrence
+              { examOccurrenceExam = eId
+              , examOccurrenceRoom = eofRoom
+              , examOccurrenceCapacity = eofCapacity
+              , examOccurrenceStart = eofStart
+              , examOccurrenceEnd = eofEnd
+              , examOccurrenceDescription = eofDescription
+              }
+
+
+        pIds <- fmap catMaybes . forM (Set.toList efExamParts) $ traverse decrypt . epfId
+        deleteWhere [ ExamPartExam ==. eId, ExamPartId /<-. pIds ]
+        forM_ (Set.toList efExamParts) $ \case
+          ExamPartForm{ epfId = Nothing, .. } -> insert_
+            ExamPart
+              { examPartExam = eId
+              , examPartName = epfName
+              , examPartMaxPoints = epfMaxPoints
+              , examPartWeight = epfWeight
+              }
+          ExamPartForm{ .. } -> void . runMaybeT $ do
+            cID <- hoistMaybe epfId
+            epfId' <- decrypt cID
+            oldPart <- MaybeT $ get epfId'
+            guard $ examPartExam oldPart == eId
+            lift $ replace epfId' ExamPart
+              { examPartExam = eId
+              , examPartName = epfName
+              , examPartMaxPoints = epfMaxPoints
+              , examPartWeight = epfWeight
+              }
+
+
+        let (invites, adds) = partitionEithers $ Set.toList efCorrectors
+
+        deleteWhere [ ExamCorrectorExam ==. eId ]
+        insertMany_ $ map (ExamCorrector eId) adds
+
+        deleteWhere [ InvitationFor ==. invRef @ExamCorrector eId, InvitationEmail /<-. invites ]
+        sinkInvitationsF examCorrectorInvitationConfig $ map (, eId, (InvDBDataExamCorrector, InvTokenDataExamCorrector)) invites
+
+      return insertRes
+
+    case insertRes of
+      Just _  -> addMessageI Error $ MsgExamNameTaken efName
+      Nothing -> do
+        addMessageI Success $ MsgExamEdited efName
+        redirect $ CExamR tid ssh csh efName EShowR
+
+  let heading = prependCourseTitle tid ssh csh . MsgExamEditHeading $ efName template
+
+  siteLayoutMsg heading $ do
+    setTitleI heading
+    let
+      editExamForm = wrapForm editExamWidget def
+        { formMethod = POST
+        , formAction = Just . SomeRoute $ CExamR tid ssh csh examn EEditR
+        , formEncoding = editExamEnctype
+        }
+    $(widgetFile "exam-edit")
+    
+
 getEShowR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
-getEShowR = error "getExamShowR"
+getEShowR tid ssh csh examn = do
+  cTime <- liftIO getCurrentTime
+  mUid <- maybeAuthId
+  
+  (Entity _ Exam{..}, parts, examVisible, (gradingVisible, gradingShown), (occurrenceAssignmentsVisible, occurrenceAssignmentsShown), results, result, occurrences) <- runDB $ do
+    exam@(Entity eId Exam{..}) <- fetchExam tid ssh csh examn
+
+    let examVisible = NTop (Just cTime) >= NTop examVisibleFrom
+
+    let gradingVisible = NTop (Just cTime) >= NTop examFinished
+    gradingShown <- or2M (return gradingVisible) . hasReadAccessTo $ CExamR tid ssh csh examn EEditR
+
+    let occurrenceAssignmentsVisible = cTime >= examPublishOccurrenceAssignments
+    occurrenceAssignmentsShown <- or2M (return occurrenceAssignmentsVisible) . hasReadAccessTo $ CExamR tid ssh csh examn EEditR
+
+    parts <- selectList [ ExamPartExam ==. eId ] [ Asc ExamPartName ]
+
+    resultsRaw <- for mUid $ \uid ->
+      E.select . E.from $ \examPartResult -> do
+        E.where_ $ examPartResult E.^. ExamPartResultUser E.==. E.val uid
+             E.&&. examPartResult E.^. ExamPartResultExamPart `E.in_` E.valList (map entityKey parts)
+        return examPartResult
+    let results = maybe Map.empty (\rs -> Map.fromList [ (examPartResultExamPart, res) | res@(Entity _ ExamPartResult{..}) <- rs ]) resultsRaw
+
+    result <- fmap join . for mUid $ getBy . UniqueExamResult eId
+
+    occurrencesRaw <- E.select . E.from $ \examOccurrence -> do
+      E.where_ $ examOccurrence E.^. ExamOccurrenceExam E.==. E.val eId
+      let
+        registered
+          | Just uid <- mUid
+          = E.exists . E.from $ \examRegistration -> do
+              E.where_ $ examRegistration E.^. ExamRegistrationExam E.==. E.val eId
+                   E.&&. examRegistration E.^. ExamRegistrationUser E.==. E.val uid
+                   E.&&. examRegistration E.^. ExamRegistrationOccurrence E.==. E.just (examOccurrence E.^. ExamOccurrenceId)
+          | otherwise = E.false
+      E.orderBy [E.desc registered, E.asc $ examOccurrence E.^. ExamOccurrenceStart, E.asc $ examOccurrence E.^. ExamOccurrenceRoom]
+      return (examOccurrence, registered)
+
+    let occurrences = map (over _2 E.unValue) occurrencesRaw
+
+    return (exam, parts, examVisible, (gradingVisible, gradingShown), (occurrenceAssignmentsVisible, occurrenceAssignmentsShown), results, result, occurrences)
+
+  let examTimes = all (\(Entity _ ExamOccurrence{..}, _) -> examOccurrenceStart == examStart && examOccurrenceEnd == examEnd) occurrences
+
+  let heading = prependCourseTitle tid ssh csh $ CI.original examName
+
+  siteLayoutMsg heading $ do
+    setTitleI heading
+    let
+      gradingKeyW :: [Points] -> Widget
+      gradingKeyW bounds
+        = let boundWidgets :: [Widget]
+              boundWidgets = map (toWidget . (pack :: String -> Text) . showFixed True) bounds
+              grades :: [ExamGrade]
+              grades = universeF
+           in $(widgetFile "widgets/gradingKey")
+
+      examBonusW :: ExamBonusRule -> Widget
+      examBonusW bonusRule = $(widgetFile "widgets/bonusRule")
+    $(widgetFile "exam-show")
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 964dfa1b3..2ae2172f7 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -456,7 +456,7 @@ postTEditR tid ssh csh tutn = do
     case insertRes of
       Just _  -> addMessageI Error $ MsgTutorialNameTaken tfName
       Nothing -> do
-        addMessageI Success $ MsgTutorialCreated tfName
+        addMessageI Success $ MsgTutorialEdited tfName
         redirect $ CourseR tid ssh csh CTutorialListR
 
   let heading = prependCourseTitle tid ssh csh . MsgTutorialEditHeading $ tfName template
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index ea6d929b3..f35c0a7c1 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -559,7 +559,8 @@ examGradingRuleForm prev = multiActionA actions (fslI MsgExamGradingRule) $ clas
                { fvLabel   = toMarkup $ mr fsLabel
                , fvTooltip = toMarkup . mr <$> fsTooltip
                , fvId
-               , fvInput = $(widgetFile "widgets/gradingKey")
+               , fvInput = let boundWidgets = map (fvInput . snd) bounds
+                            in $(widgetFile "widgets/gradingKey")
                , fvErrors = if
                    | (e : _) <- errors -> Just $ toMarkup e
                    | otherwise -> Nothing
diff --git a/src/Model.hs b/src/Model.hs
index c86406275..45ce97e6d 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -35,6 +35,7 @@ deriving instance Eq (Unique Course)    -- instance Eq TermSchoolCourseShort; in
 deriving instance Eq (Unique Sheet)     -- instance Eq CourseSheet
 deriving instance Eq (Unique Material)  -- instance Eq UniqueMaterial
 deriving instance Eq (Unique Tutorial)  -- instance Eq Tutorial
+deriving instance Eq (Unique Exam)
 
 submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime
diff --git a/src/Model/Types/Exam.hs b/src/Model/Types/Exam.hs
index 1f8d5876f..1608c7311 100644
--- a/src/Model/Types/Exam.hs
+++ b/src/Model/Types/Exam.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE UndecidableInstances #-}
+
 {-|
 Module: Model.Types.Exam
 Description: Types for modeling Exams
@@ -11,17 +13,17 @@ import Model.Types.Common
 
 import Control.Lens
 
-data ExamPartResult = ExamAttended { examPartResult :: Maybe Points }
-                    | ExamNoShow
-                    | ExamVoided
+data ExamResult' res = ExamAttended { examResult :: res }
+                     | ExamNoShow
+                     | ExamVoided
   deriving (Show, Read, Eq, Ord, Generic, Typeable)
 deriveJSON defaultOptions
   { constructorTagModifier = camelToPathPiece' 1
-  , fieldLabelModifier = camelToPathPiece' 2
+  , fieldLabelModifier = camelToPathPiece' 1
   , omitNothingFields = True
   , sumEncoding = TaggedObject "status" "result"
-  } ''ExamPartResult
-derivePersistFieldJSON ''ExamPartResult
+  } ''ExamResult'
+derivePersistFieldJSON ''ExamResult'
 
 data ExamBonusRule = ExamNoBonus
                    | ExamBonusPoints
@@ -94,12 +96,15 @@ numberGrade = prism toNumberGrade fromNumberGrade
       n   -> Left  n
 
 instance PathPiece ExamGrade where
-  toPathPiece = tshow . review numberGrade
+  toPathPiece = tshow . (fromRational :: Rational -> Deci) . review numberGrade
   fromPathPiece = finiteFromPathPiece
 
 pathPieceJSON ''ExamGrade
 pathPieceJSONKey ''ExamGrade
 
+passingGrade :: ExamGrade -> Bool
+passingGrade = (>= Grade40)
+
 data ExamGradingRule
   = ExamGradingManual
   | ExamGradingKey
@@ -112,3 +117,6 @@ deriveJSON defaultOptions
   , sumEncoding = TaggedObject "rule" "settings"
   } ''ExamGradingRule
 derivePersistFieldJSON ''ExamGradingRule
+
+type ExamResultPoints = ExamResult' (Maybe Points)
+type ExamResultGrade = ExamResult' ExamGrade
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 955b7dcf6..a6f14183a 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -126,6 +126,8 @@ makeLenses_ ''PredDNF
 makeLenses_ ''ExamBonusRule
 makeLenses_ ''ExamGradingRule
 
+makeLenses_ ''UTCTime
+
 
 -- makeClassy_ ''Load
 
diff --git a/templates/course.hamlet b/templates/course.hamlet
index 93d788a26..c416e0efc 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -93,6 +93,10 @@ $#    $if NTop (Just 0) < NTop (courseCapacity course)
       $else
         Eine Anmeldung zum Kurs ist Voraussetzung zum Zugang zu Kursmaterial
         (z.B. Übungsblätter).
+  $if hasExams
+    <dt .deflist__dt>_{MsgCourseExams}
+    <dd .deflist__dd>
+      ^{examTable}
   $if hasTutorials
     <dt .deflist__dt>_{MsgCourseTutorials}
     <dd .deflist__dd>
diff --git a/templates/exam-edit.hamlet b/templates/exam-edit.hamlet
new file mode 100644
index 000000000..e11d0926b
--- /dev/null
+++ b/templates/exam-edit.hamlet
@@ -0,0 +1,2 @@
+$newline never
+^{editExamForm}
diff --git a/templates/exam-show.cassius b/templates/exam-show.cassius
new file mode 100644
index 000000000..b0f051fcb
--- /dev/null
+++ b/templates/exam-show.cassius
@@ -0,0 +1,6 @@
+.occurrence--not-registered
+  text-decoration: strike-through;
+
+.result
+  padding-left: 2em;
+  font-size: 20px;
diff --git a/templates/exam-show.hamlet b/templates/exam-show.hamlet
new file mode 100644
index 000000000..36625be20
--- /dev/null
+++ b/templates/exam-show.hamlet
@@ -0,0 +1,149 @@
+$newline never
+$maybe Entity _ ExamResult{examResultResult} <- result
+  $if gradingShown
+    <section>
+      <h2>
+        _{MsgExamResult}
+        $if gradingShown && not gradingVisible
+          \ ^{isVisible False}
+      <p .result>
+        $case examResultResult
+          $of ExamAttended grade
+            $if examShowGrades
+              _{grade}
+            $else
+              $if passingGrade grade
+                _{MsgExamPassed}
+              $else
+                _{MsgExamNotPassed}
+          $of ExamNoShow
+            _{MsgExamNoShow}
+          $of ExamVoided
+            _{MsgExamVoided}
+
+$maybe desc <- examDescription
+  <section>
+    #{desc}
+  
+<section>
+  <dl .deflist>
+    $if not examVisible
+      <dt .deflist__dt>_{MsgExamVisibleFrom}
+      <dd .deflist__dd>
+        $maybe from <- examVisibleFrom
+          ^{formatTimeW SelFormatDateTime from}
+        $nothing
+          _{MsgNever}
+        \ ^{isVisible False}
+    $maybe regFrom <- examRegisterFrom
+      <dt .deflist__dt>_{MsgExamRegisterFrom}
+      <dd .deflist__dd>^{formatTimeW SelFormatDateTime regFrom}
+    $maybe regTo <- examRegisterTo
+      <dt .deflist__dt>_{MsgExamRegisterTo}
+      <dd .deflist__dd>^{formatTimeW SelFormatDateTime regTo}
+    $maybe deregUntil <- examDeregisterUntil
+      <dt .deflist__dt>_{MsgExamDeregisterUntil}
+      <dd .deflist__dd>^{formatTimeW SelFormatDateTime deregUntil}
+    <dt .deflist__dt>_{MsgExamPublishOccurrenceAssignmentsParticipant}
+    <dd .deflist__dd>^{formatTimeW SelFormatDateTime examPublishOccurrenceAssignments}
+    $if examTimes
+      <dt .deflist__dt>_{MsgExamTime}
+      <dd .deflist__dd>
+        ^{formatTimeW SelFormatDateTime examStart}
+        $maybe end <- examEnd
+          \ – ^{formatTimeW (bool SelFormatDateTime SelFormatTime ((on (==) utctDay) examStart end)) end}
+    $maybe finished <- examFinished
+      <dt .deflist__dt>_{MsgExamFinishedParticipant}
+      <dd .deflist__dd>^{formatTimeW SelFormatDateTime finished}
+    $if gradingShown
+      $if examGradingRule /= ExamGradingManual
+        <dt .deflist__dt>
+          _{MsgExamGradingRule}
+          $if not gradingVisible
+            \ ^{isVisible False}
+        <dd .deflist__dd>
+          $case examGradingRule
+            $of ExamGradingManual
+              _{MsgExamGradingManual'}
+            $of ExamGradingKey{..}
+              ^{gradingKeyW examGradingKey}
+      $if examBonusRule /= ExamNoBonus
+        <dt .deflist__dt>
+          _{MsgExamBonusRule}
+          $if not gradingVisible
+            \ ^{isVisible False}
+        <dd .deflist__dd>
+          ^{examBonusW examBonusRule}
+    $if occurrenceAssignmentsShown
+      <dt .deflist__dt>
+        _{MsgExamOccurrenceRuleParticipant}
+        $if not occurrenceAssignmentsVisible
+          \ ^{isVisible False}
+      <dd .deflist__dd>
+        $# TODO
+
+$if not (null occurrences)
+  <section>
+    <h2>
+      _{MsgExamOccurrences}
+    <table .table .table--striped .table--hover>
+      <thead>
+        <tr .table__row .table__row--head>
+          <th .table__th>_{MsgExamRoom}
+          $if not examTimes
+            <th .table__th>_{MsgExamRoomTime}
+          <th .table__th>_{MsgExamRoomDescription}
+          $if occurrenceAssignmentsShown
+            <th .table__th>
+              _{MsgExamRoomRegistered}
+              $if not occurrenceAssignmentsVisible
+                \ ^{isVisible False}
+      <tbody>
+        $forall (Entity _occId ExamOccurrence{examOccurrenceRoom, examOccurrenceStart, examOccurrenceEnd, examOccurrenceDescription}, registered) <- occurrences
+          <tr .table__row :occurrenceAssignmentsShown && not registered:.occurrence--not-registered>
+            <td .table__td>#{examOccurrenceRoom}
+            $if not examTimes
+              <td .table__td>
+                ^{formatTimeW SelFormatDateTime examOccurrenceStart}
+                $maybe end <- examOccurrenceEnd
+                  \ – ^{formatTimeW (bool SelFormatDateTime SelFormatTime ((on (==) utctDay) examStart end)) end}
+            <td .table__td>
+              $maybe desc <- examOccurrenceDescription
+                #{desc}
+            $if occurrenceAssignmentsShown
+              <td .table__td>
+                $if registered
+                  #{fontAwesomeIcon "check"}
+
+$if gradingShown && not (null parts)
+  <section>
+    <h2>
+      _{MsgExamParts}
+      $if gradingShown && not gradingVisible
+        \ ^{isVisible False}
+    <table .table .table--striped .table--hover >
+      <thead>
+        <tr .table__row .table__row--head>
+          <th .table__th>_{MsgExamPartName}
+          <th .table__th>_{MsgExamPartMaxPoints}
+          <th .table__th>_{MsgExamPartResultPoints}
+      <tbody>
+        $forall Entity partId ExamPart{examPartName, examPartWeight, examPartMaxPoints} <- parts
+          <tr .table__row>
+            <td .table__td>#{examPartName}
+            <td .table__td>
+              $maybe mPoints <- examPartMaxPoints
+                #{showFixed True (fromRational examPartWeight * mPoints)}
+            <td .table__td>
+              $case fmap (examPartResultResult . entityVal) (results !? partId)
+                $of Nothing
+                $of Just (ExamAttended (Just ps))
+                  #{showFixed True ps}
+                $of Just (ExamAttended Nothing)
+                  #{fontAwesomeIcon "check"}
+                $of Just ExamNoShow
+                  _{MsgExamNoShow}
+                $of Just ExamVoided
+                  _{MsgExamVoided}
+
+$# TODO: Statistics
diff --git a/templates/widgets/bonusRule.hamlet b/templates/widgets/bonusRule.hamlet
new file mode 100644
index 000000000..bf72b1684
--- /dev/null
+++ b/templates/widgets/bonusRule.hamlet
@@ -0,0 +1,8 @@
+$newline never
+$case bonusRule
+  $of ExamNoBonus
+    _{MsgExamNoBonus'}
+  $of ExamBonusPoints ps False
+    _{MsgExamBonusPoints ps}
+  $of ExamBonusPoints ps True
+    _{MsgExamBonusPointsPassed ps}
diff --git a/templates/widgets/gradingKey.hamlet b/templates/widgets/gradingKey.hamlet
index d6a95326b..e035911e1 100644
--- a/templates/widgets/gradingKey.hamlet
+++ b/templates/widgets/gradingKey.hamlet
@@ -10,6 +10,6 @@ $newline never
     <tr>
       <th>
         _{MsgGradingFrom}
-      $forall (_, fv) <- bounds
+      $forall w <- boundWidgets
         <td>
-          ^{fvInput fv}
+          ^{w}
diff --git a/templates/widgets/massinput/examParts/form.hamlet b/templates/widgets/massinput/examParts/form.hamlet
index 2da5a3234..0ef5c4f7a 100644
--- a/templates/widgets/massinput/examParts/form.hamlet
+++ b/templates/widgets/massinput/examParts/form.hamlet
@@ -1,4 +1,4 @@
 $newline never
-<td>#{csrf}^{fvInput epfNameView}
+<td>#{csrf}^{fvInput epfIdView}^{fvInput epfNameView}
 <td>^{fvInput epfMaxPointsView}
 <td>^{fvInput epfWeightView}
diff --git a/templates/widgets/massinput/examRooms/form.hamlet b/templates/widgets/massinput/examRooms/form.hamlet
index a6bdff401..bd0fd06ed 100644
--- a/templates/widgets/massinput/examRooms/form.hamlet
+++ b/templates/widgets/massinput/examRooms/form.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<td>#{csrf}^{fvInput eofRoomView}
+<td>#{csrf}^{fvInput eofIdView}^{fvInput eofRoomView}
 <td>^{fvInput eofCapacityView}
 <td>^{fvInput eofStartView}
 <td>^{fvInput eofEndView}

From 463b2b78780ecf24aa3b48f0740c18fce45e8d3c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 19 Jun 2019 16:52:00 +0200
Subject: [PATCH 477/519] fix(ratings): disallow ratings for graded sheets
 without point value

---
 messages/uniworx/de.msg     |  1 +
 src/Handler/Corrections.hs  | 66 +++++++++++++++++++------------------
 src/Handler/Utils/Rating.hs |  7 +++-
 src/Model/Rating.hs         |  1 +
 4 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index c0ee216ae..6ce7b8bbb 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -464,6 +464,7 @@ RatingNegative: Bewertungspunkte dürfen nicht negativ sein
 RatingExceedsMax: Bewertung übersteigt die erlaubte Maximalpunktzahl
 RatingNotExpected: Keine Bewertungen erlaubt
 RatingBinaryExpected: Bewertung muss 0 (=durchgefallen) oder 1 (=bestanden) sein
+RatingPointsRequired: Bewertung erfordert für dieses Blatt eine Punktzahl
 
 SubmissionSinkExceptionDuplicateFileTitle file@FilePath: Dateiname #{show file} kommt mehrfach im Zip-Archiv vor
 SubmissionSinkExceptionDuplicateRating: Mehr als eine Bewertung gefunden.
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index dc8cb791e..049eda984 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -710,12 +710,12 @@ postCorrectionR tid ssh csh shn cid = do
   results <- runDB $ correctionData tid ssh csh shn sub
 
   case results of
-    [(Entity _ Course{..}, Entity _ Sheet{..}, Entity _ Submission{..}, corrector)] -> do
+    [(Entity _ Course{..}, Entity _ Sheet{..}, Entity _ subm@Submission{..}, corrector)] -> do
       let ratingComment = fmap Text.strip submissionRatingComment >>= (\c -> c <$ guard (not $ null c))
           pointsForm = case sheetType of
             NotGraded  -> pure Nothing
             _otherwise -> aopt  (pointsFieldMax $ preview (_grading . _maxPoints) sheetType)
-                                (fslpI MsgRatingPoints "Punktezahl")
+                                (fslpI MsgRatingPoints "Punktezahl" & setTooltip sheetType)
                                 (Just submissionRatingPoints)
 
       ((corrResult, corrForm'), corrEncoding) <- runFormPost . identifyForm FIDcorrection . renderAForm FormStandard $ (,,)
@@ -734,22 +734,20 @@ postCorrectionR tid ssh csh shn cid = do
             , formEncoding = uploadEncoding
             }
 
-      case corrResult of
-        FormMissing -> return ()
-        FormFailure errs -> mapM_ (addMessage Error . toHtml) errs
-        FormSuccess (rated, ratingPoints', ratingComment') -> do
-          uid <- liftHandlerT requireAuthId
-          now <- liftIO getCurrentTime
+      formResult corrResult $ \(rated, ratingPoints', ratingComment') -> do
+        uid <- liftHandlerT requireAuthId
+        now <- liftIO getCurrentTime
 
-          if
-            | errs <- validateRating sheetType Rating'
-                        { ratingPoints  = ratingPoints'
-                        , ratingComment = ratingComment'
-                        , ratingTime    = (now <$ guard rated)
-                        }
-            , not $ null errs
-              -> mapM_ (addMessageI Error) errs
-            | otherwise -> runDBJobs $ do
+        if
+          | errs <- validateRating sheetType Rating'
+                      { ratingPoints  = ratingPoints'
+                      , ratingComment = ratingComment'
+                      , ratingTime    = (now <$ guard rated)
+                      }
+          , not $ null errs
+            -> mapM_ (addMessageI Error) errs
+          | otherwise -> do
+              runDBJobs $ do
                 update sub  [ SubmissionRatingBy      =. Just uid
                             , SubmissionRatingTime    =. (now <$ guard rated)
                             , SubmissionRatingPoints  =. ratingPoints'
@@ -761,25 +759,29 @@ postCorrectionR tid ssh csh shn cid = do
                 when (rated && isNothing submissionRatingTime) $ do
                   $logDebugS "CorrectionR" [st|Rated #{tshow sub}|]
                   queueDBJob . JobQueueNotification $ NotificationSubmissionRated sub
-
-          redirect $ CSubmissionR tid ssh csh shn cid CorrectionR
-
-      case uploadResult of
-        FormMissing -> return ()
-        FormFailure errs -> mapM_ (addMessage Error . toHtml) errs
-        FormSuccess fileUploads -> do
-          uid <- requireAuthId
-
-          res <- msgSubmissionErrors . runDBJobs . runConduit $ transPipe (lift . lift) fileUploads .| extractRatingsMsg .| sinkSubmission uid (Right sub) True
-          case res of
-            Nothing  -> return () -- ErrorMessages are already added by msgSubmissionErrors
-            (Just _) -> do
-              addMessageI Success MsgRatingFilesUpdated
               redirect $ CSubmissionR tid ssh csh shn cid CorrectionR
 
+      formResult uploadResult $ \fileUploads -> do
+        uid <- requireAuthId
+
+        res <- msgSubmissionErrors . runDBJobs . runConduit $ transPipe (lift . lift) fileUploads .| extractRatingsMsg .| sinkSubmission uid (Right sub) True
+        case res of
+          Nothing  -> return () -- ErrorMessages are already added by msgSubmissionErrors
+          (Just _) -> do
+            addMessageI Success MsgRatingFilesUpdated
+            redirect $ CSubmissionR tid ssh csh shn cid CorrectionR
+
       mr <- getMessageRender
       let sheetTypeDesc = mr sheetType
-      defaultLayout $ do
+          heading = MsgCorrectionHead tid ssh csh shn cid
+          headingWgt = [whamlet|
+              $newline never
+              _{heading}
+              $if not (submissionRatingDone subm)
+                \ ^{isVisibleWidget False}
+            |]
+      siteLayout headingWgt $ do
+        setTitleI heading
         let userCorrection = $(widgetFile "correction-user")
         $(widgetFile "correction")
     _ -> notFound
diff --git a/src/Handler/Utils/Rating.hs b/src/Handler/Utils/Rating.hs
index 2e980312f..472e49950 100644
--- a/src/Handler/Utils/Rating.hs
+++ b/src/Handler/Utils/Rating.hs
@@ -56,7 +56,7 @@ instance Pretty SheetGrading where
 
 
 validateRating :: SheetType -> Rating' -> [RatingException]
-validateRating ratingSheetType Rating'{ratingPoints=Just rp, ..}
+validateRating ratingSheetType Rating'{ ratingPoints=Just rp, .. }
   | rp < 0
     = [RatingNegative]
   | NotGraded <- ratingSheetType
@@ -67,6 +67,11 @@ validateRating ratingSheetType Rating'{ratingPoints=Just rp, ..}
   | (Just PassBinary) <- ratingSheetType ^? _grading
   , not (rp == 0 || rp == 1)
     = [RatingBinaryExpected]
+validateRating ratingSheetType Rating'{ .. }
+  | has _grading ratingSheetType
+  , is _Nothing ratingPoints
+  , isn't _Nothing ratingTime
+  = [RatingPointsRequired]
 validateRating _ _ = []
 
 getRating :: SubmissionId -> YesodDB UniWorX (Maybe Rating)
diff --git a/src/Model/Rating.hs b/src/Model/Rating.hs
index c7b4e910f..295d275eb 100644
--- a/src/Model/Rating.hs
+++ b/src/Model/Rating.hs
@@ -31,6 +31,7 @@ data RatingException = RatingNotUnicode UnicodeException -- ^ Rating failed to p
                      | RatingExceedsMax -- ^ Rating point must not exceed maximum points
                      | RatingNotExpected -- ^ Rating not expected
                      | RatingBinaryExpected -- ^ Rating must be 0 or 1
+                     | RatingPointsRequired -- ^ Rating without points for sheet that requires there to be points
   deriving (Show, Eq, Generic, Typeable)
 
 instance Exception RatingException

From 84070a5565d77dc820cb75fdc9717e27b8409f8e Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 19 Jun 2019 21:54:23 +0200
Subject: [PATCH 478/519] Replaced DisplayAble Text instance, started adding
 ToMarkup instances for keys, attempted adding interface for CryptoIDs (TODO)

---
 src/Data/CryptoID/Instances.hs        | 18 ++++++++++++++++++
 src/Data/Maybe/Instances.hs           | 13 +++++++++++++
 src/Foundation.hs                     |  4 ++++
 src/Handler/Corrections.hs            |  2 +-
 src/Handler/Course.hs                 | 10 +++++-----
 src/Handler/Home.hs                   | 10 +++++-----
 src/Handler/Profile.hs                |  1 +
 src/Handler/Sheet.hs                  |  2 +-
 src/Handler/Users.hs                  |  2 +-
 src/Handler/Utils/Table/Cells.hs      | 12 ++++++------
 src/Import/NoModel.hs                 |  2 ++
 src/Model.hs                          | 17 +++++++++++++++++
 src/Utils.hs                          |  6 ------
 templates/correction-user.hamlet      |  2 +-
 templates/mail/submissionRated.hamlet |  2 +-
 templates/profileData.hamlet          | 10 +++++-----
 templates/submission.hamlet           |  2 +-
 17 files changed, 82 insertions(+), 33 deletions(-)
 create mode 100644 src/Data/CryptoID/Instances.hs
 create mode 100644 src/Data/Maybe/Instances.hs

diff --git a/src/Data/CryptoID/Instances.hs b/src/Data/CryptoID/Instances.hs
new file mode 100644
index 000000000..e98207784
--- /dev/null
+++ b/src/Data/CryptoID/Instances.hs
@@ -0,0 +1,18 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.CryptoID.Instances
+  (
+  ) where
+
+-- import qualified Data.CryptoID as CID
+
+-- import Data.CaseInsensitive (CI)
+-- import qualified Data.CaseInsensitive as CI
+
+-- import Text.Blaze (ToMarkup(..))
+
+-- import ClassyPrelude
+
+-- TODO: markup instance for UUIDs
+-- instance ToMarkup c => ToMarkup (CID.CryptoID c s) where
+--   toMarkup = toMarkup . CID.ciphertext
\ No newline at end of file
diff --git a/src/Data/Maybe/Instances.hs b/src/Data/Maybe/Instances.hs
new file mode 100644
index 000000000..4b6eaf9e8
--- /dev/null
+++ b/src/Data/Maybe/Instances.hs
@@ -0,0 +1,13 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Maybe.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Text.Blaze (ToMarkup(..), string)
+
+instance ToMarkup a => ToMarkup (Maybe a) where
+  toMarkup Nothing  = string ""
+  toMarkup (Just x) = toMarkup x
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 3be718bb7..885a060de 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -91,15 +91,18 @@ import qualified Data.Aeson as JSON
 import Data.FileEmbed (embedFile)
 
 
+-- TODO: remove once CryptoID is an instance of ToMarkup
 instance DisplayAble b => DisplayAble (E.CryptoID a b) where
   display = display . ciphertext
 
 instance {-# OVERLAPS #-} namespace ~ CryptoIDNamespace (CI FilePath) SubmissionId => DisplayAble (E.CryptoID namespace (CI FilePath)) where
   display = toPathPiece
 
+-- TODO: remove
 instance DisplayAble TermId where
   display = termToText . unTermKey
 
+-- TODO: remove
 instance DisplayAble SchoolId where
   display = CI.original . unSchoolKey
 
@@ -215,6 +218,7 @@ maybeDisplay :: DisplayAble m => Text -> Maybe m -> Text  -> Text
 maybeDisplay _      Nothing  _     = mempty
 maybeDisplay before (Just x) after = before <> (display x) <> after
 
+-- TODO: decouple from DisplayAble
 -- Messages creates type UniWorXMessage and RenderMessage UniWorX instance
 mkMessage "UniWorX" "messages/uniworx" "de"
 mkMessageVariant "UniWorX" "Campus" "messages/campus" "de"
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index dc8cb791e..9f68b6fbb 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -126,7 +126,7 @@ colSheet = sortable (Just "sheet") (i18nCell MsgSheet) $ \row ->
               ssh   = course ^. _4
               csh   = course ^. _2
               shn   = sheetName $ entityVal sheet
-          in anchorCell (CSheetR tid ssh csh shn SShowR) [whamlet|#{display shn}|]
+          in anchorCell (CSheetR tid ssh csh shn SShowR) [whamlet|_{shn}|]
 
 colSheetType :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
 colSheetType = sortable (toNothing "sheetType") (i18nCell MsgSheetType) $
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 5abd1e624..9c3c768e4 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -53,7 +53,7 @@ colCourse :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
 colCourse = sortable (Just "course") (i18nCell MsgCourse)
           $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } ->
             anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR)
-              [whamlet|#{display courseName}|]
+              [whamlet|_{courseName}|]
 
 -- colCourseDescr :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
 -- colCourseDescr = sortable (Just "course") (i18nCell MsgCourse) $ do
@@ -70,7 +70,7 @@ colDescription = sortable Nothing mempty
 colCShort :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
 colCShort = sortable (Just "cshort") (i18nCell MsgCourseShort)
           $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } ->
-            anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR) [whamlet|#{display courseShorthand}|]
+            anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR) [whamlet|_{courseShorthand}|]
 
 -- colCShortDescr :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
 -- colCShortDescr = sortable (Just "cshort") (i18nCell MsgCourseShort)
@@ -89,17 +89,17 @@ colCShort = sortable (Just "cshort") (i18nCell MsgCourseShort)
 colTerm :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
 colTerm = sortable (Just "term") (i18nCell MsgTerm)
           $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } ->
-            anchorCell (TermCourseListR courseTerm) [whamlet|#{display courseTerm}|]
+            anchorCell (TermCourseListR courseTerm) [whamlet|#{courseTerm}|]
 
 colSchool :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
 colSchool = sortable (Just "school") (i18nCell MsgCourseSchool)
           $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, Entity _ School{..}) } ->
-            anchorCell (TermSchoolCourseListR courseTerm courseSchool) [whamlet|#{display schoolName}|]
+            anchorCell (TermSchoolCourseListR courseTerm courseSchool) [whamlet|_{schoolName}|]
 
 colSchoolShort :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
 colSchoolShort = sortable (Just "schoolshort") (i18nCell MsgCourseSchoolShort)
           $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, Entity _ School{..}) } ->
-            anchorCell (TermSchoolCourseListR courseTerm courseSchool) [whamlet|#{display schoolShorthand}|]
+            anchorCell (TermSchoolCourseListR courseTerm courseSchool) [whamlet|_{schoolShorthand}|]
 
 colRegFrom :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a)
 colRegFrom = sortable (Just "register-from") (i18nCell MsgRegisterFrom)
diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs
index b907ecf50..978e4711c 100644
--- a/src/Handler/Home.hs
+++ b/src/Handler/Home.hs
@@ -33,14 +33,14 @@ homeOpenCourses = do
       colonnade = mconcat
         [ -- dbRow
           sortable (Just "term")   (i18nCell MsgTerm) $ \DBRow{ dbrOutput=Entity{entityVal = course} } ->
-            textCell $ display $ courseTerm course
+            textCell $ display $ courseTerm course  -- TODO: ToText instance for Key Term
         , sortable (Just "school") (i18nCell MsgCourseSchool) $ \DBRow{ dbrOutput=Entity{entityVal = course} } ->
-            textCell $ display $ courseSchool course
+            textCell $ display $ courseSchool course  -- TODO: ToText instance
         , sortable (Just "course") (i18nCell MsgCourse) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> do
             let tid = courseTerm      course
                 ssh = courseSchool    course
                 csh = courseShorthand course
-            anchorCell (CourseR tid ssh csh CShowR) (toWidget $ display csh)
+            anchorCell (CourseR tid ssh csh CShowR) (toWidget csh)
         , sortable (Just "deadline") (i18nCell MsgRegisterTo) $ \DBRow{ dbrOutput=Entity{entityVal = course} } ->
             cell $ traverse (formatTime SelFormatDateTime) (courseRegisterTo course) >>= maybe mempty toWidget
         ]
@@ -121,9 +121,9 @@ homeUpcomingSheets uid = do
         , sortable (Just "school") (i18nCell MsgCourseSchool) $ \DBRow{ dbrOutput=(_,E.Value ssh,_,_,_,_) } ->
             textCell $ display ssh
         , sortable (Just "course") (i18nCell MsgCourse) $ \DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, _, _, _) } ->
-            anchorCell (CourseR tid ssh csh CShowR) (toWidget $ display csh)
+            anchorCell (CourseR tid ssh csh CShowR) (toWidget csh)
         , sortable (Just "sheet")  (i18nCell MsgSheet)  $ \DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, _) } ->
-            anchorCell (CSheetR tid ssh csh shn SShowR) (toWidget $ display shn)
+            anchorCell (CSheetR tid ssh csh shn SShowR) (toWidget shn)
         , sortable (Just "deadline") (i18nCell MsgDeadline) $ \DBRow{ dbrOutput=(_, _, _, _, E.Value deadline, _) } ->
             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) } ->
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 403e133c7..611e82cdb 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -45,6 +45,7 @@ makeSettingForm template html = do
         <*> notificationForm (stgNotificationSettings <$> template)
     return (result, widget) -- no validation required here
   where
+    -- TODO: replace display
     themeList = [Option (display t) t (toPathPiece t) | t <- universeF]
 --
 -- Version with proper grouping:
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index c14424251..9717a04df 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -236,7 +236,7 @@ getSheetListR tid ssh csh = do
                     mkRoute = do
                       cid' <- mkCid
                       return $ CSubmissionR tid ssh csh sheetName cid' SubShowR
-                in anchorCellM mkRoute (mkCid >>= \cid2 -> [whamlet|#{display cid2}|])
+                in anchorCellM mkRoute (mkCid >>= \cid2 -> [whamlet|#{display cid2}|])  -- TODO: replace display
       , sortable (Just "rating") (i18nCell MsgRating)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub,_)} ->
             let stats = sheetTypeSum sheetType in -- for statistics over all shown rows
diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs
index 8af2f6620..01b0055d9 100644
--- a/src/Handler/Users.hs
+++ b/src/Handler/Users.hs
@@ -41,7 +41,7 @@ getUsersR = do
           (nameWidget userDisplayName userSurname)
       , sortable (Just "matriculation") (i18nCell MsgMatrikelNr) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
           (AdminUserR <$> encrypt uid)
-          (toWidget . display $ userMatrikelnummer)
+          (toWgt userMatrikelnummer)
 --       , sortable (Just "last-name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
 --           (AdminUserR <$> encrypt uid)
 --           (toWidget . display $ last $ impureNonNull $ words $ userDisplayName)
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 620e6776b..6f400d0c7 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -185,7 +185,7 @@ termCell :: IsDBTable m a => TermId -> DBCell m a
 termCell tid = anchorCell link name
   where
     link = TermCourseListR tid
-    name = text2widget $ display tid
+    name = toWgt tid
 
 termCellCL :: IsDBTable m a => CourseLink -> DBCell m a
 termCellCL (tid,_,_) = termCell tid
@@ -194,11 +194,11 @@ schoolCell :: IsDBTable m a => Maybe TermId -> SchoolId -> DBCell m a
 schoolCell (Just tid) ssh  = anchorCell link name
   where
     link = TermSchoolCourseListR tid ssh
-    name = text2widget $ display ssh
+    name = toWgt ssh
 schoolCell Nothing ssh  = anchorCell link name
   where
     link = SchoolShowR ssh
-    name = text2widget $ display ssh
+    name = toWgt ssh
 
 schoolCellCL :: IsDBTable m a => CourseLink -> DBCell m a
 schoolCellCL (tid,ssh,_) = schoolCell (Just tid) ssh
@@ -207,7 +207,7 @@ courseCellCL :: IsDBTable m a => CourseLink -> DBCell m a
 courseCellCL (tid,ssh,csh) = anchorCell link name
   where
     link = CourseR tid ssh csh CShowR
-    name = citext2widget csh
+    name = toWgt csh
 
 courseCell :: IsDBTable m a => Course -> DBCell m a
 courseCell Course{..} = anchorCell link name `mappend` desc
@@ -228,7 +228,7 @@ sheetCell crse shn =
       ssh = crse ^. _2
       csh = crse ^. _3
       link= CSheetR tid ssh csh shn SShowR
-  in anchorCell link $ display2widget shn
+  in anchorCell link $ toWgt shn
 
 submissionCell :: IsDBTable m a => CourseLink -> SheetName -> SubmissionId -> DBCell m a
 submissionCell crse shn sid =
@@ -237,7 +237,7 @@ submissionCell crse shn sid =
       csh = crse ^. _3
       mkCid = encrypt sid
       mkRoute cid = CSubmissionR tid ssh csh shn cid SubShowR
-      mkText      = display2widget
+      mkText      = display2widget  -- TODO: replace with toWgt once there is a ToMarkup instance for CryptoIDs
   in anchorCellM' mkCid mkRoute mkText
 
 correctorStateCell :: IsDBTable m a => SheetCorrector -> DBCell m a
diff --git a/src/Import/NoModel.hs b/src/Import/NoModel.hs
index d2ba81705..79000ecfe 100644
--- a/src/Import/NoModel.hs
+++ b/src/Import/NoModel.hs
@@ -76,6 +76,8 @@ import Language.Haskell.TH.Instances as Import ()
 import Data.List.NonEmpty.Instances as Import ()
 import Data.NonNull.Instances as Import ()
 import Data.Monoid.Instances  as Import ()
+import Data.Maybe.Instances  as Import ()
+import Data.CryptoID.Instances  as Import ()
 import Data.Set.Instances     as Import ()
 import Data.HashMap.Strict.Instances as Import ()
 import Data.HashSet.Instances as Import ()
diff --git a/src/Model.hs b/src/Model.hs
index c86406275..f2caba32f 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -23,6 +23,9 @@ import Utils.Message (MessageStatus)
 
 import Settings.Cluster (ClusterSettingsKey)
 
+import Text.Blaze (ToMarkup(..))
+
+
 -- You can define all of your database entities in the entities file.
 -- You can find more information on persistent and how to declare entities
 -- at:
@@ -38,3 +41,17 @@ deriving instance Eq (Unique Tutorial)  -- instance Eq Tutorial
 
 submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime
+
+-- ToMarkup instances for displaying certain database primary keys
+-- TODO: work in progress, populate with more instances
+-- TODO: is there a better place for this?
+
+instance ToMarkup (Key School) where
+  toMarkup = toMarkup . unSchoolKey
+
+instance ToMarkup (Key Term) where
+  toMarkup = toMarkup . termToText . unTermKey
+
+-- TODO: unfinished
+-- instance ToMarkup (Key Submission) where
+--   toMarkup = toMarkup . unSubmissionKey
\ No newline at end of file
diff --git a/src/Utils.hs b/src/Utils.hs
index 4f565befe..55124298b 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -251,12 +251,6 @@ class DisplayAble a where
   default display :: Show a => a -> Text
   display = pack . show
 
-instance DisplayAble Text where
-  display = id
-
--- instance DisplayAble String where
---   display = pack
-
 instance DisplayAble Int
 instance DisplayAble Int64
 instance DisplayAble Integer
diff --git a/templates/correction-user.hamlet b/templates/correction-user.hamlet
index 0a639bf81..848557260 100644
--- a/templates/correction-user.hamlet
+++ b/templates/correction-user.hamlet
@@ -6,7 +6,7 @@
     $maybe Entity _ User{userDisplayName} <- corrector
       <tr .table__row>
         <th .table__th>_{MsgRatingBy}
-        <td .table__td>#{display userDisplayName}
+        <td .table__td>#{userDisplayName}
     $maybe time <- submissionRatingTime
       <tr .table__row>
         <th .table__th>_{MsgRatingTime}
diff --git a/templates/mail/submissionRated.hamlet b/templates/mail/submissionRated.hamlet
index 63afe4ee5..e632a5bef 100644
--- a/templates/mail/submissionRated.hamlet
+++ b/templates/mail/submissionRated.hamlet
@@ -27,7 +27,7 @@ $newline never
         <dt>
           _{MsgRatingBy}
         <dd>
-          #{display userDisplayName}
+          #{userDisplayName}
       $maybe time <- submissionRatingTime'
         <dt>
           _{MsgRatingTime}
diff --git a/templates/profileData.hamlet b/templates/profileData.hamlet
index 1946b98b6..28d23e806 100644
--- a/templates/profileData.hamlet
+++ b/templates/profileData.hamlet
@@ -9,7 +9,7 @@
       <dt .deflist__dt> _{MsgEMail}
       <dd .deflist__dd> #{mailtoHtml userEmail}
       <dt .deflist__dt> _{MsgIdent}
-      <dd .deflist__dd> #{display userIdent}
+      <dd .deflist__dd> #{userIdent}
       <dt .deflist__dt> _{MsgLastLogin}
       <dd .deflist__dd>
         $maybe llogin <- lastLogin
@@ -23,7 +23,7 @@
           $forall (E.Value institute) <- admin_rights
             <li .list-ul__item>
               <a href=@{SchoolShowR $ SchoolKey institute}>
-                #{display institute}
+                #{institute}
     $if not $ null lecturer_rights
       <dt .deflist__dt>_{MsgLecturerFor}
       <dd .deflist__dd>
@@ -31,14 +31,14 @@
           $forall (E.Value institute) <- lecturer_rights
             <li .list-ul__item>
               <a href=@{SchoolShowR $ SchoolKey institute}>
-                #{display institute}
+                #{institute}
     $if not $ null lecture_corrector
       <dt .deflist__dt> Korrektor
       <dd .deflist__dd>
         <ul .list-ul>
           $forall (E.Value tid, E.Value ssh, E.Value csh) <- lecture_corrector
             <li .list-ul__item>
-              <a href=@{CourseR tid ssh csh CShowR}>#{display tid}-#{display ssh}-#{display csh}
+              <a href=@{CourseR tid ssh csh CShowR}>#{tid}-#{ssh}-#{csh}
     $if not $ null studies
       <dt .deflist__dt> Studiengänge
       <dd .deflist__dd>
@@ -58,7 +58,7 @@
                 <td .table__td>_{field}#{notUsedT studyFeaturesField}
                 <td .table__td>_{degree}#{notUsedT studyFeaturesDegree}
                 <td .table__td>_{studyFeaturesType}
-                <td .table__td>#{display studyFeaturesSemester}
+                <td .table__td>#{studyFeaturesSemester}
                 <td .table__td>#{hasTickmark studyFeaturesValid}
                 <td .table__td>^{formatTimeW SelFormatDateTime studyFeaturesUpdated}
 
diff --git a/templates/submission.hamlet b/templates/submission.hamlet
index c48654517..3b5728941 100644
--- a/templates/submission.hamlet
+++ b/templates/submission.hamlet
@@ -20,7 +20,7 @@ $maybe cID <- mcid
           $maybe name <- mbName
             <li>_{MsgEditedBy name time}
           $nothing
-            <li>#{display time}
+            <li>#{time}
 
   $if maySubmit
     <section>

From d884224d1e8c652c6ec32bd57dbf37108425dc17 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 20 Jun 2019 13:52:04 +0200
Subject: [PATCH 479/519] Removed unused DisplayAble instances for CI and
 Esqueleto.Value

---
 src/Utils.hs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Utils.hs b/src/Utils.hs
index 55124298b..8f5f6c901 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -47,9 +47,6 @@ import Control.Monad.Except (MonadError(..))
 import Control.Monad.Trans.Maybe as Utils (MaybeT(..))
 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 ()
@@ -268,12 +265,6 @@ instance DisplayAble a => DisplayAble (Maybe a) where
   display Nothing  = ""
   display (Just x) = display x
 
-instance DisplayAble a => DisplayAble (E.Value a) where
-  display = display . E.unValue
-
-instance DisplayAble a => DisplayAble (CI a) where
-  display = display . CI.original
-
 instance HasResolution a => DisplayAble (Fixed a) where
   display = pack . showFixed True
 

From 117dc8185abb4da914ec38ee04a27925960d234f Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 24 Jun 2019 22:59:51 +0200
Subject: [PATCH 480/519] chore: add postbump sync version step to relase
 script

---
 package-lock.json | 43 ++++++++++++++++++++++++++++++++++++++++++-
 package.json      | 17 ++++++++++++++---
 sync-versions.js  | 16 ++++++++++++++++
 3 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 sync-versions.js

diff --git a/package-lock.json b/package-lock.json
index f7ba10d64..020e9a34f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -12465,6 +12465,47 @@
         "mkdirp": "^0.5.1"
       }
     },
+    "write-file-atomic": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "write-yaml-file": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/write-yaml-file/-/write-yaml-file-3.0.1.tgz",
+      "integrity": "sha512-OHzbrlgjw/K/BAH6LdEOcSQFz5nkk0I/25CjKLIVFvcg2Ej7+QE/GTnitgqWnhlsdghor7OV5gfttQPGogQ1XA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "js-yaml": "^3.8.1",
+        "make-dir": "^3.0.0",
+        "pify": "^4.0.0",
+        "write-file-atomic": "^2.4.3"
+      },
+      "dependencies": {
+        "make-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz",
+          "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz",
+          "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==",
+          "dev": true
+        }
+      }
+    },
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
diff --git a/package.json b/package.json
index 0e81207eb..68bfb9125 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,15 @@
       "git add"
     ]
   },
+  "standard-version": {
+    "scripts": {
+      "postbump": "node ./sync-versions.js"
+    },
+    "skip": {
+      "tag": true,
+      "commit": true
+    }
+  },
   "browserslist": [
     "defaults"
   ],
@@ -41,10 +50,10 @@
     "@babel/plugin-proposal-class-properties": "^7.4.4",
     "@babel/plugin-proposal-decorators": "^7.4.4",
     "@babel/preset-env": "^7.4.5",
-    "autoprefixer": "^9.6.0",
-    "babel-core": "^6.26.3",
     "@commitlint/cli": "^8.0.0",
     "@commitlint/config-conventional": "^8.0.0",
+    "autoprefixer": "^9.6.0",
+    "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.6",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -55,6 +64,7 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "husky": "^2.4.1",
     "jasmine-core": "^3.4.0",
+    "js-yaml": "^3.13.1",
     "karma": "^4.1.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^2.0.0",
@@ -73,7 +83,8 @@
     "style-loader": "^0.23.1",
     "uglifyjs-webpack-plugin": "^2.1.3",
     "webpack": "^4.34.0",
-    "webpack-cli": "^3.3.4"
+    "webpack-cli": "^3.3.4",
+    "write-yaml-file": "^3.0.1"
   },
   "dependencies": {
     "flatpickr": "^4.5.7"
diff --git a/sync-versions.js b/sync-versions.js
new file mode 100644
index 000000000..1c5ae8c9b
--- /dev/null
+++ b/sync-versions.js
@@ -0,0 +1,16 @@
+const yaml = require('js-yaml');
+const fs   = require('fs');
+const packageJson = require('./package.json');
+const writeYamlFile = require('write-yaml-file')
+
+try {
+  const packageYaml = yaml.safeLoad(fs.readFileSync('./package.yaml', 'utf8'));
+  packageYaml.version = packageJson.version;
+  yaml.safeDump(packageYaml);
+  console.log(packageJson.version, packageYaml.version);
+  writeYamlFile('package.yaml', packageYaml).then(() => {
+    console.log('done');
+  });
+} catch (e) {
+  console.log(e);
+}

From db584d5cea27737b5c381d16713150b7f0ac06f7 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 24 Jun 2019 23:04:25 +0200
Subject: [PATCH 481/519] chore: remove node script to sync versions in package
 files

---
 package.json     |  6 ++----
 sync-versions.js | 16 ----------------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 sync-versions.js

diff --git a/package.json b/package.json
index 68bfb9125..bd22b7c55 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
   },
   "standard-version": {
     "scripts": {
-      "postbump": "node ./sync-versions.js"
+      "postbump": "echo add any shell command here..."
     },
     "skip": {
       "tag": true,
@@ -64,7 +64,6 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "husky": "^2.4.1",
     "jasmine-core": "^3.4.0",
-    "js-yaml": "^3.13.1",
     "karma": "^4.1.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^2.0.0",
@@ -83,8 +82,7 @@
     "style-loader": "^0.23.1",
     "uglifyjs-webpack-plugin": "^2.1.3",
     "webpack": "^4.34.0",
-    "webpack-cli": "^3.3.4",
-    "write-yaml-file": "^3.0.1"
+    "webpack-cli": "^3.3.4"
   },
   "dependencies": {
     "flatpickr": "^4.5.7"
diff --git a/sync-versions.js b/sync-versions.js
deleted file mode 100644
index 1c5ae8c9b..000000000
--- a/sync-versions.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const yaml = require('js-yaml');
-const fs   = require('fs');
-const packageJson = require('./package.json');
-const writeYamlFile = require('write-yaml-file')
-
-try {
-  const packageYaml = yaml.safeLoad(fs.readFileSync('./package.yaml', 'utf8'));
-  packageYaml.version = packageJson.version;
-  yaml.safeDump(packageYaml);
-  console.log(packageJson.version, packageYaml.version);
-  writeYamlFile('package.yaml', packageYaml).then(() => {
-    console.log('done');
-  });
-} catch (e) {
-  console.log(e);
-}

From 16d422d9d82467ea6e6800bee5d1af06b7fe1d3b Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 25 Jun 2019 20:45:46 +0200
Subject: [PATCH 482/519] fix(fe-deflist): avoid horizontal scroll on pages
 with deflist

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

diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 9db97efb6..6306920e2 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -502,7 +502,7 @@ ul.list--inline {
 @media (min-width: 768px) {
 
   .deflist {
-    grid-template-columns: max-content minmax(auto, max-content);
+    grid-template-columns: max-content minmax(0, max-content);
 
     .deflist {
       margin-top: -10px;

From c82c3a9d80c4111b77ecda6ead30fdae25106b37 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 25 Jun 2019 23:09:47 +0200
Subject: [PATCH 483/519] chore: small commit to get the pipeline started

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

diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 6306920e2..2fdc1b3de 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -580,7 +580,7 @@ section {
     justify-content: center;
   }
 }
-  
+
 .form-group__input > .notification {
   margin: 0;
 }

From 8a626174d0edcb85439b1e00b9ab070cb494b339 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 26 Jun 2019 10:06:58 +0200
Subject: [PATCH 484/519] Removed more DisplayAble instances

---
 src/Data/Fixed/Instances.hs                         | 13 +++++++++++++
 src/Data/Sum/Instances.hs                           | 13 +++++++++++++
 src/Foundation.hs                                   |  1 -
 src/Import/NoModel.hs                               |  2 ++
 src/Utils.hs                                        |  7 -------
 .../grading-summary/grading-summary-row.hamlet      |  8 ++++----
 6 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 src/Data/Fixed/Instances.hs
 create mode 100644 src/Data/Sum/Instances.hs

diff --git a/src/Data/Fixed/Instances.hs b/src/Data/Fixed/Instances.hs
new file mode 100644
index 000000000..03afaeb0e
--- /dev/null
+++ b/src/Data/Fixed/Instances.hs
@@ -0,0 +1,13 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Fixed.Instances
+  (
+  ) where
+
+import ClassyPrelude
+import Data.Fixed
+
+import Text.Blaze (ToMarkup(..))
+
+instance HasResolution a => ToMarkup (Fixed a) where
+  toMarkup = toMarkup . showFixed True
\ No newline at end of file
diff --git a/src/Data/Sum/Instances.hs b/src/Data/Sum/Instances.hs
new file mode 100644
index 000000000..81c99f393
--- /dev/null
+++ b/src/Data/Sum/Instances.hs
@@ -0,0 +1,13 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Sum.Instances
+  (
+  ) where
+
+import ClassyPrelude
+import Data.Monoid (Sum(..))
+
+import Text.Blaze (ToMarkup(..))
+
+instance ToMarkup a => ToMarkup (Sum a) where
+  toMarkup = toMarkup . getSum
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 885a060de..15a35a2bb 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -218,7 +218,6 @@ maybeDisplay :: DisplayAble m => Text -> Maybe m -> Text  -> Text
 maybeDisplay _      Nothing  _     = mempty
 maybeDisplay before (Just x) after = before <> (display x) <> after
 
--- TODO: decouple from DisplayAble
 -- Messages creates type UniWorXMessage and RenderMessage UniWorX instance
 mkMessage "UniWorX" "messages/uniworx" "de"
 mkMessageVariant "UniWorX" "Campus" "messages/campus" "de"
diff --git a/src/Import/NoModel.hs b/src/Import/NoModel.hs
index 79000ecfe..9753d0e75 100644
--- a/src/Import/NoModel.hs
+++ b/src/Import/NoModel.hs
@@ -78,6 +78,8 @@ import Data.NonNull.Instances as Import ()
 import Data.Monoid.Instances  as Import ()
 import Data.Maybe.Instances  as Import ()
 import Data.CryptoID.Instances  as Import ()
+import Data.Sum.Instances     as Import ()
+import Data.Fixed.Instances   as Import ()
 import Data.Set.Instances     as Import ()
 import Data.HashMap.Strict.Instances as Import ()
 import Data.HashSet.Instances as Import ()
diff --git a/src/Utils.hs b/src/Utils.hs
index 8f5f6c901..344b8f510 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -261,16 +261,9 @@ instance DisplayAble Rational where
       rat2float :: Rational -> Double
       rat2float = fromRational
 
-instance DisplayAble a => DisplayAble (Maybe a) where
-  display Nothing  = ""
-  display (Just x) = display x
-
 instance HasResolution a => DisplayAble (Fixed a) where
   display = pack . showFixed True
 
-instance DisplayAble a => DisplayAble (Sum a) where
-  display = display . getSum
-
 {- We do not want DisplayAble for every Show-Class:
    We want to explicitly verify that the resulting text can be displayed to the User!
    For example: UTCTime values were shown without proper format rendering!
diff --git a/templates/widgets/grading-summary/grading-summary-row.hamlet b/templates/widgets/grading-summary/grading-summary-row.hamlet
index 261b98e1a..fd6c9f73f 100644
--- a/templates/widgets/grading-summary/grading-summary-row.hamlet
+++ b/templates/widgets/grading-summary/grading-summary-row.hamlet
@@ -42,13 +42,13 @@ $#
                 $# Falls Anzahl Blätter der Zeile verschieden von Anzahl gewerterer Blätter
                 \ (_{title $ getSum $ summary ^. _numMarkedPoints})
                 $# Kurze Alternative mit Hashtag-Symbol für "Anzahl"
-                $# \ (##{display $ summary ^. _numMarkedPoints})
+                $# \ (##{summary ^. _numMarkedPoints})
       $maybe _ <- hasPoints
         <td .table__td>
-          #{display (summary ^. _sumSheetsPoints)}
+          #{summary ^. _sumSheetsPoints}
           $if ((summary ^. _numSheetsPoints) /= (summary ^. _numSheets))
             $# Falls Anzahl Blätter der Zeile verschieden von Anzahl Blätter mit Punkten
             \ (_{title $ getSum $ summary ^. _numSheetsPoints})
             $# Kurze Alternative mit Hashtag-Symbol für "Anzahl"
-            $# \ (##{display $ summary ^. _numSheetsPoints})
-      <td .table__td>#{display $ summary ^. _numSheets}
+            $# \ (##{summary ^. _numSheetsPoints})
+      <td .table__td>#{summary ^. _numSheets}

From 2f7f733628a1c57e5eb2690bfd218b4d8cb023fd Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 26 Jun 2019 12:12:19 +0200
Subject: [PATCH 485/519] =?UTF-8?q?Abgaben=20Zuteilung=20=C3=BCberarbeitet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/tasks.json                    |  1 +
 messages/uniworx/de.msg               | 15 +++++-
 src/Foundation.hs                     |  9 ++++
 src/Handler/Corrections.hs            | 69 ++++++++++++++++++---------
 src/Handler/Utils/Submission.hs       | 14 ++++--
 templates/corrections-overview.hamlet | 63 +++++++++++++++++-------
 6 files changed, 125 insertions(+), 46 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index fabc6a5d5..4c18542ba 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -14,6 +14,7 @@
         "reveal": "always",
         "focus": false,
         "panel": "dedicated",
+        "clear": true,
         "showReuseMessage": false
       }
     },
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index c0ee216ae..455b57773 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -34,6 +34,12 @@ GenericShort: Kürzel
 GenericIsNew: Neu
 GenericHasConflict: Konflikt
 GenericBack: Zurück
+GenericChange: Änderung
+GenericNumChange: +/-
+GenericMin: Min
+GenericAvg: Avg
+GenericMax: Max
+GenericAll: Insgesamt
 
 SummerTerm year@Integer: Sommersemester #{display year}
 WinterTerm year@Integer: Wintersemester #{display year}/#{display $ succ year}
@@ -316,6 +322,7 @@ Correctors: Korrektoren
 CorState: Status
 CorByTut: Zuteilung nach Tutorium
 CorProportion: Anteil
+CorDeficit: Defizit
 CorByProportionOnly proportion@Rational: #{display proportion} Anteile
 CorByProportionIncludingTutorial proportion@Rational: #{display proportion} Anteile - Tutorium
 CorByProportionExcludingTutorial proportion@Rational: #{display proportion} Anteile + Tutorium
@@ -391,10 +398,11 @@ UpdatedAssignedCorrectorSingle num@Int64: #{display num} Abgaben wurden dem neue
 NoCorrector: Kein Korrektor
 RemovedCorrections num@Int64: Korrektur-Daten wurden von #{display num} Abgaben entfernt.
 UpdatedAssignedCorrectorsAuto num@Int64: #{display num} Abgaben wurden unter den Korrektoren aufgeteilt.
+UpdatedSheetCorrectorsAutoAssigned n@Int: #{display n} #{pluralDE n "Abgabe wurde einem Korrektor" "Abgaben wurden Korrektoren"} zugteilt.
+UpdatedSheetCorrectorsAutoFailed n@Int: #{display n} #{pluralDE n "Abgabe konnte" "Abgaben konnten"} nicht automatisch zugewiesen werden.
 CouldNotAssignCorrectorsAuto num@Int64: #{display num} Abgaben konnten nicht automatisch zugewiesen werden:
 SelfCorrectors num@Int64: #{display num} Abgaben wurden Abgebenden als eigenem Korrektor zugeteilt!
 
-
 CorrectionSheets: Übersicht Korrekturen nach Blättern
 CorrectionCorrectors: Übersicht Korrekturen nach Korrektoren
 AssignSubmissionExceptionNoCorrectors: Es sind keine Korrektoren eingestellt
@@ -402,13 +410,15 @@ AssignSubmissionExceptionNoCorrectorsByProportion: Es sind keine Korrektoren mit
 AssignSubmissionExceptionSubmissionsNotFound n@Int: #{tshow n} Abgaben konnten nicht gefunden werden
 NrSubmittorsTotal: Abgebende
 NrSubmissionsTotal: Abgaben
+NrSubmissionsTotalShort: Abg.
 NrSubmissionsUnassigned: Ohne Korrektor
 NoCorrectorAssigned: Ohne Korrektor
 NrCorrectors: Korrektoren
 NrSubmissionsNewlyAssigned: Neu zugeteilt
 NrSubmissionsNotAssigned: Nicht zugeteilt
 NrSubmissionsNotCorrected: Unkorrigiert
-CorrectionTime: Korrekturdauer (Min/Avg/Max)
+NrSubmissionsNotCorrectedShort: Unkg.
+CorrectionTime: Korrekturdauer
 AssignSubmissionsRandomWarning: Die Zuteilungsvorschau kann von der tatsächlichen Zuteilung abweichen, wenn mehrere Blätter auf einmal zugeteilt werden, da beim Ausgleich der Kontigente nur bereits zugeteilte Abgaben berücksichtigt werden. Da es ein randomisierte Prozess ist, kann es auch bei einzelnen Blättern gerinfgügige Abweichungen geben.
 
 CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
@@ -831,6 +841,7 @@ MenuCourseDelete: Kurs löschen
 MenuSubmissionNew: Abgabe anlegen
 MenuSubmissionOwn: Abgabe
 MenuCorrectors: Korrektoren
+MenuCorrectorsChange: Korrektoren ändern
 MenuSheetEdit: Übungsblatt editieren
 MenuSheetDelete: Übungsblatt löschen
 MenuSheetClone:  Als neues Übungsblatt klonen
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 3be718bb7..3e243af41 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -206,6 +206,15 @@ noneOneMoreDE num noneText singularForm pluralForm
   | num == 1  = singularForm
   | otherwise = pluralForm
 
+noneMoreDE :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ None
+            -> Text -- ^ Some
+            -> Text
+noneMoreDE num noneText someText
+  | num == 0  = noneText
+  | otherwise = someText
+
 -- Convenience Type for Messages, since Yesod messages cannot deal with compound type identifiers
 type IntMaybe  = Maybe Int
 type TextList  = [Text]
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 92a60d00e..bc46eb157 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1137,30 +1137,33 @@ assignHandler tid ssh csh cid assignSids = do
             in  List.foldr foldFun False sheetList
 
       -- plan or assign unassigned submissions for given sheets
-      let buildA :: (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int)) -> SheetId -> DB (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int))
+      let buildA :: (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int, Map UserId Rational)) -> SheetId -> DB (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int, Map UserId Rational))
           buildA acc sid = maybeT (return acc) $ do
             let shn = sheetName $ sheets ! sid
             -- is sheet closed?
             guardM $ lift $ hasWriteAccessTo $ CSheetR tid ssh csh shn SAssignR  -- we must check, whether the submission is already closed and thus assignable
-            -- has at least one uncorrected / unassigned submisison?
-            [E.Value hasSubmission] <- lift $ E.select $ return $ E.exists $ E.from $ \submission -> do
-              E.where_ $ submission E.^. SubmissionSheet    E.==. E.val sid
-              E.where_ $ E.isNothing $ submission E.^. SubmissionRatingBy   -- no corrector
-              E.where_ $ E.isNothing $ submission E.^. SubmissionRatingTime -- not done
-            guard hasSubmission
-            -- has at least one active corrector?
-            [E.Value hasCorrector] <- lift $ E.select $ return $ E.exists $ E.from $ \corrector -> do
-              E.where_ $ corrector E.^. SheetCorrectorSheet E.==. E.val sid
-              E.where_ $ corrector E.^. SheetCorrectorState E.==. E.val CorrectorNormal
-              -- E.where_ $ corrector E.^. SheetCorrectorLoad  E./=. E.val (Load {byTutorial = Nothing, byProportion = 0})
-            guard hasCorrector
-            -- TODO: Refactor guards above! We already have these informations, but forcing the maps inside the DB acces might not be a good idea
-            -- TODO: Maybe refactor planSubmissions instead to not throw exceptions, but signal "ok" or "not possible" instead!
-            plan <- lift $ planSubmissions sid Nothing
+            -- ask for assignment plan
+            let ignoreExceptions :: AssignSubmissionException -> DB (Map SubmissionId (Maybe UserId), Map UserId Rational) -- silently ignore errors, since we check all sheets and only care about sheets with unassigned corrections
+                ignoreExceptions NoCorrectors             = return mempty
+                ignoreExceptions NoCorrectorsByProportion = return mempty
+                ignoreExceptions (SubmissionsNotFound _sids_not_found) = return mempty -- cannot happen, since last argument to planSubmissions is Nothing
+            (plan,deficit) <- lift $ handle ignoreExceptions $ planSubmissions sid Nothing
+            guard $ not $ null plan -- only proceed if there is a plan for this sheet
+            -- implement assignment plan
             status <- lift $ case btnResult of
               Nothing -> return (Set.empty, Set.empty)
-              (Just BtnSubmissionsAssign) -> writeSubmissionPlan plan -- TODO: this comes to late!!
-            return $ Map.insert shn (status, countMapElems plan) acc
+              (Just BtnSubmissionsAssign) -> do
+                status@(sub_ok,sub_fail) <- writeSubmissionPlan plan
+                let nr_ok      = olength sub_ok
+                    nr_fail    = olength sub_fail
+                    alert_ok   = toMaybe (nr_ok   > 0) $ SomeMessage $ MsgUpdatedSheetCorrectorsAutoAssigned nr_ok
+                    alert_fail = toMaybe (nr_fail > 0) $ SomeMessage $ MsgUpdatedSheetCorrectorsAutoFailed   nr_fail
+                    msg_status = bool Success Error $ nr_fail > 0
+                    msg_header = SomeMessage $ shn <> ":"
+                when (nr_ok > 0 || nr_fail > 0) $
+                  addMessageI msg_status $ UniWorXMessages $ msg_header : catMaybes [alert_ok, alert_fail]
+                return status
+            return $ Map.insert shn (status, countMapElems plan, deficit) acc
       assignment <- foldM buildA Map.empty assignSids
 
       correctors <- E.select . E.from $ \(corrector `E.InnerJoin` user) -> do
@@ -1211,28 +1214,50 @@ assignHandler tid ssh csh cid assignSids = do
       -- create aggregate maps
       sheetMap :: Map SheetName CorrectionInfo
       sheetMap = Map.map fold infoMap
+
+      sheetLoad :: Map SheetName Load
+      sheetLoad = -- Map.unionsWith (<>) ((Map.filter () ) . snd) <$> Map.elems correctorMap)
+        let buildSL acc (_user,mSnSc) = Map.foldlWithKey buildL acc mSnSc
+            buildL acc s SheetCorrector{sheetCorrectorLoad=l, sheetCorrectorState=CorrectorNormal}
+              = Map.insertWith (<>) s l acc
+            buildL acc _ _ = acc
+        in  Map.foldl buildSL Map.empty correctorMap
+
+      deficitMap :: Map UserId Rational
+      deficitMap = foldMap (view _3) assignment
+
       corrMap  :: Map (Maybe UserId) CorrectionInfo
       corrMap  = Map.unionsWith (<>) $ Map.elems infoMap
       sheetNames = Map.keys infoMap
   let -- whamlet convenience functions
-      -- avoid nestes hamelt $maybe with duplicated $nothing
+      -- avoid nestes hamlet $maybe with duplicated $nothing
       getCorrector :: Maybe UserId -> (Widget,Map SheetName SheetCorrector)
       getCorrector (Just uid)
         | Just (User{..},loadMap) <- Map.lookup uid correctorMap
         = (nameEmailWidget userEmail userDisplayName userSurname, loadMap)
       getCorrector _ = ([whamlet|_{MsgNoCorrectorAssigned}|], mempty)
-      -- avoid nestes hamelt $maybe with duplicated $nothing
+      -- avoid nestes hamlet $maybe with duplicated $nothing
       getCorrSheetStatus :: Maybe UserId -> SheetName -> Maybe CorrectionInfo
       getCorrSheetStatus corr shn
         | (Just smap) <- Map.lookup shn infoMap
         = Map.lookup corr smap
       getCorrSheetStatus _ _ = Nothing
-      -- avoid nestes hamelt $maybe with duplicated $nothing
+      -- avoid nestes hamlet $maybe with duplicated $nothing
       getCorrNewAssignment :: Maybe UserId -> SheetName -> Maybe Int
       getCorrNewAssignment corr shn
-        | (Just (_,cass)) <- Map.lookup shn assignment
+        | (Just (_,cass,_)) <- Map.lookup shn assignment
         = Map.lookup corr cass
       getCorrNewAssignment _ _ = Nothing
+      -- avoid nestes hamlet $maybe with duplicated $nothing
+      getCorrDeficit :: Maybe UserId -> Maybe Rational
+      getCorrDeficit (Just uid) = Map.lookup uid deficitMap
+      getCorrDeficit _          = Nothing
+
+      getLoadSum :: SheetName -> Text
+      getLoadSum shn
+        | (Just load) <- Map.lookup shn sheetLoad
+        = "Σ" <> showCompactCorrectorLoad load CorrectorNormal
+      getLoadSum _ = mempty
 
       showDiffDays :: Maybe NominalDiffTime -> Text
       showDiffDays = foldMap formatDiffDays
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 7cb28cfa5..0a1e04e9c 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -66,7 +66,9 @@ assignSubmissions :: SheetId -- ^ Sheet to distribute to correctors
                   -> YesodDB UniWorX ( Set SubmissionId
                                      , Set SubmissionId
                                      ) -- ^ Returns assigned and unassigned submissions; unassigned submissions occur only if no tutors have an assigned load
-assignSubmissions sid restriction = planSubmissions sid restriction >>= writeSubmissionPlan
+assignSubmissions sid restriction = do
+    (plan,_) <- planSubmissions sid restriction
+    writeSubmissionPlan plan
 
 -- | Assigns all submissions according to an already given assignment plan
 writeSubmissionPlan :: Map SubmissionId (Maybe UserId)
@@ -89,8 +91,8 @@ writeSubmissionPlan newSubmissionData = do
 --   May throw an exception if there are no suitable correctors
 planSubmissions :: SheetId -- ^ Sheet to distribute to correctors
                   -> Maybe (Set SubmissionId) -- ^ Optionally restrict submission to consider
-                  -> YesodDB UniWorX (Map SubmissionId (Maybe UserId))
-                  -- ^ Return map that assigns submissions to Corrector
+                  -> YesodDB UniWorX (Map SubmissionId (Maybe UserId), Map UserId Rational)
+                  -- ^ Return map that assigns submissions to Corrector and another map showing each current correctors _previous_ deficit
 planSubmissions sid restriction = do
     Sheet{..} <- getJust sid
     correctorsRaw <- E.select . E.from $ \(sheet `E.InnerJoin` sheetCorrector) -> do
@@ -171,6 +173,10 @@ planSubmissions sid restriction = do
                          -> m b
       withSubmissionData f = f <$> (mappend <$> ask <*> State.get)
 
+      -- | Old Deficit for protocol purposes, not used here
+      oldDeficit :: Map UserId Rational
+      oldDeficit = Map.mapWithKey (\k _v -> calculateDeficit k submissionData) sheetCorrectors
+
       -- | How many additional submission should the given corrector be assigned, if possible?
       calculateDeficit :: UserId -> Map SubmissionId (Maybe UserId, Map UserId _, SheetId) -> Rational
       calculateDeficit corrector submissionState = getSum $ foldMap Sum deficitBySheet
@@ -235,7 +241,7 @@ planSubmissions sid restriction = do
 
         ix subId . _1 <~ Just <$> liftIO (Rand.uniform bestCorrectors)
 
-    return $ fmap (view _1) newSubmissionData
+    return (fmap (view _1) newSubmissionData, oldDeficit)
   where
     maximumsBy :: (Ord a, Ord b) => (a -> b) -> Set a -> Set a
     maximumsBy f xs = flip Set.filter xs $ \x -> maybe True (((==) `on` f) x . maximumBy (comparing f)) $ fromNullable xs
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index 621ffd51e..5d3f6ba8b 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -3,20 +3,26 @@
   _{MsgCourseParticipants nrParticipants}
   <table .table .table--striped .table--hover>
     <tr .table__row .table__row--head>
-      <th .table__th>_{MsgSheet}
+      <th .table__th rowspan=2>_{MsgSheet}
       $if groupsPossible
-        <th .table__th>_{MsgNrSubmittorsTotal}
-      <th .table__th >_{MsgNrSubmissionsTotal}
+        <th .table__th rowspan=2>_{MsgNrSubmittorsTotal}
+      <th .table__th rowspan=2>_{MsgNrSubmissionsTotal}
       <th .table__th colspan=2>_{MsgNrSubmissionsNotAssigned}
-      <th .table__th>_{MsgNrSubmissionsNotCorrected}
+      <th .table__th rowspan=2>_{MsgNrSubmissionsNotCorrected}
       <th .table__th colspan=3>_{MsgCorrectionTime}
+    <tr .table__row .table__row--head>
+      <th .table__th>
+      <th .table__th>_{MsgGenericNumChange}
+      <th .table__th>_{MsgGenericMin}
+      <th .table__th>_{MsgGenericAvg}
+      <th .table__th>_{MsgGenericMax}
     $forall (sheetName, CorrectionInfo{ciSubmittors, ciSubmissions, ciAssigned, ciCorrected, ciMin, ciTot, ciMax}) <- Map.toList sheetMap
       <tr .table__row>
         <td .table__td>^{simpleLink (toWidget sheetName) (CSheetR tid ssh csh sheetName SSubsR)}
         $if groupsPossible
           <td .table__td>#{ciSubmittors}
         <td .table__td>#{ciSubmissions}
-        $maybe ((splus,sfailed),_) <- Map.lookup sheetName assignment
+        $maybe ((splus,sfailed),_,_) <- Map.lookup sheetName assignment
           $if 0 < Set.size sfailed
             <td .table__td>#{ciSubmissions - ciAssigned}
             <td .table__td .alert-danger>(-#{show (Set.size splus)}, failed: #{show (Set.size sfailed)})
@@ -24,9 +30,11 @@
             <td .table__td>#{ciSubmissions - ciAssigned}
             <td .table__td .alert-info>(-#{show (Set.size splus)})
           $else
-            <td .table__td colspan=2>#{ciSubmissions - ciAssigned}
+            <td .table__td>#{ciSubmissions - ciAssigned}
+            <td .table__td>
         $nothing
-          <td .table__td colspan=2>#{ciSubmissions - ciAssigned}
+          <td .table__td>#{ciSubmissions - ciAssigned}
+          <td .table__td>
         <td .table__td>#{ciSubmissions - ciCorrected}
         <td .table__td>#{showDiffDays ciMin}
         <td .table__td>#{showAvgsDays ciTot ciCorrected}
@@ -35,43 +43,62 @@
   <h2>_{MsgCorrectionCorrectors}
   <table .table .table--striped .table--hover>
     <tr .table__row .table__row--head>
-      <th .table__th>_{MsgCorrector}
-      <th .table__th>_{MsgNrSubmissionsTotal}
-      <th .table__th>_{MsgNrSubmissionsNotCorrected}
+      <th .table__th rowspan=2>_{MsgCorrector}
+      <th .table__th colspan=2>_{MsgGenericAll}
+      <th .table__th>_{MsgCorProportion}
       <th .table__th colspan=3>_{MsgCorrectionTime}
       $forall shn <- sheetNames
         <th .table__th colspan=5>#{shn}
         $# ^{simpleLinkI (SomeMessage MsgMenuCorrectors) (CSheetR tid ssh csh shn SCorrR)}
+    <tr .table__row .table__row--head>
+      <th .table__th>_{MsgNrSubmissionsTotal}
+      <th .table__th>_{MsgNrSubmissionsNotCorrected}
+      <th .table__th>_{MsgCorDeficit}
+      <th .table__th>_{MsgGenericMin}
+      <th .table__th>_{MsgGenericAvg}
+      <th .table__th>_{MsgGenericMax}
+      $forall _shn <- sheetNames
+        <th .table__th>_{MsgCorProportion}
+        <th .table__th>_{MsgNrSubmissionsTotalShort}
+        <th .table__th>_{MsgGenericNumChange}
+        <th .table__th>_{MsgNrSubmissionsNotCorrectedShort}
+        <th .table__th>_{MsgGenericAvg}
     $forall (CorrectionInfo{ciCorrector, ciSubmissions, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
       $with (nameW,loadM) <- getCorrector ciCorrector
         <tr .table__row>
           <td .table__td>^{nameW}
           <td .table__td>#{ciSubmissions}
           <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciSubmissions - ciCorrected}
+          <td .table__td>
+              $maybe deficit <- getCorrDeficit ciCorrector
+                #{display deficit}
           <td .table__td>#{showDiffDays ciMin}
           <td .table__td>#{showAvgsDays ciTot ciCorrected}
           <td .table__td>#{showDiffDays ciMax}
           $forall shn <- sheetNames
-            $maybe SheetCorrector{sheetCorrectorLoad, sheetCorrectorState} <- Map.lookup shn loadM
-              <td .table__td>#{showCompactCorrectorLoad sheetCorrectorLoad sheetCorrectorState}
-            $nothing
-              <td .table__td>
+            <td .table__td>
+              $maybe SheetCorrector{sheetCorrectorLoad, sheetCorrectorState} <- Map.lookup shn loadM
+                #{showCompactCorrectorLoad sheetCorrectorLoad sheetCorrectorState}
             $maybe CorrectionInfo{ciSubmissions,ciCorrected,ciTot} <- getCorrSheetStatus ciCorrector shn
+              <td .table__td>#{ciSubmissions}
               $maybe nrNew <- getCorrNewAssignment ciCorrector shn
-                <td .table__td>#{ciSubmissions}
                 $# <td .table__td>#{ciAssigned} `ciSubmissions` is here always identical to `ciAssigned` and also works for `ciCorrector == Nothing`. ciAssigned only useful in aggregate maps like `sheetMap`
                 <td .table__td .alert-info>(+#{nrNew})
               $nothing
-                <td .table__td colspan=2>#{ciSubmissions}
+                <td .table__td>
               <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciSubmissions - ciCorrected}
               <td .table__td>#{showAvgsDays ciTot ciCorrected}
             $nothing
-              <td .table__td colspan=4>
+              <td .table__td>
+              <td .table__td>
+              <td .table__td>
+              <td .table__td>
     $if 0 < length sheetNames
       <tr .table__row>
         <td colspan=6>
         $forall shn <- sheetNames
-          <td .table__td colspan=5>^{simpleLinkI (SomeMessage MsgMenuCorrectors) (CSheetR tid ssh csh shn SCorrR)}
+          <td .table__td>#{getLoadSum shn}
+          <td .table__td colspan=4>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
   ^{btnWdgt}
  <div>
   <p>_{MsgAssignSubmissionsRandomWarning}
\ No newline at end of file

From d63a8903273360aa1dccc875b871f467e48a3f01 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 26 Jun 2019 13:39:33 +0200
Subject: [PATCH 486/519] chore: fix build environment on NixOS

---
 shell.nix    |  7 +++----
 stack.nix    | 13 ++++---------
 stack.yaml   | 19 +++++++------------
 stackage.nix | 30 ++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 stackage.nix

diff --git a/shell.nix b/shell.nix
index f98506e41..94ef0ba00 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,7 @@
-{ nixpkgs ? import <nixpkgs>, compiler ? null }:
+{ nixpkgs ? import <nixpkgs> }:
 
 let
-  inherit (nixpkgs {}) pkgs;
-  haskellPackages = if isNull compiler then pkgs.haskellPackages else pkgs.haskell.packages."${compiler}";
+  haskellPackages = import ./stackage.nix { inherit nixpkgs; };
 
   drv = haskellPackages.callPackage ./uniworx.nix {};
 
@@ -19,7 +18,7 @@ let
   '';
 
   override = oldAttrs: {
-    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ postgresql pgadmin openldap ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install ]);
+    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ nodejs-8_x postgresql pgadmin openldap ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install ]);
     shellHook = ''
       export PROMPT_INFO="${oldAttrs.name}"
 
diff --git a/stack.nix b/stack.nix
index e986ba349..a9a2af3de 100644
--- a/stack.nix
+++ b/stack.nix
@@ -1,16 +1,11 @@
 { ghc, nixpkgs ? import <nixpkgs> }:
 
 let
-  snapshot = "lts-10.5";
-  stackage = import (fetchTarball {
-    url = "https://stackage.serokell.io/drczwlyf6mi0ilh3kgv01wxwjfgvq14b-stackage/default.nix.tar.gz";
-    sha256 = "1bwlbxx6np0jfl6z9gkmmcq22crm0pa07a8zrwhz5gkal64y6jpz";
-  });
-  inherit (nixpkgs { overlays = [ stackage."${snapshot}" ]; }) haskell pkgs;
-
-  haskellPackages = pkgs.haskell.packages."${snapshot}";
-in haskell.lib.buildStackProject {
+  haskellPackages = import ./stackage.nix { inherit nixpkgs; };
+  inherit (nixpkgs {}) pkgs;
+in pkgs.haskell.lib.buildStackProject {
   inherit ghc;
+  inherit (haskellPackages) stack;
   name = "stackenv";
   buildInputs = (with pkgs;
     [ postgresql zlib libsodium
diff --git a/stack.yaml b/stack.yaml
index 02b25ee57..67b72469b 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -9,20 +9,15 @@ extra-package-dbs: []
 
 packages:
   - .
-  - location:
-      git: https://github.com/pngwjpgh/zip-stream.git
-      commit: 9272bbed000928d500febad1cdc98d1da29d399e
-    extra-dep: true
-  - location:
-      git: https://github.com/pngwjpgh/encoding.git
-      commit: 67bb87ceff53f0178c988dd4e15eeb2daee92b84
-    extra-dep: true
-  - location:
-      git: https://github.com/pngwjpgh/memcached-binary.git
-      commit: b5461747e7be226d3b67daebc3c9aefe8a4490ad
-    extra-dep: true
 
 extra-deps:
+  - git: https://github.com/pngwjpgh/zip-stream.git
+    commit: 9272bbed000928d500febad1cdc98d1da29d399e
+  - git: https://github.com/pngwjpgh/encoding.git
+    commit: 67bb87ceff53f0178c988dd4e15eeb2daee92b84
+  - git: https://github.com/pngwjpgh/memcached-binary.git
+    commit: b5461747e7be226d3b67daebc3c9aefe8a4490ad
+  
   - colonnade-1.2.0
   - yesod-colonnade-1.2.0
 
diff --git a/stackage.nix b/stackage.nix
new file mode 100644
index 000000000..4fb2c4623
--- /dev/null
+++ b/stackage.nix
@@ -0,0 +1,30 @@
+{ nixpkgs ? import <nixpkgs>
+, snapshot ? "lts-10.5"
+}:
+
+let
+  stackage = import (fetchTarball {
+    url = "https://stackage.serokell.io/drczwlyf6mi0ilh3kgv01wxwjfgvq14b-stackage/default.nix.tar.gz";
+    sha256 = "1bwlbxx6np0jfl6z9gkmmcq22crm0pa07a8zrwhz5gkal64y6jpz";
+  });
+
+  overlays =
+    [ stackage."${snapshot}"
+      (self: super: {
+          haskell = super.haskell // {
+            packages = super.haskell.packages // {
+              "${snapshot}" = super.haskell.packages."${snapshot}".override {
+                overrides = hself: hsuper: {
+                  zip-archive = self.haskell.lib.overrideCabal hsuper.zip-archive (old: {
+                    testToolDepends = old.testToolDepends ++ (with self; [ unzip ]);
+                  });
+                };
+              };
+            };
+          };
+        }
+      )
+    ];
+
+  inherit (nixpkgs { inherit overlays; }) pkgs;
+in pkgs.haskell.packages."${snapshot}"

From 067c2b9caa234aaf8cd2986252a64b935a60b121 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 26 Jun 2019 14:36:01 +0200
Subject: [PATCH 487/519] Replaced display calls in most hamlet files

---
 .gitignore                                    |  1 +
 messages/uniworx/de.msg                       | 44 +++++++++----------
 src/Foundation.hs                             | 22 ++++++++++
 src/Handler/Utils/Table/Cells.hs              |  4 +-
 src/Utils.hs                                  |  4 --
 templates/course-user.hamlet                  |  2 +-
 templates/deletedUser.hamlet                  |  6 +--
 .../grading-summary-row.hamlet                |  6 +--
 8 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0e2a4677f..0fb3c32c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ src/Handler/Course.SnapCustom.hs
 .directory
 tags
 test.log
+*.dump-splices
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index c0ee216ae..68814efbf 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -35,12 +35,12 @@ GenericIsNew: Neu
 GenericHasConflict: Konflikt
 GenericBack: Zurück
 
-SummerTerm year@Integer: Sommersemester #{display year}
-WinterTerm year@Integer: Wintersemester #{display year}/#{display $ succ year}
-SummerTermShort year@Integer: SoSe #{display year}
-WinterTermShort year@Integer: WiSe #{display year}/#{display $ mod (succ year) 100}
+SummerTerm year@Integer: Sommersemester #{year}
+WinterTerm year@Integer: Wintersemester #{year}/#{succ year}
+SummerTermShort year@Integer: SoSe #{year}
+WinterTermShort year@Integer: WiSe #{year}/#{mod (succ year) 100}
 PSLimitNonPositive: “pagesize” muss größer als null sein
-Page num@Int64: #{display num}
+Page num@Int64: #{num}
 
 TermsHeading: Semesterübersicht
 TermCurrent: Aktuelles Semester
@@ -99,9 +99,9 @@ CourseEditHeading tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display ti
 CourseEditTitle: Kurs editieren/anlegen
 CourseMembers: Teilnehmer
 CourseMemberOf: Teilnehmer
-CourseMembersCount n@Int: #{display n}
-CourseMembersCountLimited n@Int max@Int: #{display n}/#{display max}
-CourseMembersCountOf n@Int mbNum@IntMaybe: #{display n} Anmeldungen #{maybeDisplay " von " mbNum " möglichen"}
+CourseMembersCount n@Int: #{n}
+CourseMembersCountLimited n@Int max@Int: #{n}/#{max}
+CourseMembersCountOf n@Int mbNum@IntMaybe: #{n} Anmeldungen #{maybeToMessage " von " mbNum " möglichen"}
 CourseName: Name
 CourseDescription: Beschreibung
 CourseDescriptionTip: Beliebiges HTML-Markup ist gestattet
@@ -320,7 +320,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"} insgesamt
+RowCount count@Int64: #{count} #{pluralDE count "passender Eintrag" "passende Einträge"} insgesamt
 DeleteRow: Entfernen
 ProportionNegative: Anteile dürfen nicht negativ sein
 CorrectorUpdated: Korrektor erfolgreich aktualisiert
@@ -348,7 +348,7 @@ TokensResetSuccess: Authorisierungs-Tokens invalidiert
 HomeOpenCourses: Kurse mit offener Registrierung
 HomeUpcomingSheets: Anstehende Übungsblätter
 
-NumCourses num@Int64: #{display num} Kurse
+NumCourses num@Int64: #{num} Kurse
 CloseAlert: Schliessen
 
 Name: Name
@@ -385,14 +385,14 @@ NatField name@Text: #{name} muss eine natürliche Zahl sein!
 JSONFieldDecodeFailure aesonFailure@String: Konnte JSON nicht parsen: #{aesonFailure}
 SecretJSONFieldDecryptFailure: Konnte versteckte vertrauliche Daten nicht entschlüsseln
 
-SubmissionsAlreadyAssigned num@Int64: #{display num} Abgaben waren bereits einem Korrektor zugeteilt und wurden nicht verändert:
-SubmissionsAssignUnauthorized num@Int64: #{display num} Abgaben können momentan nicht einem Korrektor zugeteilt werden (z.B. weil die Abgabe noch offen ist):
-UpdatedAssignedCorrectorSingle num@Int64: #{display num} Abgaben wurden dem neuen Korrektor zugeteilt.
+SubmissionsAlreadyAssigned num@Int64: #{num} Abgaben waren bereits einem Korrektor zugeteilt und wurden nicht verändert:
+SubmissionsAssignUnauthorized num@Int64: #{num} Abgaben können momentan nicht einem Korrektor zugeteilt werden (z.B. weil die Abgabe noch offen ist):
+UpdatedAssignedCorrectorSingle num@Int64: #{num} Abgaben wurden dem neuen Korrektor zugeteilt.
 NoCorrector: Kein Korrektor
-RemovedCorrections num@Int64: Korrektur-Daten wurden von #{display num} Abgaben entfernt.
-UpdatedAssignedCorrectorsAuto num@Int64: #{display num} Abgaben wurden unter den Korrektoren aufgeteilt.
-CouldNotAssignCorrectorsAuto num@Int64: #{display num} Abgaben konnten nicht automatisch zugewiesen werden:
-SelfCorrectors num@Int64: #{display num} Abgaben wurden Abgebenden als eigenem Korrektor zugeteilt!
+RemovedCorrections num@Int64: Korrektur-Daten wurden von #{num} Abgaben entfernt.
+UpdatedAssignedCorrectorsAuto num@Int64: #{num} Abgaben wurden unter den Korrektoren aufgeteilt.
+CouldNotAssignCorrectorsAuto num@Int64: #{num} Abgaben konnten nicht automatisch zugewiesen werden:
+SelfCorrectors num@Int64: #{num} Abgaben wurden Abgebenden als eigenem Korrektor zugeteilt!
 
 
 CorrectionSheets: Übersicht Korrekturen nach Blättern
@@ -411,7 +411,7 @@ NrSubmissionsNotCorrected: Unkorrigiert
 CorrectionTime: Korrekturdauer (Min/Avg/Max)
 AssignSubmissionsRandomWarning: Die Zuteilungsvorschau kann von der tatsächlichen Zuteilung abweichen, wenn mehrere Blätter auf einmal zugeteilt werden, da beim Ausgleich der Kontigente nur bereits zugeteilte Abgaben berücksichtigt werden. Da es ein randomisierte Prozess ist, kann es auch bei einzelnen Blättern gerinfgügige Abweichungen geben.
 
-CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
+CorrectionsUploaded num@Int64: #{num} Korrekturen wurden gespeichert:
 NoCorrectionsUploaded: In der hochgeladenen Datei wurden keine Korrekturen gefunden.
 
 RatingBy: Korrigiert von
@@ -614,10 +614,10 @@ 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: 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")}.
+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 " (toMessage n <> " Abgaben von ")}#{noneOneMoreDE num "" "einem Teilnehmer" (toMessage num <> " Teilnehmern")}.
 
 MailSubjectCorrectionsAssigned csh@CourseShorthand sheetName@SheetName: Ihnen wurden Korrekturen zu #{sheetName} in #{csh} zugeteilt
-MailCorrectionsAssignedIntro courseName@Text termDesc@Text sheetName@SheetName n@Int: #{display n} #{pluralDE n "Abgabe wurde" "Abgaben wurden"} Ihnen zur Korrektur für #{sheetName} im Kurs #{courseName} (#{termDesc}) zugeteilt.
+MailCorrectionsAssignedIntro courseName@Text termDesc@Text sheetName@SheetName n@Int: #{n} #{pluralDE n "Abgabe wurde" "Abgaben wurden"} Ihnen zur Korrektur für #{sheetName} im Kurs #{courseName} (#{termDesc}) zugeteilt.
 
 MailSubjectUserRightsUpdate name@Text: Berechtigungen für #{name} aktualisiert
 MailUserRightsIntro name@Text email@UserEmail: #{name} <#{email}> hat folgende Uni2work Berechtigungen:
@@ -661,8 +661,8 @@ SheetTypeInfoNotGraded: Blätter ohne Wertung werden nirgends angerechnet, die B
 SheetTypeInfoBonus: Bonus Blätter zählen normal, erhöhen aber nicht die maximal erreichbare Punktzahl bzw. Anzahl zu bestehender Blätter.
 SheetGradingBonusIncluded: Erzielte Bonuspunkte wurden hier bereits zu den erreichten normalen Punkten hinzugezählt.
 SummaryTitle: Zusammenfassung über
-SheetGradingSummaryTitle intgr@Integer: #{display intgr} #{pluralDE intgr "Blatt" "Blätter"}
-SubmissionGradingSummaryTitle intgr@Integer: #{display intgr} #{pluralDE intgr "Abgabe" "Abgaben"}
+SheetGradingSummaryTitle intgr@Integer: #{intgr} #{pluralDE intgr "Blatt" "Blätter"}
+SubmissionGradingSummaryTitle intgr@Integer: #{intgr} #{pluralDE intgr "Abgabe" "Abgaben"}
 
 SheetTypeBonus': Bonus
 SheetTypeNormal': Normal
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 15a35a2bb..2628d0268 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -218,6 +218,10 @@ maybeDisplay :: DisplayAble m => Text -> Maybe m -> Text  -> Text
 maybeDisplay _      Nothing  _     = mempty
 maybeDisplay before (Just x) after = before <> (display x) <> after
 
+maybeToMessage :: ToMessage m => Text -> Maybe m -> Text -> Text
+maybeToMessage _      Nothing  _     = mempty
+maybeToMessage before (Just x) after = before <> (toMessage x) <> after
+
 -- Messages creates type UniWorXMessage and RenderMessage UniWorX instance
 mkMessage "UniWorX" "messages/uniworx" "de"
 mkMessageVariant "UniWorX" "Campus" "messages/campus" "de"
@@ -248,6 +252,24 @@ instance RenderMessage UniWorX ShortTermIdentifier where
 instance RenderMessage UniWorX String where
   renderMessage f ls str = renderMessage f ls $ Text.pack str
 
+-- TODO: raw number representation; instead, display e.g. 1000 as 1.000 or 1,000 or ... (language-dependent!)
+instance RenderMessage UniWorX Int where
+  renderMessage f ls = renderMessage f ls . tshow
+instance RenderMessage UniWorX Int64 where
+  renderMessage f ls = renderMessage f ls . tshow
+instance RenderMessage UniWorX Integer where
+  renderMessage f ls = renderMessage f ls . tshow
+
+instance ToMessage Int where
+  toMessage = tshow
+instance ToMessage Int64 where
+  toMessage = tshow
+instance ToMessage Integer where
+  toMessage = tshow
+
+instance HasResolution a => RenderMessage UniWorX (Fixed a) where
+  renderMessage f ls = renderMessage f ls . showFixed True
+
 instance RenderMessage UniWorX Load where
   renderMessage foundation ls = renderMessage foundation ls . \case
       (Load {byTutorial=Nothing   , byProportion=p}) -> MsgCorByProportionOnly p
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 6f400d0c7..43c2598f7 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -175,8 +175,8 @@ cellHasEMail = emailCell . view _userEmail
 maybeDateTimeCell :: IsDBTable m a => Maybe UTCTime -> DBCell m a
 maybeDateTimeCell = maybe mempty dateTimeCell
 
-numCell :: (IsDBTable m a, Num b, DisplayAble b) => b -> DBCell m a
-numCell = textCell . display
+numCell :: (IsDBTable m a, Num b, ToMessage b) => b -> DBCell m a
+numCell = textCell . toMessage
 
 int64Cell :: (IsDBTable m a) => Int64-> DBCell m a
 int64Cell = numCell
diff --git a/src/Utils.hs b/src/Utils.hs
index 344b8f510..2fb5f6340 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -248,10 +248,6 @@ class DisplayAble a where
   default display :: Show a => a -> Text
   display = pack . show
 
-instance DisplayAble Int
-instance DisplayAble Int64
-instance DisplayAble Integer
-
 instance DisplayAble Rational where
   display r = showFFloat (Just 2) (rat2float r) ""
       & pack
diff --git a/templates/course-user.hamlet b/templates/course-user.hamlet
index dd0bac222..338bb52c2 100644
--- a/templates/course-user.hamlet
+++ b/templates/course-user.hamlet
@@ -38,7 +38,7 @@
                     <td .table__td>_{field}#{notUsedT studyFeaturesField}
                     <td .table__td>_{degree}#{notUsedT studyFeaturesDegree}
                     <td .table__td>_{studyFeaturesType}
-                    <td .table__td>#{display studyFeaturesSemester}
+                    <td .table__td>#{studyFeaturesSemester}
                     <td .table__td>#{hasTickmark studyFeaturesValid}
                     <td .table__td>^{formatTimeW SelFormatDate studyFeaturesUpdated}
         $maybe _ <- mRegistration
diff --git a/templates/deletedUser.hamlet b/templates/deletedUser.hamlet
index 373057fb9..19ec61702 100644
--- a/templates/deletedUser.hamlet
+++ b/templates/deletedUser.hamlet
@@ -6,13 +6,13 @@
   <div .container>
     #{mailtoHtml userEmail}
   <div .container>
-    #{display deletedSubmissions} Abgaben wurden unwiederruflich gelöscht.
+    #{deletedSubmissions} Abgaben wurden unwiederruflich gelöscht.
   $if groupSubmissions > 0
     <div .container>
-      #{display groupSubmissions} Gruppenabgaben verbleiben in der Datenbank,
+      #{groupSubmissions} Gruppenabgaben verbleiben in der Datenbank,
       aber die Zuordnung zum Benutzer wurden gelöscht.
       Gruppenabgaben können dadurch zu Einzelabgaben werden,
       welche dann vom letzten Benutzer gelöscht werden können.
   $if deletedSubmissionGroups > 0
     <div .container>
-      #{display deletedSubmissionGroups} benannte Abgabengruppen wurden gelöscht, da diese dadurch leer wurden.
+      #{deletedSubmissionGroups} benannte Abgabengruppen wurden gelöscht, da diese dadurch leer wurden.
diff --git a/templates/widgets/grading-summary/grading-summary-row.hamlet b/templates/widgets/grading-summary/grading-summary-row.hamlet
index fd6c9f73f..47d8d51fd 100644
--- a/templates/widgets/grading-summary/grading-summary-row.hamlet
+++ b/templates/widgets/grading-summary/grading-summary-row.hamlet
@@ -21,7 +21,7 @@ $#
                 $if pmax > 0
                   #{textPercentInt pacv pmax}
               <td .table__td>
-                #{display pacv} / #{display pmax}
+                _{pacv} / _{pmax}
           $else
               <td .table__td>
               <td .table__td>
@@ -29,7 +29,7 @@ $#
         $with Sum numPass <- summary ^. _numSheetsPasses
           <td .table__td>
             $if numPass > 0
-              #{display numPass}
+              _{numPass}
       $maybe _ <- hasMarkedPoints
         $with Sum pmax <- summary ^. _sumMarkedPoints
           $with Sum pacv <- summary ^. _achievedPoints
@@ -37,7 +37,7 @@ $#
               $if pmax > 0
                 #{textPercent $ realToFrac $ pacv / pmax}
             <td .table__td>
-              #{display pacv} / #{display pmax}
+              _{pacv} / _{pmax}
               $if ((summary ^. _numMarkedPoints) /= (summary ^. _numSheets))
                 $# Falls Anzahl Blätter der Zeile verschieden von Anzahl gewerterer Blätter
                 \ (_{title $ getSum $ summary ^. _numMarkedPoints})

From 228cd507498a74f92978c2c9082d91348e68c564 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 26 Jun 2019 15:08:03 +0200
Subject: [PATCH 488/519] feat(corrector-assignment): show load/submission
 percentages

---
 messages/uniworx/de.msg                       |  2 +-
 src/Handler/Corrections.hs                    | 15 +++++---
 src/Handler/Health.hs                         |  4 +--
 src/Handler/Sheet.hs                          |  4 +--
 src/Utils.hs                                  | 34 +++++++++++++------
 templates/corrections-overview.hamlet         | 32 ++++++++++++-----
 .../grading-summary-row.hamlet                |  4 +--
 7 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index cd7300b09..012b6b587 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -322,7 +322,7 @@ Correctors: Korrektoren
 CorState: Status
 CorByTut: Zuteilung nach Tutorium
 CorProportion: Anteil
-CorDeficit: Defizit
+CorDeficitProportion: Defizit Anteile
 CorByProportionOnly proportion@Rational: #{display proportion} Anteile
 CorByProportionIncludingTutorial proportion@Rational: #{display proportion} Anteile - Tutorium
 CorByProportionExcludingTutorial proportion@Rational: #{display proportion} Anteile + Tutorium
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 81335f4ac..f62fc6487 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1214,6 +1214,9 @@ assignHandler tid ssh csh cid assignSids = do
 
   let -- infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo) -- repeated here for easier reference
       -- create aggregate maps
+      sheetNames :: [SheetName]
+      sheetNames = Map.keys infoMap
+
       sheetMap :: Map SheetName CorrectionInfo
       sheetMap = Map.map fold infoMap
 
@@ -1230,7 +1233,10 @@ assignHandler tid ssh csh cid assignSids = do
 
       corrMap  :: Map (Maybe UserId) CorrectionInfo
       corrMap  = Map.unionsWith (<>) $ Map.elems infoMap
-      sheetNames = Map.keys infoMap
+
+      corrMapSum :: CorrectionInfo
+      corrMapSum = fold corrMap
+
   let -- whamlet convenience functions
       -- avoid nestes hamlet $maybe with duplicated $nothing
       getCorrector :: Maybe UserId -> (Widget,Map SheetName SheetCorrector)
@@ -1256,10 +1262,9 @@ assignHandler tid ssh csh cid assignSids = do
       getCorrDeficit _          = Nothing
 
       getLoadSum :: SheetName -> Text
-      getLoadSum shn
-        | (Just load) <- Map.lookup shn sheetLoad
-        = "Σ" <> showCompactCorrectorLoad load CorrectorNormal
-      getLoadSum _ = mempty
+      getLoadSum shn | (Just load) <- Map.lookup shn sheetLoad
+                     = showCompactCorrectorLoad load CorrectorNormal
+      getLoadSum  _  = mempty
 
       showDiffDays :: Maybe NominalDiffTime -> Text
       showDiffDays = foldMap formatDiffDays
diff --git a/src/Handler/Health.hs b/src/Handler/Health.hs
index 046c16aff..7b29e2bbd 100644
--- a/src/Handler/Health.hs
+++ b/src/Handler/Health.hs
@@ -63,7 +63,7 @@ getHealthR = do
                     <dd .deflist__dd>#{boolSymbol passed}
                   $of HealthLDAPAdmins (Just found)
                     <dt .deflist__dt>_{MsgHealthLDAPAdmins}
-                    <dd .deflist__dd>#{textPercent found}
+                    <dd .deflist__dd>#{textPercent found 1}
                   $of HealthSMTPConnect (Just passed)
                     <dt .deflist__dt>_{MsgHealthSMTPConnect}
                     <dd .deflist__dd>#{boolSymbol passed}
@@ -80,7 +80,7 @@ getInstanceR = do
   instanceInfo@(clusterId, instanceId) <- getsYesod $ (,) <$> appClusterID <*> appInstanceID
 
   setWeakEtagHashable (clusterId, instanceId)
-  
+
   selectRep $ do
     provideRep $
       siteLayoutMsg MsgInstanceIdentification $ do
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index c14424251..791bce180 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -257,9 +257,7 @@ getSheetListR tid ssh csh = do
               (Just (Entity _ Submission{submissionRatingPoints=Just sPoints})) ->
                 case preview (_grading . _maxPoints) sType of
                   Just maxPoints
-                    | maxPoints /= 0 ->
-                        let percent = sPoints / maxPoints
-                        in textCell $ textPercent $ realToFrac percent
+                    | maxPoints /= 0 -> textCell $ textPercent sPoints maxPoints
                   _other -> mempty
               _other -> mempty
       ]
diff --git a/src/Utils.hs b/src/Utils.hs
index 4f565befe..e02a8b9b2 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -2,12 +2,13 @@ module Utils
   ( module Utils
   ) where
 
-import ClassyPrelude.Yesod hiding (foldlM)
+import ClassyPrelude.Yesod hiding (foldlM, Proxy)
 
 -- import Data.Double.Conversion.Text -- faster implementation for textPercent?
 import qualified Data.Foldable as Fold
 import Data.Foldable as Utils (foldlM, foldrM)
 import Data.Monoid (Sum(..))
+import Data.Proxy
 
 import Data.CaseInsensitive (CI)
 import qualified Data.CaseInsensitive as CI
@@ -67,7 +68,7 @@ import qualified Crypto.Saltine.Class as Saltine
 import qualified Crypto.Data.PKCS7 as PKCS7
 
 import Data.Fixed
-import Data.Ratio ((%))
+-- import Data.Ratio ((%))
 
 import Data.Binary (Binary)
 import qualified Data.Binary as Binary
@@ -293,15 +294,28 @@ instance {-# OVERLAPPABLE #-} Show a => DisplayAble a where -- The easy way out
   display = pack . show
 -}
 
-textPercent :: Real a => a -> Text -- slow, maybe use Data.Double.Conversion.Text.toFixed instead?
-textPercent x = lz <> pack (show rx) <> "%"
- where
-   rx :: Centi
-   rx = realToFrac (x * 100)
-   lz = if rx < 10.0 then "0" else ""
+-- | Convert `part` and `whole` into percentage including symbol
+--   showing trailing zeroes and to decimal digits
+textPercent :: Real a => a -> a -> Text
+textPercent = textPercent' False 2
+
+-- | Convert `part` and `whole` into percentage including symbol
+--   `trailZero` shows trailing Zeros, `precision` is number of decimal digits
+textPercent' :: Real a => Bool -> Int -> a -> a -> Text
+textPercent' trailZero precision part whole
+    | precision == 0 = showPercent (frac :: Uni)
+    | precision == 1 = showPercent (frac :: Deci)
+    | precision == 2 = showPercent (frac :: Centi)
+    | precision == 3 = showPercent (frac :: Milli)
+    | precision == 4 = showPercent (frac :: Micro)
+    | otherwise      = showPercent (frac :: Pico)
+  where
+    frac :: forall a . HasResolution a => Fixed a
+    frac = MkFixed $ round $ (* (fromInteger $ resolution (Proxy :: Proxy a)))  $ (100*) $ toRational part / toRational whole
+
+    showPercent :: HasResolution a => Fixed a -> Text
+    showPercent f = pack $ showFixed trailZero f <> "%"
 
-textPercentInt :: Integral a => a -> a -> Text -- slow, maybe use Data.Double.Conversion.Text.toFixed instead?
-textPercentInt part whole = textPercent $ fromIntegral part % fromIntegral whole
 
 -- | Convert number of bytes to human readable format
 textBytes :: Integral a => a -> Text
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index 5d3f6ba8b..c4d4c0f3c 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -45,7 +45,7 @@
     <tr .table__row .table__row--head>
       <th .table__th rowspan=2>_{MsgCorrector}
       <th .table__th colspan=2>_{MsgGenericAll}
-      <th .table__th>_{MsgCorProportion}
+      <th .table__th rowspan=2>_{MsgCorDeficitProportion}
       <th .table__th colspan=3>_{MsgCorrectionTime}
       $forall shn <- sheetNames
         <th .table__th colspan=5>#{shn}
@@ -53,7 +53,6 @@
     <tr .table__row .table__row--head>
       <th .table__th>_{MsgNrSubmissionsTotal}
       <th .table__th>_{MsgNrSubmissionsNotCorrected}
-      <th .table__th>_{MsgCorDeficit}
       <th .table__th>_{MsgGenericMin}
       <th .table__th>_{MsgGenericAvg}
       <th .table__th>_{MsgGenericMax}
@@ -63,24 +62,33 @@
         <th .table__th>_{MsgGenericNumChange}
         <th .table__th>_{MsgNrSubmissionsNotCorrectedShort}
         <th .table__th>_{MsgGenericAvg}
-    $forall (CorrectionInfo{ciCorrector, ciSubmissions, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
+    $forall (CorrectionInfo{ciCorrector, ciSubmissions=ciSubmissionsNr, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
       $with (nameW,loadM) <- getCorrector ciCorrector
         <tr .table__row>
           <td .table__td>^{nameW}
-          <td .table__td>#{ciSubmissions}
-          <td .table__td .heated style="--hotness: #{heat ciSubmissions ciCorrected}">#{ciSubmissions - ciCorrected}
+          <td .table__td>#{ciSubmissionsNr}
+            $with total <- ciSubmissions corrMapSum
+              $if total > 0
+                \ (#{textPercent' True 0 ciSubmissionsNr total})
+          <td .table__td .heated style="--hotness: #{heat ciSubmissionsNr ciCorrected}">#{ciSubmissionsNr - ciCorrected}
           <td .table__td>
               $maybe deficit <- getCorrDeficit ciCorrector
                 #{display deficit}
           <td .table__td>#{showDiffDays ciMin}
           <td .table__td>#{showAvgsDays ciTot ciCorrected}
           <td .table__td>#{showDiffDays ciMax}
-          $forall shn <- sheetNames
+          $forall (shn, CorrectionInfo{ciSubmissions=sheetSubmissionsNr}) <- Map.toList sheetMap
             <td .table__td>
               $maybe SheetCorrector{sheetCorrectorLoad, sheetCorrectorState} <- Map.lookup shn loadM
                 #{showCompactCorrectorLoad sheetCorrectorLoad sheetCorrectorState}
+                $if sheetCorrectorState == CorrectorNormal
+                  $maybe Load{byProportion=total} <- Map.lookup shn sheetLoad
+                    $if total > 0
+                      \ (#{textPercent' True 0 (byProportion sheetCorrectorLoad) total})
             $maybe CorrectionInfo{ciSubmissions,ciCorrected,ciTot} <- getCorrSheetStatus ciCorrector shn
               <td .table__td>#{ciSubmissions}
+                $if sheetSubmissionsNr > 0
+                  \ (#{textPercent' True 0 ciSubmissions sheetSubmissionsNr})
               $maybe nrNew <- getCorrNewAssignment ciCorrector shn
                 $# <td .table__td>#{ciAssigned} `ciSubmissions` is here always identical to `ciAssigned` and also works for `ciCorrector == Nothing`. ciAssigned only useful in aggregate maps like `sheetMap`
                 <td .table__td .alert-info>(+#{nrNew})
@@ -95,10 +103,16 @@
               <td .table__td>
     $if 0 < length sheetNames
       <tr .table__row>
-        <td colspan=6>
+        <td .table__th>Σ
+        <td .table__th>#{ciSubmissions corrMapSum}
+        <td .table__th>#{ciCorrected   corrMapSum}
+        <td .table__th>
+        <td .table__th>#{showDiffDays (ciMin corrMapSum)}
+        <td .table__th>#{showAvgsDays (ciTot corrMapSum) (ciCorrected corrMapSum)}
+        <td .table__th>#{showDiffDays (ciMax corrMapSum)}
         $forall shn <- sheetNames
-          <td .table__td>#{getLoadSum shn}
-          <td .table__td colspan=4>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
+          <td .table__th>#{getLoadSum shn}
+          <td .table__th colspan=4>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
   ^{btnWdgt}
  <div>
   <p>_{MsgAssignSubmissionsRandomWarning}
\ No newline at end of file
diff --git a/templates/widgets/grading-summary/grading-summary-row.hamlet b/templates/widgets/grading-summary/grading-summary-row.hamlet
index 261b98e1a..0e64a515b 100644
--- a/templates/widgets/grading-summary/grading-summary-row.hamlet
+++ b/templates/widgets/grading-summary/grading-summary-row.hamlet
@@ -19,7 +19,7 @@ $#
             $with Sum pacv <- summary ^. _achievedPasses
               <td .table__td>
                 $if pmax > 0
-                  #{textPercentInt pacv pmax}
+                  #{textPercent pacv pmax}
               <td .table__td>
                 #{display pacv} / #{display pmax}
           $else
@@ -35,7 +35,7 @@ $#
           $with Sum pacv <- summary ^. _achievedPoints
             <td .table__td>
               $if pmax > 0
-                #{textPercent $ realToFrac $ pacv / pmax}
+                #{textPercent pacv pmax}
             <td .table__td>
               #{display pacv} / #{display pmax}
               $if ((summary ^. _numMarkedPoints) /= (summary ^. _numSheets))

From 96edf7dff3acc3297aa6d991f2a303e18d4b28a1 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 26 Jun 2019 15:08:21 +0200
Subject: [PATCH 489/519] Replaced all DisplayAble instances except Rational

---
 messages/uniworx/de.msg | 10 +++++-----
 src/Foundation.hs       | 19 ++++++++++++-------
 src/Utils.hs            |  3 ---
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 68814efbf..69a48ab45 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -420,8 +420,8 @@ AssignedTime: Zuteilung
 AchievedBonusPoints: Erreichte Bonuspunkte
 AchievedNormalPoints: Erreichte Punkte
 AchievedPassPoints: Erreichte Punkte
-AchievedOf achieved@Points possible@Points: #{display achieved} von #{display possible}
-PassAchievedOf points@Points passingPoints@Points maxPoints@Points: #{display points} von #{display maxPoints} (Bestanden ab #{display passingPoints})
+AchievedOf achieved@Points possible@Points: #{achieved} von #{possible}
+PassAchievedOf points@Points passingPoints@Points maxPoints@Points: #{points} von #{maxPoints} (Bestanden ab #{passingPoints})
 PassedResult: Ergebnis
 Passed: Bestanden
 NotPassed: Nicht bestanden
@@ -434,7 +434,7 @@ RatingDone: Bewertung sichtbar
 RatingPercent: Erreicht
 RatingFiles: Korrigierte Dateien
 PointsNotPositive: Punktzahl darf nicht negativ sein
-PointsTooHigh maxPoints@Points: Punktzahl darf nicht höher als #{tshow maxPoints} sein
+PointsTooHigh maxPoints@Points: Punktzahl darf nicht höher als #{maxPoints} sein
 RatingPointsDone: Abgabe zählt als korrigiert, gdw. Punktezahl gesetzt ist
 ColumnRatingPoints: Punktzahl
 Pseudonyms: Pseudonyme
@@ -513,7 +513,7 @@ LastEdit: Letzte Änderung
 LastEditByUser: Ihre letzte Bearbeitung
 NoEditByUser: Nicht von Ihnen bearbeitet
 
-SubmissionFilesIgnored n@Int: Es #{pluralDE n "wurde" "wurden"} #{tshow n} #{pluralDE n "Datei" "Dateien"} in der hochgeladenen Abgabe ignoriert
+SubmissionFilesIgnored n@Int: Es #{pluralDE n "wurde" "wurden"} #{n} #{pluralDE n "Datei" "Dateien"} in der hochgeladenen Abgabe ignoriert
 SubmissionDoesNotExist smid@CryptoFileNameSubmission: Es existiert keine Abgabe mit Nummer #{toPathPiece smid}.
 
 LDAPLoginTitle: Campus-Login
@@ -609,7 +609,7 @@ MailSubjectSheetActive csh@CourseShorthand sheetName@SheetName: #{sheetName} in
 MailSheetActiveIntro courseName@Text termDesc@Text sheetName@SheetName: Sie können nun #{sheetName} im Kurs #{courseName} (#{termDesc}) herunterladen.
 
 MailSubjectSubmissionsUnassigned csh@CourseShorthand sheetName@SheetName: Abgaben zu #{sheetName} in #{csh} konnten nicht verteilt werden
-MailSubmissionsUnassignedIntro n@Int courseName@Text termDesc@Text sheetName@SheetName: #{tshow n} Abgaben zu #{sheetName} im Kurs #{courseName} (#{termDesc}) konnten nicht automatisiert verteilt werden.
+MailSubmissionsUnassignedIntro n@Int courseName@Text termDesc@Text sheetName@SheetName: #{n} Abgaben zu #{sheetName} im Kurs #{courseName} (#{termDesc}) konnten nicht automatisiert verteilt werden.
 
 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.
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 2628d0268..7261724ef 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -260,13 +260,6 @@ instance RenderMessage UniWorX Int64 where
 instance RenderMessage UniWorX Integer where
   renderMessage f ls = renderMessage f ls . tshow
 
-instance ToMessage Int where
-  toMessage = tshow
-instance ToMessage Int64 where
-  toMessage = tshow
-instance ToMessage Integer where
-  toMessage = tshow
-
 instance HasResolution a => RenderMessage UniWorX (Fixed a) where
   renderMessage f ls = renderMessage f ls . showFixed True
 
@@ -344,6 +337,18 @@ instance RenderMessage UniWorX StudyDegreeTerm where
       mr = renderMessage foundation ls
 
 
+-- ToMessage instances for converting raw numbers to Text (no internationalization)
+
+instance ToMessage Int where
+  toMessage = tshow
+instance ToMessage Int64 where
+  toMessage = tshow
+instance ToMessage Integer where
+  toMessage = tshow
+
+instance HasResolution a => ToMessage (Fixed a) where
+  toMessage = toMessage . showFixed True
+
 
 newtype ErrorResponseTitle = ErrorResponseTitle ErrorResponse
 embedRenderMessageVariant ''UniWorX ''ErrorResponseTitle ("ErrorResponseTitle" <>)
diff --git a/src/Utils.hs b/src/Utils.hs
index 2fb5f6340..e9949b8d9 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -257,9 +257,6 @@ instance DisplayAble Rational where
       rat2float :: Rational -> Double
       rat2float = fromRational
 
-instance HasResolution a => DisplayAble (Fixed a) where
-  display = pack . showFixed True
-
 {- We do not want DisplayAble for every Show-Class:
    We want to explicitly verify that the resulting text can be displayed to the User!
    For example: UTCTime values were shown without proper format rendering!

From 749cd2f7bcf990f5eee18d90099843151cb56716 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 26 Jun 2019 15:22:46 +0200
Subject: [PATCH 490/519] fix(sheet corrector assigment): minor bugfix

---
 templates/corrections-overview.hamlet | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index c4d4c0f3c..94ada0543 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -104,15 +104,17 @@
     $if 0 < length sheetNames
       <tr .table__row>
         <td .table__th>Σ
-        <td .table__th>#{ciSubmissions corrMapSum}
+        $with ciSubmissionsNr <- ciSubmissions corrMapSum
+          $with ciCorrectedNr <- ciCorrected   corrMapSum
+            <td .table__th>#{ciSubmissionsNr}
+            <td .table__td .heated style="--hotness: #{heat ciSubmissionsNr ciCorrectedNr}">#{ciSubmissionsNr - ciCorrectedNr}
         <td .table__th>#{ciCorrected   corrMapSum}
-        <td .table__th>
         <td .table__th>#{showDiffDays (ciMin corrMapSum)}
         <td .table__th>#{showAvgsDays (ciTot corrMapSum) (ciCorrected corrMapSum)}
         <td .table__th>#{showDiffDays (ciMax corrMapSum)}
         $forall shn <- sheetNames
           <td .table__th>#{getLoadSum shn}
-          <td .table__th colspan=4>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
+          <td .table__td colspan=4>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
   ^{btnWdgt}
  <div>
   <p>_{MsgAssignSubmissionsRandomWarning}
\ No newline at end of file

From 99184ff05322573a6958f09e30fa0fdcdd3d665b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 26 Jun 2019 15:25:59 +0200
Subject: [PATCH 491/519] feat(exams): exam registration

---
 messages/uniworx/de.msg |  8 ++++++--
 routes                  |  5 ++++-
 src/Foundation.hs       | 21 ++++++++++++++++++---
 src/Handler/Course.hs   | 16 +++++++++++++++-
 src/Handler/Exam.hs     | 34 +++++++++++++++++++++++++++++++++-
 5 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 8c713c0a0..492a08b54 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -1104,7 +1104,7 @@ ExamOccurrences: Prüfungen
 ExamRoomAlreadyExists: Prüfung ist bereits eingetragen
 ExamRoom: Raum
 ExamRoomCapacity: Kapazität
-ExamRoomCapacityNonPositive: Kapazität muss positiv und größer null sein
+ExamRoomCapacityNegative: Kapazität darf nicht negativ sein
 ExamRoomTime: Termin
 ExamRoomStart: Beginn
 ExamRoomEnd: Ende
@@ -1141,4 +1141,8 @@ ExamBonusPointsPassed possible@Points: Maximal #{showFixed True possible} Klausu
 
 ExamPassed: Bestanden
 ExamNotPassed: Nicht bestanden
-ExamResult: Klausurergebnis
\ No newline at end of file
+ExamResult: Klausurergebnis
+
+ExamRegisteredSuccess exam@ExamName: Erfolgreich zur Klausur #{exam} angemeldet
+ExamDeregisteredSuccess exam@ExamName: Erfolgreich von der Klausur #{exam} abgemeldet
+ExamRegistered: Angemeldet
\ No newline at end of file
diff --git a/routes b/routes
index 9d35caa33..a6241127d 100644
--- a/routes
+++ b/routes
@@ -143,7 +143,10 @@
     /show                       EShowR         GET             !time
     /edit                       EEditR         GET POST
     /corrector-invite           ECInviteR      GET POST
-
+    /users                      EUsersR        GET POST        !timeANDcorrector
+    /users/new                  EAddUserR      GET POST
+    /users/invite               EInviteR       GET POST
+    /register                   ERegisterR         POST        !timeANDcourse-registered !timeANDexam-registered
 
 /subs          CorrectionsR          GET POST !corrector !lecturer
 /subs/upload   CorrectionsUploadR    GET POST !corrector !lecturer
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 821427118..97dd384f5 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -650,12 +650,27 @@ tagAccessPredicate AuthTutor = APDB $ \mAuthId route _ -> exceptT return return
       guardMExceptT (not $ Map.null resMap) (unauthorizedI MsgUnauthorizedTutor)
       return Authorized
 tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
-  CExamR tid ssh csh examn _subRoute -> maybeT (unauthorizedI MsgUnauthorizedExamTime) $ do
+  CExamR tid ssh csh examn subRoute -> maybeT (unauthorizedI MsgUnauthorizedExamTime) $ do
     course <- $cachedHereBinary (tid, ssh, csh) . MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
-    Entity _ Exam{..} <- $cachedHereBinary (course, examn) . MaybeT . getBy $ UniqueExam course examn
+    Entity eId Exam{..} <- $cachedHereBinary (course, examn) . MaybeT . getBy $ UniqueExam course examn
     cTime <- liftIO getCurrentTime
+    registered <- case mAuthId of
+      Just uid -> $cachedHereBinary (eId, uid) . lift . existsBy $ UniqueExamRegistration eId uid
+      Nothing  -> return False
 
-    guard $ NTop examVisibleFrom <= NTop (Just cTime)
+    let visible = NTop examVisibleFrom <= NTop (Just cTime)
+
+    case subRoute of
+      EShowR     -> guard visible
+      EUsersR    -> guard $ examStart <= cTime
+                         && NTop (Just cTime) <= NTop examFinished
+      ERegisterR
+        | not registered -> guard $ visible
+                                 && NTop examRegisterFrom <= NTop (Just cTime)
+                                 && NTop (Just cTime) <= NTop examRegisterTo
+        | otherwise      -> guard $ visible
+                                 && NTop (Just cTime) <= NTop examDeregisterUntil
+      _          -> return ()
 
     return Authorized
   
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index f849fb282..f55328ca5 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -430,7 +430,21 @@ getCShowR tid ssh csh = do
                 $maybe endT' <- endT
                   \ – #{endT'}
               |]
-
+          , sortable Nothing mempty $ \DBRow{ dbrOutput = Entity eId Exam{..} } -> sqlCell $ do
+              mayRegister <- (== Authorized) <$> evalAccessDB (CExamR tid ssh csh examName ERegisterR) True
+              isRegistered <- case mbAid of
+                Nothing  -> return False
+                Just uid -> existsBy $ UniqueExamRegistration eId uid
+              if
+                | mayRegister -> do
+                    (examRegisterForm, examRegisterEnctype) <- liftHandlerT . generateFormPost . buttonForm' $ bool [BtnRegister] [BtnDeregister] isRegistered
+                    return $ wrapForm examRegisterForm def
+                      { formAction = Just . SomeRoute $ CExamR tid ssh csh examName ERegisterR
+                      , formEncoding = examRegisterEnctype
+                      , formSubmit = FormNoSubmit
+                      }
+                | isRegistered -> return [whamlet|_{MsgExamRegistered}|]
+                | otherwise -> return mempty
           ]
         dbtSorting = Map.fromList
           [ ("name", SortColumn $ \exam -> exam E.^. ExamName )
diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
index dffde8e32..f44a78abf 100644
--- a/src/Handler/Exam.hs
+++ b/src/Handler/Exam.hs
@@ -275,7 +275,7 @@ examOccurrenceForm prev = wFormToAForm $ do
     examOccurrenceForm' nudge mPrev csrf = do
       (eofIdRes, eofIdView) <- mopt hiddenField ("" & addName (nudge "id")) (Just $ eofId =<< mPrev)
       (eofRoomRes, eofRoomView) <- mpreq textField ("" & addName (nudge "name")) (eofRoom <$> mPrev)
-      (eofCapacityRes, eofCapacityView) <- mpreq (posIntFieldI MsgExamRoomCapacityNonPositive) ("" & addName (nudge "capacity")) (eofCapacity <$> mPrev)
+      (eofCapacityRes, eofCapacityView) <- mpreq (natFieldI MsgExamRoomCapacityNegative) ("" & addName (nudge "capacity")) (eofCapacity <$> mPrev)
       (eofStartRes, eofStartView) <- mpreq utcTimeField ("" & addName (nudge "start")) (eofStart <$> mPrev)
       (eofEndRes, eofEndView) <- mopt utcTimeField ("" & addName (nudge "end")) (eofEnd <$> mPrev)
       (eofDescRes, eofDescView) <- mopt htmlFieldSmall ("" & addName (nudge "description")) (eofDescription <$> mPrev)
@@ -691,3 +691,35 @@ getEShowR tid ssh csh examn = do
       examBonusW :: ExamBonusRule -> Widget
       examBonusW bonusRule = $(widgetFile "widgets/bonusRule")
     $(widgetFile "exam-show")
+
+getEUsersR, postEUsersR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
+getEUsersR = postEUsersR
+postEUsersR = error "postEUsersR"
+
+getEAddUserR, postEAddUserR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
+getEAddUserR = postEAddUserR
+postEAddUserR = error "postEAddUserR"
+
+getEInviteR, postEInviteR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
+getEInviteR = postEInviteR
+postEInviteR = error "postEInviteR"
+
+postERegisterR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
+postERegisterR tid ssh csh examn = do
+  uid <- requireAuthId
+
+  Entity eId Exam{..} <- runDB $ fetchExam tid ssh csh examn
+
+  ((btnResult, _), _) <- runFormPost buttonForm
+
+  formResult btnResult $ \case
+    BtnRegister -> do
+      runDB . void . insert $ ExamRegistration eId uid Nothing
+      addMessageI Success $ MsgExamRegisteredSuccess examn
+      redirect $ CExamR tid ssh csh examn EShowR
+    BtnDeregister -> do
+      runDB . deleteBy $ UniqueExamRegistration eId uid
+      addMessageI Success $ MsgExamDeregisteredSuccess examn
+      redirect $ CExamR tid ssh csh examn EShowR
+
+  invalidArgs ["Register/Deregister button required"]

From 1684da07f2352f76df7cef3bd7b33aa32a8dda97 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 26 Jun 2019 17:33:55 +0200
Subject: [PATCH 492/519] fix(exams): Fix registration

---
 messages/uniworx/de.msg     |  5 ++++-
 src/Foundation.hs           | 27 +++++++++++++++++++++++++++
 src/Handler/Exam.hs         | 25 +++++++++++++++++++++++--
 src/Model/Types/Security.hs |  1 +
 templates/exam-show.hamlet  |  4 ++++
 5 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 492a08b54..ef3910846 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -878,6 +878,7 @@ AuthTagTutor: Nutzer ist Tutor
 AuthTagTime: Zeitliche Einschränkungen sind erfüllt
 AuthTagCourseRegistered: Nutzer ist Kursteilnehmer
 AuthTagTutorialRegistered: Nutzer ist Tutoriumsteilnehmer
+AuthTagExamRegistered: Nutzer ist Klausurteilnehmer
 AuthTagParticipant: Nutzer ist mit Kurs assoziiert
 AuthTagRegisterGroup: Nutzer ist nicht Mitglied eines anderen Tutoriums mit der selben Registrierungs-Gruppe
 AuthTagCapacity: Kapazität ist ausreichend
@@ -1145,4 +1146,6 @@ ExamResult: Klausurergebnis
 
 ExamRegisteredSuccess exam@ExamName: Erfolgreich zur Klausur #{exam} angemeldet
 ExamDeregisteredSuccess exam@ExamName: Erfolgreich von der Klausur #{exam} abgemeldet
-ExamRegistered: Angemeldet
\ No newline at end of file
+ExamRegistered: Angemeldet
+ExamNotRegistered: Nicht angemeldet
+ExamRegistration: Anmeldung
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 97dd384f5..21349c919 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -797,6 +797,33 @@ tagAccessPredicate AuthTutorialRegistered = APDB $ \mAuthId route _ -> case rout
     guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedRegistered)
     return Authorized
   r -> $unsupportedAuthPredicate AuthTutorialRegistered r
+tagAccessPredicate AuthExamRegistered = APDB $ \mAuthId route _ -> case route of
+  CExamR tid ssh csh examn _ -> exceptT return return $ do
+    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
+    [E.Value c] <- $cachedHereBinary (authId, tid, ssh, csh, examn) . lift . E.select . E.from $ \(course `E.InnerJoin` exam `E.InnerJoin` examRegistration) -> do
+      E.on $ exam E.^. ExamId E.==. examRegistration E.^. ExamRegistrationExam
+      E.on $ course E.^. CourseId E.==. exam E.^. ExamCourse
+      E.where_ $ examRegistration E.^. ExamRegistrationUser 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.&&. exam E.^. ExamName  E.==. E.val examn
+      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] <- $cachedHereBinary (authId, tid, ssh, csh) . lift . E.select . E.from $ \(course `E.InnerJoin` exam `E.InnerJoin` examRegistration) -> do
+      E.on $ exam E.^. ExamId E.==. examRegistration E.^. ExamRegistrationExam
+      E.on $ course E.^. CourseId E.==. exam E.^. ExamCourse
+      E.where_ $ examRegistration E.^. ExamRegistrationUser 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 AuthExamRegistered r
 tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
   CourseR tid ssh csh (CUserR cID) -> exceptT return return $ do
     let authorizedIfExists f = do
diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
index f44a78abf..5a7817339 100644
--- a/src/Handler/Exam.hs
+++ b/src/Handler/Exam.hs
@@ -634,7 +634,7 @@ getEShowR tid ssh csh examn = do
   cTime <- liftIO getCurrentTime
   mUid <- maybeAuthId
   
-  (Entity _ Exam{..}, parts, examVisible, (gradingVisible, gradingShown), (occurrenceAssignmentsVisible, occurrenceAssignmentsShown), results, result, occurrences) <- runDB $ do
+  (Entity _ Exam{..}, parts, examVisible, (gradingVisible, gradingShown), (occurrenceAssignmentsVisible, occurrenceAssignmentsShown), results, result, occurrences, (registered, mayRegister)) <- runDB $ do
     exam@(Entity eId Exam{..}) <- fetchExam tid ssh csh examn
 
     let examVisible = NTop (Just cTime) >= NTop examVisibleFrom
@@ -671,9 +671,30 @@ getEShowR tid ssh csh examn = do
 
     let occurrences = map (over _2 E.unValue) occurrencesRaw
 
-    return (exam, parts, examVisible, (gradingVisible, gradingShown), (occurrenceAssignmentsVisible, occurrenceAssignmentsShown), results, result, occurrences)
+    registered <- for mUid $ existsBy . UniqueExamRegistration eId
+    mayRegister <- (== Authorized) <$> evalAccessDB (CExamR tid ssh csh examName ERegisterR) True
+
+    return (exam, parts, examVisible, (gradingVisible, gradingShown), (occurrenceAssignmentsVisible, occurrenceAssignmentsShown), results, result, occurrences, (registered, mayRegister))
 
   let examTimes = all (\(Entity _ ExamOccurrence{..}, _) -> examOccurrenceStart == examStart && examOccurrenceEnd == examEnd) occurrences
+      registerWidget
+        | Just isRegistered <- registered
+        , mayRegister = Just $ do
+            (examRegisterForm, examRegisterEnctype) <- liftHandlerT . generateFormPost . buttonForm' $ bool [BtnRegister] [BtnDeregister] isRegistered
+            [whamlet|
+              <p>
+                $if isRegistered
+                  _{MsgExamRegistered}
+                $else
+                  _{MsgExamNotRegistered}
+            |]
+            wrapForm examRegisterForm def
+              { formAction = Just . SomeRoute $ CExamR tid ssh csh examName ERegisterR
+              , formEncoding = examRegisterEnctype
+              , formSubmit = FormNoSubmit
+            }
+        | fromMaybe False registered = Just [whamlet|_{MsgExamRegistered}|]
+        | otherwise = Nothing
 
   let heading = prependCourseTitle tid ssh csh $ CI.original examName
 
diff --git a/src/Model/Types/Security.hs b/src/Model/Types/Security.hs
index 1c1919fdf..805e7d96d 100644
--- a/src/Model/Types/Security.hs
+++ b/src/Model/Types/Security.hs
@@ -42,6 +42,7 @@ data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prä
   | AuthTutor
   | AuthCourseRegistered
   | AuthTutorialRegistered
+  | AuthExamRegistered
   | AuthParticipant
   | AuthTime
   | AuthMaterials
diff --git a/templates/exam-show.hamlet b/templates/exam-show.hamlet
index 36625be20..3603fee38 100644
--- a/templates/exam-show.hamlet
+++ b/templates/exam-show.hamlet
@@ -81,6 +81,10 @@ $maybe desc <- examDescription
           \ ^{isVisible False}
       <dd .deflist__dd>
         $# TODO
+    $maybe registerWdgt <- registerWidget
+      <dt .deflist__dt>_{MsgExamRegistration}
+      <dd .deflist__dd>^{registerWdgt}
+    
 
 $if not (null occurrences)
   <section>

From 09e072c6e32031433479c9a4d5c99a1a02703e7c Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 26 Jun 2019 18:09:37 +0200
Subject: [PATCH 493/519] Replaced DisplayAble instance for Rational with
 auxiliary function rounding to Fixed E3

---
 messages/uniworx/de.msg   |  6 +++---
 src/Foundation.hs         |  6 ++++++
 src/Model/Types/Common.hs |  3 +--
 src/Utils.hs              | 18 ++----------------
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 69a48ab45..f426e0568 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -316,9 +316,9 @@ Correctors: Korrektoren
 CorState: Status
 CorByTut: Zuteilung nach Tutorium
 CorProportion: Anteil
-CorByProportionOnly proportion@Rational: #{display proportion} Anteile
-CorByProportionIncludingTutorial proportion@Rational: #{display proportion} Anteile - Tutorium
-CorByProportionExcludingTutorial proportion@Rational: #{display proportion} Anteile + Tutorium
+CorByProportionOnly proportion@Rational: #{rationalToFixed3 proportion} Anteile
+CorByProportionIncludingTutorial proportion@Rational: #{rationalToFixed3 proportion} Anteile - Tutorium
+CorByProportionExcludingTutorial proportion@Rational: #{rationalToFixed3 proportion} Anteile + Tutorium
 
 RowCount count@Int64: #{count} #{pluralDE count "passender Eintrag" "passende Einträge"} insgesamt
 DeleteRow: Entfernen
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 7261724ef..ba7747040 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -350,6 +350,12 @@ instance HasResolution a => ToMessage (Fixed a) where
   toMessage = toMessage . showFixed True
 
 
+-- Do not use toMessage on Rationals and round them automatically. Instead, use rationalToFixed3 (declared in src/Utils.hs) to convert a Rational to Fixed E3!
+-- instance ToMessage Rational where
+--   toMessage = toMessage . fromRational'
+--     where fromRational' = fromRational :: Rational -> Fixed E3
+
+
 newtype ErrorResponseTitle = ErrorResponseTitle ErrorResponse
 embedRenderMessageVariant ''UniWorX ''ErrorResponseTitle ("ErrorResponseTitle" <>)
 
diff --git a/src/Model/Types/Common.hs b/src/Model/Types/Common.hs
index 5ffbcfb07..674bb78f6 100644
--- a/src/Model/Types/Common.hs
+++ b/src/Model/Types/Common.hs
@@ -16,7 +16,6 @@ import qualified Yesod.Auth.Util.PasswordStore as PWStore
 type Count  = Sum Integer
 type Points = Centi
 
-
 type Email           = Text
 
 type SchoolName      = CI Text
@@ -32,4 +31,4 @@ type PWHashAlgorithm = ByteString -> PWStore.Salt -> Int -> ByteString
 type InstanceId      = UUID
 type ClusterId       = UUID
 type TokenId         = UUID
-type TermCandidateIncidence = UUID
+type TermCandidateIncidence = UUID
\ No newline at end of file
diff --git a/src/Utils.hs b/src/Utils.hs
index e9949b8d9..66fe2b006 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -30,7 +30,6 @@ import Text.Blaze (Markup, ToMarkup)
 
 import Data.Char (isDigit, isSpace, isAscii)
 import Data.Text (dropWhileEnd, takeWhileEnd, justifyRight)
-import Numeric (showFFloat)
 
 import Data.Set (Set)
 import qualified Data.Set as Set
@@ -248,21 +247,8 @@ class DisplayAble a where
   default display :: Show a => a -> Text
   display = pack . show
 
-instance DisplayAble Rational where
-  display r = showFFloat (Just 2) (rat2float r) ""
-      & pack
-      & dropWhileEnd ('0'==)
-      & dropWhileEnd ('.'==)
-    where
-      rat2float :: Rational -> Double
-      rat2float = fromRational
-
-{- We do not want DisplayAble for every Show-Class:
-   We want to explicitly verify that the resulting text can be displayed to the User!
-   For example: UTCTime values were shown without proper format rendering!
-instance {-# OVERLAPPABLE #-} Show a => DisplayAble a where -- The easy way out of UndecidableInstances (TypeFamilies would have been proper, but are much more complicated)
-  display = pack . show
--}
+rationalToFixed3 :: Rational -> Fixed E3
+rationalToFixed3 = fromRational
 
 textPercent :: Real a => a -> Text -- slow, maybe use Data.Double.Conversion.Text.toFixed instead?
 textPercent x = lz <> pack (show rx) <> "%"

From a40456f2cdc8b1896e724c10707ccaccd61dfe4e Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 26 Jun 2019 19:03:13 +0200
Subject: [PATCH 494/519] Removed DisplayAble instance for CryptoIDs

---
 src/Data/CryptoID/Instances.hs        | 14 +++------
 src/Foundation.hs                     | 44 +++++++++++----------------
 src/Handler/Corrections.hs            |  2 +-
 src/Handler/Sheet.hs                  |  2 +-
 src/Handler/Utils/Table/Cells.hs      |  2 +-
 templates/correction-user.hamlet      |  2 +-
 templates/mail/submissionRated.hamlet |  2 +-
 7 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/src/Data/CryptoID/Instances.hs b/src/Data/CryptoID/Instances.hs
index e98207784..60b6e9081 100644
--- a/src/Data/CryptoID/Instances.hs
+++ b/src/Data/CryptoID/Instances.hs
@@ -4,15 +4,11 @@ module Data.CryptoID.Instances
   (
   ) where
 
--- import qualified Data.CryptoID as CID
+import qualified Data.CryptoID as CID
 
--- import Data.CaseInsensitive (CI)
--- import qualified Data.CaseInsensitive as CI
+import Text.Blaze (ToMarkup(..))
 
--- import Text.Blaze (ToMarkup(..))
+import ClassyPrelude
 
--- import ClassyPrelude
-
--- TODO: markup instance for UUIDs
--- instance ToMarkup c => ToMarkup (CID.CryptoID c s) where
---   toMarkup = toMarkup . CID.ciphertext
\ No newline at end of file
+instance ToMarkup s => ToMarkup (CID.CryptoID c s) where
+  toMarkup = toMarkup . CID.ciphertext
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index ba7747040..20352f19a 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -21,10 +21,7 @@ import qualified Network.Wai as W (pathInfo)
 
 import Yesod.Core.Types     (Logger)
 import qualified Yesod.Core.Unsafe as Unsafe
-import Data.CaseInsensitive (CI)
-import qualified Data.CaseInsensitive as CI
-
-import qualified Data.CryptoID as E
+import Data.CaseInsensitive (original, mk)
 
 import Data.ByteArray (convert)
 import Crypto.Hash (Digest, SHAKE256, SHAKE128)
@@ -91,20 +88,13 @@ import qualified Data.Aeson as JSON
 import Data.FileEmbed (embedFile)
 
 
--- TODO: remove once CryptoID is an instance of ToMarkup
-instance DisplayAble b => DisplayAble (E.CryptoID a b) where
-  display = display . ciphertext
-
-instance {-# OVERLAPS #-} namespace ~ CryptoIDNamespace (CI FilePath) SubmissionId => DisplayAble (E.CryptoID namespace (CI FilePath)) where
-  display = toPathPiece
-
 -- TODO: remove
 instance DisplayAble TermId where
   display = termToText . unTermKey
 
 -- TODO: remove
 instance DisplayAble SchoolId where
-  display = CI.original . unSchoolKey
+  display = original . unSchoolKey
 
 type SMTPPool = Pool SMTPConnection
 
@@ -1451,11 +1441,11 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (TermEditExistR tid)   = return ("Editieren" , Just $ TermCourseListR tid)
   breadcrumb (TermCourseListR (unTermKey -> tid)) = getMessageRender <&> \mr -> (mr $ ShortTermIdentifier tid, Just CourseListR)
 
-  breadcrumb (TermSchoolCourseListR tid ssh)  = return (CI.original $ unSchoolKey ssh, Just $ TermCourseListR tid)
+  breadcrumb (TermSchoolCourseListR tid ssh)  = return (original $ unSchoolKey ssh, Just $ TermCourseListR tid)
 
   breadcrumb  CourseListR                 = return ("Kurse"    , Nothing)
   breadcrumb  CourseNewR                  = return ("Neu"      , Just CourseListR)
-  breadcrumb (CourseR tid ssh csh CShowR) = return (CI.original csh, Just $ TermSchoolCourseListR tid ssh)
+  breadcrumb (CourseR tid ssh csh CShowR) = return (original csh, Just $ TermSchoolCourseListR tid ssh)
   --         (CourseR tid ssh csh CRegisterR) -- is POST only
   breadcrumb (CourseR tid ssh csh CEditR)     = return ("Editieren"  , Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh CUsersR)    = return ("Anmeldungen", Just $ CourseR tid ssh csh CShowR)
@@ -1472,12 +1462,12 @@ instance YesodBreadcrumbs UniWorX where
   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 TUsersR)   = return (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 SShowR)   = return (original shn, Just $ CourseR tid ssh csh SheetListR)
   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)
@@ -1493,7 +1483,7 @@ instance YesodBreadcrumbs UniWorX where
 
   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 MShowR) = return (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
@@ -2005,8 +1995,8 @@ pageActions (CourseR tid ssh csh SheetListR) =
       , menuItemLabel = MsgMenuCorrectionsOwn
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute (CorrectionsR, [ ("corrections-term"  , termToText $ unTermKey tid)
-                                                 , ("corrections-school", CI.original $ unSchoolKey ssh)
-                                                 , ("corrections-course", CI.original csh)
+                                                 , ("corrections-school", original $ unSchoolKey ssh)
+                                                 , ("corrections-course", original csh)
                                                  ])
       , menuItemModal = False
       , menuItemAccessCallback' = do
@@ -2146,9 +2136,9 @@ pageActions (CSheetR tid ssh csh shn SShowR) =
       , menuItemLabel = MsgMenuCorrectionsOwn
       , menuItemIcon = Nothing
       , menuItemRoute = SomeRoute (CorrectionsR, [ ("corrections-term"  , termToText $ unTermKey tid)
-                                                 , ("corrections-school", CI.original $ unSchoolKey ssh)
-                                                 , ("corrections-course", CI.original csh)
-                                                 , ("corrections-sheet" , CI.original shn)
+                                                 , ("corrections-school", original $ unSchoolKey ssh)
+                                                 , ("corrections-course", original csh)
+                                                 , ("corrections-sheet" , original shn)
                                                  ])
       , menuItemModal = False
       , menuItemAccessCallback' = (== Authorized) <$> evalAccessCorrector tid ssh csh
@@ -2499,7 +2489,7 @@ routeNormalizers =
             tell $ Any True
     maybeOrig f route = maybeT (return route) $ f route
     hasChanged a b
-      | ((/=) `on` CI.original) a b = do
+      | ((/=) `on` original) a b = do
           $logDebugS "routeNormalizers" [st|#{tshow a} /= #{tshow b}|]
           tell $ Any True
       | otherwise                   = return ()
@@ -2565,7 +2555,7 @@ instance YesodAuth UniWorX where
       now <- liftIO getCurrentTime
 
       let
-        userIdent = CI.mk credsIdent
+        userIdent = mk credsIdent
         uAuth = UniqueAuthentication userIdent
 
         isDummy = credsPlugin == "dummy"
@@ -2603,7 +2593,7 @@ instance YesodAuth UniWorX where
 
       flip catches excHandlers $ case (,) <$> appLdapConf <*> appLdapPool of
         Just (ldapConf, ldapPool) -> fmap (either id id) . runExceptT $ do
-          ldapData <- campusUser ldapConf ldapPool $ Creds credsPlugin (CI.original userIdent) credsExtra
+          ldapData <- campusUser ldapConf ldapPool $ Creds credsPlugin (original userIdent) credsExtra
           $logDebugS "LDAP" $ "Successful LDAP lookup: " <> tshow ldapData
 
           let
@@ -2620,7 +2610,7 @@ instance YesodAuth UniWorX where
           userEmail <- if
             | Just [bs] <- userEmail'
             , Right userEmail <- Text.decodeUtf8' bs
-              -> return $ CI.mk userEmail
+              -> return $ mk userEmail
             | otherwise
               -> throwError $ ServerError "Could not retrieve user email"
           userDisplayName <- if
@@ -2675,7 +2665,7 @@ instance YesodAuth UniWorX where
               Right str <- return $ Text.decodeUtf8' v'
               return str
 
-            termNames = nubBy ((==) `on` CI.mk) $ do
+            termNames = nubBy ((==) `on` mk) $ do
               (k, v) <- ldapData
               guard $ k == Attr "dfnEduPersonFieldOfStudyString"
               v' <- v
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 9f68b6fbb..7dc79ae4f 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -149,7 +149,7 @@ colSubmissionLink = sortable Nothing (i18nCell MsgSubmission)
               mkRoute = do
                 cid <- mkCid
                 return $ CSubmissionR tid ssh csh shn cid SubShowR
-          in anchorCellM mkRoute (mkCid >>= \cid -> [whamlet|#{display cid}|])
+          in anchorCellM mkRoute (mkCid >>= \cid -> [whamlet|#{cid}|])
 
 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
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 9717a04df..94b00334d 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -236,7 +236,7 @@ getSheetListR tid ssh csh = do
                     mkRoute = do
                       cid' <- mkCid
                       return $ CSubmissionR tid ssh csh sheetName cid' SubShowR
-                in anchorCellM mkRoute (mkCid >>= \cid2 -> [whamlet|#{display cid2}|])  -- TODO: replace display
+                in anchorCellM mkRoute (mkCid >>= \cid2 -> [whamlet|#{cid2}|])
       , sortable (Just "rating") (i18nCell MsgRating)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub,_)} ->
             let stats = sheetTypeSum sheetType in -- for statistics over all shown rows
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 43c2598f7..a00fa8ae9 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -237,7 +237,7 @@ submissionCell crse shn sid =
       csh = crse ^. _3
       mkCid = encrypt sid
       mkRoute cid = CSubmissionR tid ssh csh shn cid SubShowR
-      mkText      = display2widget  -- TODO: replace with toWgt once there is a ToMarkup instance for CryptoIDs
+      mkText      = toWgt -- display2widget  -- TODO: replace with toWgt once there is a ToMarkup instance for CryptoIDs
   in anchorCellM' mkCid mkRoute mkText
 
 correctorStateCell :: IsDBTable m a => SheetCorrector -> DBCell m a
diff --git a/templates/correction-user.hamlet b/templates/correction-user.hamlet
index 848557260..78a4533b2 100644
--- a/templates/correction-user.hamlet
+++ b/templates/correction-user.hamlet
@@ -2,7 +2,7 @@
   <table .table .table--striped .table--hover .table--vertical>
     <tr .table__row>
       <th .table__th>_{MsgSubmission}
-      <td .table__td>#{display cid}
+      <td .table__td>#{cid}
     $maybe Entity _ User{userDisplayName} <- corrector
       <tr .table__row>
         <th .table__th>_{MsgRatingBy}
diff --git a/templates/mail/submissionRated.hamlet b/templates/mail/submissionRated.hamlet
index e632a5bef..51f675e70 100644
--- a/templates/mail/submissionRated.hamlet
+++ b/templates/mail/submissionRated.hamlet
@@ -22,7 +22,7 @@ $newline never
         _{MsgSubmission}
       <dd>
         <a href=@{CSubmissionR tid ssh csh shn csid SubShowR}>
-          #{display csid}
+          #{csid}
       $maybe User{userDisplayName} <- corrector
         <dt>
           _{MsgRatingBy}

From f5b3dd4c3ac9e35b43b361e8a950cfa52c062d53 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 26 Jun 2019 19:27:41 +0200
Subject: [PATCH 495/519] Replaced DisplayAble instance for TermId and SchoolId
 with ToMessage instances

---
 messages/uniworx/de.msg | 72 ++++++++++++++++++++---------------------
 src/Foundation.hs       | 19 ++++-------
 src/Handler/Course.hs   |  4 +--
 src/Handler/Home.hs     |  8 ++---
 src/Utils/TH.hs         |  3 --
 5 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index f426e0568..88ebae84c 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -45,8 +45,8 @@ Page num@Int64: #{num}
 TermsHeading: Semesterübersicht
 TermCurrent: Aktuelles Semester
 TermEditHeading: Semester editieren/anlegen
-TermEditTid tid@TermId: Semester #{display tid} editieren
-TermEdited  tid@TermId: Semester #{display tid} erfolgreich editiert.
+TermEditTid tid@TermId: Semester #{tid} editieren
+TermEdited  tid@TermId: Semester #{tid} erfolgreich editiert.
 TermNewTitle: Semester editieren/anlegen.
 InvalidInput: Eingaben bitte korrigieren.
 Term: Semester
@@ -85,17 +85,17 @@ CourseTutorial: Tutorium
 CourseStudyFeatureTooltip: Korrekte Angabe kann Notenweiterleitungen beschleunigen
 CourseSecretWrong: Falsches Kennwort
 CourseSecret: Zugangspasswort
-CourseEditOk       tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} wurde erfolgreich geändert.
-CourseNewDupShort  tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} konnte nicht erstellt werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester.
-CourseEditDupShort tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} konnte nicht geändert werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester.
+CourseEditOk       tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{tid}-#{ssh}-#{csh} wurde erfolgreich geändert.
+CourseNewDupShort  tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{tid}-#{ssh}-#{csh} konnte nicht erstellt werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester.
+CourseEditDupShort tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{tid}-#{ssh}-#{csh} konnte nicht geändert werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{csh} in diesem Semester.
 FFSheetName: Name
-TermCourseListHeading tid@TermId: Kursübersicht #{display tid}
-TermSchoolCourseListHeading tid@TermId school@SchoolName: Kursübersicht #{display tid} für #{school}
+TermCourseListHeading tid@TermId: Kursübersicht #{tid}
+TermSchoolCourseListHeading tid@TermId school@SchoolName: Kursübersicht #{tid} für #{school}
 CourseListTitle: Alle Kurse
-TermCourseListTitle   tid@TermId: Kurse #{display tid}
-TermSchoolCourseListTitle tid@TermId school@SchoolName: Kurse #{display tid} für #{school}
+TermCourseListTitle   tid@TermId: Kurse #{tid}
+TermSchoolCourseListTitle tid@TermId school@SchoolName: Kurse #{tid} für #{school}
 CourseNewHeading: Neuen Kurs anlegen
-CourseEditHeading tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{display tid}-#{display ssh}-#{csh} editieren
+CourseEditHeading tid@TermId ssh@SchoolId csh@CourseShorthand: Kurs #{tid}-#{ssh}-#{csh} editieren
 CourseEditTitle: Kurs editieren/anlegen
 CourseMembers: Teilnehmer
 CourseMemberOf: Teilnehmer
@@ -141,22 +141,22 @@ CourseDeregistrationEndMustBeAfterStart: Ende des Abmeldezeitraums muss nach dem
 CourseUserMustBeLecturer: Aktueller Benutzer muss als Kursverwalter eingetragen sein
 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.
+NoSuchTerm tid@TermId: Semester #{tid} gibt es nicht.
+NoSuchSchool ssh@SchoolId: Institut #{ssh} gibt es nicht.
 NoSuchCourseShorthand csh@CourseShorthand: Kein Kurs mit Kürzel #{csh} bekannt.
 NoSuchCourse: Keinen passenden Kurs gefunden.
 
 Sheet: Blatt
-SheetList          tid@TermId ssh@SchoolId csh@CourseShorthand: #{display tid}-#{display ssh}-#{csh} Übersicht Übungsblätter
-SheetNewHeading    tid@TermId ssh@SchoolId csh@CourseShorthand: #{display tid}-#{display ssh}-#{csh} Neues Übungsblatt anlegen
-SheetNewOk         tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{sheetName} wurde als neues Übungsblatt im Kurs #{display tid}-#{display ssh}-#{csh} erfolgreich erstellt.
-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} 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.
+SheetList          tid@TermId ssh@SchoolId csh@CourseShorthand: #{tid}-#{ssh}-#{csh} Übersicht Übungsblätter
+SheetNewHeading    tid@TermId ssh@SchoolId csh@CourseShorthand: #{tid}-#{ssh}-#{csh} Neues Übungsblatt anlegen
+SheetNewOk         tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{sheetName} wurde als neues Übungsblatt im Kurs #{tid}-#{ssh}-#{csh} erfolgreich erstellt.
+SheetTitle         tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{tid}-#{ssh}-#{csh} #{sheetName}
+SheetTitleNew      tid@TermId ssh@SchoolId csh@CourseShorthand                    : #{tid}-#{ssh}-#{csh}: Neues Übungsblatt
+SheetEditHead      tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{tid}-#{ssh}-#{csh} #{sheetName} editieren
+SheetEditOk        tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: Übungsblatt #{sheetName} wurde gespeichert in Kurs #{tid}-#{ssh}-#{csh}
+SheetNameDup       tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: Es gibt bereits ein Übungsblatt #{sheetName} in diesem Kurs #{tid}-#{ssh}-#{csh}
+SheetDelHead       tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{sheetName} wirklich aus Kurs #{tid}-#{ssh}-#{csh} herauslöschen? Alle assoziierten Abgaben und Korrekturen gehen ebenfalls verloren!
+SheetDelOk         tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{tid}-#{ssh}-#{csh}: #{sheetName} gelöscht.
 SheetDelHasSubmissions objs@Int: Inkl. #{tshow objs} #{pluralDE objs "Abgabe" "Abgaben"}!
 
 SheetDeleteQuestion: Wollen Sie das unten aufgeführte Übungsblatt und alle zugehörigen Abgaben wirklich löschen?
@@ -202,12 +202,12 @@ Deadline: Abgabe
 Done: Eingereicht
 
 Submission: Abgabenummer
-SubmissionsCourse tid@TermId ssh@SchoolId csh@CourseShorthand: Alle Abgaben Kurs #{display tid}-#{display ssh}-#{csh}
+SubmissionsCourse tid@TermId ssh@SchoolId csh@CourseShorthand: Alle Abgaben Kurs #{tid}-#{ssh}-#{csh}
 SubmissionsSheet sheetName@SheetName: Abgaben für #{sheetName}
 SubmissionWrongSheet: Abgabenummer gehört nicht zum angegebenen Übungsblatt.
 SubmissionAlreadyExists: Sie haben bereits eine Abgabe zu diesem Übungsblatt.
-SubmissionEditHead tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{display tid}-#{display ssh}-#{csh} #{sheetName}: Abgabe editieren/anlegen
-CorrectionHead     tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName cid@CryptoFileNameSubmission: #{display tid}-#{display ssh}-#{csh} #{sheetName}: Korrektur
+SubmissionEditHead tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{tid}-#{ssh}-#{csh} #{sheetName}: Abgabe editieren/anlegen
+CorrectionHead     tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName cid@CryptoFileNameSubmission: #{tid}-#{ssh}-#{csh} #{sheetName}: Korrektur
 SubmissionMembers: Abgebende
 SubmissionMember: Abgebende(r)
 SubmissionArchive: Zip-Archiv der Abgabedatei(en)
@@ -246,8 +246,8 @@ MaterialNewHeading: Neues Material veröffentlichen
 MaterialNewTitle: Neues Material
 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}
+MaterialSaveOk  tid@TermId ssh@SchoolId csh@CourseShorthand materialName@MaterialName: Material "#{materialName}" erfolgreich gespeichert in Kurs #{tid}-#{ssh}-#{csh}
+MaterialNameDup tid@TermId ssh@SchoolId csh@CourseShorthand materialName@MaterialName: Es gibt bereits Material mit Namen "#{materialName}" in diesem Kurs #{tid}-#{ssh}-#{csh}
 MaterialDeleteCaption: Wollen Sie das unten aufgeführte Material wirklich löschen?
 MaterialDelHasFiles count@Int64: inklusive #{tshow count} #{pluralDE count "Datei" "Dateien"}
 MaterialIsVisible: Achtung, dieses Material wurde bereits veröffentlicht.
@@ -302,12 +302,12 @@ UnauthorizedTutorialRegisterGroup: Sie sind bereits in einem Tutorium mit dersel
 
 EMail: E-Mail
 EMailUnknown email@UserEmail: E-Mail #{email} gehört zu keinem bekannten Benutzer.
-NotAParticipant email@UserEmail tid@TermId csh@CourseShorthand: #{email} ist nicht im Kurs #{display tid}-#{csh} angemeldet.
+NotAParticipant email@UserEmail tid@TermId csh@CourseShorthand: #{email} ist nicht im Kurs #{tid}-#{csh} angemeldet.
 TooManyParticipants: Es wurden zu viele Mitabgebende angegeben
 
 AddCorrector: Zusätzlicher Korrektor
 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}
+SheetCorrectorsTitle tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: Korrektoren für #{tid}-#{ssh}-#{csh} #{sheetName}
 CountTutProp: Tutorien zählen gegen Proportion
 CountTutPropTip: Wenn Abgaben nach Tutorium zugeteilt werden, zählen diese Zuteilungen in Bezug auf den jeweiligen Anteil?
 AutoAssignCorrs: Korrekturen nach Ablauf des Abgabezeitraums automatisch zuteilen
@@ -528,8 +528,8 @@ CorrectorExcused: Entschuldigt
 CorrectorStateTip: Abwesende Korrektoren bekommen bei späteren Übungsblättern mehr Korrekturen zum Ausgleich zugewiesen. Entschuldigte Korrektoren müssen nicht nacharbeiten.
 
 DayIsAHoliday     tid@TermId name@Text date@Text: "#{name}" (#{date}) ist ein Feiertag
-DayIsOutOfLecture tid@TermId name@Text date@Text: "#{name}" (#{date}) ist außerhalb der Vorlesungszeit des #{display tid}
-DayIsOutOfTerm    tid@TermId name@Text date@Text: "#{name}" (#{date}) liegt nicht im Semester #{display tid}
+DayIsOutOfLecture tid@TermId name@Text date@Text: "#{name}" (#{date}) ist außerhalb der Vorlesungszeit des #{tid}
+DayIsOutOfTerm    tid@TermId name@Text date@Text: "#{name}" (#{date}) liegt nicht im Semester #{tid}
 
 UploadModeNone: Kein Upload
 UploadModeAny: Upload, beliebige Datei(en)
@@ -630,16 +630,16 @@ MailSubjectSupport: Supportanfrage
 MailSubjectSupportCustom customSubject@Text: [Support] #{customSubject}
 
 CommCourseSubject: Kursmitteilung
-MailSubjectLecturerInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Kursverwalter
+MailSubjectLecturerInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{tid}-#{ssh}-#{csh}] Einladung zum Kursverwalter
 InvitationAcceptDecline: Einladung annehmen/ablehnen
 
-MailSubjectParticipantInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Kursteilname
+MailSubjectParticipantInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{tid}-#{ssh}-#{csh}] Einladung zum Kursteilname
 
-MailSubjectCorrectorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@SheetName: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Korrektor für #{shn}
+MailSubjectCorrectorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@SheetName: [#{tid}-#{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}
+MailSubjectTutorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand tutn@TutorialName: [#{tid}-#{ssh}-#{csh}] Einladung zum Tutor für #{tutn}
 
-MailSubjectSubmissionUserInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@SheetName: [#{display tid}-#{display ssh}-#{csh}] Einladung zu einer Abgabe für #{shn}
+MailSubjectSubmissionUserInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@SheetName: [#{tid}-#{ssh}-#{csh}] Einladung zu einer Abgabe für #{shn}
 
 SheetGrading: Bewertung
 SheetGradingPoints maxPoints@Points: #{tshow maxPoints} Punkte
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 20352f19a..82b078bcd 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -88,14 +88,6 @@ import qualified Data.Aeson as JSON
 import Data.FileEmbed (embedFile)
 
 
--- TODO: remove
-instance DisplayAble TermId where
-  display = termToText . unTermKey
-
--- TODO: remove
-instance DisplayAble SchoolId where
-  display = original . unSchoolKey
-
 type SMTPPool = Pool SMTPConnection
 
 -- infixl 9 :$:
@@ -204,10 +196,6 @@ type IntMaybe  = Maybe Int
 type TextList  = [Text]
 
 -- | Convenience function for i18n messages definitions
-maybeDisplay :: DisplayAble m => Text -> Maybe m -> Text  -> Text
-maybeDisplay _      Nothing  _     = mempty
-maybeDisplay before (Just x) after = before <> (display x) <> after
-
 maybeToMessage :: ToMessage m => Text -> Maybe m -> Text -> Text
 maybeToMessage _      Nothing  _     = mempty
 maybeToMessage before (Just x) after = before <> (toMessage x) <> after
@@ -339,12 +327,17 @@ instance ToMessage Integer where
 instance HasResolution a => ToMessage (Fixed a) where
   toMessage = toMessage . showFixed True
 
-
 -- Do not use toMessage on Rationals and round them automatically. Instead, use rationalToFixed3 (declared in src/Utils.hs) to convert a Rational to Fixed E3!
 -- instance ToMessage Rational where
 --   toMessage = toMessage . fromRational'
 --     where fromRational' = fromRational :: Rational -> Fixed E3
 
+-- ToMessage instances for *selected* database IDs
+instance ToMessage TermId where
+  toMessage = tshow
+instance ToMessage SchoolId where
+  toMessage = tshow
+
 
 newtype ErrorResponseTitle = ErrorResponseTitle ErrorResponse
 embedRenderMessageVariant ''UniWorX ''ErrorResponseTitle ("ErrorResponseTitle" <>)
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 9c3c768e4..1e110122c 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -1163,7 +1163,7 @@ postCUsersR tid ssh csh = do
           ]
         addMessageI Success $ MsgCourseUsersDeregistered nrDel
         redirect $ CourseR tid ssh csh CUsersR
-  let headingLong  = [whamlet|_{MsgMenuCourseMembers} #{courseName course} #{display tid}|]
+  let headingLong  = [whamlet|_{MsgMenuCourseMembers} #{courseName course} #{tid}|]
       headingShort = prependCourseTitle tid ssh csh MsgCourseMembers
   siteLayout headingLong $ do
     setTitleI headingShort
@@ -1350,7 +1350,7 @@ postCUserR tid ssh csh uCId = do
   mRegAt <- for (courseParticipantRegistration . entityVal <$> mRegistration) $ formatTime SelFormatDateTime
 
   -- generate output
-  let headingLong  = [whamlet|^{nameWidget userDisplayName userSurname} - _{MsgCourseMemberOf} #{csh} #{display tid}|]
+  let headingLong  = [whamlet|^{nameWidget userDisplayName userSurname} - _{MsgCourseMemberOf} #{csh} #{tid}|]
       headingShort = prependCourseTitle tid ssh csh $ SomeMessage userDisplayName
   siteLayout headingLong $ do
     setTitleI headingShort
diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs
index 978e4711c..84420bb07 100644
--- a/src/Handler/Home.hs
+++ b/src/Handler/Home.hs
@@ -33,9 +33,9 @@ homeOpenCourses = do
       colonnade = mconcat
         [ -- dbRow
           sortable (Just "term")   (i18nCell MsgTerm) $ \DBRow{ dbrOutput=Entity{entityVal = course} } ->
-            textCell $ display $ courseTerm course  -- TODO: ToText instance for Key Term
+            textCell $ toMessage $ courseTerm course
         , sortable (Just "school") (i18nCell MsgCourseSchool) $ \DBRow{ dbrOutput=Entity{entityVal = course} } ->
-            textCell $ display $ courseSchool course  -- TODO: ToText instance
+            textCell $ toMessage $ courseSchool course
         , sortable (Just "course") (i18nCell MsgCourse) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> do
             let tid = courseTerm      course
                 ssh = courseSchool    course
@@ -117,9 +117,9 @@ homeUpcomingSheets uid = do
         [ -- dbRow
           -- TOOD: sortable (Just "term")   (textCell MsgTerm)   $ \DBRow{ dbrOutput=(view _1 -> E.Value tid) } ->
           sortable (Just "term")   (i18nCell MsgTerm)   $ \DBRow{ dbrOutput=(E.Value tid,_,_,_,_,_) } ->
-            textCell $ display tid
+            textCell $ toMessage tid
         , sortable (Just "school") (i18nCell MsgCourseSchool) $ \DBRow{ dbrOutput=(_,E.Value ssh,_,_,_,_) } ->
-            textCell $ display ssh
+            textCell $ toMessage ssh
         , sortable (Just "course") (i18nCell MsgCourse) $ \DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, _, _, _) } ->
             anchorCell (CourseR tid ssh csh CShowR) (toWidget csh)
         , sortable (Just "sheet")  (i18nCell MsgSheet)  $ \DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, _) } ->
diff --git a/src/Utils/TH.hs b/src/Utils/TH.hs
index 5e7b1f36d..a1f9e9163 100644
--- a/src/Utils/TH.hs
+++ b/src/Utils/TH.hs
@@ -95,9 +95,6 @@ afterN n = do
 deriveShowWith :: (String -> String) -> Name -> Q [Dec]
 deriveShowWith = deriveSimpleWith ''Show 'show
 
--- deriveDisplayWith :: (String -> String) -> Name -> Q [Dec]
--- deriveDisplayWith = deriveSimpleWith ''DisplayAble 'display
-
 deriveSimpleWith ::  Name -> Name -> (String -> String) -> Name -> Q [Dec]
 deriveSimpleWith cls fun strOp ty = do
     (TyConI tyCon)  <- reify ty

From f8d0b021edcf254c161ff98e1183e9e4bfab0df9 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 26 Jun 2019 19:34:56 +0200
Subject: [PATCH 496/519] feat(forms): Introduce more convenient form
 validation

---
 ChangeLog.md            |  4 +++
 messages/uniworx/de.msg |  4 ++-
 src/Handler/Exam.hs     | 16 ++++++++++--
 src/Utils/Form.hs       | 56 ++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 25616306d..2cfe46396 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+  * Version 26.06.2019
+  
+    Rudimentäre Unterstützung für Klausurbetrieb
+
   * Version 07.06.2019
 
     Abgaben können bestimmte Dateinamen und Endungen erzwingen
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index ef3910846..66a159c18 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -1148,4 +1148,6 @@ ExamRegisteredSuccess exam@ExamName: Erfolgreich zur Klausur #{exam} angemeldet
 ExamDeregisteredSuccess exam@ExamName: Erfolgreich von der Klausur #{exam} abgemeldet
 ExamRegistered: Angemeldet
 ExamNotRegistered: Nicht angemeldet
-ExamRegistration: Anmeldung
\ No newline at end of file
+ExamRegistration: Anmeldung
+
+ExamEndMustBeAfterStart: Beginn der Klausur muss vor ihrem Ende liegen
\ No newline at end of file
diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
index 5a7817339..d63ed3de9 100644
--- a/src/Handler/Exam.hs
+++ b/src/Handler/Exam.hs
@@ -25,6 +25,8 @@ import Text.Blaze.Html.Renderer.String (renderHtml)
 
 import qualified Data.CaseInsensitive as CI
 
+import qualified Control.Monad.State.Class as State
+
 
 getCExamListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCExamListR tid ssh csh = do
@@ -438,6 +440,16 @@ examTemplate cid = runMaybeT $ do
     , efCorrectors       = Set.empty
     }
 
+
+validateExam :: (MonadHandler m, HandlerSite m ~ UniWorX) => FormValidator ExamForm m ()
+validateExam = do
+  ExamForm{..} <- State.get
+  
+  guardValidation MsgExamEndMustBeAfterStart $ NTop efEnd >= NTop (Just efStart)
+
+  -- TODO
+
+
 getCExamNewR, postCExamNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCExamNewR = postCExamNewR
 postCExamNewR tid ssh csh = do
@@ -446,7 +458,7 @@ postCExamNewR tid ssh csh = do
     template <- examTemplate cid
     return (cid, template)
   
-  ((newExamResult, newExamWidget), newExamEnctype) <- runFormPost $ examForm template
+  ((newExamResult, newExamWidget), newExamEnctype) <- runFormPost . validateForm validateExam $ examForm template
 
   formResult newExamResult $ \ExamForm{..} -> do
     insertRes <- runDBJobs $ do
@@ -525,7 +537,7 @@ postEEditR tid ssh csh examn = do
 
     return (cid, eId, template)
 
-  ((editExamResult, editExamWidget), editExamEnctype) <- runFormPost . examForm $ Just template
+  ((editExamResult, editExamWidget), editExamEnctype) <- runFormPost . validateForm validateExam . examForm $ Just template
 
   formResult editExamResult $ \ExamForm{..} -> do
     insertRes <- runDBJobs $ do
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 3947e214d..86d757dec 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# OPTIONS_GHC -fno-warn-deprecations #-}
 
 module Utils.Form where
@@ -23,8 +24,11 @@ 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 Control.Monad.State.Class (MonadState(..))
+import Control.Monad.Trans.RWS (RWST, execRWST, mapRWST)
 import Control.Monad.Trans.Except (ExceptT, runExceptT)
+import Control.Monad.Fix (MonadFix)
+import Control.Monad.Morph (MFunctor(..))
 
 import Data.List ((!!))
 
@@ -779,6 +783,56 @@ prismAForm p outer form = review p <$> form inner
   where
     inner = outer >>= preview p
 
+newtype FormValidator r m a = FormValidator { unFormValidator :: RWST () [SomeMessage (HandlerSite m)] r m a }
+
+deriving newtype instance Functor m => Functor (FormValidator r m)
+deriving newtype instance Monad m => Applicative (FormValidator r m)
+deriving newtype instance Monad m => Monad (FormValidator r m)
+deriving newtype instance Monad m => MonadState r (FormValidator r m)
+deriving newtype instance MonadFix m => MonadFix (FormValidator r m)
+instance MonadTrans (FormValidator r) where
+  lift = FormValidator . lift
+
+validateForm :: MonadHandler m
+             => FormValidator a m ()
+             -> (Markup -> MForm m (FormResult a, xml))
+             -> (Markup -> MForm m (FormResult a, xml))
+validateForm valF form csrf = do
+  (res, xml) <- form csrf
+  res' <- for res $ lift . execRWST (unFormValidator valF) ()
+  (, xml) <$> case res' of
+    FormSuccess (x, []  ) -> return $ FormSuccess x
+    FormSuccess (_, msgs) -> formFailure msgs
+    FormMissing           -> return FormMissing
+    FormFailure errs      -> return $ FormFailure errs
+
+validateFormDB :: ( MonadHandler m
+                  , YesodPersist (HandlerSite m)
+                  )
+               => FormValidator a (YesodDB (HandlerSite m)) ()
+               -> (Markup -> MForm m (FormResult a, xml))
+               -> (Markup -> MForm m (FormResult a, xml))
+validateFormDB (FormValidator valF) = validateForm . FormValidator $ hoist (liftHandlerT . runDB) valF
+
+tellValidationError :: ( MonadHandler m
+                       , RenderMessage (HandlerSite m) msg
+                       )
+                    => msg -> FormValidator r m ()
+tellValidationError = FormValidator . tell . pure . SomeMessage
+
+guardValidation :: ( MonadHandler m
+                   , RenderMessage (HandlerSite m) msg
+                   )
+                => msg -> Bool -> FormValidator r m ()
+guardValidation _   False = return ()
+guardValidation msg True  = tellValidationError msg
+
+guardValidationM :: ( MonadHandler m
+                    , RenderMessage (HandlerSite m) msg
+                    )
+                 => msg -> m Bool -> FormValidator r m ()
+guardValidationM = (. lift) . (=<<) . guardValidation
+
 -----------------------
 -- Form Manipulation --
 -----------------------

From 89d5364c937132a642d7b7960e90b73868fe56f4 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 26 Jun 2019 19:35:49 +0200
Subject: [PATCH 497/519] fix(Help Widget, Corrector Assignment): Modal Form
 closes in place; assign alerts

Closes #195
---
 .directory                 |  2 +-
 messages/uniworx/de.msg    |  2 ++
 src/Foundation.hs          |  4 +--
 src/Handler/Corrections.hs | 69 ++++++++++----------------------------
 src/Handler/Help.hs        |  2 +-
 src/Handler/Profile.hs     |  4 +--
 src/Utils/Form.hs          |  5 +++
 7 files changed, 31 insertions(+), 57 deletions(-)

diff --git a/.directory b/.directory
index 59c2c250d..9e958424d 100644
--- a/.directory
+++ b/.directory
@@ -1,5 +1,5 @@
 [Dolphin]
-Timestamp=2018,3,14,10,57,55
+Timestamp=2019,6,26,19,32,25
 Version=4
 
 [Settings]
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 012b6b587..2195c86a5 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -203,6 +203,7 @@ SheetErrHintEarly: Hinweise dürfen erst nach Beginn des Abgabezeitraums herausg
 SheetErrSolutionEarly: Lösungen dürfen erst nach Ende der Abgabezeitraums herausgegeben werden
 SheetNoCurrent: Es gibt momentan kein aktives Übungsblatt.
 SheetNoOldUnassigned: Alle Abgaben inaktiver Blätter sind bereits einen Korrektor zugeteilt.
+SheetsUnassignable name@Text: Momentan keine Abgaben zuteilbar für #{name}
 
 Deadline: Abgabe
 Done: Eingereicht
@@ -403,6 +404,7 @@ UpdatedSheetCorrectorsAutoFailed n@Int: #{display n} #{pluralDE n "Abgabe konnte
 CouldNotAssignCorrectorsAuto num@Int64: #{display num} Abgaben konnten nicht automatisch zugewiesen werden:
 SelfCorrectors num@Int64: #{display num} Abgaben wurden Abgebenden als eigenem Korrektor zugeteilt!
 
+
 CorrectionSheets: Übersicht Korrekturen nach Blättern
 CorrectionCorrectors: Übersicht Korrekturen nach Korrektoren
 AssignSubmissionExceptionNoCorrectors: Es sind keine Korrektoren eingestellt
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 3e243af41..ed6a01a70 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1436,7 +1436,7 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (CourseR tid ssh csh CInviteR)   = return ("Einladung", Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh (CUserR _)) = return ("Teilnehmer" , Just $ CourseR tid ssh csh CUsersR)
   breadcrumb (CourseR tid ssh csh CCorrectionsR) = return ("Abgaben" , Just $ CourseR tid ssh csh CShowR)
-  breadcrumb (CourseR tid ssh csh CAssignR)   = return ("Zuteilung"  , Just $ CourseR tid ssh csh CCorrectionsR)
+  breadcrumb (CourseR tid ssh csh CAssignR)   = return ("Zuteilung Korrekturen"  , Just $ CourseR tid ssh csh CCorrectionsR)
   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 SheetCurrentR) = return ("Aktuelles Blatt", Just $ CourseR tid ssh csh SheetListR)
@@ -1454,7 +1454,7 @@ instance YesodBreadcrumbs UniWorX where
   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 SAssignR) = return ("Zuteilen"     , Just $ CSheetR tid ssh csh shn SSubsR)
+  breadcrumb (CSheetR tid ssh csh shn SAssignR) = return ("Zuteilung Korrekturen"     , Just $ CSheetR tid ssh csh shn SSubsR)
   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)
   breadcrumb (CSubmissionR tid ssh csh shn _ SubShowR) = return ("Abgabe", Just $ CSheetR tid ssh csh shn SShowR)
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index f62fc6487..446b93273 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1052,11 +1052,8 @@ data SubAssignInfo = SubAssignInfo { saiName :: SheetName, saiSubmissionNr, saiC
 getCAssignR, postCAssignR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCAssignR = postCAssignR
 postCAssignR tid ssh csh = do
-  (shids,cid) <- runDB $ do
-    cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-    shids <- selectKeysList [SheetCourse ==. cid] [Asc SheetActiveTo]
-    return (shids,cid)
-  assignHandler tid ssh csh cid shids
+  cid <- runDB $ getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+  assignHandler tid ssh csh cid []
 
 getSAssignR, postSAssignR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSAssignR = postSAssignR
@@ -1064,51 +1061,13 @@ postSAssignR tid ssh csh shn = do
   (shid,cid) <- runDB $ fetchSheetIdCourseId tid ssh csh shn
   assignHandler tid ssh csh cid [shid]
 
--- DEPRECATED assignHandler', delete me soonish
-assignHandler' :: TermId -> SchoolId -> CourseShorthand -> CourseId -> [SheetId] -> Handler Html
-assignHandler' tid ssh csh _cid rawSids = do
-  -- gather data
-  openSubs <- runDB $ (\f -> foldM f Map.empty rawSids) $
-      \acc sid -> maybeT (return acc) $ do
-        Just Sheet{sheetName=saiName} <- lift $ get sid
-        guardM $ lift $ hasWriteAccessTo $ CSheetR tid ssh csh saiName SAssignR  -- we must check, whether the submission is already closed and thus assignable
-        saiUnassignedNr <- lift $ count [SubmissionSheet ==. sid, SubmissionRatingBy ==. Nothing]
-        guard $ 0 < saiUnassignedNr -- only consider sheets with unassigned submissions
-        saiSubmissionNr <- lift $ count [SubmissionSheet ==. sid]
-        saiCorrectorNr  <- lift $ count [SheetCorrectorSheet ==. sid, SheetCorrectorState ==. CorrectorNormal]
-        -- guard $ saiCorrectorNr > 0 -- COMMENTED OUT BECAUSE we should show sheets without possible correctors to inform the user about these problematic sheets
-        return $ Map.insert sid SubAssignInfo{..} acc
-  let sids = Map.keys openSubs
-  linkBack <- simpleLinkI (SomeMessage MsgGenericBack) <$> case sids of
-        [sid] -> do Sheet{sheetName} <- runDB $ getJust sid
-                    return $ CSheetR tid ssh csh sheetName SSubsR
-        _     ->    return $ CourseR tid ssh csh CCorrectionsR
-  -- process form
-  currentRoute <- getCurrentRoute
-  ((btnResult, btnWdgt), btnEnctype) <- runFormPost $ identifyForm FIDAssignSubmissions buttonForm
-  assignmentStatus <- fmap (fromMaybe Map.empty) . formResultMaybe btnResult $ \BtnSubmissionsAssign ->
-      -- Assign submissions
-      fmap Just . runDB $ (\f -> foldM f Map.empty sids) $
-        \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing
-      -- Too much important information for an alert message. Display proper info page instead
-  let btnForm = wrapForm btnWdgt def
-                { formAction = SomeRoute <$> currentRoute
-                , formEncoding = btnEnctype
-                , formSubmit = FormNoSubmit
-                }
-      headingShort = MsgMenuCorrectionsAssign
-      headingLong = prependCourseTitle tid ssh csh MsgMenuCorrectionsAssign
-  siteLayoutMsg headingShort $ do
-    setTitleI headingLong
-    $(widgetFile "corrections-assign")
-    if null sids || not (null assignmentStatus)
-      then linkBack  -- TODO: convenience link might be unnecessary: either via breadcrumb or closing model. Remove, if modal works fine. Otherwise change to PrimaryAction?
-      else btnForm
+{- TODO: Feature:
+  make distivt buttons for each sheet, so that users see which sheet will be assigned.
+  Currently this information is available within the page heading!
 
-
-{- TODO: make buttons for each sheet, so that users see which sheet is assigned
+  Stub:
 data ButtonCorrectionsAssign = BtnCorrectionsAssignAll | BtnCorrectionsAssignSheet SheetName
-  deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
+    deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
 instance Button UniWorX ButtonCorrectionsAssign
 -- Are those needed any more?
 instance Universe ButtonCorrectionsAssign
@@ -1126,7 +1085,7 @@ assignHandler tid ssh csh cid assignSids = do
   (btnWdgt, btnResult) <- runButtonForm FIDAssignSubmissions
 
   -- gather data
-  (nrParticipants, groupsPossible, infoMap, correctorMap, assignment) <- runDB $ do
+  (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment) <- runDB $ do
       -- cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
       nrParticipants <- count [CourseParticipantCourse ==. cid]
 
@@ -1137,6 +1096,7 @@ assignHandler tid ssh csh cid assignSids = do
           groupsPossible =
             let foldFun (Entity _ Sheet{sheetGrouping=sgr}) acc = acc || sgr /= NoGroups
             in  List.foldr foldFun False sheetList
+          assignSheetNames = fmap sheetName $ mapMaybe (\sid -> Map.lookup sid sheets) assignSids
 
       -- plan or assign unassigned submissions for given sheets
       let buildA :: (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int, Map UserId Rational)) -> SheetId -> DB (Map SheetName ((Set SubmissionId, Set SubmissionId), Map (Maybe UserId) Int, Map UserId Rational))
@@ -1166,7 +1126,10 @@ assignHandler tid ssh csh cid assignSids = do
                   addMessageI msg_status $ UniWorXMessages $ msg_header : catMaybes [alert_ok, alert_fail]
                 return status
             return $ Map.insert shn (status, countMapElems plan, deficit) acc
-      assignment <- foldM buildA Map.empty assignSids
+      assignSids' <- if null assignSids -- assignAll; we distinguish assignSids' here avoid useless Alerts
+                      then selectKeysList [SheetCourse ==. cid] [Asc SheetActiveTo]
+                      else return assignSids
+      assignment <- foldM buildA Map.empty assignSids'
 
       correctors <- E.select . E.from $ \(corrector `E.InnerJoin` user) -> do
           E.on $ corrector E.^. SheetCorrectorUser E.==. user E.^. UserId
@@ -1210,7 +1173,7 @@ assignHandler tid ssh csh cid assignSids = do
                             }
               in Map.insertWith (Map.unionWith (<>)) shnm cinf m
 
-      return (nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
+      return (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
 
   let -- infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo) -- repeated here for easier reference
       -- create aggregate maps
@@ -1277,6 +1240,10 @@ assignHandler tid ssh csh cid assignSids = do
         | 0 < Map.size assignment = MsgMenuCorrectionsAssignSheet $ Text.intercalate ", " $ fmap CI.original $ Map.keys assignment
         | otherwise               = MsgMenuCorrectionsAssign
       headingLong = prependCourseTitle tid ssh csh MsgMenuCorrectionsAssign
+
+      unassignableSheets = filter (\shn -> Map.notMember shn assignment) assignSheetNames
+  unless (null unassignableSheets) $ addMessageI Warning $ MsgSheetsUnassignable $ Text.intercalate ", " $ fmap CI.original unassignableSheets
+
   siteLayoutMsg headingShort $ do
     setTitleI headingLong
     $(widgetFile "corrections-overview")
diff --git a/src/Handler/Help.hs b/src/Handler/Help.hs
index bf33da8d5..5380d9880 100644
--- a/src/Handler/Help.hs
+++ b/src/Handler/Help.hs
@@ -66,6 +66,6 @@ postHelpR = do
     let formWidget = wrapForm formWidget' def
           { formAction = Just $ SomeRoute HelpR
           , formEncoding = formEnctype
-          , formAttrs = [ ("data-ajax-submit", "") | isModal ]
+          , formAttrs = [ asyncSubmitAttr | isModal ]
           }
     $(widgetFile "help")
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 403e133c7..282286f4f 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -147,7 +147,7 @@ postProfileR = do
 
   siteLayout [whamlet|_{MsgProfileFor} ^{nameWidget userDisplayName userSurname}|] $ do
     setTitle . toHtml $ "Profil " <> userIdent
-    let settingsForm = 
+    let settingsForm =
           wrapForm formWidget FormSettings
             { formMethod = POST
             , formAction = Just . SomeRoute $ ProfileR :#: ProfileSettings
@@ -593,7 +593,7 @@ postUserNotificationR cID = do
   let formWidget = wrapForm nsInnerWdgt def
         { formAction = Just . SomeRoute $ UserNotificationR cID
         , formEncoding = nsEnc
-        , formAttrs = [ ("data-ajax-submit", "") | isModal ]
+        , formAttrs = [ asyncSubmitAttr | isModal ]
         }
 
   formResultModal nsRes (UserNotificationR cID, [ (toPathPiece GetBearer, toPathPiece jwt) | Just jwt <- pure mJwt ]) $ \ns -> do
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 69eb65254..b189485a5 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -156,6 +156,11 @@ inputReadonly = addAttr "readonly" ""
 addAutosubmit :: FieldSettings site -> FieldSettings site
 addAutosubmit = addAttr "uw-auto-submit-input" ""
 
+-- | Asynchronous Submit, e.g. use with forms in modals
+asyncSubmitAttr :: (Text,Text)
+asyncSubmitAttr = ("uw-async-form", "")
+
+
 ------------------------------------------------
 -- Unique Form Identifiers to avoid accidents --
 ------------------------------------------------

From 726dbe6b1a23440285fb50e83d12b7fea14189ff Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 26 Jun 2019 23:32:50 +0200
Subject: [PATCH 498/519] Removed DisplayAble class

---
 src/Handler/Profile.hs      |  3 +--
 src/Model/Types/DateTime.hs |  2 --
 src/Model/Types/Misc.hs     |  2 +-
 src/Model/Types/Sheet.hs    |  7 -------
 src/Utils.hs                | 13 -------------
 5 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 611e82cdb..4bb679ec3 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -45,8 +45,7 @@ makeSettingForm template html = do
         <*> notificationForm (stgNotificationSettings <$> template)
     return (result, widget) -- no validation required here
   where
-    -- TODO: replace display
-    themeList = [Option (display t) t (toPathPiece t) | t <- universeF]
+    themeList = [Option (toMessage t) t (toPathPiece t) | t <- universeF]
 --
 -- Version with proper grouping:
 --
diff --git a/src/Model/Types/DateTime.hs b/src/Model/Types/DateTime.hs
index 10783550e..fd497cc40 100644
--- a/src/Model/Types/DateTime.hs
+++ b/src/Model/Types/DateTime.hs
@@ -45,8 +45,6 @@ seasonFromChar c
   where
     (~=) = (==) `on` CI.mk
 
--- instance DisplayAble Season
-
 data TermIdentifier = TermIdentifier
   { year :: Integer -- ^ Using 'Integer' to model years is consistent with 'Data.Time.Calendar'
   , season :: Season
diff --git a/src/Model/Types/Misc.hs b/src/Model/Types/Misc.hs
index efe0308a6..510b21251 100644
--- a/src/Model/Types/Misc.hs
+++ b/src/Model/Types/Misc.hs
@@ -39,6 +39,6 @@ instance Finite Theme
 
 nullaryPathPiece ''Theme $ camelToPathPiece' 1
 
-$(deriveSimpleWith ''DisplayAble 'display (over Text.packed $ Text.intercalate " " . unsafeTail . splitCamel) ''Theme) -- describe theme to user
+$(deriveSimpleWith ''ToMessage 'toMessage (over Text.packed $ Text.intercalate " " . unsafeTail . splitCamel) ''Theme) -- describe theme to user
 
 derivePersistField "Theme"
diff --git a/src/Model/Types/Sheet.hs b/src/Model/Types/Sheet.hs
index 5e971fb1d..b4a6b0a90 100644
--- a/src/Model/Types/Sheet.hs
+++ b/src/Model/Types/Sheet.hs
@@ -164,13 +164,6 @@ sheetFile2markup SheetHint     = iconHint
 sheetFile2markup SheetSolution = iconSolution
 sheetFile2markup SheetMarking  = iconMarking
 
--- $(deriveSimpleWith ''DisplayAble 'display (drop 17) ''SheetFileType)
--- instance DisplayAble SheetFileType where -- deprecated, see RenderMessage instance in Foundation
---   display SheetExercise = "Aufgabenstellung"
---   display SheetHint     = "Hinweise"
---   display SheetSolution = "Musterlösung"
---   display SheetMarking  = "Korrekturhinweise"
-
 -- partitionFileType' :: Ord a => [(SheetFileType,a)] -> Map SheetFileType (Set a)
 -- partitionFileType' = groupMap
 
diff --git a/src/Utils.hs b/src/Utils.hs
index 66fe2b006..35ca18bcc 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -231,22 +231,9 @@ str2widget :: (MonadBaseControl IO m, MonadThrow m, MonadIO m)
            => String -> WidgetT site m ()
 str2widget s = [whamlet|#{s}|]
 
-display2widget ::  (MonadBaseControl IO m, MonadThrow m, MonadIO m, DisplayAble a)
-               => a -> WidgetT site m ()
-display2widget = text2widget . display
-
 withFragment :: Monad m => MForm m (a, WidgetT site IO ()) -> Markup -> MForm m (a, WidgetT site IO ())
 withFragment form html = flip fmap form $ over _2 (toWidget html >>)
 
-
--- Types that can be converted to Text for direct displayed to User! (Show for debugging, Display for Production)
-{- (not so sure we really want to get rid of display?!) DEPRECATED display "Create RenderMessage Instances instead!" -}
-class DisplayAble a where
-  display :: a -> Text
-  -- Default definitions for types belonging to Show (allows empty instance declarations)
-  default display :: Show a => a -> Text
-  display = pack . show
-
 rationalToFixed3 :: Rational -> Fixed E3
 rationalToFixed3 = fromRational
 

From 52c4a689385ed97195817b2648144d7a55f4c010 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 26 Jun 2019 21:28:31 +0200
Subject: [PATCH 499/519] Lecturer info exams added

---
 src/Utils.hs                           | 26 +++++++--
 templates/i18n/info-lecturer/de.hamlet | 78 ++++++++++++++++++++++++--
 2 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/src/Utils.hs b/src/Utils.hs
index 4f565befe..e34abcd21 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -136,9 +136,25 @@ fontAwesomeIcon iconName =
 iconQuestion :: Markup
 iconQuestion = fontAwesomeIcon "question-circle"
 
+iconNew :: Markup
+iconNew = fontAwesomeIcon "seedling"
+
+iconOK :: Markup
+iconOK = fontAwesomeIcon "check"
+
+iconNotOK :: Markup
+iconNotOK = fontAwesomeIcon "times"
+
+iconWarning :: Markup
+iconWarning = fontAwesomeIcon "exclamation"
+
+iconProblem :: Markup
+iconProblem = fontAwesomeIcon "bolt"
+
 iconHint :: Markup
 iconHint = fontAwesomeIcon "life-ring"
 
+-- Icons for SheetFileType
 iconSolution :: Markup
 iconSolution =fontAwesomeIcon "exclamation-circle"
 
@@ -177,21 +193,21 @@ hasComment False = fontAwesomeIcon "comment-slash" -- comment-alt-slash is not a
 
 hasTickmark :: Bool -> Markup
 -- ^ Display an icon that denotes that something™ is okay
-hasTickmark True  = fontAwesomeIcon "check"
+hasTickmark True  = iconOK
 hasTickmark False = mempty
 
 isBad :: Bool -> Markup
 -- ^ Display an icon that denotes that something™ is bad
-isBad True  = fontAwesomeIcon "bolt" -- or times?!
+isBad True  = iconProblem
 isBad False = mempty
 
 isNew :: Bool -> Markup
-isNew True  = fontAwesomeIcon "seedling" -- was exclamation
+isNew True  = iconNew
 isNew False = mempty
 
 boolSymbol :: Bool -> Markup
-boolSymbol True  = fontAwesomeIcon "check"
-boolSymbol False = fontAwesomeIcon "times"
+boolSymbol True  = iconOK
+boolSymbol False = iconNotOK
 
 
 
diff --git a/templates/i18n/info-lecturer/de.hamlet b/templates/i18n/info-lecturer/de.hamlet
index e766ef7da..0d34ff8b0 100644
--- a/templates/i18n/info-lecturer/de.hamlet
+++ b/templates/i18n/info-lecturer/de.hamlet
@@ -7,8 +7,16 @@ $newline text
   <h2>Bekannte Probleme in Bearbeitung
 
   <dl .deflist>
-    <dt .deflist__dt>Derzeit keine bekannt.
+    <dt .deflist__dt>Klausuren #{iconNew}
+    <dd .deflist__dd>
+      Klausuren werden ab sofort teilweise unterstüzt.
+      Der genaue Stand der Entwicklung ist weiter unter auf dieser
+      Seite in einem eigenem Abschnitt detailliert.
 
+    <dt .deflist__dt>Benachrichtigungen
+    <dd .deflist__dd>
+      Benachrichtigungen werden momentan oft mit großer Verzögerung versandt.
+      Die Ursache ist derzeit noch unbekannt, da das Problem noch nicht genauer untersucht werden konnte.
 
     $#
     $# MOVE ITEM TO SECTION "VERANSTALTUNGEN", once it is implemented:
@@ -241,10 +249,72 @@ $newline text
 
 
 <section>
-  <h2>Klausuren
-  Das Verwalten von Klausuren und Notenmeldungen
-  ist leider noch nicht fertig implementiert.
+  <h2> Klausuren
+  <p>  Das Verwalten von Klausuren und Notenmeldungen wurde nun teilweise implementiert und ist ab sofort einsetzbar.
+  <dl .deflist>
+    <dt .deflist__dt> Anlegen/Editieren
+    <dd .deflist__dd>
+          Klausuren können von Dozenten und Assistenten angelegt werden.
+          Eine Vielzahl von optionalen Eigenschaften können sofort oder später angegeben werden,
+          z.B. Sichtbarkeit und Anmeldezeitraum.
 
+    <dt .deflist__dt> Prüfungen
+    <dd .deflist__dd>
+          Eine Klausur kann in mehrere Prüfungen unterteilt sein, welche jeweils einen eigenen Ort und Zeitraum besitzen.
+        <p>
+          Im einfachsten Fall lassen sich damit Klausuren abbilden, welche gleichzeitig in verschiedenen Räumen stattfinden.
+          Es lassen sich damit jetzt aber auch zeitlich getrennte Prüfungen verwalten, wie z.B. mündliche Prüfungen bei Seminaren oder Praktika.
+          Teilnehmern wird eine übersichtliche Tabelle aller Prüfungen angezeigt.
+
+    <dt .deflist__dt> #{iconProblem} Prüfungszuteilung
+    <dd .deflist__dd>
+          Auf Wunsch kann Uni2work die Zuteilung der Teilnehmer auf die Prüfungen (Räume bzw. Prüfungstermine)
+          nach verschiedenen Kriterien wie Name oder Matrikelnummer vornehmen.
+
+    <dt .deflist__dt> #{iconWarning} Anmeldungen
+    <dd .deflist__dd>
+          Teilnehmer können sich bereits zu sichtbaren Klausur innerhalb des eingestellten
+          Anmeldezeitraums anmelden.
+      <p>
+          <em>
+            Achtung: #
+          Die Liste der angemeldeten Teilnehmer ist momentan noch nicht einsehbar oder exportierbar, wird aber sicher gespeichert.
+          Dieses Feature folgt in Kürze.
+
+    <dt .deflist__dt> #{iconProblem} Korrekturen
+    <dd .deflist__dd>
+          <p>
+            Korrekturen können derzeit noch nicht eingetragen werden. #
+             Die Realisierung sollte in wenigen Wochen erfolgen.
+          <p>
+            Es besteht auch die Option, Namen für Teilaufgaben und/oder Klausurkorrektoren einzutragen.
+            $# Besondere Rechte für Klausurkorrektoren?
+
+    <dt .deflist__dt> #{iconProblem} Klausurbonus
+    <dd .deflist__dd>
+          Es werden verschiedene Möglichkeiten angebotenen werden,
+          die erzielten Bewertungen der Hausübungen
+          unter einstellbaren Bedingungen
+          in einen Klausurbonus umzurechnen (z.B. anrechnung nur, falls bereits ohne Bonus bestanden).
+
+    <dt .deflist__dt> #{iconProblem} Notenmeldung
+    <dd .deflist__dd>
+        <p>
+          Endnoten können leider noch nicht ans Prüfungsamt gemeldet werden.
+        <p>
+          Im Unterschied zum alten UniWorX gibt es keinen Knopf mehr zu Notenmeldung.
+          Stattdessen kann ein Datum eingetragen werden, ab dem die Klausur an das Prüfungsamt übergeben wird.
+          Dadurch kann die Notenmeldung nicht mehr vergessen werden.
+        <p>
+          Damit nachträgliche Änderungen nicht mehr verloren gehen können,
+          dürfen Dozenten nach dem Übergabedatum an das Prüfungsamt
+          keine Änderungen mehr an der Klausur vornehmen, da diese dann
+          ein Teil der Unterlagen des Prüfungsamtes ist.
+        <p>
+          Dozenten können jedoch explizit kleinere nachträgliche Änderungen an das
+          Prüfungsamt übermitteln. Für größere Änderungen kann das Prüfungsamt
+          die Klausur auch wieder an den Dozenten zurück übergeben;
+          der Dozent trägt dann einfach ein späteres Datum für die Übergabe ein.
 <section>
   <h2>Sonstiges
   <dl .deflist>

From 96387cbed5bda9b901706318e1931e6e718a0680 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 27 Jun 2019 08:55:32 +0200
Subject: [PATCH 500/519] fix(many occurrences throughout the project): Fix
 typo: occurence -> occurrence everywhere

A typo between occurence in code and occurrence in tests prevented
deployment. I changed all occurrences of "occurence" to the correct
spelling, such that
---
 messages/uniworx/de.msg                       |  4 +-
 models/tutorials                              |  2 +-
 src/Handler/Admin.hs                          |  2 +-
 src/Handler/Course.hs                         |  2 +-
 src/Handler/Tutorial.hs                       |  8 +-
 .../Form/{Occurences.hs => Occurrences.hs}    | 78 +++++++++----------
 src/Handler/Utils/Table/Cells.hs              | 18 ++---
 src/Model/Types/DateTime.hs                   | 20 ++---
 src/Utils/Lens.hs                             | 12 +--
 src/Utils/{Occurences.hs => Occurrences.hs}   | 30 +++----
 .../{occurence => occurrence}/cell.hamlet     |  6 +-
 .../cell/except-no-occur.hamlet               |  0
 .../cell/except-occur.hamlet                  |  0
 .../cell/weekly.hamlet                        |  0
 .../form/except-add.hamlet                    |  0
 .../form/except-layout.hamlet                 |  0
 .../form/except-no-occur.hamlet               |  0
 .../form/except-occur.hamlet                  |  0
 .../form/scheduled-add.hamlet                 |  0
 .../form/scheduled-layout.hamlet              |  0
 .../form/weekly.hamlet                        |  0
 test/Database.hs                              | 12 +--
 test/Model/TypesSpec.hs                       | 18 ++---
 23 files changed, 106 insertions(+), 106 deletions(-)
 rename src/Handler/Utils/Form/{Occurences.hs => Occurrences.hs} (63%)
 rename src/Utils/{Occurences.hs => Occurrences.hs} (73%)
 rename templates/widgets/{occurence => occurrence}/cell.hamlet (64%)
 rename templates/widgets/{occurence => occurrence}/cell/except-no-occur.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/cell/except-occur.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/cell/weekly.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/form/except-add.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/form/except-layout.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/form/except-no-occur.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/form/except-occur.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/form/scheduled-add.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/form/scheduled-layout.hamlet (100%)
 rename templates/widgets/{occurence => occurrence}/form/weekly.hamlet (100%)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 2195c86a5..bf7943f8b 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -965,8 +965,8 @@ ScheduleRegular: Planmäßiger Termin
 ScheduleRegularKind: Plan
 WeekDay: Wochentag
 Day: Tag
-OccurenceStart: Beginn
-OccurenceEnd: Ende
+OccurrenceStart: Beginn
+OccurrenceEnd: Ende
 ScheduleExists: Dieser Plan existiert bereits
 
 ScheduleExceptions: Termin-Ausnahmen
diff --git a/models/tutorials b/models/tutorials
index 4961e0bd5..166a8dbef 100644
--- a/models/tutorials
+++ b/models/tutorials
@@ -4,7 +4,7 @@ Tutorial json
     type            (CI Text) -- "Tutorium", "Zentralübung", ...
     capacity        Int Maybe -- limit for enrolment in this tutorial
     room            Text
-    time            Occurences
+    time            Occurrences
     regGroup        (CI Text) Maybe -- each participant may register for one tutorial per regGroup
     registerFrom    UTCTime Maybe
     registerTo      UTCTime Maybe
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 6f13dba0c..1b6242611 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 occurences of @mreq@ with @mpreq@ (no fields should be /actually/ required)
+    -- This /needs/ to replace all occurrences 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/Course.hs b/src/Handler/Course.hs
index 5abd1e624..c31b7048c 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -360,7 +360,7 @@ getCShowR tid ssh csh = do
                              ^{nameEmailWidget' tutor}
                      |]
           , sortable (Just "room") (i18nCell MsgTutorialRoom) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> textCell tutorialRoom
-          , sortable Nothing (i18nCell MsgTutorialTime) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> occurencesCell tutorialTime
+          , sortable Nothing (i18nCell MsgTutorialTime) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> occurrencesCell 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
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index caeeb11c1..fe0820abf 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -8,7 +8,7 @@ import Handler.Utils.Tutorial
 import Handler.Utils.Table.Cells
 import Handler.Utils.Delete
 import Handler.Utils.Communication
-import Handler.Utils.Form.Occurences
+import Handler.Utils.Form.Occurrences
 import Handler.Utils.Invitations
 import Jobs.Queue
 
@@ -64,7 +64,7 @@ getCTutorialListR tid ssh csh = do
           , 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 Nothing (i18nCell MsgTutorialTime) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> occurrencesCell tutorialTime
           , sortable (Just "register-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
@@ -275,7 +275,7 @@ data TutorialForm = TutorialForm
   , tfType            :: CI Text
   , tfCapacity        :: Maybe Int
   , tfRoom            :: Text
-  , tfTime            :: Occurences
+  , tfTime            :: Occurrences
   , tfRegGroup        :: Maybe (CI Text)
   , tfRegisterFrom    :: Maybe UTCTime
   , tfRegisterTo      :: Maybe UTCTime
@@ -322,7 +322,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 ("occurences" :: Text) (tfTime <$> template)
+    <*> occurrencesAForm ("occurrences" :: 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/Form/Occurences.hs b/src/Handler/Utils/Form/Occurrences.hs
similarity index 63%
rename from src/Handler/Utils/Form/Occurences.hs
rename to src/Handler/Utils/Form/Occurrences.hs
index da0e7733f..e3de0c461 100644
--- a/src/Handler/Utils/Form/Occurences.hs
+++ b/src/Handler/Utils/Form/Occurrences.hs
@@ -1,5 +1,5 @@
-module Handler.Utils.Form.Occurences
-  ( occurencesAForm
+module Handler.Utils.Form.Occurrences
+  ( occurrencesAForm
   ) where
 
 import Import
@@ -12,33 +12,33 @@ import qualified Data.Map as Map
 
 import Utils.Lens
 
-  
-data OccurenceScheduleKind = ScheduleKindWeekly
+
+data OccurrenceScheduleKind = ScheduleKindWeekly
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
-instance Universe OccurenceScheduleKind
-instance Finite OccurenceScheduleKind
+instance Universe OccurrenceScheduleKind
+instance Finite OccurrenceScheduleKind
 
-nullaryPathPiece ''OccurenceScheduleKind $ camelToPathPiece' 2
-embedRenderMessage ''UniWorX ''OccurenceScheduleKind id
+nullaryPathPiece ''OccurrenceScheduleKind $ camelToPathPiece' 2
+embedRenderMessage ''UniWorX ''OccurrenceScheduleKind id
 
-data OccurenceExceptionKind = ExceptionKindOccur
+data OccurrenceExceptionKind = ExceptionKindOccur
                             | ExceptionKindNoOccur
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
-instance Universe OccurenceExceptionKind
-instance Finite OccurenceExceptionKind
+instance Universe OccurrenceExceptionKind
+instance Finite OccurrenceExceptionKind
 
-nullaryPathPiece ''OccurenceExceptionKind $ camelToPathPiece' 2
-embedRenderMessage ''UniWorX ''OccurenceExceptionKind id
+nullaryPathPiece ''OccurrenceExceptionKind $ camelToPathPiece' 2
+embedRenderMessage ''UniWorX ''OccurrenceExceptionKind id
 
 
-occurencesAForm :: PathPiece ident => ident -> Maybe Occurences -> AForm Handler Occurences
-occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
+occurrencesAForm :: PathPiece ident => ident -> Maybe Occurrences -> AForm Handler Occurrences
+occurrencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
   Just cRoute <- getCurrentRoute
-  
+
   let
-    scheduled :: AForm Handler (Set OccurenceSchedule)
+    scheduled :: AForm Handler (Set OccurrenceSchedule)
     scheduled = Set.fromList <$> massInputAccumA
       miAdd'
       miCell'
@@ -47,16 +47,16 @@ occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
       (miIdent' <> "__scheduled" :: Text)
       (fslI MsgScheduleRegular & setTooltip MsgMassInputTip)
       False
-      (Set.toList . occurencesScheduled <$> mPrev)
+      (Set.toList . occurrencesScheduled <$> 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
+        miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([OccurrenceSchedule] -> FormResult [OccurrenceSchedule])
+        miAdd' nudge submitView = over (mapped . mapped . _2) (\addWidget -> $(widgetFile "widgets/occurrence/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
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurrenceStart & addName (nudge "occur-start")) Nothing
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurrenceEnd & addName (nudge "occur-end")) Nothing
                             )
                           ]
             ) (fslI MsgScheduleRegularKind & addName (nudge "kind")) Nothing
@@ -65,16 +65,16 @@ occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
             | newSched' `elem` oldScheds -> FormFailure [mr MsgScheduleExists]
             | otherwise -> FormSuccess $ pure newSched'
 
-        miCell' :: OccurenceSchedule -> Widget
+        miCell' :: OccurrenceSchedule -> Widget
         miCell' ScheduleWeekly{..} = do
           scheduleStart' <- formatTime SelFormatTime scheduleStart
           scheduleEnd' <- formatTime SelFormatTime scheduleEnd
-          $(widgetFile "widgets/occurence/form/weekly")
+          $(widgetFile "widgets/occurrence/form/weekly")
 
-        miLayout' :: MassInputLayout ListLength OccurenceSchedule ()
-        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurence/form/scheduled-layout")
+        miLayout' :: MassInputLayout ListLength OccurrenceSchedule ()
+        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurrence/form/scheduled-layout")
 
-    exceptions :: AForm Handler (Set OccurenceException)
+    exceptions :: AForm Handler (Set OccurrenceException)
     exceptions = Set.fromList <$> massInputAccumA
       miAdd'
       miCell'
@@ -83,16 +83,16 @@ occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
       (miIdent' <> "__exceptions" :: Text)
       (fslI MsgScheduleExceptions & setTooltip (UniWorXMessages [SomeMessage MsgScheduleExceptionsTip, SomeMessage MsgMassInputTip]))
       False
-      (Set.toList . occurencesExceptions <$> mPrev)
+      (Set.toList . occurrencesExceptions <$> 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
+        miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([OccurrenceException] -> FormResult [OccurrenceException])
+        miAdd' nudge submitView = over (mapped . mapped . _2) (\addWidget -> $(widgetFile "widgets/occurrence/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
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurrenceStart & addName (nudge "occur-start")) Nothing
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurrenceEnd & addName (nudge "occur-end")) Nothing
                             )
                           , ( ExceptionKindNoOccur
                             , ExceptNoOccur
@@ -104,20 +104,20 @@ occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
           return $ newExc <&> \newExc' oldExcs -> if
             | newExc' `elem` oldExcs -> FormFailure [mr MsgExceptionExists]
             | otherwise -> FormSuccess $ pure newExc'
-          
 
-        miCell' :: OccurenceException -> Widget
+
+        miCell' :: OccurrenceException -> Widget
         miCell' ExceptOccur{..} = do
           exceptStart' <- formatTime SelFormatDateTime (LocalTime exceptDay exceptStart)
           exceptEnd'   <- formatTime SelFormatTime     exceptEnd
-          $(widgetFile "widgets/occurence/form/except-occur")
+          $(widgetFile "widgets/occurrence/form/except-occur")
         miCell' ExceptNoOccur{..} = do
           exceptTime' <- formatTime SelFormatDateTime exceptTime
-          $(widgetFile "widgets/occurence/form/except-no-occur")
+          $(widgetFile "widgets/occurrence/form/except-no-occur")
 
-        miLayout' :: MassInputLayout ListLength OccurenceException ()
-        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurence/form/except-layout")
+        miLayout' :: MassInputLayout ListLength OccurrenceException ()
+        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurrence/form/except-layout")
 
-  aFormToWForm $ Occurences
+  aFormToWForm $ Occurrences
     <$> scheduled
     <*> exceptions
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 620e6776b..b901fb8d3 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -14,7 +14,7 @@ import Text.Blaze (ToMarkup(..))
 import Utils.Lens
 import Handler.Utils
 
-import Utils.Occurences
+import Utils.Occurrences
 
 import qualified Data.Set as Set
 
@@ -248,19 +248,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
+occurrencesCell :: IsDBTable m a => Occurrences -> DBCell m a
+occurrencesCell (normalizeOccurrences -> Occurrences{..}) = cell $ do
+  let occurrencesScheduled' = flip map (Set.toList occurrencesScheduled) $ \case
         ScheduleWeekly{..} -> do
           scheduleStart' <- formatTime SelFormatTime scheduleStart
           scheduleEnd' <- formatTime SelFormatTime scheduleEnd
-          $(widgetFile "widgets/occurence/cell/weekly")
-      occurencesExceptions' = flip map (Set.toList occurencesExceptions) $ \case
+          $(widgetFile "widgets/occurrence/cell/weekly")
+      occurrencesExceptions' = flip map (Set.toList occurrencesExceptions) $ \case
         ExceptOccur{..} -> do
           exceptStart' <- formatTime SelFormatDateTime (LocalTime exceptDay exceptStart)
           exceptEnd'   <- formatTime SelFormatTime     exceptStart
-          $(widgetFile "widgets/occurence/cell/except-occur")
+          $(widgetFile "widgets/occurrence/cell/except-occur")
         ExceptNoOccur{..} -> do
           exceptTime' <- formatTime SelFormatDateTime exceptTime
-          $(widgetFile "widgets/occurence/cell/except-no-occur")
-  $(widgetFile "widgets/occurence/cell")
+          $(widgetFile "widgets/occurrence/cell/except-no-occur")
+  $(widgetFile "widgets/occurrence/cell")
diff --git a/src/Model/Types/DateTime.hs b/src/Model/Types/DateTime.hs
index 10783550e..c72a6ba37 100644
--- a/src/Model/Types/DateTime.hs
+++ b/src/Model/Types/DateTime.hs
@@ -2,7 +2,7 @@
 Module: Model.Types.DateTime
 Description: Time related types
 
-Terms, Seasons, and Occurence schedules
+Terms, Seasons, and Occurrence schedules
 -}
 module Model.Types.DateTime
   ( module Model.Types.DateTime
@@ -152,7 +152,7 @@ time `withinTerm` term = timeYear `mod` 100 == termYear `mod` 100
     termYear = year term
 
 
-data OccurenceSchedule = ScheduleWeekly
+data OccurrenceSchedule = ScheduleWeekly
                          { scheduleDayOfWeek :: WeekDay
                          , scheduleStart     :: TimeOfDay
                          , scheduleEnd       :: TimeOfDay
@@ -164,9 +164,9 @@ deriveJSON defaultOptions
   , constructorTagModifier = camelToPathPiece' 1
   , tagSingleConstructors = True
   , sumEncoding = TaggedObject "repeat" "schedule"
-  } ''OccurenceSchedule
+  } ''OccurrenceSchedule
 
-data OccurenceException = ExceptOccur
+data OccurrenceException = ExceptOccur
                           { exceptDay   :: Day
                           , exceptStart :: TimeOfDay
                           , exceptEnd   :: TimeOfDay
@@ -180,15 +180,15 @@ deriveJSON defaultOptions
   { fieldLabelModifier = camelToPathPiece' 1
   , constructorTagModifier = camelToPathPiece' 1
   , sumEncoding = TaggedObject "exception" "for"
-  } ''OccurenceException
+  } ''OccurrenceException
 
-data Occurences = Occurences
-  { occurencesScheduled  :: Set OccurenceSchedule
-  , occurencesExceptions :: Set OccurenceException
+data Occurrences = Occurrences
+  { occurrencesScheduled  :: Set OccurrenceSchedule
+  , occurrencesExceptions :: Set OccurrenceException
   } deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 deriveJSON defaultOptions
   { fieldLabelModifier = camelToPathPiece' 1
-  } ''Occurences
-derivePersistFieldJSON ''Occurences
+  } ''Occurrences
+derivePersistFieldJSON ''Occurrences
 
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index b4cd5a572..7ebf61d99 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -111,15 +111,15 @@ makeLenses_ ''SubmissionMode
 
 makePrisms ''E.Value
 
-makeLenses_ ''OccurenceSchedule
+makeLenses_ ''OccurrenceSchedule
 
-makePrisms ''OccurenceSchedule
+makePrisms ''OccurrenceSchedule
 
-makeLenses_ ''OccurenceException
+makeLenses_ ''OccurrenceException
 
-makePrisms ''OccurenceException
+makePrisms ''OccurrenceException
 
-makeLenses_ ''Occurences
+makeLenses_ ''Occurrences
 
 makeLenses_ ''PredDNF
 
@@ -132,6 +132,6 @@ makeLenses_ ''PredDNF
 
 class HasInstanceID s a | s -> a where
   instanceID :: Lens' s a
-  
+
 class HasJSONWebKeySet s a | s -> a where
   jsonWebKeySet :: Lens' s a
diff --git a/src/Utils/Occurences.hs b/src/Utils/Occurrences.hs
similarity index 73%
rename from src/Utils/Occurences.hs
rename to src/Utils/Occurrences.hs
index 077d79250..a5e271136 100644
--- a/src/Utils/Occurences.hs
+++ b/src/Utils/Occurrences.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-overlapping-patterns #-}
 
-module Utils.Occurences
-  ( normalizeOccurences
+module Utils.Occurrences
+  ( normalizeOccurrences
   ) where
 
 import ClassyPrelude
@@ -20,21 +20,21 @@ import Data.Time
 import Data.Time.Calendar.WeekDate
 
 
-normalizeOccurences :: Occurences -> Occurences
--- ^ 
+normalizeOccurrences :: Occurrences -> Occurrences
+-- ^
 --
 --   - Removes unnecessary exceptions
 --   - Merges overlapping schedules
-normalizeOccurences initial
+normalizeOccurrences initial
   | Left new <- runReader (runExceptT go) initial
-  = normalizeOccurences new
+  = normalizeOccurrences new
   | otherwise
   = initial
   where
-    go :: ExceptT Occurences (Reader Occurences) ()
+    go :: ExceptT Occurrences (Reader Occurrences) ()
     -- Find some inconsistency and `throwE` a version without it
     go = do
-      scheduled <- view _occurencesScheduled
+      scheduled <- view _occurrencesScheduled
       forM_ scheduled $ \case
         a@ScheduleWeekly{} -> do
           let
@@ -50,35 +50,35 @@ normalizeOccurences initial
               | otherwise
               = Nothing
             merge _ = Nothing
-          merges <- views _occurencesScheduled $ mapMaybe (\b -> (,) <$> pure b <*> merge b) . Set.toList . Set.delete a
+          merges <- views _occurrencesScheduled $ 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)
+            ((b, merged) : _) -> throwE =<< asks (over _occurrencesScheduled $ Set.insert merged . Set.delete b . Set.delete a)
 
-      exceptions <- view _occurencesExceptions
+      exceptions <- view _occurrencesExceptions
       forM_ exceptions $ \case
         needle@ExceptNoOccur{..} -> do
           let LocalTime{..} = exceptTime
               (_, _, toEnum . (`mod` 7) -> localWeekDay) = toWeekDate localDay
-          needed <- views _occurencesScheduled . any $ \case
+          needed <- views _occurrencesScheduled . any $ \case
             ScheduleWeekly{..} -> and
               [ scheduleDayOfWeek == localWeekDay
               , scheduleStart <= localTimeOfDay
               , localTimeOfDay <= scheduleEnd
               ]
           unless needed $
-            throwE =<< asks (over _occurencesExceptions $ Set.delete needle)
+            throwE =<< asks (over _occurrencesExceptions $ 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
+          needed <- views _occurrencesScheduled . none $ \case
             ScheduleWeekly{..} -> and
               [ scheduleDayOfWeek == localWeekDay
               , scheduleStart == exceptStart
               , scheduleEnd == exceptEnd
               ]
           unless needed $
-            throwE =<< asks (over _occurencesExceptions $ Set.filter (not . withinNeedle) . Set.delete needle)
+            throwE =<< asks (over _occurrencesExceptions $ Set.filter (not . withinNeedle) . Set.delete needle)
diff --git a/templates/widgets/occurence/cell.hamlet b/templates/widgets/occurrence/cell.hamlet
similarity index 64%
rename from templates/widgets/occurence/cell.hamlet
rename to templates/widgets/occurrence/cell.hamlet
index bb1f1f3d7..295b3ae24 100644
--- a/templates/widgets/occurence/cell.hamlet
+++ b/templates/widgets/occurrence/cell.hamlet
@@ -1,12 +1,12 @@
 $newline never
 <ul .list--inline .list--iconless .list--comma-separated>
-  $forall sched <- occurencesScheduled'
+  $forall sched <- occurrencesScheduled'
     <li>^{sched}
 
-$if not (null occurencesExceptions)
+$if not (null occurrencesExceptions)
   $# <div .tooltip>
   $#   <div .tooltip__handle .tooltip__handle--danger>
   $#   <div .tooltip__content>
       <ul>
-        $forall exc <- occurencesExceptions'
+        $forall exc <- occurrencesExceptions'
           <li>^{exc}
diff --git a/templates/widgets/occurence/cell/except-no-occur.hamlet b/templates/widgets/occurrence/cell/except-no-occur.hamlet
similarity index 100%
rename from templates/widgets/occurence/cell/except-no-occur.hamlet
rename to templates/widgets/occurrence/cell/except-no-occur.hamlet
diff --git a/templates/widgets/occurence/cell/except-occur.hamlet b/templates/widgets/occurrence/cell/except-occur.hamlet
similarity index 100%
rename from templates/widgets/occurence/cell/except-occur.hamlet
rename to templates/widgets/occurrence/cell/except-occur.hamlet
diff --git a/templates/widgets/occurence/cell/weekly.hamlet b/templates/widgets/occurrence/cell/weekly.hamlet
similarity index 100%
rename from templates/widgets/occurence/cell/weekly.hamlet
rename to templates/widgets/occurrence/cell/weekly.hamlet
diff --git a/templates/widgets/occurence/form/except-add.hamlet b/templates/widgets/occurrence/form/except-add.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/except-add.hamlet
rename to templates/widgets/occurrence/form/except-add.hamlet
diff --git a/templates/widgets/occurence/form/except-layout.hamlet b/templates/widgets/occurrence/form/except-layout.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/except-layout.hamlet
rename to templates/widgets/occurrence/form/except-layout.hamlet
diff --git a/templates/widgets/occurence/form/except-no-occur.hamlet b/templates/widgets/occurrence/form/except-no-occur.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/except-no-occur.hamlet
rename to templates/widgets/occurrence/form/except-no-occur.hamlet
diff --git a/templates/widgets/occurence/form/except-occur.hamlet b/templates/widgets/occurrence/form/except-occur.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/except-occur.hamlet
rename to templates/widgets/occurrence/form/except-occur.hamlet
diff --git a/templates/widgets/occurence/form/scheduled-add.hamlet b/templates/widgets/occurrence/form/scheduled-add.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/scheduled-add.hamlet
rename to templates/widgets/occurrence/form/scheduled-add.hamlet
diff --git a/templates/widgets/occurence/form/scheduled-layout.hamlet b/templates/widgets/occurrence/form/scheduled-layout.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/scheduled-layout.hamlet
rename to templates/widgets/occurrence/form/scheduled-layout.hamlet
diff --git a/templates/widgets/occurence/form/weekly.hamlet b/templates/widgets/occurrence/form/weekly.hamlet
similarity index 100%
rename from templates/widgets/occurence/form/weekly.hamlet
rename to templates/widgets/occurrence/form/weekly.hamlet
diff --git a/test/Database.hs b/test/Database.hs
index ea044ac75..f59df7ec2 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -586,9 +586,9 @@ fillDb = do
     , 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
+    , tutorialTime = Occurrences
+      { occurrencesScheduled = Set.singleton $ ScheduleWeekly Tuesday (TimeOfDay 08 15 00) (TimeOfDay 10 00 00)
+      , occurrencesExceptions = Set.empty
       }
     , tutorialRegGroup = Just "tutorium"
     , tutorialRegisterFrom = Just now
@@ -604,9 +604,9 @@ fillDb = do
     , 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
+    , tutorialTime = Occurrences
+      { occurrencesScheduled  = Set.singleton $ ScheduleWeekly Tuesday (TimeOfDay 10 15 00) (TimeOfDay 12 00 00)
+      , occurrencesExceptions = Set.empty
       }
     , tutorialRegGroup = Just "tutorium"
     , tutorialRegisterFrom = Just now
diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index 3805809db..84596eabf 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -26,7 +26,7 @@ import Time.Types (WeekDay(..))
 
 instance (Arbitrary a, MonoFoldable a) => Arbitrary (NonNull a) where
   arbitrary = arbitrary `suchThatMap` fromNullable
-  
+
 instance Arbitrary Season where
   arbitrary = genericArbitrary
   shrink = genericShrink
@@ -71,7 +71,7 @@ instance Arbitrary SheetGradeSummary where
 instance Arbitrary SheetGroup where
   arbitrary = genericArbitrary
   shrink = genericShrink
-  
+
 instance Arbitrary SheetTypeSummary where
   arbitrary = genericArbitrary
   shrink = genericShrink
@@ -79,7 +79,7 @@ instance Arbitrary SheetTypeSummary where
 instance Arbitrary SheetFileType where
   arbitrary = genericArbitrary
   shrink = genericShrink
-  
+
 instance Arbitrary SubmissionFileType where
   arbitrary = genericArbitrary
   shrink = genericShrink
@@ -151,7 +151,7 @@ instance Arbitrary AuthTag where
   shrink = genericShrink
 instance CoArbitrary AuthTag where
   coarbitrary = genericCoarbitrary
-  
+
 instance Arbitrary AuthTagActive where
   arbitrary = AuthTagActive <$> arbitrary
   shrink = genericShrink
@@ -180,7 +180,7 @@ instance Arbitrary AuthenticationMode where
           authPWHash = unsafePerformIO . fmap decodeUtf8 $ makePasswordWith pwHashAlgorithm pw (pwHashStrength `div` 2)
         return $ AuthPWHash{..}
     ]
-  
+
   shrink AuthLDAP = []
   shrink (AuthPWHash _) = [AuthLDAP]
 
@@ -199,18 +199,18 @@ instance Arbitrary Html where
 instance Arbitrary WeekDay where
   arbitrary = oneof $ map pure [minBound..maxBound]
 
-instance Arbitrary OccurenceSchedule where
+instance Arbitrary OccurrenceSchedule where
   arbitrary = genericArbitrary
   shrink = genericShrink
 
-instance Arbitrary OccurenceException where
+instance Arbitrary OccurrenceException where
   arbitrary = genericArbitrary
   shrink = genericShrink
 
-instance Arbitrary Occurences where
+instance Arbitrary Occurrences where
   arbitrary = genericArbitrary
   shrink = genericShrink
-  
+
 
 spec :: Spec
 spec = do

From 6fb1399ef448eb1a6b92c652e644d6aaafe11673 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 27 Jun 2019 10:58:35 +0200
Subject: [PATCH 501/519] feat(exams): Form validation

---
 messages/uniworx/de.msg | 11 ++++++++++-
 src/Handler/Exam.hs     | 14 ++++++++++----
 src/Utils/Form.hs       |  7 ++++---
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 1b460503d..386a3765f 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -1066,6 +1066,7 @@ ExamRegisterFromTip: Zeitpunkt ab dem sich Kursteilnehmer selbständig zur Klaus
 ExamRegisterTo: Anmeldung bis
 ExamDeregisterUntil: Abmeldung bis
 ExamPublishOccurrenceAssignments: Terminzuteilung den Teilnehmern mitteilen um
+ExamPublishOccurrenceAssignmentsTip: Ab diesem Zeitpunkt Teilnehmer einsehen zu welchen Teilprüfungen (Räumen) sie angemeldet sind
 ExamPublishOccurrenceAssignmentsParticipant: Terminzuteilung einsehbar ab
 ExamFinished: Bewertung abgeschlossen ab
 ExamFinishedParticipant: Bewertung vorrausichtlich abgeschlossen
@@ -1152,4 +1153,12 @@ ExamRegistered: Angemeldet
 ExamNotRegistered: Nicht angemeldet
 ExamRegistration: Anmeldung
 
-ExamEndMustBeAfterStart: Beginn der Klausur muss vor ihrem Ende liegen
\ No newline at end of file
+ExamRegisterToMustBeAfterRegisterFrom: "Anmeldung ab" muss vor "Anmeldung bis" liegen
+ExamDeregisterUntilMustBeAfterRegisterFrom: "Abmeldung bis" muss nach "Anmeldung bis" liegen
+ExamStartMustBeAfterPublishOccurrenceAssignments: Start muss nach Veröffentlichung der Terminzuordnung liegen
+ExamEndMustBeAfterStart: Beginn der Klausur muss vor ihrem Ende liegen
+ExamFinishedMustBeAfterEnd: "Bewertung abgeschlossen ab" muss nach Ende liegen
+ExamFinishedMustBeAfterStart: "Bewertung abgeschlossen ab" muss nach Start liegen
+ExamClosedMustBeAfterFinished: "Noten stehen fest ab" muss nach "Bewertung abgeschlossen ab" liegen
+ExamClosedMustBeAfterStart: "Noten stehen fest ab" muss nach Start liegen
+ExamClosedMustBeAfterEnd: "Noten stehen fest ab" muss nach Ende liegen
\ No newline at end of file
diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
index d63ed3de9..51693fe85 100644
--- a/src/Handler/Exam.hs
+++ b/src/Handler/Exam.hs
@@ -203,7 +203,7 @@ examForm template html = do
     <*> aopt utcTimeField (fslpI MsgExamRegisterFrom (mr MsgDate) & setTooltip MsgExamRegisterFromTip) (efRegisterFrom <$> template)
     <*> aopt utcTimeField (fslpI MsgExamRegisterTo (mr MsgDate)) (efRegisterTo <$> template)
     <*> aopt utcTimeField (fslpI MsgExamDeregisterUntil (mr MsgDate)) (efDeregisterUntil <$> template)
-    <*> areq utcTimeField (fslpI MsgExamPublishOccurrenceAssignments (mr MsgDate)) (efPublishOccurrenceAssignments <$> template)
+    <*> areq utcTimeField (fslpI MsgExamPublishOccurrenceAssignments (mr MsgDate) & setTooltip MsgExamPublishOccurrenceAssignments) (efPublishOccurrenceAssignments <$> template)
     <*> aopt utcTimeField (fslpI MsgExamFinished (mr MsgDate) & setTooltip MsgExamFinishedTip) (efFinished <$> template)
     <*> aopt utcTimeField (fslpI MsgExamClosed (mr MsgDate) & setTooltip MsgExamClosedTip) (efClosed <$> template)
     <*  aformSection MsgExamFormOccurrences
@@ -445,9 +445,15 @@ validateExam :: (MonadHandler m, HandlerSite m ~ UniWorX) => FormValidator ExamF
 validateExam = do
   ExamForm{..} <- State.get
   
-  guardValidation MsgExamEndMustBeAfterStart $ NTop efEnd >= NTop (Just efStart)
-
-  -- TODO
+  guardValidation MsgExamRegisterToMustBeAfterRegisterFrom                 $ NTop efRegisterTo                   >= NTop efRegisterFrom
+  guardValidation MsgExamDeregisterUntilMustBeAfterRegisterFrom            $ NTop efDeregisterUntil              >= NTop efRegisterFrom
+  guardValidation MsgExamStartMustBeAfterPublishOccurrenceAssignments      $ efStart                             >= efPublishOccurrenceAssignments
+  guardValidation MsgExamEndMustBeAfterStart                               $ NTop efEnd                          >= NTop (Just efStart)
+  guardValidation MsgExamFinishedMustBeAfterEnd                            . fromMaybe True $ (>=) <$> efFinished <*> efEnd
+  guardValidation MsgExamFinishedMustBeAfterStart                          $ NTop efFinished                     >= NTop (Just efStart)
+  guardValidation MsgExamClosedMustBeAfterFinished                         . fromMaybe True $ (>=) <$> efClosed <*> efFinished
+  guardValidation MsgExamClosedMustBeAfterStart                            $ NTop efClosed                       >= NTop (Just efStart)
+  guardValidation MsgExamClosedMustBeAfterEnd                              . fromMaybe True $ (>=) <$> efClosed <*> efEnd
 
 
 getCExamNewR, postCExamNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 8a5da1d54..8ada2cc6d 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -828,9 +828,10 @@ tellValidationError = FormValidator . tell . pure . SomeMessage
 guardValidation :: ( MonadHandler m
                    , RenderMessage (HandlerSite m) msg
                    )
-                => msg -> Bool -> FormValidator r m ()
-guardValidation _   False = return ()
-guardValidation msg True  = tellValidationError msg
+                => msg -- ^ Message describing violation
+                -> Bool -- ^ @False@ iff constraint is violated
+                -> FormValidator r m ()
+guardValidation msg isValid = when (not isValid) $ tellValidationError msg
 
 guardValidationM :: ( MonadHandler m
                     , RenderMessage (HandlerSite m) msg

From 24aacef6af65d1c6c0cec53bd121abe1d889de2d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 27 Jun 2019 11:09:44 +0200
Subject: [PATCH 502/519] fix(exam grading keys): Fix spacing

---
 src/Handler/Exam.hs                  | 2 +-
 templates/widgets/gradingKey.cassius | 3 +++
 templates/widgets/gradingKey.hamlet  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 templates/widgets/gradingKey.cassius

diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
index 51693fe85..f8fb8722e 100644
--- a/src/Handler/Exam.hs
+++ b/src/Handler/Exam.hs
@@ -722,7 +722,7 @@ getEShowR tid ssh csh examn = do
       gradingKeyW :: [Points] -> Widget
       gradingKeyW bounds
         = let boundWidgets :: [Widget]
-              boundWidgets = map (toWidget . (pack :: String -> Text) . showFixed True) bounds
+              boundWidgets = toWidget . (pack :: String -> Text) . showFixed True <$> 0 : bounds
               grades :: [ExamGrade]
               grades = universeF
            in $(widgetFile "widgets/gradingKey")
diff --git a/templates/widgets/gradingKey.cassius b/templates/widgets/gradingKey.cassius
new file mode 100644
index 000000000..396f41818
--- /dev/null
+++ b/templates/widgets/gradingKey.cassius
@@ -0,0 +1,3 @@
+.table--grading-key
+  th, td
+    padding: 3px;
\ No newline at end of file
diff --git a/templates/widgets/gradingKey.hamlet b/templates/widgets/gradingKey.hamlet
index e035911e1..dac9e9537 100644
--- a/templates/widgets/gradingKey.hamlet
+++ b/templates/widgets/gradingKey.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<table>
+<table .table--grading-key>
   <thead>
     <tr>
       <td>

From e1e26abbbffd0f30a9e53c1a73f5bff7b1cb4afc Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 27 Jun 2019 11:22:04 +0200
Subject: [PATCH 503/519] fix(info-lecturer): Touch ups

---
 templates/i18n/info-lecturer/de.hamlet | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/templates/i18n/info-lecturer/de.hamlet b/templates/i18n/info-lecturer/de.hamlet
index 0d34ff8b0..b01937d50 100644
--- a/templates/i18n/info-lecturer/de.hamlet
+++ b/templates/i18n/info-lecturer/de.hamlet
@@ -263,7 +263,8 @@ $newline text
           Eine Klausur kann in mehrere Prüfungen unterteilt sein, welche jeweils einen eigenen Ort und Zeitraum besitzen.
         <p>
           Im einfachsten Fall lassen sich damit Klausuren abbilden, welche gleichzeitig in verschiedenen Räumen stattfinden.
-          Es lassen sich damit jetzt aber auch zeitlich getrennte Prüfungen verwalten, wie z.B. mündliche Prüfungen bei Seminaren oder Praktika.
+        <p>
+          Es lassen sich aber auch zeitlich getrennte Prüfungen verwalten, wie z.B. mündliche Prüfungen bei Seminaren oder Praktika.
           Teilnehmern wird eine übersichtliche Tabelle aller Prüfungen angezeigt.
 
     <dt .deflist__dt> #{iconProblem} Prüfungszuteilung
@@ -284,11 +285,14 @@ $newline text
     <dt .deflist__dt> #{iconProblem} Korrekturen
     <dd .deflist__dd>
           <p>
-            Korrekturen können derzeit noch nicht eingetragen werden. #
-             Die Realisierung sollte in wenigen Wochen erfolgen.
+            Korrekturen können derzeit noch nicht eingetragen werden.
+            Die Realisierung sollte in wenigen Wochen erfolgen.
           <p>
-            Es besteht auch die Option, Namen für Teilaufgaben und/oder Klausurkorrektoren einzutragen.
-            $# Besondere Rechte für Klausurkorrektoren?
+            Die Eintragung von Korrekturen erfolgt immer pro Teilaufgabe.
+            Optional kann aus der erreichten Punktesumme dann automatisch eine Gesamtnote berechnet werden.
+          <p>
+            Optional können Klausurkorrektoren angegeben werden, die ab Durchführung der Klausur berechtigt sind eigenständig Korrekturergebnisse einzutragen.
+            Es kann das Recht Ergebnisse einzutragen pro Korrektor auf bestimmte Teilaufgaben beschränkt werden.
 
     <dt .deflist__dt> #{iconProblem} Klausurbonus
     <dd .deflist__dd>

From d07f53e1d8db10407d26d4fdd6e7c4c8a34b973d Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 27 Jun 2019 16:51:38 +0200
Subject: [PATCH 504/519] fix(corrector assignment): sheet tabel mixed up
 columns sorted

some columns did not belong to each other.
---
 src/Handler/Corrections.hs            | 15 ++++++++++++---
 src/Model.hs                          |  9 +++++++++
 templates/corrections-overview.hamlet | 26 ++++++++++++++++++--------
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 446b93273..ddf820d18 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1177,8 +1177,10 @@ assignHandler tid ssh csh cid assignSids = do
 
   let -- infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo) -- repeated here for easier reference
       -- create aggregate maps
-      sheetNames :: [SheetName]
-      sheetNames = Map.keys infoMap
+
+      -- Always iterate over sheetList for consistent sorting!
+      sheetList :: [(SheetName, CorrectionInfo)]
+      sheetList = Map.toDescList sheetMap -- newest Sheet first, except for CorrectionSheetTable
 
       sheetMap :: Map SheetName CorrectionInfo
       sheetMap = Map.map fold infoMap
@@ -1197,6 +1199,11 @@ assignHandler tid ssh csh cid assignSids = do
       corrMap  :: Map (Maybe UserId) CorrectionInfo
       corrMap  = Map.unionsWith (<>) $ Map.elems infoMap
 
+      corrInfos :: [CorrectionInfo]
+      corrInfos = sortBy (compare `on` (byName . ciCorrector) ) $ Map.elems corrMap
+        where byName Nothing    = Nothing
+              byName (Just uid) = Map.lookup uid correctorMap
+
       corrMapSum :: CorrectionInfo
       corrMapSum = fold corrMap
 
@@ -1235,7 +1242,9 @@ assignHandler tid ssh csh cid assignSids = do
       showAvgsDays Nothing   _ = mempty
       showAvgsDays (Just dt) n = formatDiffDays $ dt / fromIntegral n
       heat :: Integer -> Integer -> Double
-      heat full achieved = roundToDigits 3 $ cutOffPercent 0.4 (fromIntegral full) (fromIntegral achieved)
+      heat = heat' 0.3
+      heat' :: Double -> Integer -> Integer -> Double
+      heat' cut full achieved = roundToDigits 3 $ cutOffPercent cut (fromIntegral full^2) (fromIntegral achieved^2)
   let headingShort
         | 0 < Map.size assignment = MsgMenuCorrectionsAssignSheet $ Text.intercalate ", " $ fmap CI.original $ Map.keys assignment
         | otherwise               = MsgMenuCorrectionsAssign
diff --git a/src/Model.hs b/src/Model.hs
index 45ce97e6d..ee5a8bbd8 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -37,5 +37,14 @@ deriving instance Eq (Unique Material)  -- instance Eq UniqueMaterial
 deriving instance Eq (Unique Tutorial)  -- instance Eq Tutorial
 deriving instance Eq (Unique Exam)
 
+instance Ord User where
+  compare User{userSurname=surnameA, userDisplayName=displayNameA, userEmail=emailA}
+          User{userSurname=surnameB, userDisplayName=displayNameB, userEmail=emailB}
+    =    compare     surnameA     surnameB
+      <> compare displayNameA displayNameB
+      <> compare       emailA       emailB  -- userEmail is unique, so this suffices
+
+
+
 submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime
diff --git a/templates/corrections-overview.hamlet b/templates/corrections-overview.hamlet
index 94ada0543..61e75f123 100644
--- a/templates/corrections-overview.hamlet
+++ b/templates/corrections-overview.hamlet
@@ -1,5 +1,6 @@
 <div>
   <h2>_{MsgCorrectionSheets}
+
   _{MsgCourseParticipants nrParticipants}
   <table .table .table--striped .table--hover>
     <tr .table__row .table__row--head>
@@ -16,7 +17,8 @@
       <th .table__th>_{MsgGenericMin}
       <th .table__th>_{MsgGenericAvg}
       <th .table__th>_{MsgGenericMax}
-    $forall (sheetName, CorrectionInfo{ciSubmittors, ciSubmissions, ciAssigned, ciCorrected, ciMin, ciTot, ciMax}) <- Map.toList sheetMap
+    $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+    $forall (sheetName, CorrectionInfo{ciSubmittors, ciSubmissions, ciAssigned, ciCorrected, ciMin, ciTot, ciMax}) <- reverse sheetList
       <tr .table__row>
         <td .table__td>^{simpleLink (toWidget sheetName) (CSheetR tid ssh csh sheetName SSubsR)}
         $if groupsPossible
@@ -39,15 +41,19 @@
         <td .table__td>#{showDiffDays ciMin}
         <td .table__td>#{showAvgsDays ciTot ciCorrected}
         <td .table__td>#{showDiffDays ciMax}
+
+
 <div>
   <h2>_{MsgCorrectionCorrectors}
+
   <table .table .table--striped .table--hover>
     <tr .table__row .table__row--head>
       <th .table__th rowspan=2>_{MsgCorrector}
       <th .table__th colspan=2>_{MsgGenericAll}
       <th .table__th rowspan=2>_{MsgCorDeficitProportion}
       <th .table__th colspan=3>_{MsgCorrectionTime}
-      $forall shn <- sheetNames
+      $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+      $forall (shn,_) <- sheetList
         <th .table__th colspan=5>#{shn}
         $# ^{simpleLinkI (SomeMessage MsgMenuCorrectors) (CSheetR tid ssh csh shn SCorrR)}
     <tr .table__row .table__row--head>
@@ -56,13 +62,14 @@
       <th .table__th>_{MsgGenericMin}
       <th .table__th>_{MsgGenericAvg}
       <th .table__th>_{MsgGenericMax}
-      $forall _shn <- sheetNames
+      $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+      $forall _shn <- sheetList
         <th .table__th>_{MsgCorProportion}
         <th .table__th>_{MsgNrSubmissionsTotalShort}
         <th .table__th>_{MsgGenericNumChange}
         <th .table__th>_{MsgNrSubmissionsNotCorrectedShort}
         <th .table__th>_{MsgGenericAvg}
-    $forall (CorrectionInfo{ciCorrector, ciSubmissions=ciSubmissionsNr, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
+    $forall (CorrectionInfo{ciCorrector, ciSubmissions=ciSubmissionsNr, ciCorrected, ciMin, ciTot, ciMax}) <- corrInfos
       $with (nameW,loadM) <- getCorrector ciCorrector
         <tr .table__row>
           <td .table__td>^{nameW}
@@ -77,7 +84,8 @@
           <td .table__td>#{showDiffDays ciMin}
           <td .table__td>#{showAvgsDays ciTot ciCorrected}
           <td .table__td>#{showDiffDays ciMax}
-          $forall (shn, CorrectionInfo{ciSubmissions=sheetSubmissionsNr}) <- Map.toList sheetMap
+          $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+          $forall (shn, CorrectionInfo{ciSubmissions=sheetSubmissionsNr}) <- sheetList
             <td .table__td>
               $maybe SheetCorrector{sheetCorrectorLoad, sheetCorrectorState} <- Map.lookup shn loadM
                 #{showCompactCorrectorLoad sheetCorrectorLoad sheetCorrectorState}
@@ -101,7 +109,7 @@
               <td .table__td>
               <td .table__td>
               <td .table__td>
-    $if 0 < length sheetNames
+    $if not (null sheetList)
       <tr .table__row>
         <td .table__th>Σ
         $with ciSubmissionsNr <- ciSubmissions corrMapSum
@@ -112,9 +120,11 @@
         <td .table__th>#{showDiffDays (ciMin corrMapSum)}
         <td .table__th>#{showAvgsDays (ciTot corrMapSum) (ciCorrected corrMapSum)}
         <td .table__th>#{showDiffDays (ciMax corrMapSum)}
-        $forall shn <- sheetNames
+        $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+        $forall (shn, CorrectionInfo{ciSubmissions}) <- sheetList
           <td .table__th>#{getLoadSum shn}
-          <td .table__td colspan=4>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
+          <td .table__th>#{ciSubmissions}
+          <td .table__td colspan=3>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
   ^{btnWdgt}
  <div>
   <p>_{MsgAssignSubmissionsRandomWarning}
\ No newline at end of file

From 16c556b852501a5e6c88094556f5054c4d4f352b Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 27 Jun 2019 18:48:15 +0200
Subject: [PATCH 505/519] fix(correction assignment): correcting lecturer's
 names are shown now

Table only shows sheet correctors, but lecturers may occasionally
correct too
---
 src/Handler/Corrections.hs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index ddf820d18..c3a2574fe 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1085,7 +1085,7 @@ assignHandler tid ssh csh cid assignSids = do
   (btnWdgt, btnResult) <- runButtonForm FIDAssignSubmissions
 
   -- gather data
-  (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment) <- runDB $ do
+  (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment, lecturerNames) <- runDB $ do
       -- cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
       nrParticipants <- count [CourseParticipantCourse ==. cid]
 
@@ -1141,6 +1141,12 @@ assignHandler tid ssh csh cid assignSids = do
               in  Map.insertWith (\(usr, ma) (_, mb) -> (usr, Map.union ma mb))  uid (user, Map.singleton shn sheetcorr) acc
             )
 
+      -- lecturerNames :: Map UserId User
+      lecturerNames <- fmap entities2map $ E.select $ 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
+
       submissions <- E.select . E.from $ \submission -> do
           E.where_ $ submission E.^. SubmissionSheet `E.in_` E.valList sheetIds
           let numSubmittors = E.sub_select . E.from $ \subUser -> do
@@ -1173,7 +1179,7 @@ assignHandler tid ssh csh cid assignSids = do
                             }
               in Map.insertWith (Map.unionWith (<>)) shnm cinf m
 
-      return (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
+      return (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment, lecturerNames)
 
   let -- infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo) -- repeated here for easier reference
       -- create aggregate maps
@@ -1203,7 +1209,6 @@ assignHandler tid ssh csh cid assignSids = do
       corrInfos = sortBy (compare `on` (byName . ciCorrector) ) $ Map.elems corrMap
         where byName Nothing    = Nothing
               byName (Just uid) = Map.lookup uid correctorMap
-
       corrMapSum :: CorrectionInfo
       corrMapSum = fold corrMap
 
@@ -1213,6 +1218,8 @@ assignHandler tid ssh csh cid assignSids = do
       getCorrector (Just uid)
         | Just (User{..},loadMap) <- Map.lookup uid correctorMap
         = (nameEmailWidget userEmail userDisplayName userSurname, loadMap)
+        | Just (User{..} ) <- Map.lookup uid lecturerNames
+        = (nameEmailWidget userEmail userDisplayName userSurname, mempty)  -- lecturers may also correct in rare cases
       getCorrector _ = ([whamlet|_{MsgNoCorrectorAssigned}|], mempty)
       -- avoid nestes hamlet $maybe with duplicated $nothing
       getCorrSheetStatus :: Maybe UserId -> SheetName -> Maybe CorrectionInfo

From 8476314a46fa093231e6b0664a96e94284ff506f Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 27 Jun 2019 19:53:26 +0200
Subject: [PATCH 506/519] Better fix for lecturer names

---
 src/Handler/Corrections.hs       | 18 +++++++++---------
 src/Handler/Utils/Corrections.hs |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index c3a2574fe..851c1b1c4 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1085,7 +1085,7 @@ assignHandler tid ssh csh cid assignSids = do
   (btnWdgt, btnResult) <- runButtonForm FIDAssignSubmissions
 
   -- gather data
-  (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment, lecturerNames) <- runDB $ do
+  (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment) <- runDB $ do
       -- cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
       nrParticipants <- count [CourseParticipantCourse ==. cid]
 
@@ -1141,11 +1141,11 @@ assignHandler tid ssh csh cid assignSids = do
               in  Map.insertWith (\(usr, ma) (_, mb) -> (usr, Map.union ma mb))  uid (user, Map.singleton shn sheetcorr) acc
             )
 
-      -- lecturerNames :: Map UserId User
-      lecturerNames <- fmap entities2map $ E.select $ 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
+      -- -- lecturerNames :: Map UserId User
+      -- lecturerNames <- fmap entities2map $ E.select $ 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
 
       submissions <- E.select . E.from $ \submission -> do
           E.where_ $ submission E.^. SubmissionSheet `E.in_` E.valList sheetIds
@@ -1179,7 +1179,7 @@ assignHandler tid ssh csh cid assignSids = do
                             }
               in Map.insertWith (Map.unionWith (<>)) shnm cinf m
 
-      return (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment, lecturerNames)
+      return (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
 
   let -- infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo) -- repeated here for easier reference
       -- create aggregate maps
@@ -1218,8 +1218,8 @@ assignHandler tid ssh csh cid assignSids = do
       getCorrector (Just uid)
         | Just (User{..},loadMap) <- Map.lookup uid correctorMap
         = (nameEmailWidget userEmail userDisplayName userSurname, loadMap)
-        | Just (User{..} ) <- Map.lookup uid lecturerNames
-        = (nameEmailWidget userEmail userDisplayName userSurname, mempty)  -- lecturers may also correct in rare cases
+        -- | Just (User{..} ) <- Map.lookup uid lecturerNames
+        -- = (nameEmailWidget userEmail userDisplayName userSurname, mempty)  -- lecturers may also correct in rare cases
       getCorrector _ = ([whamlet|_{MsgNoCorrectorAssigned}|], mempty)
       -- avoid nestes hamlet $maybe with duplicated $nothing
       getCorrSheetStatus :: Maybe UserId -> SheetName -> Maybe CorrectionInfo
diff --git a/src/Handler/Utils/Corrections.hs b/src/Handler/Utils/Corrections.hs
index ca5d433d7..2fd58de80 100644
--- a/src/Handler/Utils/Corrections.hs
+++ b/src/Handler/Utils/Corrections.hs
@@ -30,6 +30,8 @@ instance Semigroup CorrectionInfo where
       mergeWith prj f = on f prj corrA corrB
 
       keepEqual (Just x) (Just y) | x==y = Just x
+      keepEqual Nothing other = other
+      keepEqual other Nothing = other
       keepEqual _ _ = Nothing
 
 instance Monoid CorrectionInfo where

From 2073130867ffa10c3f9469643355b8dfb67fa413 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 28 Jun 2019 22:27:22 +0200
Subject: [PATCH 507/519] fix(datepicker): hide number input spinners in
 datepicker

---
 frontend/vendor/flatpickr.css | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/frontend/vendor/flatpickr.css b/frontend/vendor/flatpickr.css
index 64e91f696..ffab7ba7e 100644
--- a/frontend/vendor/flatpickr.css
+++ b/frontend/vendor/flatpickr.css
@@ -1,3 +1,18 @@
+/*
+  custom code
+  hides the up/down arrows in time (number) inputs
+*/
+/* webkit */
+.flatpickr-calendar input[type=number]::-webkit-inner-spin-button,
+.flatpickr-calendar input[type=number]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+/* firefox */
+.flatpickr-calendar input[type=number] {
+  -moz-appearance:textfield;
+}
+/* vendor code */
 .flatpickr-calendar {
   background: transparent;
   opacity: 0;

From 2aea61c259fe22763076440589ef7b857f169cec Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 2 Jul 2019 14:52:31 +0200
Subject: [PATCH 508/519] chore(nixos): Fix development environment

---
 shell.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shell.nix b/shell.nix
index 94ef0ba00..b942f99b9 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,7 @@
 { nixpkgs ? import <nixpkgs> }:
 
 let
+  inherit (nixpkgs {}) pkgs;
   haskellPackages = import ./stackage.nix { inherit nixpkgs; };
 
   drv = haskellPackages.callPackage ./uniworx.nix {};

From 92f5d84431cbf2647ccd38e45fdcc64a708bdaa0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 2 Jul 2019 14:56:14 +0200
Subject: [PATCH 509/519] chore(haddock): Fix haddock

---
 src/Handler/Corrections.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 851c1b1c4..43a8bbed7 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1218,8 +1218,8 @@ assignHandler tid ssh csh cid assignSids = do
       getCorrector (Just uid)
         | Just (User{..},loadMap) <- Map.lookup uid correctorMap
         = (nameEmailWidget userEmail userDisplayName userSurname, loadMap)
-        -- | Just (User{..} ) <- Map.lookup uid lecturerNames
-        -- = (nameEmailWidget userEmail userDisplayName userSurname, mempty)  -- lecturers may also correct in rare cases
+        --  |  Just (User{..} ) <- Map.lookup uid lecturerNames
+        --  = (nameEmailWidget userEmail userDisplayName userSurname, mempty)  -- lecturers may also correct in rare cases
       getCorrector _ = ([whamlet|_{MsgNoCorrectorAssigned}|], mempty)
       -- avoid nestes hamlet $maybe with duplicated $nothing
       getCorrSheetStatus :: Maybe UserId -> SheetName -> Maybe CorrectionInfo

From 605e62f4458238119eaf13b3e8151924d758e3a9 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 2 Jul 2019 16:40:32 +0200
Subject: [PATCH 510/519] feat(standard-version): complete release workflow

BREAKING CHANGE: Start of new versioning schema
---
 package.json     | 12 +++----
 sync-versions.hs | 81 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100755 sync-versions.hs

diff --git a/package.json b/package.json
index bd22b7c55..b17c39291 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "frontend:test:watch": "karma start --conf karma.conf.js --single-run false",
     "frontend:build": "webpack",
     "frontend:build:watch": "webpack --watch",
-    "release": "standard-version"
+    "release": "git reset && standard-version -a"
   },
   "husky": {
     "hooks": {
@@ -34,12 +34,12 @@
   },
   "standard-version": {
     "scripts": {
-      "postbump": "echo add any shell command here..."
+      "postbump": "./sync-versions.hs && git add -- package.yaml"
     },
-    "skip": {
-      "tag": true,
-      "commit": true
-    }
+    "commitUrlFormat": "https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/{{hash}}",
+    "compareUrlFormat": "https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/{{previousTag}}...{{currentTag}}",
+    "issueUrlFormat": "https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/{{id}}",
+    "userUrlFormat": "https://gitlab.cip.ifi.lmu.de/{{user}}"
   },
   "browserslist": [
     "defaults"
diff --git a/sync-versions.hs b/sync-versions.hs
new file mode 100755
index 000000000..eccf58721
--- /dev/null
+++ b/sync-versions.hs
@@ -0,0 +1,81 @@
+#!/usr/bin/env stack
+-- stack runghc --package libyaml
+
+{-# LANGUAGE OverloadedStrings
+           , LambdaCase
+           , PackageImports
+           , NamedFieldPuns
+           , RecordWildCards
+  #-}
+
+import "libyaml" Text.Libyaml
+import Control.Monad.Trans.Resource
+import Data.Conduit
+import qualified Data.Conduit.List as C
+
+import qualified Data.Aeson as JSON
+
+import qualified Data.ByteString as BS
+import qualified Data.ByteString.Char8 as CBS
+import qualified Data.ByteString.Lazy as LBS
+
+import qualified Data.HashMap.Lazy as HashMap
+
+import Data.Text (Text)
+import qualified Data.Text as Text
+import qualified Data.Text.IO as Text
+import qualified Data.Text.Encoding as Text
+
+import Text.Printf
+import System.IO (stderr)
+
+main :: IO ()
+main = do
+  Just packageJSON <- JSON.decode <$> LBS.readFile "package.json"
+  let
+    newVersion :: Text
+    Just (JSON.String newVersion) = HashMap.lookup ("version" :: Text) packageJSON
+
+  updatePackageYaml newVersion
+
+
+updatePackageYaml :: Text -> IO ()
+updatePackageYaml newVersion = do
+  (oldVersion, start, end) <- runResourceT . runConduit . (.|) (decodeFileMarked "package.yaml") $ do
+    awaitUntil $ \case
+      MarkedEvent{ yamlEvent = EventMappingStart _ _ _ } -> True
+      _ -> False
+    awaitUntil $ \case
+      MarkedEvent{ yamlEvent = EventScalar s _ _ _ }
+        | s == "version" -> True
+      _ -> False
+    _ <- await -- Throw away "version: "
+    Just MarkedEvent{ yamlEvent = EventScalar oldVersion' _ _ _, .. } <- await
+    let oldVersion = Text.decodeUtf8 oldVersion'
+    return (oldVersion, yamlStartMark, yamlEndMark)
+
+  encNewVersion <- runResourceT . runConduit . (.| encode) $ C.sourceList
+    [ EventStreamStart
+    , EventDocumentStart
+    , EventScalar (Text.encodeUtf8 newVersion) NoTag Any Nothing
+    , EventDocumentEnd
+    , EventStreamEnd
+    ]
+
+  hPrintf stderr "package.yaml: %s -> %s\n" oldVersion newVersion
+
+  packageYaml <- BS.readFile "package.yaml"
+  BS.writeFile "package.yaml" . mconcat $
+    [ BS.take (fromIntegral $ yamlIndex start) packageYaml
+    , Text.encodeUtf8 . Text.strip $ Text.decodeUtf8 encNewVersion
+    , BS.drop (fromIntegral $ yamlIndex end) packageYaml
+    ]
+  where
+    awaitUntil :: Monad m => (i -> Bool) -> ConduitM i o m ()
+    awaitUntil pred = do
+      nextIn <- await
+      case nextIn of
+        Nothing -> error "Ran out of input in awaitUntil"
+        Just inp
+          | pred inp -> leftover inp
+        Just _ -> awaitUntil pred

From 5aa906e7eb3798d590a38ae3e18ce4c18741d9b4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 2 Jul 2019 16:57:06 +0200
Subject: [PATCH 511/519] fix(standard-version): properly reset staging area
 before release

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b17c39291..0fb71a2ce 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "frontend:test:watch": "karma start --conf karma.conf.js --single-run false",
     "frontend:build": "webpack",
     "frontend:build:watch": "webpack --watch",
-    "release": "git reset && standard-version -a"
+    "release": "standard-version -a",
+    "prerelease": "git reset"
   },
   "husky": {
     "hooks": {

From 90c7d3c47b4e04a835474982866af0cf716050aa Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 2 Jul 2019 17:16:04 +0200
Subject: [PATCH 512/519] refactor: drop redundant do

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

diff --git a/src/Handler/Info.hs b/src/Handler/Info.hs
index 14446d2dd..fdee48ea9 100644
--- a/src/Handler/Info.hs
+++ b/src/Handler/Info.hs
@@ -30,7 +30,7 @@ getDataProtR = -- do
 
 -- | Allgemeine Informationen
 getInfoR :: Handler Html
-getInfoR = do
+getInfoR = -- do
   siteLayoutMsg MsgInfoHeading $ do
     setTitleI MsgInfoHeading
     let features = $(i18nWidgetFile "featureList")

From 7ed6fe4fedc2f0ee463680a0d3210d7a6f4ac7ab Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 2 Jul 2019 17:16:31 +0200
Subject: [PATCH 513/519] feat(standard-version): allow adding additional
 changes to release

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0fb71a2ce..820a65d34 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,7 @@
     "frontend:test:watch": "karma start --conf karma.conf.js --single-run false",
     "frontend:build": "webpack",
     "frontend:build:watch": "webpack --watch",
-    "release": "standard-version -a",
-    "prerelease": "git reset"
+    "release": "standard-version -a"
   },
   "husky": {
     "hooks": {

From 3dbc82820509f5a7a655a7a52564b733b6a73af9 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 3 Jul 2019 09:21:23 +0200
Subject: [PATCH 514/519] chore(release): 1.0.0

---
 CHANGELOG.md      | 53 +++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 package.yaml      |  2 +-
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..6828319d7
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,53 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+## 1.0.0 (2019-07-03)
+
+
+### Bug Fixes
+
+* **sheet corrector assigment:** minor bugfix ([749cd2f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/749cd2f))
+* async table js util now knows current random css prefix ([cc90faf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cc90faf))
+* **correction assignment:** correcting lecturer's names are shown now ([16c556b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/16c556b))
+* **corrector assignment:** sheet tabel mixed up columns sorted ([d07f53e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d07f53e))
+* **datepicker:** hide number input spinners in datepicker ([2073130](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2073130))
+* **exam grading keys:** Fix spacing ([24aacef](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/24aacef))
+* **exams:** Fix registration ([1684da0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1684da0))
+* **fe:** style notifications acceptably for now ([fc80f08](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/fc80f08))
+* **fe-async-table:** Emulate no-js behaviour when handling pagesize ([28dcc8d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/28dcc8d))
+* **fe-check-all:** use arrow fn to keep scope in event listeners ([09e681e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/09e681e))
+* **fe-deflist:** avoid horizontal scroll on pages with deflist ([16d422d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/16d422d))
+* **Help Widget, Corrector Assignment:** Modal Form closes in place; assign alerts ([89d5364](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/89d5364)), closes [#195](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/195)
+* **info-lecturer:** Touch ups ([e1e26ab](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/e1e26ab))
+* **many occurrences throughout the project:** Fix typo: occurence -> occurrence everywhere ([96387cb](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/96387cb))
+* filter submission by not having corrector ([3bded50](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3bded50))
+* minor heat correction for correction overview ([5546849](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5546849))
+* **ratings:** disallow ratings for graded sheets without point value ([463b2b7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/463b2b7))
+* **standard-version:** properly reset staging area before release ([5aa906e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5aa906e))
+
+
+### Features
+
+* **corrector-assignment:** show load/submission percentages ([228cd50](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/228cd50))
+* make pagesize changes load async ([6486120](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/6486120))
+* **development:** add commitlint to ensure proper commit msgs ([dd528c1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/dd528c1))
+* **development:** add standard-version for automatic changelog generation ([c495ef5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c495ef5))
+* **exams:** CRU (no D) for exams ([67a50c9](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/67a50c9))
+* **exams:** exam registration ([99184ff](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/99184ff))
+* **exams:** Form validation ([6fb1399](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/6fb1399))
+* **fe-heatmap:** add css class heated for heatmap elements ([b09b876](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b09b876)), closes [#405](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/405)
+* **forms:** Introduce more convenient form validation ([f8d0b02](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f8d0b02))
+* **standard-version:** allow adding additional changes to release ([7ed6fe4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7ed6fe4))
+* **standard-version:** complete release workflow ([605e62f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/605e62f))
+
+
+### Tests
+
+* Does ist build with everything except for `makeClassy ''Entity`? Probably the functional dependency is to blame?! ([bb552c4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/bb552c4))
+* removing makeCLassyFor maybe build works then? ([2550f74](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2550f74))
+
+
+### BREAKING CHANGES
+
+* **standard-version:** Start of new versioning schema
diff --git a/package-lock.json b/package-lock.json
index 020e9a34f..337c5e344 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 820a65d34..9c9168e4f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index b9561aa88..808523406 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: "0.0.0"
+version: 1.0.0
 
 dependencies:
   # Due to a bug in GHC 8.0.1, we block its usage

From b0ed911849b17dd264c445b162fd2a3c4415f744 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 3 Jul 2019 10:05:53 +0200
Subject: [PATCH 515/519] refactor(displayable): removed resolved TODOs

---
 src/Handler/Utils/Table/Cells.hs | 2 +-
 src/Model.hs                     | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 880720fed..2e8e53db8 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -237,7 +237,7 @@ submissionCell crse shn sid =
       csh = crse ^. _3
       mkCid = encrypt sid
       mkRoute cid = CSubmissionR tid ssh csh shn cid SubShowR
-      mkText      = toWgt -- display2widget  -- TODO: replace with toWgt once there is a ToMarkup instance for CryptoIDs
+      mkText      = toWgt
   in anchorCellM' mkCid mkRoute mkText
 
 correctorStateCell :: IsDBTable m a => SheetCorrector -> DBCell m a
diff --git a/src/Model.hs b/src/Model.hs
index d68e7806e..787bf9b77 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -53,15 +53,10 @@ submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime
 
 -- ToMarkup instances for displaying certain database primary keys
--- TODO: work in progress, populate with more instances
 -- TODO: is there a better place for this?
 
 instance ToMarkup (Key School) where
   toMarkup = toMarkup . unSchoolKey
 
 instance ToMarkup (Key Term) where
-  toMarkup = toMarkup . termToText . unTermKey
-
--- TODO: unfinished
--- instance ToMarkup (Key Submission) where
---   toMarkup = toMarkup . unSubmissionKey
\ No newline at end of file
+  toMarkup = toMarkup . termToText . unTermKey
\ No newline at end of file

From c7312e8ec662eea25dd7f8d6ff36c28af890ec59 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 3 Jul 2019 11:15:03 +0200
Subject: [PATCH 516/519] fix(displayable): fixed faulty display of db keys
 (SchoolId, TermId)

---
 src/Foundation.hs |  6 ------
 src/Model.hs      | 13 +++++++++----
 src/Utils.hs      |  9 ++++++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 3c390cce8..dae8095fc 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -349,12 +349,6 @@ instance HasResolution a => ToMessage (Fixed a) where
 --   toMessage = toMessage . fromRational'
 --     where fromRational' = fromRational :: Rational -> Fixed E3
 
--- ToMessage instances for *selected* database IDs
-instance ToMessage TermId where
-  toMessage = tshow
-instance ToMessage SchoolId where
-  toMessage = tshow
-
 
 newtype ErrorResponseTitle = ErrorResponseTitle ErrorResponse
 embedRenderMessageVariant ''UniWorX ''ErrorResponseTitle ("ErrorResponseTitle" <>)
diff --git a/src/Model.hs b/src/Model.hs
index 787bf9b77..c97b1a68e 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -16,7 +16,7 @@ import Cron.Types
 
 import Data.Aeson (Value)
 
-import Data.CaseInsensitive (CI)
+import Data.CaseInsensitive (CI, original)
 import Data.CaseInsensitive.Instances ()
 
 import Utils.Message (MessageStatus)
@@ -52,11 +52,16 @@ instance Ord User where
 submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime
 
--- ToMarkup instances for displaying certain database primary keys
--- TODO: is there a better place for this?
+-- ToMarkup and ToMessage instances for displaying selected database primary keys
 
 instance ToMarkup (Key School) where
   toMarkup = toMarkup . unSchoolKey
 
+instance ToMessage (Key School) where
+  toMessage = original . unSchoolKey
+
 instance ToMarkup (Key Term) where
-  toMarkup = toMarkup . termToText . unTermKey
\ No newline at end of file
+  toMarkup = toMarkup . termToText . unTermKey
+
+instance ToMessage (Key Term) where
+  toMessage = termToText . unTermKey
\ No newline at end of file
diff --git a/src/Utils.hs b/src/Utils.hs
index 18b06229e..6096851e2 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -251,8 +251,11 @@ str2widget s = [whamlet|#{s}|]
 withFragment :: Monad m => MForm m (a, WidgetT site IO ()) -> Markup -> MForm m (a, WidgetT site IO ())
 withFragment form html = flip fmap form $ over _2 (toWidget html >>)
 
+rationalToFixed :: forall a. HasResolution a => Rational -> Fixed a
+rationalToFixed = MkFixed . round . (* (fromIntegral $ resolution (Proxy :: HasResolution a => Proxy a)))
+
 rationalToFixed3 :: Rational -> Fixed E3
-rationalToFixed3 = fromRational
+rationalToFixed3 = rationalToFixed
 
 -- | Convert `part` and `whole` into percentage including symbol
 --   showing trailing zeroes and to decimal digits
@@ -270,8 +273,8 @@ textPercent' trailZero precision part whole
     | precision == 4 = showPercent (frac :: Micro)
     | otherwise      = showPercent (frac :: Pico)
   where
-    frac :: forall a . HasResolution a => Fixed a
-    frac = MkFixed $ round $ (* (fromInteger $ resolution (Proxy :: Proxy a)))  $ (100*) $ toRational part / toRational whole
+    frac :: forall a. HasResolution a => Fixed a
+    frac = rationalToFixed $ (100*) $ toRational part / toRational whole
 
     showPercent :: HasResolution a => Fixed a -> Text
     showPercent f = pack $ showFixed trailZero f <> "%"

From 31e6b72c463e7f638a2cc2ff6f19b67f2d49db73 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 3 Jul 2019 11:56:44 +0200
Subject: [PATCH 517/519] feat(exams): add extremely rudimentary registration
 table

---
 messages/uniworx/de.msg     |  5 ++-
 src/Foundation.hs           |  9 ++++++
 src/Handler/Exam.hs         | 63 ++++++++++++++++++++++++++++++++++++-
 templates/exam-users.hamlet |  2 ++
 4 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 templates/exam-users.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 6ae69522d..dadac1c30 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -864,6 +864,7 @@ MenuTutorialComm: Mitteilung an Teilnehmer
 MenuExamList: Klausuren
 MenuExamNew: Neue Klausur anlegen
 MenuExamEdit: Bearbeiten
+MenuExamUsers: Teilnehmer
 
 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
@@ -1164,4 +1165,6 @@ ExamClosedMustBeAfterStart: "Noten stehen fest ab" muss nach Start liegen
 ExamClosedMustBeAfterEnd: "Noten stehen fest ab" muss nach Ende liegen
 
 VersionHistory: Versionsgeschichte
-KnownBugs: Bekannte Bugs
\ No newline at end of file
+KnownBugs: Bekannte Bugs
+
+ExamUsersHeading: Klausurteilnehmer
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index ba5336f14..8a9896dcd 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1509,6 +1509,7 @@ instance YesodBreadcrumbs UniWorX where
 
   breadcrumb (CExamR tid ssh csh examn EShowR) = return (CI.original examn, Just $ CourseR tid ssh csh CExamListR)
   breadcrumb (CExamR tid ssh csh examn EEditR) = return ("Bearbeiten", Just $ CExamR tid ssh csh examn EShowR)
+  breadcrumb (CExamR tid ssh csh examn EUsersR) = return ("Teilnehmer", Just $ CExamR tid ssh csh examn EShowR)
 
   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)
@@ -2192,6 +2193,14 @@ pageActions (CExamR tid ssh csh examn EShowR) =
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
+  , MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuExamUsers
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CExamR tid ssh csh examn EUsersR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
   ]
 pageActions (CSheetR tid ssh csh shn SShowR) =
   [ MenuItem
diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
index f8fb8722e..0cd76224a 100644
--- a/src/Handler/Exam.hs
+++ b/src/Handler/Exam.hs
@@ -7,6 +7,7 @@ import Import
 import Handler.Utils
 import Handler.Utils.Exam
 import Handler.Utils.Invitations
+import Handler.Utils.Table.Columns
 import Handler.Utils.Table.Cells
 import Jobs.Queue
 
@@ -14,6 +15,7 @@ import Utils.Lens hiding (parts)
 
 import qualified Database.Esqueleto as E
 import qualified Database.Esqueleto.Utils as E
+import Database.Esqueleto.Utils.TH
 
 import Data.Map ((!), (!?))
 import qualified Data.Map as Map
@@ -731,9 +733,68 @@ getEShowR tid ssh csh examn = do
       examBonusW bonusRule = $(widgetFile "widgets/bonusRule")
     $(widgetFile "exam-show")
 
+type ExamUserTableExpr = (E.SqlExpr (Entity ExamRegistration) `E.InnerJoin` E.SqlExpr (Entity User)) `E.LeftOuterJoin` E.SqlExpr (Maybe (Entity ExamOccurrence))
+type ExamUserTableData = DBRow (Entity ExamRegistration, Entity User, Maybe (Entity ExamOccurrence))
+
+instance HasEntity ExamUserTableData User where
+  hasEntity = _dbrOutput . _2
+
+instance HasUser ExamUserTableData where
+  hasUser = _dbrOutput . _2 . _entityVal
+
+_userTableOccurrence :: Lens' ExamUserTableData (Maybe (Entity ExamOccurrence))
+_userTableOccurrence = _dbrOutput . _3
+
+queryUser :: ExamUserTableExpr -> E.SqlExpr (Entity User)
+queryUser = $(sqlIJproj 2 2) . $(sqlLOJproj 2 1)
+  
+queryExamRegistration :: ExamUserTableExpr -> E.SqlExpr (Entity ExamRegistration)
+queryExamRegistration = $(sqlIJproj 2 1) . $(sqlLOJproj 2 1)
+
 getEUsersR, postEUsersR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
 getEUsersR = postEUsersR
-postEUsersR = error "postEUsersR"
+postEUsersR tid ssh csh examn = do
+  eid <- runDB $ fetchExamId tid ssh csh examn
+  
+  let
+    examUsersDBTable = DBTable{..}
+      where
+        dbtSQLQuery ((examRegistration `E.InnerJoin` user) `E.LeftOuterJoin` occurrence) = do
+          E.on $ occurrence E.?. ExamOccurrenceExam E.==. E.just (E.val eid)
+           E.&&. occurrence E.?. ExamOccurrenceId   E.==. examRegistration E.^. ExamRegistrationOccurrence
+          E.on $ examRegistration E.^. ExamRegistrationUser E.==. user E.^. UserId
+          E.where_ $ examRegistration E.^. ExamRegistrationExam E.==. E.val eid
+          return (examRegistration, user, occurrence)
+        dbtRowKey = queryExamRegistration >>> (E.^. ExamRegistrationId)
+        dbtProj = return
+        dbtColonnade = dbColonnade $ mconcat
+          [ colUserNameLink (CourseR tid ssh csh . CUserR)
+          , colUserMatriclenr
+          -- , colUserDegreeShort
+          -- , colUserField
+          -- , colUserSemester
+          , sortable (Just "room") (i18nCell MsgExamRoom) (maybe mempty (cell . toWgt . examOccurrenceRoom . entityVal) . view _userTableOccurrence)
+          ] 
+        dbtSorting = Map.fromList
+          [ sortUserNameLink    queryUser
+          , sortUserSurname     queryUser
+          , sortUserDisplayName queryUser
+          , sortUserMatriclenr  queryUser
+          ]
+        dbtFilter = Map.empty
+        dbtFilterUI = const mempty
+        dbtStyle = def
+        dbtParams = def
+        dbtIdent :: Text
+        dbtIdent = "exam-users"
+
+    examUsersDBTableValidator = def
+  ((), examUsersTable) <- runDB $ dbTable examUsersDBTableValidator examUsersDBTable
+
+  siteLayoutMsg (prependCourseTitle tid ssh csh MsgExamUsersHeading) $ do
+    setTitleI $ prependCourseTitle tid ssh csh MsgExamUsersHeading
+    $(widgetFile "exam-users")
+
 
 getEAddUserR, postEAddUserR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
 getEAddUserR = postEAddUserR
diff --git a/templates/exam-users.hamlet b/templates/exam-users.hamlet
new file mode 100644
index 000000000..dea20c2a7
--- /dev/null
+++ b/templates/exam-users.hamlet
@@ -0,0 +1,2 @@
+$newline never
+^{examUsersTable}

From 90da1228f4fdbe4f9ddbcaa2cff782147b60e878 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 3 Jul 2019 11:59:24 +0200
Subject: [PATCH 518/519] chore(ghc): dump splices to files

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

diff --git a/package.yaml b/package.yaml
index 808523406..9fbd863e6 100644
--- a/package.yaml
+++ b/package.yaml
@@ -204,6 +204,7 @@ library:
         ghc-options:
           - -O0
           - -ddump-splices
+          - -ddump-to-file
         cpp-options: -DDEVELOPMENT
       else:
         ghc-options:

From efbc6ef49a69935ea2ce13164df33b410dc2945b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 3 Jul 2019 11:59:56 +0200
Subject: [PATCH 519/519] chore(release): 1.1.0

---
 CHANGELOG.md      | 14 ++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 package.yaml      |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6828319d7..ac59b8585 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.1.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v1.0.0...v1.1.0) (2019-07-03)
+
+
+### Bug Fixes
+
+* **displayable:** fixed faulty display of db keys (SchoolId, TermId) ([c7312e8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c7312e8))
+
+
+### Features
+
+* **exams:** add extremely rudimentary registration table ([31e6b72](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/31e6b72))
+
+
+
 ## 1.0.0 (2019-07-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index aa51ea98c..678c3079c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9c9168e4f..81a0352f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 9fbd863e6..d6661bbb3 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 1.0.0
+version: 1.1.0
 
 dependencies:
   # Due to a bug in GHC 8.0.1, we block its usage