From df66c9b58dd1ea6119d428470d2d089edd70e2d0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 10 Oct 2019 10:34:16 +0200
Subject: [PATCH 01/65] feat(correction-interface): wire up ECorrectR

---
 messages/uniworx/de.msg     |  1 +
 routes                      |  1 +
 src/Foundation.hs           | 23 +++++++++++++++++++++
 src/Handler/Exam.hs         |  1 +
 src/Handler/Exam/Correct.hs | 40 +++++++++++++++++++++++++++++++++++++
 src/Handler/Exam/Form.hs    |  2 +-
 6 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/Handler/Exam/Correct.hs

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 514420c38..3802a2b29 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -1428,6 +1428,7 @@ ExamFormCorrection: Korrektur
 ExamFormParts: Teile
 
 ExamCorrectors: Korrektoren
+ExamCorrectorsTip: Hier eingetragene Korrektoren können zwischen Beginn der Prüfung und "Bewertung abgeschlossen ab" Ergebnisse für alle Teilprüfungen und alle Teilnehmer im System hinterlegen.
 ExamCorrectorAlreadyAdded: Ein Korrektor mit dieser E-Mail ist bereits für diese Prüfung eingetragen
 
 ExamParts: Teilprüfungen/Aufgaben
diff --git a/routes b/routes
index 00a90b6e8..1a23f7cf3 100644
--- a/routes
+++ b/routes
@@ -175,6 +175,7 @@
     /users/invite               EInviteR       GET POST
     /register                   ERegisterR         POST        !timeANDcourse-registeredAND¬exam-registered !timeANDexam-registeredAND¬exam-result
     /grades                     EGradesR       GET POST        !exam-office
+    /correct                    ECorrectR      GET POST        !exam-correctorANDtime
   /apps                         CApplicationsR GET POST
   !/apps/files                  CAppsFilesR    GET
   /apps/#CryptoFileNameCourseApplication CourseApplicationR:
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 3cf3ae881..38daf44af 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -776,6 +776,18 @@ tagAccessPredicate AuthCorrector = APDB $ \mAuthId route _ -> exceptT return ret
     _ -> do
       guardMExceptT (not $ Map.null resMap) (unauthorizedI MsgUnauthorizedCorrectorAny)
       return Authorized
+tagAccessPredicate AuthExamCorrector = APDB $ \mAuthId route _ -> case route of
+  CExamR tid ssh csh examn _ -> exceptT return return $ do
+    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
+    isCorrector <- $cachedHereBinary (mAuthId, tid, ssh, csh, examn) . lift . E.selectExists . E.from $ \(course `E.InnerJoin` exam `E.InnerJoin` examCorrector) -> do
+      E.on $ examCorrector E.^. ExamCorrectorExam E.==. exam E.^. ExamId
+       E.&&. examCorrector E.^. ExamCorrectorUser E.==. E.val authId
+      E.on $ exam E.^. ExamCourse 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.&&. exam E.^. ExamName E.==. E.val examn
+  r -> $unsupportedAuthPredicate AuthExamCorrector r
 tagAccessPredicate AuthTutor = APDB $ \mAuthId route _ -> exceptT return return $ do
   authId <- maybeExceptT AuthenticationRequired $ return mAuthId
   resList <- $cachedHereBinary authId . lift . E.select . E.from $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutor) -> do
@@ -834,6 +846,8 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
                                  && NTop (Just cTime) <= NTop examRegisterTo
         | otherwise      -> guard $ visible
                                  && NTop (Just cTime) <= NTop examDeregisterUntil
+      ECorrectR -> guard $ NTop (Just cTime) >= NTop examStart
+                        && NTop (Just cTime) <= NTop examFinished
       _          -> return ()
 
     return Authorized
@@ -1946,6 +1960,7 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (CExamR tid ssh csh examn EUsersR) = return ("Teilnehmer", Just $ CExamR tid ssh csh examn EShowR)
   breadcrumb (CExamR tid ssh csh examn EAddUserR) = return ("Prüfungsteilnehmer hinzufügen", Just $ CExamR tid ssh csh examn EUsersR)
   breadcrumb (CExamR tid ssh csh examn EGradesR) = return ("Prüfungsleistungen", Just $ CExamR tid ssh csh examn EShowR)
+  breadcrumb (CExamR tid ssh csh examn ECorrectR) = return ("Korrekturen eintragen", Just $ CExamR tid ssh csh examn EShowR)
 
   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)
@@ -2793,6 +2808,14 @@ pageActions (CExamR tid ssh csh examn EShowR) =
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
+  , MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuExamCorrect
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CExamR tid ssh csh examn ECorrectR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
   ]
 pageActions (CExamR tid ssh csh examn EUsersR) =
   [ MenuItem
diff --git a/src/Handler/Exam.hs b/src/Handler/Exam.hs
index 6580c90f4..c48854461 100644
--- a/src/Handler/Exam.hs
+++ b/src/Handler/Exam.hs
@@ -11,3 +11,4 @@ import Handler.Exam.Edit               as Handler.Exam
 import Handler.Exam.Show               as Handler.Exam
 import Handler.Exam.Users              as Handler.Exam
 import Handler.Exam.AddUser            as Handler.Exam
+import Handler.Exam.Correct            as Handler.Exam
diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
new file mode 100644
index 000000000..e9a7bd692
--- /dev/null
+++ b/src/Handler/Exam/Correct.hs
@@ -0,0 +1,40 @@
+module Handler.Exam.Correct
+  ( getECorrectR, postECorrectR
+  ) where
+
+import Import
+
+data CorrectInterfaceResponse
+  = CorrectInterfaceSuccess
+    { ciUserIdent :: CryptoUUIDUser
+    , ciUserDisplayName :: Text
+    , ciUserMatrikelnummer :: Maybe Text
+    , ciResults :: Map ExamPartNumber (Maybe Points)
+    }
+  | CorrectInterfaceFailure
+    { ciIcon :: Icon
+    , ciMessage :: Text
+    }
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 2
+  , fieldLabelModifier = camelToPathPiece' 1
+  , sumEncoding = TaggedObject "status" "result"
+  } ''CorrectorInterfaceResponse
+-- E.g.: { "status": "success", "user-ident": "Max Musterstudent", "user-matrikelnummer": "123", "results": { "1a": null, "2a": 7, "2c3.5": 12 } }
+
+data CorrectInterfaceRequest
+  = CorrectInterfaceRequest
+    { cirName :: Text
+    , cirResults :: Map ExamPartNumber (Maybe Points)
+    }
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 1
+  } ''CorrectorInterfaceRequest
+-- E.g.: { "name": "max", "results": { "1a": null, "2c3.5": 9001.2 }}
+ 
+
+getECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
+getECorrectR = error "ECorrectR not implemented"
+  
+postECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Value
+postECorrectR = error "ECorrectR not implemented" -- use returnJson & requireCheckJsonBody
diff --git a/src/Handler/Exam/Form.hs b/src/Handler/Exam/Form.hs
index 1604a4207..24c8000a2 100644
--- a/src/Handler/Exam/Form.hs
+++ b/src/Handler/Exam/Form.hs
@@ -147,7 +147,7 @@ examCorrectorsForm mPrev = wFormToAForm $ do
     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) False (Set.toList <$> mPrev)
+  fmap Set.fromList <$> massInputAccumW miAdd' miCell' miButtonAction' miLayout' ("correctors" :: Text) (fslI MsgExamCorrectors & setTooltip (UniWorXMessages [MsgExamCorrectorsTip, MsgMassInputTip]) False (Set.toList <$> mPrev)
 
 examOccurrenceForm :: Maybe (Set ExamOccurrenceForm) -> AForm Handler (Set ExamOccurrenceForm)
 examOccurrenceForm prev = wFormToAForm $ do

From cb7c9ac6dad5e248e9cf0748a871947369cd39af Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 8 Jan 2020 16:38:16 +0100
Subject: [PATCH 02/65] feat(exam-correct): add basic interface stub

---
 messages/uniworx/de-de-formal.msg     | 10 +++++++++
 messages/uniworx/en-eu.msg            | 10 +++++++++
 src/Handler/Exam/Correct.hs           | 28 ++++++++++++++++++++++++-
 src/Model/Types/Exam.hs               |  2 ++
 src/Utils/Tooltip.hs                  |  6 ++++++
 templates/widgets/exam-correct.hamlet | 30 +++++++++++++++++++++++++++
 templates/widgets/text-tooltip.hamlet |  6 ++++++
 7 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 src/Utils/Tooltip.hs
 create mode 100644 templates/widgets/exam-correct.hamlet
 create mode 100644 templates/widgets/text-tooltip.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index a82909d18..8b963d3f1 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1359,6 +1359,16 @@ ExamRegistrationInvitationDeclined examn@ExamName: Sie haben die Einladung, Teil
 ExamRegistrationInviteHeading examn@ExamName: Einladung zum Teilnehmer für #{examn}
 ExamRegistrationInviteExplanation: Sie wurden eingeladen, Prüfungsteilnehmer zu sein.
 
+ExamCorrectHeading examname@Text: Prüfungsergebnisse für #{examname} eintragen
+
+ExamCorrectHeadParticipant: Teilnehmer
+ExamCorrectHeadParticipantTooltip: Geben Sie hier einen beliebigen eindeutigen Identifikator des Teilnehmers an. Definitiv eindeutig ist die Matrikelnummer des Teilnehmers, aber auch der Name oder ein Teil der Matrikelnummer können unter Umständen (je nach Liste aller Prüfungsteilnehmer) bereits eindeutig sein.
+ExamCorrectHeadPart exampartnum@ExamPartNumber: #{exampartnum}
+ExamCorrectHeadPartName exampartname@ExamPartName: #{exampartname}
+ExamCorrectHeadStatus: Status
+
+ExamCorrectButtonSend: Senden
+
 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}
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 6dc28491a..b6bf6aa6d 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1357,6 +1357,16 @@ ExamRegistrationInvitationDeclined examn: You have declined the invitation to pa
 ExamRegistrationInviteHeading examn: Invitation to participate in #{examn}
 ExamRegistrationInviteExplanation: You were invited to register for an exam.
 
+ExamCorrectHeading examname: Submit corrections for #{examname}
+
+ExamCorrectHeadParticipant: Participant
+ExamCorrectHeadParticipantTooltip: Enter any string that uniquely identifies the participant. Their matriculation number is definitely unique, but also their name or a part of their matriculation number may already be unique for this participant (depending on the list of all participants).
+ExamCorrectHeadPart exampartnum: #{exampartnum}
+ExamCorrectHeadPartName exampartname: #{exampartname}
+ExamCorrectHeadStatus: Status
+
+ExamCorrectButtonSend: Submit
+
 SubmissionUserInvitationAccepted shn: You now participate in a submission for #{shn}
 SubmissionUserInvitationDeclined shn: You have declined the invitation to participate in a submission for #{shn}
 SubmissionUserInviteHeading shn: Invitation to participate in a submission for #{shn}
diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 39d433d23..0c4aa044c 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -4,6 +4,12 @@ module Handler.Exam.Correct
 
 import Import
 
+import qualified Data.CaseInsensitive as CI (original)
+
+import Handler.Utils
+import Handler.Utils.Exam (fetchExam)
+
+
 data CorrectInterfaceResponse
   = CorrectInterfaceSuccess CryptoUUIDUser Text (Maybe Text) (Map ExamPartNumber (Maybe Points))
 --    { ciUserIdent :: CryptoUUIDUser
@@ -34,7 +40,27 @@ deriveJSON defaultOptions
  
 
 getECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
-getECorrectR = error "ECorrectR not implemented"
+getECorrectR tid ssh csh examn = do
+  MsgRenderer mr <- getMsgRenderer
+
+  (Entity _ Exam{..}, examParts) <- runDB $ do
+    exam@(Entity eId Exam{..}) <- fetchExam tid ssh csh examn
+    examParts <- sortOn (view $ _entityVal . _examPartNumber) <$> selectList [ ExamPartExam ==. eId ] [ Asc ExamPartName ]
+    return (exam, entityVal <$> examParts)
+  
+  let
+    heading = prependCourseTitle tid ssh csh $ (mr . MsgExamCorrectHeading . CI.original) examName
+    
+    ptsInput :: ExamPartNumber -> Widget
+    ptsInput n = do
+      name <- newIdent
+      fieldView (pointsField :: Field Handler Points) ("exam-correct__"<>(toPathPiece n)) name [("class","exam-correct__pts-input")] (Left "") False
+    
+    participantHeadTooltip = [whamlet| _{MsgExamCorrectHeadParticipantTooltip} |]
+
+  siteLayoutMsg heading $ do
+    setTitleI heading
+    $(widgetFile "widgets/exam-correct")
   
 postECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Value
 postECorrectR = error "ECorrectR not implemented" -- use returnJson & requireCheckJsonBody
diff --git a/src/Model/Types/Exam.hs b/src/Model/Types/Exam.hs
index afd09396e..282b13931 100644
--- a/src/Model/Types/Exam.hs
+++ b/src/Model/Types/Exam.hs
@@ -317,6 +317,8 @@ instance PathPiece ExamPartNumber where
 
 instance ToMarkup ExamPartNumber where
   toMarkup = toMarkup . view _ExamPartNumber
+instance ToMessage ExamPartNumber where
+  toMessage = toMessage . view _ExamPartNumber
 
 pathPieceCsv ''ExamPartNumber
 pathPieceJSON ''ExamPartNumber
diff --git a/src/Utils/Tooltip.hs b/src/Utils/Tooltip.hs
new file mode 100644
index 000000000..5332868b6
--- /dev/null
+++ b/src/Utils/Tooltip.hs
@@ -0,0 +1,6 @@
+module Utils.Tooltip where
+
+import ClassyPrelude.Yesod hiding (Proxy)
+
+textTooltip :: forall site. WidgetFor site () -> WidgetFor site () -> WidgetFor site ()
+textTooltip ttHandle ttContent = $(whamletFile "templates/widgets/text-tooltip.hamlet")
diff --git a/templates/widgets/exam-correct.hamlet b/templates/widgets/exam-correct.hamlet
new file mode 100644
index 000000000..2e177884d
--- /dev/null
+++ b/templates/widgets/exam-correct.hamlet
@@ -0,0 +1,30 @@
+$newline never
+
+<section>
+  <table #exam-correct uw-hide-columns="exam-corrections" .table .table--striped>
+    <thead>
+      <tr .table__row .table__row--head>
+        <th .table__th uw-hide-column-header="participant">
+          _{MsgExamCorrectHeadParticipant}
+          ^{iconTooltip participantHeadTooltip Nothing True}
+        $forall ExamPart{examPartNumber,examPartName} <- examParts
+          <th .table__th>
+            $maybe name <- examPartName
+              <span .tooltip>
+                <span>
+                  _{MsgExamCorrectHeadPart examPartNumber}
+                <span .tooltip__content>
+                  _{MsgExamCorrectHeadPartName name}
+            $nothing
+              _{MsgExamCorrectHeadPart examPartNumber}
+        <th .table__th uw-hide-column-header="status">_{MsgExamCorrectHeadStatus}
+    <tbody>
+      <tr #exam-correct__new .table__row>
+        <td .table__td>
+          <input #exam-correct__participant type="text">
+        $forall ExamPart{examPartNumber} <- examParts
+          <td .table__td>
+            ^{ptsInput examPartNumber}
+        <td #exam-correct__status .table__td>
+          <button #exam-correct__send-btn .btn .btn-primary>
+            _{MsgExamCorrectButtonSend}
diff --git a/templates/widgets/text-tooltip.hamlet b/templates/widgets/text-tooltip.hamlet
new file mode 100644
index 000000000..7317c2831
--- /dev/null
+++ b/templates/widgets/text-tooltip.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<span .tooltip>
+  <span>
+    ^{ttHandle}
+  <span .tooltip__content>
+    ^{ttContent}

From 9ecffc8d8c843441365e871a50fa74cfa36abd5c Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 9 Jan 2020 08:56:19 +0100
Subject: [PATCH 03/65] fix: fix hlint

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

diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 0c4aa044c..31bd1d8ed 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -54,7 +54,7 @@ getECorrectR tid ssh csh examn = do
     ptsInput :: ExamPartNumber -> Widget
     ptsInput n = do
       name <- newIdent
-      fieldView (pointsField :: Field Handler Points) ("exam-correct__"<>(toPathPiece n)) name [("class","exam-correct__pts-input")] (Left "") False
+      fieldView (pointsField :: Field Handler Points) ("exam-correct__" <> toPathPiece n) name [("class","exam-correct__pts-input")] (Left "") False
     
     participantHeadTooltip = [whamlet| _{MsgExamCorrectHeadParticipantTooltip} |]
 

From 9fa4245607a1e31e915c67a3840dad291a9d284b Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 9 Jan 2020 09:59:07 +0100
Subject: [PATCH 04/65] feat(exam-correct): add sortable style and date column

---
 messages/uniworx/de-de-formal.msg     |  1 +
 messages/uniworx/en-eu.msg            |  1 +
 src/Handler/Exam/Correct.hs           |  2 +-
 templates/exam-correct.hamlet         | 36 +++++++++++++++++++++++++++
 templates/widgets/exam-correct.hamlet | 30 ----------------------
 5 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 templates/exam-correct.hamlet
 delete mode 100644 templates/widgets/exam-correct.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 8b963d3f1..f2807b76a 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1361,6 +1361,7 @@ ExamRegistrationInviteExplanation: Sie wurden eingeladen, Prüfungsteilnehmer zu
 
 ExamCorrectHeading examname@Text: Prüfungsergebnisse für #{examname} eintragen
 
+ExamCorrectHeadDate: Zeit
 ExamCorrectHeadParticipant: Teilnehmer
 ExamCorrectHeadParticipantTooltip: Geben Sie hier einen beliebigen eindeutigen Identifikator des Teilnehmers an. Definitiv eindeutig ist die Matrikelnummer des Teilnehmers, aber auch der Name oder ein Teil der Matrikelnummer können unter Umständen (je nach Liste aller Prüfungsteilnehmer) bereits eindeutig sein.
 ExamCorrectHeadPart exampartnum@ExamPartNumber: #{exampartnum}
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index b6bf6aa6d..8aaf830df 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1359,6 +1359,7 @@ ExamRegistrationInviteExplanation: You were invited to register for an exam.
 
 ExamCorrectHeading examname: Submit corrections for #{examname}
 
+ExamCorrectHeadDate: Time
 ExamCorrectHeadParticipant: Participant
 ExamCorrectHeadParticipantTooltip: Enter any string that uniquely identifies the participant. Their matriculation number is definitely unique, but also their name or a part of their matriculation number may already be unique for this participant (depending on the list of all participants).
 ExamCorrectHeadPart exampartnum: #{exampartnum}
diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 31bd1d8ed..53c7012fb 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -60,7 +60,7 @@ getECorrectR tid ssh csh examn = do
 
   siteLayoutMsg heading $ do
     setTitleI heading
-    $(widgetFile "widgets/exam-correct")
+    $(widgetFile "exam-correct")
   
 postECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Value
 postECorrectR = error "ECorrectR not implemented" -- use returnJson & requireCheckJsonBody
diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
new file mode 100644
index 000000000..953a85c7c
--- /dev/null
+++ b/templates/exam-correct.hamlet
@@ -0,0 +1,36 @@
+$newline never
+
+<section>
+  <div uw-hide-columns="exam-correct">
+    <table uw-exam-correct .table .table--striped>
+      <thead>
+        <tr .table__row .table__row--head>
+          <th .table__th .sortable .sorted-desc uw-hide-column-header="date">
+            _{MsgExamCorrectHeadDate}
+          <th .table__th .sortable uw-hide-column-header="participant">
+            _{MsgExamCorrectHeadParticipant}
+            ^{iconTooltip participantHeadTooltip Nothing True}
+          $forall ExamPart{examPartNumber,examPartName} <- examParts
+            <th .table__th .sortable uw-hide-column-header=#{examPartNumber}>
+              $maybe name <- examPartName
+                <span .tooltip>
+                  <span>
+                    _{MsgExamCorrectHeadPart examPartNumber}
+                  <span .tooltip__content>
+                    _{MsgExamCorrectHeadPartName name}
+              $nothing
+                _{MsgExamCorrectHeadPart examPartNumber}
+          <th .table__th .sortable uw-hide-column-header="status">
+            _{MsgExamCorrectHeadStatus}
+      <tbody #exam-correct--new>
+        <tr .table__row>
+          <td .table__td>
+          <td .table__td>
+            <input #exam-correct__participant type="text">
+          $forall ExamPart{examPartNumber} <- examParts
+            <td .table__td>
+              ^{ptsInput examPartNumber}
+          <td #exam-correct__status .table__td>
+            <button #exam-correct__send-btn .btn .btn-primary>
+              _{MsgExamCorrectButtonSend}
+      <tbody>
diff --git a/templates/widgets/exam-correct.hamlet b/templates/widgets/exam-correct.hamlet
deleted file mode 100644
index 2e177884d..000000000
--- a/templates/widgets/exam-correct.hamlet
+++ /dev/null
@@ -1,30 +0,0 @@
-$newline never
-
-<section>
-  <table #exam-correct uw-hide-columns="exam-corrections" .table .table--striped>
-    <thead>
-      <tr .table__row .table__row--head>
-        <th .table__th uw-hide-column-header="participant">
-          _{MsgExamCorrectHeadParticipant}
-          ^{iconTooltip participantHeadTooltip Nothing True}
-        $forall ExamPart{examPartNumber,examPartName} <- examParts
-          <th .table__th>
-            $maybe name <- examPartName
-              <span .tooltip>
-                <span>
-                  _{MsgExamCorrectHeadPart examPartNumber}
-                <span .tooltip__content>
-                  _{MsgExamCorrectHeadPartName name}
-            $nothing
-              _{MsgExamCorrectHeadPart examPartNumber}
-        <th .table__th uw-hide-column-header="status">_{MsgExamCorrectHeadStatus}
-    <tbody>
-      <tr #exam-correct__new .table__row>
-        <td .table__td>
-          <input #exam-correct__participant type="text">
-        $forall ExamPart{examPartNumber} <- examParts
-          <td .table__td>
-            ^{ptsInput examPartNumber}
-        <td #exam-correct__status .table__td>
-          <button #exam-correct__send-btn .btn .btn-primary>
-            _{MsgExamCorrectButtonSend}

From 9a791562b6809b54b6d45699566e0f369e14c627 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 9 Jan 2020 11:08:43 +0100
Subject: [PATCH 05/65] feat(exam-correct): setup basic session storage
 manager, add util stub

---
 .../lib/storage-manager/storage-manager.js    | 50 ++++++++++++++++++-
 .../src/utils/exam-correct/exam-correct.js    | 33 ++++++++++++
 frontend/src/utils/utils.js                   |  2 +
 templates/exam-correct.hamlet                 |  2 +-
 4 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/utils/exam-correct/exam-correct.js

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index 9b6202329..d071d0c2b 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -4,10 +4,11 @@ import * as semver from 'semver';
 
 export const LOCATION = {
   LOCAL: 'local',
+  SESSION: 'session',
   WINDOW: 'window',
 };
 
-const LOCATION_SHADOWING = [ LOCATION.WINDOW, LOCATION.LOCAL ];
+const LOCATION_SHADOWING = [ LOCATION.WINDOW, LOCATION.SESSION, LOCATION.LOCAL ];
 
 export class StorageManager {
 
@@ -80,6 +81,10 @@ export class StorageManager {
           val = this._getFromLocalStorage()[key];
           break;
         }
+        case LOCATION.SESSION: {
+          val = this._getFromSessionStorage()[key];
+          break;
+        }
         case LOCATION.WINDOW: {
           val = this._getFromWindow()[key];
           break;
@@ -220,4 +225,47 @@ export class StorageManager {
       delete this._global.App.Storage[this.namespace];
     }
   }
+
+
+  _getFromSessionStorage() {
+    let state;
+
+    try {
+      state = JSON.parse(window.sessionStorage.getItem(this.namespace));
+    } catch {
+      state = null;
+    }
+
+    if (state === null || !state.version || !semver.satisfies(this.version, `^${state.version}`)) {
+      // remove item from session if it stores an invalid state
+      this._clearSessionStorage();
+      return {};
+    }
+
+    if ('state' in state)
+      return state.state;
+    else {
+      delete state.version;
+      return state;
+    }
+  }
+
+  _saveToSessionStorage(state) {
+    if (!state)
+      return this._clearSessionStorage();
+
+    let versionedState;
+    
+    if ('version' in state || 'state' in state) {
+      versionedState = { version: this.version, state: state };
+    } else {
+      versionedState = { version: this.version, ...state };
+    }
+    
+    window.sessionStorage.setItem(this.namespace, JSON.stringify(versionedState));
+  }
+
+  _clearSessionStorage() {
+    window.sessionStorage.removeItem(this.namespace);
+  }
 }
diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
new file mode 100644
index 000000000..cc8705345
--- /dev/null
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -0,0 +1,33 @@
+import { Utility } from '../../core/utility';
+import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-manager';
+// import './exam-correct.sass';
+
+const EXAM_CORRECT_IDENT = 'uw-exam-correct';
+
+@Utility({
+  selector: `[${EXAM_CORRECT_IDENT}]`,
+})
+export class ExamCorrect {
+
+  _storageManager = new StorageManager('EXAM_CORRECT', '0.0.0', { location: LOCATION.SESSION, encrypted: true });
+
+  _element;
+
+  constructor(element) {
+    if (!element) {
+      throw new Error('Exam Correct utility cannot be setup without an element!');
+    }
+
+    this._element = element;
+
+    if (this._element.tagName !== 'TABLE') {
+      throw new Error('Exam Correct utility can only be setup with a <table> element!');
+    }
+
+  }
+
+  destroy() {
+    console.log('TBD: destroy ExamCorrect');
+  }
+
+}
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index 00f3e5ec0..d365f812b 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -12,6 +12,7 @@ import { Tooltip } from './tooltips/tooltips';
 import { CourseTeaser } from './course-teaser/course-teaser';
 import { NavbarUtils } from './navbar/navbar';
 import { HideColumns } from './hide-columns/hide-columns';
+import { ExamCorrect } from './exam-correct/exam-correct';
 
 export const Utils = [
   Alerts,
@@ -29,4 +30,5 @@ export const Utils = [
   CourseTeaser,
   ...NavbarUtils,
   HideColumns,
+  ExamCorrect,
 ];
diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index 953a85c7c..42e3f4879 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -2,7 +2,7 @@ $newline never
 
 <section>
   <div uw-hide-columns="exam-correct">
-    <table uw-exam-correct .table .table--striped>
+    <table .table .table--striped uw-exam-correct=#{intercalate "-" [toPathPiece tid, toPathPiece ssh, toPathPiece csh, toPathPiece examn]}>
       <thead>
         <tr .table__row .table__row--head>
           <th .table__th .sortable .sorted-desc uw-hide-column-header="date">

From 11c0bd07e93a4a59d78226dbf3a2ca94d02a5883 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 9 Jan 2020 12:27:02 +0100
Subject: [PATCH 06/65] feat(sort-table): add basic SortTable util stub

---
 frontend/src/utils/sort-table/sort-table.js | 27 +++++++++++++++++++++
 frontend/src/utils/utils.js                 |  2 ++
 src/Handler/Exam/Correct.hs                 |  2 ++
 templates/exam-correct.hamlet               |  2 +-
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/utils/sort-table/sort-table.js

diff --git a/frontend/src/utils/sort-table/sort-table.js b/frontend/src/utils/sort-table/sort-table.js
new file mode 100644
index 000000000..3c43a9ee2
--- /dev/null
+++ b/frontend/src/utils/sort-table/sort-table.js
@@ -0,0 +1,27 @@
+import { Utility } from '../../core/utility';
+import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-manager';
+
+const SORT_TABLE_IDENT = 'uw-sort-table';
+
+@Utility({
+  selector: `table[${SORT_TABLE_IDENT}]`,
+})
+export class SortTable {
+
+  _storageManager = new StorageManager('SORT_TABLE', '0.0.0', { location: LOCATION.LOCAL });
+
+  _element;
+
+  constructor(element) {
+    if (!element) {
+      throw new Error('Sort Table utility cannot be setup without an element!');
+    }
+
+    this._element = element;
+  }
+
+  destroy() {
+    console.log('TBD destroy SortTable');
+  }
+
+}
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index d365f812b..215134503 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -13,6 +13,7 @@ import { CourseTeaser } from './course-teaser/course-teaser';
 import { NavbarUtils } from './navbar/navbar';
 import { HideColumns } from './hide-columns/hide-columns';
 import { ExamCorrect } from './exam-correct/exam-correct';
+import { SortTable } from './sort-table/sort-table';
 
 export const Utils = [
   Alerts,
@@ -31,4 +32,5 @@ export const Utils = [
   ...NavbarUtils,
   HideColumns,
   ExamCorrect,
+  SortTable,
 ];
diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 53c7012fb..241ee642b 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -58,6 +58,8 @@ getECorrectR tid ssh csh examn = do
     
     participantHeadTooltip = [whamlet| _{MsgExamCorrectHeadParticipantTooltip} |]
 
+    examCorrectIdent = intercalate "-" [toPathPiece tid, toPathPiece ssh, toPathPiece csh, toPathPiece examn]
+
   siteLayoutMsg heading $ do
     setTitleI heading
     $(widgetFile "exam-correct")
diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index 42e3f4879..9d0038cf2 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -2,7 +2,7 @@ $newline never
 
 <section>
   <div uw-hide-columns="exam-correct">
-    <table .table .table--striped uw-exam-correct=#{intercalate "-" [toPathPiece tid, toPathPiece ssh, toPathPiece csh, toPathPiece examn]}>
+    <table .table .table--striped uw-exam-correct=#{examCorrectIdent} uw-sort-table=#{examCorrectIdent}>
       <thead>
         <tr .table__row .table__row--head>
           <th .table__th .sortable .sorted-desc uw-hide-column-header="date">

From 9d845d3a0b787345e08a266e18eb026ad422b00e Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 9 Jan 2020 12:29:46 +0100
Subject: [PATCH 07/65] refactor(exam-correct): replace table constraint with
 better selector

---
 frontend/src/utils/exam-correct/exam-correct.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index cc8705345..f3cb8d810 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -5,7 +5,7 @@ import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-mana
 const EXAM_CORRECT_IDENT = 'uw-exam-correct';
 
 @Utility({
-  selector: `[${EXAM_CORRECT_IDENT}]`,
+  selector: `table[${EXAM_CORRECT_IDENT}]`,
 })
 export class ExamCorrect {
 
@@ -20,10 +20,6 @@ export class ExamCorrect {
 
     this._element = element;
 
-    if (this._element.tagName !== 'TABLE') {
-      throw new Error('Exam Correct utility can only be setup with a <table> element!');
-    }
-
   }
 
   destroy() {

From 0467194e3df2da569bd2a4bd8c63bc2d23f44c30 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 9 Jan 2020 15:59:31 +0100
Subject: [PATCH 08/65] feat(exam-correct): stub

---
 .../src/utils/exam-correct/exam-correct.js    | 99 ++++++++++++++++++-
 src/Handler/Exam/Correct.hs                   |  2 +-
 templates/exam-correct.hamlet                 |  2 +-
 3 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index f3cb8d810..f9ab25fa7 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -1,8 +1,17 @@
 import { Utility } from '../../core/utility';
 import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-manager';
+
 // import './exam-correct.sass';
 
+import moment from 'moment';
+
+
 const EXAM_CORRECT_IDENT = 'uw-exam-correct';
+const EXAM_CORRECT_PART_INPUT_ATTR = 'uw-exam-correct--part-input';
+const EXAM_CORRECT_SEND_BTN_ID = 'exam-correct__send-btn';
+const EXAM_CORRECT_PARTICIPANT_INPUT_ID = 'exam-correct__participant';
+const EXAM_CORRECT_INPUT_BODY_ID = 'exam-correct__new';
+
 
 @Utility({
   selector: `table[${EXAM_CORRECT_IDENT}]`,
@@ -13,17 +22,101 @@ export class ExamCorrect {
 
   _element;
 
-  constructor(element) {
+  _sendBtn;
+  _participantInput;
+  _partInputs;
+
+  constructor(element, app) {
     if (!element) {
       throw new Error('Exam Correct utility cannot be setup without an element!');
     }
 
-    this._element = element;
+    if (!app) {
+      throw new Error('Exam Correct utility cannot be setup without an app!');
+    }
 
+    this._element = element;
+    this._app = app;
+    this._sendBtn = document.getElementById(EXAM_CORRECT_SEND_BTN_ID);
+    this._participantInput = document.getElementById(EXAM_CORRECT_PARTICIPANT_INPUT_ID);
+    this._partInputs = [...this._element.querySelectorAll(`input[${EXAM_CORRECT_PART_INPUT_ATTR}]`)];
+
+    if (this._sendBtn)
+      this._sendBtn.addEventListener('click', this._sendCorrectionHandler.bind(this));
+    else console.error('ExamCorrect utility could not detect send button!');
+
+    if (this._participantInput)
+      this._participantInput.addEventListener('focusout', this._validateParticipantInput.bind(this));
+    else throw new Error('ExamCorrect utility could not detect participant input!');
   }
 
   destroy() {
-    console.log('TBD: destroy ExamCorrect');
+    // TODO work in progress
+    this._sendBtn.removeEventListener('click', this._sendCorrectionHandler);
+    this._participantInput.removeEventListener('change', this._validateParticipantInput);
+  }
+
+  _validateParticipantInput(event) {
+    console.log('WIP _validateParticipantInput', event);
+  }
+
+  _sendCorrectionHandler(event) {
+    console.log('WIP _sendCorrectionHandler', event);
+
+    const participant = this._participantInput.value;
+    const results = {};
+    this._partInputs.forEach((input) => {
+      if (input.value && !isNaN(input.value)) {
+        const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
+        if (!partKey) throw new Error('Exam part input without part attribute!');
+        results[partKey] = input.value;
+      }
+    });
+
+    console.log(participant, results);
+
+    const correctionRow = document.createElement('TR');
+    const dateTD = document.createElement('TD');
+    dateTD.appendChild(document.createTextNode(moment().format()));
+    const participantTD = document.createElement('TD');
+    participantTD.appendChild(document.createTextNode(participant));
+    const partTDs = this._partInputs.map((input) => {
+      const partTD = document.createElement('TD');
+      const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
+      if (results[partKey])
+        partTD.appendChild(document.createTextNode(results[partKey]));
+      return partTD;
+    });
+    [dateTD,participantTD,...partTDs].forEach((td) => correctionRow.appendChild(td));
+    const tableBody = this._element.querySelector(`tbody:not(#${EXAM_CORRECT_INPUT_BODY_ID})`);
+    tableBody.insertBefore(correctionRow, tableBody.firstChild);
+
+    this._participantInput.value = null;
+    console.log(this._partInputs);
+    this._partInputs.forEach((input) => {
+      input.value = null;
+    });
+
+    const url = 'TODO';
+    const headers = {};
+    const body = {
+      participant: participant,
+      results: results,
+    };
+    this._app.httpClient.post({
+      url: url,
+      headers: headers,
+      body: body,
+    }).then(
+      (response) => response.json()
+    ).then(
+      (response) => this._processResponse(response)
+    ).catch((error) => {
+      // TODO
+      console.error('Error while processing response', error, body);
+    });
+
+    // TODO wait for response and replace status icon accordingly (add edit button to paste content in current input)
   }
 
 }
diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 241ee642b..aef3dd55d 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -54,7 +54,7 @@ getECorrectR tid ssh csh examn = do
     ptsInput :: ExamPartNumber -> Widget
     ptsInput n = do
       name <- newIdent
-      fieldView (pointsField :: Field Handler Points) ("exam-correct__" <> toPathPiece n) name [("class","exam-correct__pts-input")] (Left "") False
+      fieldView (pointsField :: Field Handler Points) ("exam-correct__" <> toPathPiece n) name [("uw-exam-correct--part-input", toPathPiece n)] (Left "") False
     
     participantHeadTooltip = [whamlet| _{MsgExamCorrectHeadParticipantTooltip} |]
 
diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index 9d0038cf2..ab6645ba5 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -22,7 +22,7 @@ $newline never
                 _{MsgExamCorrectHeadPart examPartNumber}
           <th .table__th .sortable uw-hide-column-header="status">
             _{MsgExamCorrectHeadStatus}
-      <tbody #exam-correct--new>
+      <tbody #exam-correct__new>
         <tr .table__row>
           <td .table__td>
           <td .table__td>

From 6727dff2ef5de6cf3d4c302165c1c04302d41b68 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 10 Jan 2020 19:40:48 +0100
Subject: [PATCH 09/65] feat(exam-correct): more stub

---
 .../src/utils/exam-correct/exam-correct.js    | 64 +++++++++++++++----
 .../src/utils/exam-correct/exam-correct.sass  |  2 +
 2 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 frontend/src/utils/exam-correct/exam-correct.sass

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index f9ab25fa7..aa76ea9ad 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -1,7 +1,7 @@
 import { Utility } from '../../core/utility';
 import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-manager';
 
-// import './exam-correct.sass';
+import './exam-correct.sass';
 
 import moment from 'moment';
 
@@ -12,6 +12,8 @@ const EXAM_CORRECT_SEND_BTN_ID = 'exam-correct__send-btn';
 const EXAM_CORRECT_PARTICIPANT_INPUT_ID = 'exam-correct__participant';
 const EXAM_CORRECT_INPUT_BODY_ID = 'exam-correct__new';
 
+const INPUT_EMPTY_CLASS = 'input--invalid';
+
 
 @Utility({
   selector: `table[${EXAM_CORRECT_IDENT}]`,
@@ -51,9 +53,9 @@ export class ExamCorrect {
   }
 
   destroy() {
-    // TODO work in progress
     this._sendBtn.removeEventListener('click', this._sendCorrectionHandler);
     this._participantInput.removeEventListener('change', this._validateParticipantInput);
+    this._participantInput.removeEventListener('input', this._removeInputEmptyClassHandler);
   }
 
   _validateParticipantInput(event) {
@@ -63,18 +65,36 @@ export class ExamCorrect {
   _sendCorrectionHandler(event) {
     console.log('WIP _sendCorrectionHandler', event);
 
+    // refocus participant input element for convenience
+    this._participantInput.focus();
+
     const participant = this._participantInput.value;
+
+    // abort send if the participant input is empty
+    if (!participant) {
+      this._participantInput.classList.add(INPUT_EMPTY_CLASS);
+      this._participantInput.addEventListener('input', this._removeInputEmptyClassHandler.bind(this), { once: true });
+      return;
+    }
+
     const results = {};
     this._partInputs.forEach((input) => {
       if (input.value && !isNaN(input.value)) {
+        // TODO instead of ignoring NaN values, abort send and add error class to corresponding input
+        // (latter is optional)
         const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
         if (!partKey) throw new Error('Exam part input without part attribute!');
-        results[partKey] = input.value;
+        results[partKey] = parseFloat(input.value);
       }
     });
 
+    // abort send if there are no results (after validation)
+    if (results === {}) return;
+
     console.log(participant, results);
 
+    // TODO apply row and data classes
+    // (maybe create some sort of template for this instead)
     const correctionRow = document.createElement('TR');
     const dateTD = document.createElement('TD');
     dateTD.appendChild(document.createTextNode(moment().format()));
@@ -91,11 +111,8 @@ export class ExamCorrect {
     const tableBody = this._element.querySelector(`tbody:not(#${EXAM_CORRECT_INPUT_BODY_ID})`);
     tableBody.insertBefore(correctionRow, tableBody.firstChild);
 
-    this._participantInput.value = null;
-    console.log(this._partInputs);
-    this._partInputs.forEach((input) => {
-      input.value = null;
-    });
+    // clear input values on validation success
+    [this._participantInput, ...this._partInputs].forEach(clearInput);
 
     const url = 'TODO';
     const headers = {};
@@ -103,6 +120,7 @@ export class ExamCorrect {
       participant: participant,
       results: results,
     };
+
     this._app.httpClient.post({
       url: url,
       headers: headers,
@@ -110,13 +128,37 @@ export class ExamCorrect {
     }).then(
       (response) => response.json()
     ).then(
-      (response) => this._processResponse(response)
+      (response) => this._processResponse(response, participant)
     ).catch((error) => {
-      // TODO
-      console.error('Error while processing response', error, body);
+      console.error('Error while processing response', error);
     });
 
     // TODO wait for response and replace status icon accordingly (add edit button to paste content in current input)
   }
 
+  _processResponse(response, participant) {
+    console.log('WIP ExamCorrect._processResponse', response, participant);
+    
+    // TODO find the first corresponding row (participant matches cell entry in second column) top-down
+    // if found:
+    //   if the response status is 'success' (i.e. the results have been upserted into the DB),
+    //     replace loading spinner in this row with tick mark icon
+    //   otherwise, 
+    //     replace loading spinner with error icon (error message as tooltip if present?)
+  }
+
+  _removeInputEmptyClassHandler() {
+    console.log('removeclass');
+    if (this._participantInput.value) {
+      this._participantInput.classList.remove(INPUT_EMPTY_CLASS);
+    } else {
+      this._participantInput.addEventListener('input', this._removeInputEmptyClassHandler, { once: true });
+    }
+  }
+
+}
+
+// TODO move to general util section?
+function clearInput(inputElement) {
+  inputElement.value = null;
 }
diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
new file mode 100644
index 000000000..a6a646bed
--- /dev/null
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -0,0 +1,2 @@
+#exam-correct__participant.input--invalid
+  border: 2px solid var(--color-error)

From 2b3046164f1c503dcd7fc558fce4fe8fc052c892 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Mon, 13 Jan 2020 10:46:11 +0100
Subject: [PATCH 10/65] fix(exam-correct): add XSRF token to post header

---
 .../src/utils/exam-correct/exam-correct.js    | 29 +++++++++++++------
 package-lock.json                             |  5 ++++
 package.json                                  |  1 +
 records.json                                  | 13 +++++++++
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index aa76ea9ad..5e1e96ca2 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -3,9 +3,12 @@ import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-mana
 
 import './exam-correct.sass';
 
+import Cookies from 'js-cookie';
 import moment from 'moment';
 
 
+const EXAM_CORRECT_URL_POST = 'correct';
+
 const EXAM_CORRECT_IDENT = 'uw-exam-correct';
 const EXAM_CORRECT_PART_INPUT_ATTR = 'uw-exam-correct--part-input';
 const EXAM_CORRECT_SEND_BTN_ID = 'exam-correct__send-btn';
@@ -89,13 +92,13 @@ export class ExamCorrect {
     });
 
     // abort send if there are no results (after validation)
-    if (results === {}) return;
+    if (Object.keys(results).length <= 0) return;
 
-    console.log(participant, results);
+    console.log('input validated, proceeding', participant, results);
 
-    // TODO apply row and data classes
-    // (maybe create some sort of template for this instead)
+    // TODO create and use template for this
     const correctionRow = document.createElement('TR');
+    correctionRow.classList.add('table__row');
     const dateTD = document.createElement('TD');
     dateTD.appendChild(document.createTextNode(moment().format()));
     const participantTD = document.createElement('TD');
@@ -107,27 +110,35 @@ export class ExamCorrect {
         partTD.appendChild(document.createTextNode(results[partKey]));
       return partTD;
     });
-    [dateTD,participantTD,...partTDs].forEach((td) => correctionRow.appendChild(td));
+    [dateTD,participantTD,...partTDs].forEach((td) => {
+      td.classList.add('table__td');
+      correctionRow.appendChild(td);
+    });
     const tableBody = this._element.querySelector(`tbody:not(#${EXAM_CORRECT_INPUT_BODY_ID})`);
     tableBody.insertBefore(correctionRow, tableBody.firstChild);
 
     // clear input values on validation success
+    // TODO only clear input on post success
     [this._participantInput, ...this._partInputs].forEach(clearInput);
 
-    const url = 'TODO';
-    const headers = {};
+    const url = EXAM_CORRECT_URL_POST;
+    const headers = {
+      'X-XSRF-TOKEN': Cookies.get('XSRF-TOKEN'),
+    };
     const body = {
       participant: participant,
       results: results,
     };
 
+    console.log('body', body);
+
     this._app.httpClient.post({
       url: url,
       headers: headers,
       body: body,
     }).then(
-      (response) => response.json()
-    ).then(
+    //  (response) => response.json()
+    //).then(
       (response) => this._processResponse(response, participant)
     ).catch((error) => {
       console.error('Error while processing response', error);
diff --git a/package-lock.json b/package-lock.json
index e25a06694..5e95dfe19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9767,6 +9767,11 @@
         }
       }
     },
+    "js-cookie": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
+      "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ=="
+    },
     "js-levenshtein": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
diff --git a/package.json b/package.json
index c943338ee..8095b10cb 100644
--- a/package.json
+++ b/package.json
@@ -108,6 +108,7 @@
     "@babel/runtime": "^7.7.6",
     "@juggle/resize-observer": "^2.5.0",
     "core-js": "^3.4.8",
+    "js-cookie": "^2.2.1",
     "moment": "^2.24.0",
     "npm": "^6.13.4",
     "tail.datetime": "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/tail.DateTime.git#master",
diff --git a/records.json b/records.json
index 0e3c24f99..9d50500cc 100644
--- a/records.json
+++ b/records.json
@@ -739,5 +739,18 @@
         "usedIds": []
       }
     }
+  ],
+  "mini-css-extract-plugin node_modules/css-loader/dist/cjs.js??ref--6-1!node_modules/postcss-loader/src/index.js??ref--6-2!node_modules/resolve-url-loader/index.js??ref--6-3!node_modules/sass-loader/dist/cjs.js??ref--6-4!frontend/src/utils/exam-correct/exam-correct.sass": [
+    {
+      "modules": {
+        "byIdentifier": {},
+        "usedIds": {}
+      },
+      "chunks": {
+        "byName": {},
+        "bySource": {},
+        "usedIds": []
+      }
+    }
   ]
 }
\ No newline at end of file

From eefff9f719aa44a544f3eea25ba29b987d085365 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Mon, 13 Jan 2020 16:29:26 +0100
Subject: [PATCH 11/65] feat(exam-correct): status icons (wip)

---
 .../src/utils/exam-correct/exam-correct.js    | 55 +++++++++++++++----
 .../src/utils/exam-correct/exam-correct.sass  | 20 +++++++
 2 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 5e1e96ca2..15f15bf2c 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -14,9 +14,13 @@ const EXAM_CORRECT_PART_INPUT_ATTR = 'uw-exam-correct--part-input';
 const EXAM_CORRECT_SEND_BTN_ID = 'exam-correct__send-btn';
 const EXAM_CORRECT_PARTICIPANT_INPUT_ID = 'exam-correct__participant';
 const EXAM_CORRECT_INPUT_BODY_ID = 'exam-correct__new';
+const EXAM_CORRECT_PARTICIPANT_ATTR = 'exam-correct--participant';
 
 const INPUT_EMPTY_CLASS = 'input--invalid';
 
+// TODO get from settings
+const MOMENT_FORMAT = 'DD.MM.YY HH:mm:ss';
+
 
 @Utility({
   selector: `table[${EXAM_CORRECT_IDENT}]`,
@@ -100,9 +104,12 @@ export class ExamCorrect {
     const correctionRow = document.createElement('TR');
     correctionRow.classList.add('table__row');
     const dateTD = document.createElement('TD');
-    dateTD.appendChild(document.createTextNode(moment().format()));
+    const now = moment();
+    dateTD.appendChild(document.createTextNode(now.format(MOMENT_FORMAT)));
+    dateTD.setAttribute('date', moment());
     const participantTD = document.createElement('TD');
     participantTD.appendChild(document.createTextNode(participant));
+    participantTD.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, participant);
     const partTDs = this._partInputs.map((input) => {
       const partTD = document.createElement('TD');
       const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
@@ -110,7 +117,11 @@ export class ExamCorrect {
         partTD.appendChild(document.createTextNode(results[partKey]));
       return partTD;
     });
-    [dateTD,participantTD,...partTDs].forEach((td) => {
+    const statusTD = document.createElement('TD');
+    const statusDiv = document.createElement('DIV');
+    statusDiv.classList.add('exam-correct--loading');
+    statusTD.appendChild(statusDiv);
+    [dateTD,participantTD,...partTDs, statusTD].forEach((td) => {
       td.classList.add('table__td');
       correctionRow.appendChild(td);
     });
@@ -143,19 +154,43 @@ export class ExamCorrect {
     ).catch((error) => {
       console.error('Error while processing response', error);
     });
-
-    // TODO wait for response and replace status icon accordingly (add edit button to paste content in current input)
   }
 
   _processResponse(response, participant) {
     console.log('WIP ExamCorrect._processResponse', response, participant);
     
-    // TODO find the first corresponding row (participant matches cell entry in second column) top-down
-    // if found:
-    //   if the response status is 'success' (i.e. the results have been upserted into the DB),
-    //     replace loading spinner in this row with tick mark icon
-    //   otherwise, 
-    //     replace loading spinner with error icon (error message as tooltip if present?)
+    if (response) {
+      for (let row of [...this._element.rows]) {
+        const participantElem = row.cells.item(1);
+        const participantIdent = participantElem && participantElem.getAttribute(EXAM_CORRECT_PARTICIPANT_ATTR);
+        if (participantIdent === participant) {
+          let faIcon, ecClass;
+          switch (response.status) {
+            case 'success':
+              // TODO replace loading spinner class with fontawesome tick mark icon
+              // TODO replace participant identifier with participant from response
+              faIcon = 'fa-check';
+              ecClass = 'exam-correct--success';
+              break;
+            case 'error':
+              // TODO replace loading spinner class with fontawesome error icon
+              // TODO show tooltip with error message?
+              faIcon = 'fa-times';
+              ecClass = 'exam-correct--error';
+              break;
+            default:
+              console.error('Invalid response');
+              faIcon = 'fa-times';
+              ecClass = 'exam-correct--error';
+          }
+          row.querySelectorAll('.exam-correct--loading').forEach((elem) => {
+            elem.classList.remove('exam-correct--loading');
+            elem.classList.add('fa', faIcon, ecClass);
+          });
+          break;
+        }
+      }
+    }
   }
 
   _removeInputEmptyClassHandler() {
diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index a6a646bed..63fd21145 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -1,2 +1,22 @@
 #exam-correct__participant.input--invalid
   border: 2px solid var(--color-error)
+
+.exam-correct--success
+  color: var(--color-success)
+
+.exam-correct--error
+  color: var(--color-error)
+
+.exam-correct--loading
+  border: 3px solid var(--color-grey-light)
+  border-top: 3px solid var(--color-primary)
+  border-radius: 50%
+  width: 20px
+  height: 20px
+  animation: spin 2s linear infinite
+
+@keyframes spin
+  0%
+    transform: rotate(0deg)
+  100%
+    transform: rotate(360deg)

From a525cab356427514c49348929a362a52fd6edc8b Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 15 Jan 2020 13:54:04 +0100
Subject: [PATCH 12/65] feat(exam-correct): postECorrectR stub

---
 messages/uniworx/de-de-formal.msg |   3 +
 messages/uniworx/en-eu.msg        |   3 +
 src/Handler/Exam/Correct.hs       | 125 +++++++++++++++++++++++++-----
 3 files changed, 110 insertions(+), 21 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 3bea521f8..d5ff609c9 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1375,6 +1375,9 @@ ExamCorrectHeadStatus: Status
 
 ExamCorrectButtonSend: Senden
 
+ExamCorrectErrorMultipleMatchingParticipants: Dem Identifikator konnten mehrere Pruefungsteilnehmer zugeordnet werden.
+ExamCorrectErrorNoMatchingParticipants: Dem Identifikator konnte kein Pruefungsteilnehmer zugeordnet werden.
+
 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}
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index cff989fb9..a6bd7cbad 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1373,6 +1373,9 @@ ExamCorrectHeadStatus: Status
 
 ExamCorrectButtonSend: Submit
 
+ExamCorrectErrorMultipleMatchingParticipants: This identifier matches on multiple exam participants.
+ExamCorrectErrorNoMatchingParticipants: This identifier does not match on any exam participant.
+
 SubmissionUserInvitationAccepted shn: You now participate in a submission for #{shn}
 SubmissionUserInvitationDeclined shn: You have declined the invitation to participate in a submission for #{shn}
 SubmissionUserInviteHeading shn: Invitation to participate in a submission for #{shn}
diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index aef3dd55d..8b157dbde 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -4,37 +4,57 @@ module Handler.Exam.Correct
 
 import Import
 
+import qualified Data.Set as Set
 import qualified Data.CaseInsensitive as CI (original)
 
+import qualified Database.Esqueleto as E
+import qualified Database.Esqueleto.Utils as E
+
 import Handler.Utils
 import Handler.Utils.Exam (fetchExam)
 
 
-data CorrectInterfaceResponse
-  = CorrectInterfaceSuccess CryptoUUIDUser Text (Maybe Text) (Map ExamPartNumber (Maybe Points))
---    { ciUserIdent :: CryptoUUIDUser
---    , ciUserDisplayName :: Text
---    , ciUserMatrikelnummer :: Maybe Text
---    , ciResults :: Map ExamPartNumber (Maybe Points)
---    }
-  | CorrectInterfaceFailure Icon Text
---    { ciIcon :: Icon
---    , ciMessage :: Text
---    }
+data CorrectInterfaceUser
+  = CorrectInterfaceUser
+    { ciuSurname     :: Text
+    , ciuDisplayName :: Text
+    , ciuMatNr       :: Maybe UserMatriculation
+    , ciuId          :: CryptoUUIDUser
+    }
 deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 2
-  , fieldLabelModifier = camelToPathPiece' 1
-  , sumEncoding = TaggedObject "status" "result"
+  { fieldLabelModifier = camelToPathPiece' 1
+  } ''CorrectInterfaceUser
+
+data CorrectInterfaceResponse
+  = CorrectInterfaceResponseSuccess
+    { cirsUser       :: CorrectInterfaceUser
+    , cirsResults    :: Map ExamPartNumber (Maybe Points)
+    }
+  | CorrectInterfaceResponseAmbiguous
+    { ciraUsers      :: Set CorrectInterfaceUser
+    , ciraMessage    :: Text
+    }
+  | CorrectInterfaceResponseFailure
+    { cirfMessage    :: Text
+    }
+  | CorrectInterfaceResponseNoOp
+    { cirnUsers      :: Set CorrectInterfaceUser
+    }
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 3
+  , fieldLabelModifier     = camelToPathPiece' 1
+  , sumEncoding            = TaggedObject "status" "result"
   } ''CorrectInterfaceResponse
 -- E.g.: { "status": "success", "user-ident": "Max Musterstudent", "user-matrikelnummer": "123", "results": { "1a": null, "2a": 7, "2c3.5": 12 } }
 
 data CorrectInterfaceRequest
-  = CorrectInterfaceRequest Text (Map ExamPartNumber (Maybe Points))
---    { cirName :: Text
---    , cirResults :: Map ExamPartNumber (Maybe Points)
---    }
+  = CorrectInterfaceRequest
+    { ciqName        :: Text
+    , ciqResults     :: Map ExamPartNumber (Maybe Points)
+    , ciqNoOp        :: Bool
+    }
 deriveJSON defaultOptions
-  { fieldLabelModifier = camelToPathPiece' 1
+  { fieldLabelModifier     = camelToPathPiece' 1
   } ''CorrectInterfaceRequest
 -- E.g.: { "name": "max", "results": { "1a": null, "2c3.5": 9001.2 }}
  
@@ -63,6 +83,69 @@ getECorrectR tid ssh csh examn = do
   siteLayoutMsg heading $ do
     setTitleI heading
     $(widgetFile "exam-correct")
-  
+
+
 postECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Value
-postECorrectR = error "ECorrectR not implemented" -- use returnJson & requireCheckJsonBody
+postECorrectR tid ssh csh examn = do
+  now <- liftIO getCurrentTime
+  mUid <- maybeAuthId
+  MsgRenderer mr <- getMsgRenderer
+
+  CorrectInterfaceRequest{ciqName,ciqResults,ciqNoOp} <- requireCheckJsonBody
+
+  participantMatches <- runDB $ do
+    Entity eId _ <- fetchExam tid ssh csh examn
+    E.select . E.from $ \(examRegistration `E.InnerJoin` user) -> do
+      E.on $ examRegistration E.^. ExamRegistrationUser E.==. user
+      E.where_ $ examRegistration E.^. ExamRegistrationExam E.==. E.val eId
+        E.&&. ( user E.^. UserMatrikelnummer E.==. E.val ciqName
+          E.||. user E.^. UserMatrikelnummer `E.hasInfix` E.val ciqName
+          E.||. user E.^. UserSurname E.==. E.val ciqName
+          E.||. user E.^. UserSurname `E.hasInfix` E.val ciqName
+          E.||. user E.^. UserFirstName E.==. E.val ciqName
+          E.||. user E.^. UserFirstName `E.hasInfix` E.val ciqName
+          E.||. user E.^. UserDisplayName E.==. E.val ciqName
+          E.||. user E.^. UserDisplayName `E.hasInfix` E.val ciqName )
+      return user
+
+  let
+    usersToResponse = traverse $ \user@(Entity uid User{..}) -> do
+      uuid <- encrypt uid
+      return CorrectInterfaceUser
+        { ciuSurname     = userSurname
+        , ciuDisplayName = userDisplayName
+        , ciuMatNr       = userMatrikelnummer
+        , ciuId          = uuid
+        }
+
+  if
+    | ciqNoOp -> do
+      users <- usersToResponse participantMatches
+      returnJson $ CorrectInterfaceResponseNoOp
+        { cirnUsers     = Set.fromList users
+        }
+    | [match] <- participantMatches -> do
+      -- TODO upsert results
+      -- TODO log to Transaction Log
+      [user] <- usersToResponse participantMatches
+      returnJson $ CorrectInterfaceResponseSuccess
+        { cirsUser      = user
+        , cirsResults   = ciqResults
+        }
+    | [] <- participantMatches -> returnJson $ CorrectInterfaceResponseFailure
+      { cirfMessage     = mr MsgExamCorrectErrorNoMatchingParticipants
+      }
+    | otherwise -> do
+      users <- usersToResponse participantMatches
+      returnJson $ CorrectInterfaceResponseAmbiguous
+        { ciraMessage     = mr MsgExamCorrectErrorMultipleMatchingParticipants
+        , ciraUsers       = Set.fromList users
+        }
+
+    -- TODO if the request is a noop, respond with a 200 and the matches
+    -- TODO if there is exactly one match, respond with a 200, a (Map ExamPartNumber ExamPartPoints) 
+    --      and a single (surname,displayName,matrikelnummer)
+
+    -- TODO if there are multiple matches, respond with a 400 and a set containing the matches (Ambiguous case)
+
+    -- TODO if there are no matches, respond with a 400 and an error message (no matches, Failure case)

From 650598fc22cf33d9eafb97a988db672d94cc3a48 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 15 Jan 2020 18:06:20 +0100
Subject: [PATCH 13/65] feat(exam-correct): upsert exam part results (TODO)

---
 .../src/utils/exam-correct/exam-correct.js    | 12 ++--
 src/Handler/Exam/Correct.hs                   | 58 +++++++++++--------
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 15f15bf2c..08b679767 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -1,5 +1,6 @@
 import { Utility } from '../../core/utility';
 import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-manager';
+import { HttpClient } from '../../services/http-client/http-client';
 
 import './exam-correct.sass';
 
@@ -135,10 +136,13 @@ export class ExamCorrect {
     const url = EXAM_CORRECT_URL_POST;
     const headers = {
       'X-XSRF-TOKEN': Cookies.get('XSRF-TOKEN'),
+      'Content-Type': HttpClient.ACCEPT.JSON,
+      'Accept': HttpClient.ACCEPT.JSON,
     };
     const body = {
-      participant: participant,
+      name: participant,
       results: results,
+      op: true,
     };
 
     console.log('body', body);
@@ -146,10 +150,10 @@ export class ExamCorrect {
     this._app.httpClient.post({
       url: url,
       headers: headers,
-      body: body,
+      body: JSON.stringify(body),
     }).then(
-    //  (response) => response.json()
-    //).then(
+      (response) => response.json()
+    ).then(
       (response) => this._processResponse(response, participant)
     ).catch((error) => {
       console.error('Error while processing response', error);
diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 8b157dbde..141fee1ea 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -20,7 +20,7 @@ data CorrectInterfaceUser
     , ciuDisplayName :: Text
     , ciuMatNr       :: Maybe UserMatriculation
     , ciuId          :: CryptoUUIDUser
-    }
+    } deriving (Eq,Ord)
 deriveJSON defaultOptions
   { fieldLabelModifier = camelToPathPiece' 1
   } ''CorrectInterfaceUser
@@ -43,7 +43,7 @@ data CorrectInterfaceResponse
 deriveJSON defaultOptions
   { constructorTagModifier = camelToPathPiece' 3
   , fieldLabelModifier     = camelToPathPiece' 1
-  , sumEncoding            = TaggedObject "status" "result"
+  , sumEncoding            = TaggedObject "status" "results"
   } ''CorrectInterfaceResponse
 -- E.g.: { "status": "success", "user-ident": "Max Musterstudent", "user-matrikelnummer": "123", "results": { "1a": null, "2a": 7, "2c3.5": 12 } }
 
@@ -51,7 +51,7 @@ data CorrectInterfaceRequest
   = CorrectInterfaceRequest
     { ciqName        :: Text
     , ciqResults     :: Map ExamPartNumber (Maybe Points)
-    , ciqNoOp        :: Bool
+    , ciqOp          :: Bool  -- not no-op
     }
 deriveJSON defaultOptions
   { fieldLabelModifier     = camelToPathPiece' 1
@@ -87,19 +87,17 @@ getECorrectR tid ssh csh examn = do
 
 postECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Value
 postECorrectR tid ssh csh examn = do
-  now <- liftIO getCurrentTime
-  mUid <- maybeAuthId
   MsgRenderer mr <- getMsgRenderer
 
-  CorrectInterfaceRequest{ciqName,ciqResults,ciqNoOp} <- requireCheckJsonBody
+  CorrectInterfaceRequest{ciqName,ciqResults,ciqOp} <- requireCheckJsonBody
 
   participantMatches <- runDB $ do
     Entity eId _ <- fetchExam tid ssh csh examn
     E.select . E.from $ \(examRegistration `E.InnerJoin` user) -> do
-      E.on $ examRegistration E.^. ExamRegistrationUser E.==. user
+      E.on $ examRegistration E.^. ExamRegistrationUser E.==. user E.^. UserId
       E.where_ $ examRegistration E.^. ExamRegistrationExam E.==. E.val eId
-        E.&&. ( user E.^. UserMatrikelnummer E.==. E.val ciqName
-          E.||. user E.^. UserMatrikelnummer `E.hasInfix` E.val ciqName
+        E.&&. ( user E.^. UserMatrikelnummer E.==. E.val (Just ciqName)
+          E.||. user E.^. UserMatrikelnummer `E.hasInfix` E.val (Just ciqName)
           E.||. user E.^. UserSurname E.==. E.val ciqName
           E.||. user E.^. UserSurname `E.hasInfix` E.val ciqName
           E.||. user E.^. UserFirstName E.==. E.val ciqName
@@ -109,7 +107,7 @@ postECorrectR tid ssh csh examn = do
       return user
 
   let
-    usersToResponse = traverse $ \user@(Entity uid User{..}) -> do
+    userToResponse (Entity uid User{..}) = do
       uuid <- encrypt uid
       return CorrectInterfaceUser
         { ciuSurname     = userSurname
@@ -119,15 +117,30 @@ postECorrectR tid ssh csh examn = do
         }
 
   if
-    | ciqNoOp -> do
-      users <- usersToResponse participantMatches
+    | not ciqOp -> do
+      users <- traverse userToResponse participantMatches
       returnJson $ CorrectInterfaceResponseNoOp
         { cirnUsers     = Set.fromList users
         }
-    | [match] <- participantMatches -> do
-      -- TODO upsert results
-      -- TODO log to Transaction Log
-      [user] <- usersToResponse participantMatches
+    | [match@(Entity uid _)] <- participantMatches -> do
+      runDB $ do
+        Entity eId _ <- fetchExam tid ssh csh examn
+        iforM_ ciqResults $ \partNumber mPartResult -> do
+          examPartId <- getKeyBy404 $ UniqueExamPartNumber eId partNumber
+          mOldResult <- getBy $ UniqueExamPartResult examPartId uid
+          unless (fmap (examPartResultResult . entityVal) mOldResult /= mPartResult) $ do
+            let partResult = maybe 0.00 (\p -> ExamPartResultResult p) mPartResult
+            now <- liftIO getCurrentTime
+            upsert ExamPartResult
+              { examPartResultExamPart    = examPartId
+              , examPartResultUser        = uid
+              , examPartResultResult      = partResult
+              , examPartResultLastChanged = now
+              }
+              [ ExamPartResultResult =. partResult
+              ]
+            audit $ TransactionExamPartResultEdit examPartId uid
+      user <- userToResponse match
       returnJson $ CorrectInterfaceResponseSuccess
         { cirsUser      = user
         , cirsResults   = ciqResults
@@ -136,16 +149,13 @@ postECorrectR tid ssh csh examn = do
       { cirfMessage     = mr MsgExamCorrectErrorNoMatchingParticipants
       }
     | otherwise -> do
-      users <- usersToResponse participantMatches
+      users <- traverse userToResponse participantMatches
       returnJson $ CorrectInterfaceResponseAmbiguous
         { ciraMessage     = mr MsgExamCorrectErrorMultipleMatchingParticipants
         , ciraUsers       = Set.fromList users
         }
 
-    -- TODO if the request is a noop, respond with a 200 and the matches
-    -- TODO if there is exactly one match, respond with a 200, a (Map ExamPartNumber ExamPartPoints) 
-    --      and a single (surname,displayName,matrikelnummer)
-
-    -- TODO if there are multiple matches, respond with a 400 and a set containing the matches (Ambiguous case)
-
-    -- TODO if there are no matches, respond with a 400 and an error message (no matches, Failure case)
+    -- TODO if the request is a noop, respond with a 200
+    -- TODO if there is exactly one match, respond with a 200
+    -- TODO if there are multiple matches, respond with a 400
+    -- TODO if there are no matches, respond with a 400

From 6837c44b7f40bd4544e75a91a70f6722dc3d5ea7 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Mon, 20 Jan 2020 09:41:23 +0100
Subject: [PATCH 14/65] feat(exam-correct): single runDB in POST handler; more
 response handling

---
 .../src/utils/exam-correct/exam-correct.js    |  51 ++++--
 src/Handler/Exam/Correct.hs                   | 146 ++++++++++--------
 2 files changed, 126 insertions(+), 71 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 08b679767..45f967ee7 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -99,8 +99,6 @@ export class ExamCorrect {
     // abort send if there are no results (after validation)
     if (Object.keys(results).length <= 0) return;
 
-    console.log('input validated, proceeding', participant, results);
-
     // TODO create and use template for this
     const correctionRow = document.createElement('TR');
     correctionRow.classList.add('table__row');
@@ -145,8 +143,6 @@ export class ExamCorrect {
       op: true,
     };
 
-    console.log('body', body);
-
     this._app.httpClient.post({
       url: url,
       headers: headers,
@@ -170,19 +166,35 @@ export class ExamCorrect {
         if (participantIdent === participant) {
           let faIcon, ecClass;
           switch (response.status) {
+            // TODO fetch update time from response and replace
             case 'success':
-              // TODO replace loading spinner class with fontawesome tick mark icon
-              // TODO replace participant identifier with participant from response
               faIcon = 'fa-check';
               ecClass = 'exam-correct--success';
+              if (response.user) {
+                participantElem.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, response.user.id);
+                participantElem.innerHTML = '';
+                formatUser(participantElem, response.user);
+              }
+              // TODO replace results with results from response
+              // TODO set edit button visibility
               break;
-            case 'error':
-              // TODO replace loading spinner class with fontawesome error icon
-              // TODO show tooltip with error message?
+            case 'ambiguous':
+              // TODO show tooltip with error message
+              // TODO set edit button visibility
+              faIcon = 'fa-times';
+              ecClass = 'exam-correct--error';
+              // TODO show users
+              if (response.users) {
+                showUsers(participantElem, response.users);
+              }
+              break;
+            case 'failure':
               faIcon = 'fa-times';
               ecClass = 'exam-correct--error';
               break;
             default:
+              // TODO show tooltip with 'invalid response'
+              // TODO set edit button visibility
               console.error('Invalid response');
               faIcon = 'fa-times';
               ecClass = 'exam-correct--error';
@@ -212,3 +224,24 @@ export class ExamCorrect {
 function clearInput(inputElement) {
   inputElement.value = null;
 }
+
+function formatUser(elem, user) {
+  if (user && user['display-name'] && user['surname']) {
+    elem.innerHTML += user['display-name'].replace(new RegExp(user['surname']), `<strong>${user['surname']}</strong>`) + (user['mat-nr'] ? ` (${user['mat-nr']})` : '');
+  } else {
+    console.error('Unable to format invalid user response');
+  }
+}
+
+// TODO better name
+function showUsers(elem, users) {
+  elem.innerHTML = '';
+  if (users) {
+    for (const user of users) {
+      formatUser(elem, user);
+      elem.innerHTML += '<br/>';
+    }
+  } else {
+    console.error('Unable to show users from invalid response');
+  }
+}
diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 141fee1ea..1c8b798b1 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -29,6 +29,7 @@ data CorrectInterfaceResponse
   = CorrectInterfaceResponseSuccess
     { cirsUser       :: CorrectInterfaceUser
     , cirsResults    :: Map ExamPartNumber (Maybe Points)
+    , cirsTime       :: UTCTime
     }
   | CorrectInterfaceResponseAmbiguous
     { ciraUsers      :: Set CorrectInterfaceUser
@@ -85,77 +86,98 @@ getECorrectR tid ssh csh examn = do
     $(widgetFile "exam-correct")
 
 
-postECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Value
+postECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Void
 postECorrectR tid ssh csh examn = do
   MsgRenderer mr <- getMsgRenderer
 
   CorrectInterfaceRequest{ciqName,ciqResults,ciqOp} <- requireCheckJsonBody
 
-  participantMatches <- runDB $ do
+  response <- runDB $ do
     Entity eId _ <- fetchExam tid ssh csh examn
-    E.select . E.from $ \(examRegistration `E.InnerJoin` user) -> do
+
+    participantMatches <- E.select . E.from $ \(examRegistration `E.InnerJoin` user) -> do
       E.on $ examRegistration E.^. ExamRegistrationUser E.==. user E.^. UserId
       E.where_ $ examRegistration E.^. ExamRegistrationExam E.==. E.val eId
-        E.&&. ( user E.^. UserMatrikelnummer E.==. E.val (Just ciqName)
-          E.||. user E.^. UserMatrikelnummer `E.hasInfix` E.val (Just ciqName)
-          E.||. user E.^. UserSurname E.==. E.val ciqName
-          E.||. user E.^. UserSurname `E.hasInfix` E.val ciqName
-          E.||. user E.^. UserFirstName E.==. E.val ciqName
-          E.||. user E.^. UserFirstName `E.hasInfix` E.val ciqName
-          E.||. user E.^. UserDisplayName E.==. E.val ciqName
-          E.||. user E.^. UserDisplayName `E.hasInfix` E.val ciqName )
+      E.where_ $ user E.^. UserMatrikelnummer E.==. E.val (Just ciqName)
+           E.||. user E.^. UserMatrikelnummer `E.hasInfix` E.val (Just ciqName)
+           E.||. user E.^. UserSurname E.==. E.val ciqName
+           E.||. user E.^. UserSurname `E.hasInfix` E.val ciqName
+           E.||. user E.^. UserFirstName E.==. E.val ciqName
+           E.||. user E.^. UserFirstName `E.hasInfix` E.val ciqName
+           E.||. user E.^. UserDisplayName E.==. E.val ciqName
+           E.||. user E.^. UserDisplayName `E.hasInfix` E.val ciqName
       return user
 
+    let
+      userToResponse (Entity uid User{..}) = do
+        uuid <- encrypt uid
+        return CorrectInterfaceUser
+          { ciuSurname     = userSurname
+          , ciuDisplayName = userDisplayName
+          , ciuMatNr       = userMatrikelnummer
+          , ciuId          = uuid
+          }
+
+    if
+      -- on no-op request, answer with 200 and a set of all participant matches
+      | not ciqOp -> do
+        users <- traverse userToResponse participantMatches
+        return CorrectInterfaceResponseNoOp
+          { cirnUsers = Set.fromList users
+          }
+
+      -- on match with exactly one exam participant, insert results and answer with 200
+      | [match@(Entity uid _)] <- participantMatches -> do
+        now <- liftIO getCurrentTime
+        newExamPartResults <- iforM ciqResults $ \partNumber mPartResult -> do
+            examPartId <- getKeyBy404 $ UniqueExamPartNumber eId partNumber
+            mOldResult <- getBy $ UniqueExamPartResult examPartId uid
+            if
+              | Just (Entity oldId _) <- mOldResult, is _Nothing mPartResult -> do
+                delete oldId
+                audit $ TransactionExamPartResultDeleted examPartId uid
+                return Nothing
+              | Just partResult <- mPartResult
+              , fmap (examPartResultResult . entityVal) mOldResult /= fmap ExamAttended mPartResult -> do
+                newExamPartResult <- upsert ExamPartResult
+                  { examPartResultExamPart    = examPartId
+                  , examPartResultUser        = uid
+                  , examPartResultResult      = ExamAttended partResult
+                  , examPartResultLastChanged = now
+                  }
+                  [ ExamPartResultResult      =. ExamAttended partResult
+                  , ExamPartResultLastChanged =. now
+                  ]
+                audit $ TransactionExamPartResultEdit examPartId uid
+                return $ newExamPartResult ^? _entityVal . _examPartResultResult . _ExamAttended
+              | otherwise -> return Nothing
+        user <- userToResponse match
+        return CorrectInterfaceResponseSuccess
+          { cirsUser    = user
+          , cirsResults = newExamPartResults
+          , cirsTime    = now
+          }
+
+      -- on match with no exam participant, answer with 400
+      | [] <- participantMatches -> return CorrectInterfaceResponseFailure
+        { cirfMessage   = mr MsgExamCorrectErrorNoMatchingParticipants
+        }
+
+      -- on match with multiple exam participants, answer with 400 and a set of all matches
+      | otherwise -> do
+        users <- traverse userToResponse participantMatches
+        return CorrectInterfaceResponseAmbiguous
+          { ciraMessage = mr MsgExamCorrectErrorMultipleMatchingParticipants
+          , ciraUsers   = Set.fromList users
+          }
+  
   let
-    userToResponse (Entity uid User{..}) = do
-      uuid <- encrypt uid
-      return CorrectInterfaceUser
-        { ciuSurname     = userSurname
-        , ciuDisplayName = userDisplayName
-        , ciuMatNr       = userMatrikelnummer
-        , ciuId          = uuid
-        }
+    responseStatus = case response of
+      CorrectInterfaceResponseSuccess{} -> ok200
+      CorrectInterfaceResponseNoOp{}    -> ok200
+      _                                 -> badRequest400
 
-  if
-    | not ciqOp -> do
-      users <- traverse userToResponse participantMatches
-      returnJson $ CorrectInterfaceResponseNoOp
-        { cirnUsers     = Set.fromList users
-        }
-    | [match@(Entity uid _)] <- participantMatches -> do
-      runDB $ do
-        Entity eId _ <- fetchExam tid ssh csh examn
-        iforM_ ciqResults $ \partNumber mPartResult -> do
-          examPartId <- getKeyBy404 $ UniqueExamPartNumber eId partNumber
-          mOldResult <- getBy $ UniqueExamPartResult examPartId uid
-          unless (fmap (examPartResultResult . entityVal) mOldResult /= mPartResult) $ do
-            let partResult = maybe 0.00 (\p -> ExamPartResultResult p) mPartResult
-            now <- liftIO getCurrentTime
-            upsert ExamPartResult
-              { examPartResultExamPart    = examPartId
-              , examPartResultUser        = uid
-              , examPartResultResult      = partResult
-              , examPartResultLastChanged = now
-              }
-              [ ExamPartResultResult =. partResult
-              ]
-            audit $ TransactionExamPartResultEdit examPartId uid
-      user <- userToResponse match
-      returnJson $ CorrectInterfaceResponseSuccess
-        { cirsUser      = user
-        , cirsResults   = ciqResults
-        }
-    | [] <- participantMatches -> returnJson $ CorrectInterfaceResponseFailure
-      { cirfMessage     = mr MsgExamCorrectErrorNoMatchingParticipants
-      }
-    | otherwise -> do
-      users <- traverse userToResponse participantMatches
-      returnJson $ CorrectInterfaceResponseAmbiguous
-        { ciraMessage     = mr MsgExamCorrectErrorMultipleMatchingParticipants
-        , ciraUsers       = Set.fromList users
-        }
-
-    -- TODO if the request is a noop, respond with a 200
-    -- TODO if there is exactly one match, respond with a 200
-    -- TODO if there are multiple matches, respond with a 400
-    -- TODO if there are no matches, respond with a 400
+  whenM acceptsJson $
+    sendResponseStatus responseStatus $ toJSON response
+  
+  redirect $ CExamR tid ssh csh examn EShowR

From 431d0046658f6f096fb3bf4c11acba0337f10629 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Mon, 20 Jan 2020 11:11:14 +0100
Subject: [PATCH 15/65] feat(exam-correct): validate user input stub

---
 .../src/utils/exam-correct/exam-correct.js    | 153 ++++++++++++------
 records.json                                  |   2 +-
 templates/exam-correct.hamlet                 |   3 +-
 3 files changed, 108 insertions(+), 50 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 45f967ee7..70a9bdb63 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -9,13 +9,20 @@ import moment from 'moment';
 
 
 const EXAM_CORRECT_URL_POST = 'correct';
+const EXAM_CORRECT_HEADERS = {
+  'X-XSRF-TOKEN': Cookies.get('XSRF-TOKEN'),
+  'Content-Type': HttpClient.ACCEPT.JSON,
+  'Accept':       HttpClient.ACCEPT.JSON,
+};
+
 
 const EXAM_CORRECT_IDENT = 'uw-exam-correct';
 const EXAM_CORRECT_PART_INPUT_ATTR = 'uw-exam-correct--part-input';
 const EXAM_CORRECT_SEND_BTN_ID = 'exam-correct__send-btn';
-const EXAM_CORRECT_PARTICIPANT_INPUT_ID = 'exam-correct__participant';
+const EXAM_CORRECT_PARTICIPANT_INPUT_ID = 'exam-correct__user';
+const EXAM_CORRECT_USER_INPUT_CANDIDATES_ID = 'exam-correct__user-candidates';
 const EXAM_CORRECT_INPUT_BODY_ID = 'exam-correct__new';
-const EXAM_CORRECT_PARTICIPANT_ATTR = 'exam-correct--participant';
+const EXAM_CORRECT_PARTICIPANT_ATTR = 'exam-correct--user';
 
 const INPUT_EMPTY_CLASS = 'input--invalid';
 
@@ -33,7 +40,8 @@ export class ExamCorrect {
   _element;
 
   _sendBtn;
-  _participantInput;
+  _userInput;
+  _userInputCandidates;
   _partInputs;
 
   constructor(element, app) {
@@ -48,40 +56,65 @@ export class ExamCorrect {
     this._element = element;
     this._app = app;
     this._sendBtn = document.getElementById(EXAM_CORRECT_SEND_BTN_ID);
-    this._participantInput = document.getElementById(EXAM_CORRECT_PARTICIPANT_INPUT_ID);
+    this._userInput = document.getElementById(EXAM_CORRECT_PARTICIPANT_INPUT_ID);
+    this._userInputCandidates = document.getElementById(EXAM_CORRECT_USER_INPUT_CANDIDATES_ID);
     this._partInputs = [...this._element.querySelectorAll(`input[${EXAM_CORRECT_PART_INPUT_ATTR}]`)];
 
     if (this._sendBtn)
       this._sendBtn.addEventListener('click', this._sendCorrectionHandler.bind(this));
     else console.error('ExamCorrect utility could not detect send button!');
 
-    if (this._participantInput)
-      this._participantInput.addEventListener('focusout', this._validateParticipantInput.bind(this));
-    else throw new Error('ExamCorrect utility could not detect participant input!');
+    if (this._userInput)
+      this._userInput.addEventListener('focusout', this._validateUserInput.bind(this));
+    else throw new Error('ExamCorrect utility could not detect user input!');
+
+    if (!this._userInputCandidates) {
+      throw new Error('ExamCorrect utility could not detect user input candidate list!');
+    }
   }
 
   destroy() {
     this._sendBtn.removeEventListener('click', this._sendCorrectionHandler);
-    this._participantInput.removeEventListener('change', this._validateParticipantInput);
-    this._participantInput.removeEventListener('input', this._removeInputEmptyClassHandler);
+    this._userInput.removeEventListener('change', this._validateUserInput);
+    this._userInput.removeEventListener('input', this._removeInputEmptyClassHandler);
   }
 
-  _validateParticipantInput(event) {
-    console.log('WIP _validateParticipantInput', event);
+  _validateUserInput() {
+    const user = this._userInput.value;
+
+    if (!user) return;
+
+    const body = {
+      name:    user,
+      results: {},
+      op:      false,
+    };
+
+    this._app.httpClient.post({
+      url: EXAM_CORRECT_URL_POST,
+      headers: EXAM_CORRECT_HEADERS,
+      body: JSON.stringify(body),
+    }).then(
+      (response) => response.json()
+    ).then(
+      (response) => this._processResponse(response, user)
+    ).catch((error) => {
+      console.error('Error while validating user input', error);
+    });
   }
 
   _sendCorrectionHandler(event) {
     console.log('WIP _sendCorrectionHandler', event);
 
-    // refocus participant input element for convenience
-    this._participantInput.focus();
+    // refocus user input element for convenience
+    this._userInput.focus();
 
-    const participant = this._participantInput.value;
+    const user = this._userInput.value;
 
-    // abort send if the participant input is empty
-    if (!participant) {
-      this._participantInput.classList.add(INPUT_EMPTY_CLASS);
-      this._participantInput.addEventListener('input', this._removeInputEmptyClassHandler.bind(this), { once: true });
+    // abort send if the user input is empty
+    if (!user) {
+      this._userInput.classList.add(INPUT_EMPTY_CLASS);
+      this._userInput.addEventListener('input', this._removeInputEmptyClassHandler.bind(this), { once: true });
       return;
     }
 
@@ -106,9 +139,9 @@ export class ExamCorrect {
     const now = moment();
     dateTD.appendChild(document.createTextNode(now.format(MOMENT_FORMAT)));
     dateTD.setAttribute('date', moment());
-    const participantTD = document.createElement('TD');
-    participantTD.appendChild(document.createTextNode(participant));
-    participantTD.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, participant);
+    const userTD = document.createElement('TD');
+    userTD.appendChild(document.createTextNode(user));
+    userTD.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, user);
     const partTDs = this._partInputs.map((input) => {
       const partTD = document.createElement('TD');
       const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
@@ -120,7 +153,7 @@ export class ExamCorrect {
     const statusDiv = document.createElement('DIV');
     statusDiv.classList.add('exam-correct--loading');
     statusTD.appendChild(statusDiv);
-    [dateTD,participantTD,...partTDs, statusTD].forEach((td) => {
+    [dateTD,userTD,...partTDs, statusTD].forEach((td) => {
       td.classList.add('table__td');
       correctionRow.appendChild(td);
     });
@@ -129,41 +162,65 @@ export class ExamCorrect {
 
     // clear input values on validation success
     // TODO only clear input on post success
-    [this._participantInput, ...this._partInputs].forEach(clearInput);
+    [this._userInput, ...this._partInputs].forEach(clearInput);
 
-    const url = EXAM_CORRECT_URL_POST;
-    const headers = {
-      'X-XSRF-TOKEN': Cookies.get('XSRF-TOKEN'),
-      'Content-Type': HttpClient.ACCEPT.JSON,
-      'Accept': HttpClient.ACCEPT.JSON,
-    };
     const body = {
-      name: participant,
+      name: user,
       results: results,
       op: true,
     };
 
     this._app.httpClient.post({
-      url: url,
-      headers: headers,
+      url: EXAM_CORRECT_URL_POST,
+      headers: EXAM_CORRECT_HEADERS,
       body: JSON.stringify(body),
     }).then(
       (response) => response.json()
     ).then(
-      (response) => this._processResponse(response, participant)
+      (response) => this._processResponse(response, user)
     ).catch((error) => {
       console.error('Error while processing response', error);
     });
   }
 
-  _processResponse(response, participant) {
-    console.log('WIP ExamCorrect._processResponse', response, participant);
-    
+  _processResponse(response, user) {
+    console.log('WIP _processResponse', response, user);
+
     if (response) {
+      if (response.status === 'no-op') {
+        if (response.users) {
+          // TODO directly replace input value and add attr if list contains only one element
+
+          // TODO add event handler on links -> display name as input value and set id as attribute
+          // TODO how to destroy candidate handlers?
+          response.users.forEach((userCandidate) => {
+            const candidateItem = document.createElement('li');
+            userAsInnerHTML(candidateItem, userCandidate);
+            candidateItem.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, userCandidate.id);
+            
+            const acceptCandidateHandler = () => {
+              console.log('candidate accepted');
+              this._userInput.value = userCandidate['display-name'] || userCandidate.surname || userCandidate['mat-nr'];
+              this._userInput.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, userCandidate.id);
+              
+              // remove all candidates
+              while (this._userInputCandidates.firstChild) {
+                this._userInputCandidates.removeChild(this._userInputCandidates.firstChild);
+              }
+            };
+            candidateItem.addEventListener('click', acceptCandidateHandler, { once: true });
+
+            this._userInputCandidates.appendChild(candidateItem);
+          });
+        }
+
+        return;
+      }
+    
       for (let row of [...this._element.rows]) {
-        const participantElem = row.cells.item(1);
-        const participantIdent = participantElem && participantElem.getAttribute(EXAM_CORRECT_PARTICIPANT_ATTR);
-        if (participantIdent === participant) {
+        const userElem = row.cells.item(1);
+        const userIdent = userElem && userElem.getAttribute(EXAM_CORRECT_PARTICIPANT_ATTR);
+        if (userIdent === user) {
           let faIcon, ecClass;
           switch (response.status) {
             // TODO fetch update time from response and replace
@@ -171,9 +228,9 @@ export class ExamCorrect {
               faIcon = 'fa-check';
               ecClass = 'exam-correct--success';
               if (response.user) {
-                participantElem.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, response.user.id);
-                participantElem.innerHTML = '';
-                formatUser(participantElem, response.user);
+                userElem.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, response.user.id);
+                userElem.innerHTML = '';
+                userAsInnerHTML(userElem, response.user);
               }
               // TODO replace results with results from response
               // TODO set edit button visibility
@@ -185,7 +242,7 @@ export class ExamCorrect {
               ecClass = 'exam-correct--error';
               // TODO show users
               if (response.users) {
-                showUsers(participantElem, response.users);
+                showUsers(userElem, response.users);
               }
               break;
             case 'failure':
@@ -211,10 +268,10 @@ export class ExamCorrect {
 
   _removeInputEmptyClassHandler() {
     console.log('removeclass');
-    if (this._participantInput.value) {
-      this._participantInput.classList.remove(INPUT_EMPTY_CLASS);
+    if (this._userInput.value) {
+      this._userInput.classList.remove(INPUT_EMPTY_CLASS);
     } else {
-      this._participantInput.addEventListener('input', this._removeInputEmptyClassHandler, { once: true });
+      this._userInput.addEventListener('input', this._removeInputEmptyClassHandler, { once: true });
     }
   }
 
@@ -225,7 +282,7 @@ function clearInput(inputElement) {
   inputElement.value = null;
 }
 
-function formatUser(elem, user) {
+function userAsInnerHTML(elem, user) {
   if (user && user['display-name'] && user['surname']) {
     elem.innerHTML += user['display-name'].replace(new RegExp(user['surname']), `<strong>${user['surname']}</strong>`) + (user['mat-nr'] ? ` (${user['mat-nr']})` : '');
   } else {
@@ -238,7 +295,7 @@ function showUsers(elem, users) {
   elem.innerHTML = '';
   if (users) {
     for (const user of users) {
-      formatUser(elem, user);
+      userAsInnerHTML(elem, user);
       elem.innerHTML += '<br/>';
     }
   } else {
diff --git a/records.json b/records.json
index 00fdc183c..9e7f6c03d 100644
--- a/records.json
+++ b/records.json
@@ -779,4 +779,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index ab6645ba5..b825dda09 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -26,7 +26,8 @@ $newline never
         <tr .table__row>
           <td .table__td>
           <td .table__td>
-            <input #exam-correct__participant type="text">
+            <input #exam-correct__user type="text">
+            <ul #exam-correct__user-candidates>
           $forall ExamPart{examPartNumber} <- examParts
             <td .table__td>
               ^{ptsInput examPartNumber}

From daf9eee1d3203da5cd7893431a3358a12e41941a Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Mon, 20 Jan 2020 17:02:40 +0100
Subject: [PATCH 16/65] feat(exam-correct): more on frontend name resolving

---
 .../src/utils/exam-correct/exam-correct.js    | 207 +++++++++++++-----
 .../src/utils/exam-correct/exam-correct.sass  |  19 +-
 messages/uniworx/de-de-formal.msg             |   6 +-
 templates/exam-correct.hamlet                 |   3 +-
 4 files changed, 170 insertions(+), 65 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 70a9bdb63..0e57d86e3 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -19,16 +19,29 @@ const EXAM_CORRECT_HEADERS = {
 const EXAM_CORRECT_IDENT = 'uw-exam-correct';
 const EXAM_CORRECT_PART_INPUT_ATTR = 'uw-exam-correct--part-input';
 const EXAM_CORRECT_SEND_BTN_ID = 'exam-correct__send-btn';
-const EXAM_CORRECT_PARTICIPANT_INPUT_ID = 'exam-correct__user';
+const EXAM_CORRECT_USER_INPUT_ID = 'exam-correct__user';
+const EXAM_CORRECT_USER_INPUT_STATUS_ID = 'exam-correct__user-status';
 const EXAM_CORRECT_USER_INPUT_CANDIDATES_ID = 'exam-correct__user-candidates';
 const EXAM_CORRECT_INPUT_BODY_ID = 'exam-correct__new';
-const EXAM_CORRECT_PARTICIPANT_ATTR = 'exam-correct--user';
+const EXAM_CORRECT_USER_ATTR = 'exam-correct--user-id';
+const EXAM_CORRECT_USER_DNAME_ATTR = 'exam-correct--user-dname';
 
 const INPUT_EMPTY_CLASS = 'input--invalid';
 
 // TODO get from settings
 const MOMENT_FORMAT = 'DD.MM.YY HH:mm:ss';
 
+// TODO 1 for debugging only, 3 would be a better choice
+const USER_VALIDATION_MIN_LENGTH = 1;
+
+const STATUS = {
+  NONE: 0,
+  SUCCESS: 1,
+  AMBIGUOUS: 2,
+  ERROR: 3,
+  LOADING: 4,
+};
+
 
 @Utility({
   selector: `table[${EXAM_CORRECT_IDENT}]`,
@@ -41,6 +54,7 @@ export class ExamCorrect {
 
   _sendBtn;
   _userInput;
+  _userInputStatus;
   _userInputCandidates;
   _partInputs;
 
@@ -56,7 +70,8 @@ export class ExamCorrect {
     this._element = element;
     this._app = app;
     this._sendBtn = document.getElementById(EXAM_CORRECT_SEND_BTN_ID);
-    this._userInput = document.getElementById(EXAM_CORRECT_PARTICIPANT_INPUT_ID);
+    this._userInput = document.getElementById(EXAM_CORRECT_USER_INPUT_ID);
+    this._userInputStatus = document.getElementById(EXAM_CORRECT_USER_INPUT_STATUS_ID);
     this._userInputCandidates = document.getElementById(EXAM_CORRECT_USER_INPUT_CANDIDATES_ID);
     this._partInputs = [...this._element.querySelectorAll(`input[${EXAM_CORRECT_PART_INPUT_ATTR}]`)];
 
@@ -68,6 +83,10 @@ export class ExamCorrect {
       this._userInput.addEventListener('focusout', this._validateUserInput.bind(this));
     else throw new Error('ExamCorrect utility could not detect user input!');
 
+    if (!this._userInputStatus) {
+      throw new Error('ExamCorrect utility could not detect user input status element!');
+    }
+
     if (!this._userInputCandidates) {
       throw new Error('ExamCorrect utility could not detect user input candidate list!');
     }
@@ -77,17 +96,34 @@ export class ExamCorrect {
     this._sendBtn.removeEventListener('click', this._sendCorrectionHandler);
     this._userInput.removeEventListener('change', this._validateUserInput);
     this._userInput.removeEventListener('input', this._removeInputEmptyClassHandler);
+    // TODO destroy handlers on user input candidate elements
   }
 
   _validateUserInput() {
     const user = this._userInput.value;
 
-    if (!user) return;
+    // do nothing in case of empty or too short input
+    if (!user || user.length < USER_VALIDATION_MIN_LENGTH) {
+      removeAllChildren(this._userInputCandidates);
+      setStatus(this._userInputStatus, STATUS.NONE);
+      return;
+    }
+
+    if (this._userInput.getAttribute(EXAM_CORRECT_USER_ATTR) !== null) {
+      if (this._userInput.value === this._userInput.getAttribute(EXAM_CORRECT_USER_DNAME_ATTR)) {
+        setStatus(this._userInputStatus, STATUS.NONE);
+        return;
+      } else {
+        this._userInput.removeAttribute(EXAM_CORRECT_USER_ATTR);
+      }
+    }
+
+    setStatus(this._userInputStatus, STATUS.LOADING);
 
     const body = {
-      name:    user,
+      name: user,
       results: {},
-      op:      false,
+      op: false,
     };
 
     this._app.httpClient.post({
@@ -103,9 +139,7 @@ export class ExamCorrect {
     });
   }
 
-  _sendCorrectionHandler(event) {
-    console.log('WIP _sendCorrectionHandler', event);
-
+  _sendCorrectionHandler() {
     // refocus user input element for convenience
     this._userInput.focus();
 
@@ -119,15 +153,19 @@ export class ExamCorrect {
     }
 
     const results = {};
-    this._partInputs.forEach((input) => {
-      if (input.value && !isNaN(input.value)) {
-        // TODO instead of ignoring NaN values, abort send and add error class to corresponding input
-        // (latter is optional)
+    for (const input of this._partInputs) {
+      if (input.value) {
+        if (isNaN(input.value)) {
+          input.classList.add('input--invalid');
+          input.focus();
+          return;
+        }
+
         const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
         if (!partKey) throw new Error('Exam part input without part attribute!');
         results[partKey] = parseFloat(input.value);
       }
-    });
+    }
 
     // abort send if there are no results (after validation)
     if (Object.keys(results).length <= 0) return;
@@ -141,7 +179,7 @@ export class ExamCorrect {
     dateTD.setAttribute('date', moment());
     const userTD = document.createElement('TD');
     userTD.appendChild(document.createTextNode(user));
-    userTD.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, user);
+    userTD.setAttribute(EXAM_CORRECT_USER_ATTR, user);
     const partTDs = this._partInputs.map((input) => {
       const partTD = document.createElement('TD');
       const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
@@ -163,6 +201,7 @@ export class ExamCorrect {
     // clear input values on validation success
     // TODO only clear input on post success
     [this._userInput, ...this._partInputs].forEach(clearInput);
+    setStatus(this._userInputStatus, STATUS.NONE);
 
     const body = {
       name: user,
@@ -189,29 +228,49 @@ export class ExamCorrect {
     if (response) {
       if (response.status === 'no-op') {
         if (response.users) {
-          // TODO directly replace input value and add attr if list contains only one element
+          // delete candidate list entries from previous requests
+          removeAllChildren(this._userInputCandidates);
 
-          // TODO add event handler on links -> display name as input value and set id as attribute
+          // show error if there are no matches for this input
+          if (response.users.length === 0) {
+            setStatus(this._userInputStatus, STATUS.FAILURE);
+            return;
+          }
+
+          // directly accept response if there is exactly one candidate (input not ambiguous)
+          if (response.users.length === 1) {
+            const candidate = response.users[0];
+            this._userInput.value = candidate['display-name'];
+            this._userInput.setAttribute(EXAM_CORRECT_USER_ATTR, candidate.id);
+            this._userInput.setAttribute(EXAM_CORRECT_USER_DNAME_ATTR, candidate['display-name']);
+            setStatus(this._userInputStatus, STATUS.SUCCESS);
+            return;
+          }
+
+          setStatus(this._userInputStatus, STATUS.AMBIGUOUS);
           // TODO how to destroy candidate handlers?
           response.users.forEach((userCandidate) => {
             const candidateItem = document.createElement('li');
-            userAsInnerHTML(candidateItem, userCandidate);
-            candidateItem.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, userCandidate.id);
+            candidateItem.innerHTML = userToHTML(userCandidate);
+            candidateItem.setAttribute(EXAM_CORRECT_USER_ATTR, userCandidate.id);
             
             const acceptCandidateHandler = () => {
-              console.log('candidate accepted');
               this._userInput.value = userCandidate['display-name'] || userCandidate.surname || userCandidate['mat-nr'];
-              this._userInput.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, userCandidate.id);
+              this._userInput.setAttribute(EXAM_CORRECT_USER_ATTR, userCandidate.id);
               
-              // remove all candidates
-              while (this._userInputCandidates.firstChild) {
-                this._userInputCandidates.removeChild(this._userInputCandidates.firstChild);
-              }
+              // remove all candidates on accept
+              removeAllChildren(this._userInputCandidates);
+
+              setStatus(this._userInputStatus, STATUS.SUCCESS);
+
+              // TODO focus first part result input element for convenience
             };
-            candidateItem.addEventListener('click', acceptCandidateHandler, { once: true });
+            candidateItem.addEventListener('click', acceptCandidateHandler);
 
             this._userInputCandidates.appendChild(candidateItem);
           });
+        } else {
+          setStatus(this._userInputStatus, STATUS.FAILURE);
         }
 
         return;
@@ -219,18 +278,16 @@ export class ExamCorrect {
     
       for (let row of [...this._element.rows]) {
         const userElem = row.cells.item(1);
-        const userIdent = userElem && userElem.getAttribute(EXAM_CORRECT_PARTICIPANT_ATTR);
+        const userIdent = userElem && userElem.getAttribute(EXAM_CORRECT_USER_ATTR);
         if (userIdent === user) {
-          let faIcon, ecClass;
+          let status = STATUS.ERROR;
           switch (response.status) {
             // TODO fetch update time from response and replace
             case 'success':
-              faIcon = 'fa-check';
-              ecClass = 'exam-correct--success';
+              status = STATUS.SUCCESS;
               if (response.user) {
-                userElem.setAttribute(EXAM_CORRECT_PARTICIPANT_ATTR, response.user.id);
-                userElem.innerHTML = '';
-                userAsInnerHTML(userElem, response.user);
+                userElem.setAttribute(EXAM_CORRECT_USER_ATTR, response.user.id);
+                userElem.innerHTML = userToHTML(response.user);
               }
               // TODO replace results with results from response
               // TODO set edit button visibility
@@ -238,27 +295,21 @@ export class ExamCorrect {
             case 'ambiguous':
               // TODO show tooltip with error message
               // TODO set edit button visibility
-              faIcon = 'fa-times';
-              ecClass = 'exam-correct--error';
-              // TODO show users
+              status = STATUS.AMBIGUOUS;
               if (response.users) {
-                showUsers(userElem, response.users);
+                this._showUserList(userElem, response.users);
               }
               break;
             case 'failure':
-              faIcon = 'fa-times';
-              ecClass = 'exam-correct--error';
+              status = STATUS.FAILURE;
               break;
             default:
               // TODO show tooltip with 'invalid response'
               // TODO set edit button visibility
               console.error('Invalid response');
-              faIcon = 'fa-times';
-              ecClass = 'exam-correct--error';
           }
           row.querySelectorAll('.exam-correct--loading').forEach((elem) => {
-            elem.classList.remove('exam-correct--loading');
-            elem.classList.add('fa', faIcon, ecClass);
+            setStatus(elem, status);
           });
           break;
         }
@@ -275,30 +326,76 @@ export class ExamCorrect {
     }
   }
 
+  // TODO better name
+  _showUserList(elem, users) {
+    if (users) {
+      removeAllChildren(elem);
+      const list = document.createElement('UL');
+      for (const user of users) {
+        const listItem = document.createElement('LI');
+        listItem.innerHTML = userToHTML(user);
+        listItem.setAttribute(EXAM_CORRECT_USER_ATTR, user.id);
+        listItem.setAttribute(EXAM_CORRECT_USER_DNAME_ATTR, user['display-name']);
+        // TODO destroy event handler
+        //const acceptCandidateHandler = () => {
+        //  elem.innerHTML = userToHTML(user);
+        //};
+        //listItem.addEventListener('click', acceptCandidateHandler);
+        list.appendChild(listItem);
+      }
+      elem.appendChild(list);
+    } else {
+      console.error('Unable to show users from invalid response');
+    }
+  }
+
 }
 
 // TODO move to general util section?
 function clearInput(inputElement) {
   inputElement.value = null;
 }
+function removeAllChildren(element) {
+  while (element.firstChild) {
+    element.removeChild(element.firstChild);
+  }
+}
 
-function userAsInnerHTML(elem, user) {
+
+function userToHTML(user) {
   if (user && user['display-name'] && user['surname']) {
-    elem.innerHTML += user['display-name'].replace(new RegExp(user['surname']), `<strong>${user['surname']}</strong>`) + (user['mat-nr'] ? ` (${user['mat-nr']})` : '');
+    return user['display-name'].replace(new RegExp(user['surname']), `<strong>${user['surname']}</strong>`) + (user['mat-nr'] ? ` (${user['mat-nr']})` : '');
   } else {
     console.error('Unable to format invalid user response');
+    return '';
   }
 }
 
-// TODO better name
-function showUsers(elem, users) {
-  elem.innerHTML = '';
-  if (users) {
-    for (const user of users) {
-      userAsInnerHTML(elem, user);
-      elem.innerHTML += '<br/>';
-    }
-  } else {
-    console.error('Unable to show users from invalid response');
+function setStatus(elem, status) {
+  const successClasses = ['fas', 'fa-fw', 'fa-check', 'exam-correct--success'];
+  const ambiguousClasses = ['fas', 'fa-fw', 'fa-question', 'exam-correct--ambiguous'];
+  const errorClasses = ['fas', 'fa-fw', 'fa-times', 'exam-correct--error'];
+  const loadingClasses = ['fas', 'fa-fw', 'fa-spinner-third', 'exam-correct--loading'];
+
+  elem.classList.remove(...successClasses, ...ambiguousClasses, ...errorClasses, ...loadingClasses);
+
+  switch (status) {
+    case STATUS.NONE:
+      break;
+    case STATUS.SUCCESS:
+      elem.classList.add(...successClasses);
+      break;
+    case STATUS.AMBIGUOUS:
+      elem.classList.add(...ambiguousClasses);
+      break;
+    case STATUS.FAILURE:
+      elem.classList.add(...errorClasses);
+      break;
+    case STATUS.LOADING:
+      elem.classList.add(...loadingClasses);
+      break;
+    default:
+      console.error('Invalid user input status!');
   }
 }
+
diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index 63fd21145..821feecd2 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -1,18 +1,25 @@
-#exam-correct__participant.input--invalid
+input.input--invalid
   border: 2px solid var(--color-error)
 
+.exam-correct--input-status
+  $exam-correct--input-status-margin: 10px
+
+  input
+    width: calc(100% - 18em/14 - #{$exam-correct--input-status-margin})
+  i
+    margin-left: $exam-correct--input-status-margin
+
 .exam-correct--success
   color: var(--color-success)
 
+.exam-correct--ambiguous
+  color: var(--color-warning)
+
 .exam-correct--error
   color: var(--color-error)
 
+// TODO move to general app style
 .exam-correct--loading
-  border: 3px solid var(--color-grey-light)
-  border-top: 3px solid var(--color-primary)
-  border-radius: 50%
-  width: 20px
-  height: 20px
   animation: spin 2s linear infinite
 
 @keyframes spin
diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 88f55b4ec..e47822fed 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1405,8 +1405,8 @@ ExamCorrectHeadStatus: Status
 
 ExamCorrectButtonSend: Senden
 
-ExamCorrectErrorMultipleMatchingParticipants: Dem Identifikator konnten mehrere Pruefungsteilnehmer zugeordnet werden.
-ExamCorrectErrorNoMatchingParticipants: Dem Identifikator konnte kein Pruefungsteilnehmer zugeordnet werden.
+ExamCorrectErrorMultipleMatchingParticipants: Dem Identifikator konnten mehrere Prüfungsteilnehmer zugeordnet werden.
+ExamCorrectErrorNoMatchingParticipants: Dem Identifikator konnte kein Prüfungsteilnehmer zugeordnet werden.
 
 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
@@ -2289,4 +2289,4 @@ ExternalExamUserMustBeStaff: Sie selbst müssen stets assoziierte Person sein, f
 ExternalExamCourseExists: Der angegebene Kurs existiert im System. Prüfungen sollten daher direkt beim Kurs (statt extern) hinterlegt werden.
 ExternalExamExists coursen@CourseName examn@ExamName: Prüfung „#{examn}“ für Kurs „#{coursen}“ existiert bereits.
 ExternalExamCreated coursen@CourseName examn@ExamName: Prüfung „#{examn}“ für Kurs „#{coursen}“ erfolgreich angelegt.
-ExternalExamEdited coursen@CourseName examn@ExamName: Prüfung „#{examn}“ für Kurs „#{coursen}“ erfolgreich bearbeitet.
\ No newline at end of file
+ExternalExamEdited coursen@CourseName examn@ExamName: Prüfung „#{examn}“ für Kurs „#{coursen}“ erfolgreich bearbeitet.
diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index b825dda09..9abfdc8d7 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -25,8 +25,9 @@ $newline never
       <tbody #exam-correct__new>
         <tr .table__row>
           <td .table__td>
-          <td .table__td>
+          <td .table__td .exam-correct--input-status>
             <input #exam-correct__user type="text">
+            <i #exam-correct__user-status .fas .fa-fw>
             <ul #exam-correct__user-candidates>
           $forall ExamPart{examPartNumber} <- examParts
             <td .table__td>

From d8a080d74d4d8ebe78c864daedcd0d4b0b6114d4 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 21 Jan 2020 16:44:35 +0100
Subject: [PATCH 17/65] feat(exam-correct): server date handling in frontend
 and refactor

---
 .../src/utils/exam-correct/exam-correct.js    | 36 +++++++++++--------
 .../src/utils/exam-correct/exam-correct.sass  |  4 +++
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 0e57d86e3..426a7952e 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -111,19 +111,18 @@ export class ExamCorrect {
 
     if (this._userInput.getAttribute(EXAM_CORRECT_USER_ATTR) !== null) {
       if (this._userInput.value === this._userInput.getAttribute(EXAM_CORRECT_USER_DNAME_ATTR)) {
-        setStatus(this._userInputStatus, STATUS.NONE);
+        setStatus(this._userInputStatus, STATUS.SUCCESS);
         return;
       } else {
         this._userInput.removeAttribute(EXAM_CORRECT_USER_ATTR);
+        this._userInput.removeAttribute(EXAM_CORRECT_USER_DNAME_ATTR);
       }
     }
 
     setStatus(this._userInputStatus, STATUS.LOADING);
 
     const body = {
-      name: user,
-      results: {},
-      op: false,
+      user: user,
     };
 
     this._app.httpClient.post({
@@ -143,10 +142,11 @@ export class ExamCorrect {
     // refocus user input element for convenience
     this._userInput.focus();
 
+    const userId = this._userInput.getAttribute(EXAM_CORRECT_USER_ATTR);
     const user = this._userInput.value;
 
     // abort send if the user input is empty
-    if (!user) {
+    if (!user && !userId) {
       this._userInput.classList.add(INPUT_EMPTY_CLASS);
       this._userInput.addEventListener('input', this._removeInputEmptyClassHandler.bind(this), { once: true });
       return;
@@ -177,6 +177,7 @@ export class ExamCorrect {
     const now = moment();
     dateTD.appendChild(document.createTextNode(now.format(MOMENT_FORMAT)));
     dateTD.setAttribute('date', moment());
+    dateTD.classList.add('exam-correct--local-time');
     const userTD = document.createElement('TD');
     userTD.appendChild(document.createTextNode(user));
     userTD.setAttribute(EXAM_CORRECT_USER_ATTR, user);
@@ -198,15 +199,13 @@ export class ExamCorrect {
     const tableBody = this._element.querySelector(`tbody:not(#${EXAM_CORRECT_INPUT_BODY_ID})`);
     tableBody.insertBefore(correctionRow, tableBody.firstChild);
 
-    // clear input values on validation success
-    // TODO only clear input on post success
-    [this._userInput, ...this._partInputs].forEach(clearInput);
-    setStatus(this._userInputStatus, STATUS.NONE);
+    // clear inputs on validation success
+    this._clearUserInput();
+    this._partInputs.forEach(clearInput);
 
     const body = {
-      name: user,
+      user: userId || user,
       results: results,
-      op: true,
     };
 
     this._app.httpClient.post({
@@ -223,8 +222,6 @@ export class ExamCorrect {
   }
 
   _processResponse(response, user) {
-    console.log('WIP _processResponse', response, user);
-
     if (response) {
       if (response.status === 'no-op') {
         if (response.users) {
@@ -288,6 +285,10 @@ export class ExamCorrect {
               if (response.user) {
                 userElem.setAttribute(EXAM_CORRECT_USER_ATTR, response.user.id);
                 userElem.innerHTML = userToHTML(response.user);
+                const timeElem = row.cells.item(0);
+                timeElem.innerHTML = moment(response.time).format(MOMENT_FORMAT);
+                timeElem.classList.remove('exam-correct--local-time');
+                // TODO special style for server time?
               }
               // TODO replace results with results from response
               // TODO set edit button visibility
@@ -318,7 +319,6 @@ export class ExamCorrect {
   }
 
   _removeInputEmptyClassHandler() {
-    console.log('removeclass');
     if (this._userInput.value) {
       this._userInput.classList.remove(INPUT_EMPTY_CLASS);
     } else {
@@ -349,6 +349,14 @@ export class ExamCorrect {
     }
   }
 
+  _clearUserInput() {
+    removeAllChildren(this._userInputCandidates);
+    clearInput(this._userInput);
+    this._userInput.removeAttribute(EXAM_CORRECT_USER_ATTR);
+    this._userInput.removeAttribute(EXAM_CORRECT_USER_DNAME_ATTR);
+    setStatus(this._userInputStatus, STATUS.NONE);
+  }
+
 }
 
 // TODO move to general util section?
diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index 821feecd2..386ddf327 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -9,6 +9,10 @@ input.input--invalid
   i
     margin-left: $exam-correct--input-status-margin
 
+.exam-correct--local-time
+  color: var(--color-fontsec)
+  font-style: italic
+
 .exam-correct--success
   color: var(--color-success)
 

From 4a36a010f4bc0ea326f263c0ee77132843f03c73 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 21 Jan 2020 16:45:47 +0100
Subject: [PATCH 18/65] feat(exam-correct): request refactor and handling of
 sent uuids

---
 src/Handler/Exam/Correct.hs | 54 ++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 1c8b798b1..79d86b9d6 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -5,7 +5,8 @@ module Handler.Exam.Correct
 import Import
 
 import qualified Data.Set as Set
-import qualified Data.CaseInsensitive as CI (original)
+import qualified Data.CaseInsensitive as CI
+import qualified Data.Aeson as JSON
 
 import qualified Database.Esqueleto as E
 import qualified Database.Esqueleto.Utils as E
@@ -46,19 +47,20 @@ deriveJSON defaultOptions
   , fieldLabelModifier     = camelToPathPiece' 1
   , sumEncoding            = TaggedObject "status" "results"
   } ''CorrectInterfaceResponse
--- E.g.: { "status": "success", "user-ident": "Max Musterstudent", "user-matrikelnummer": "123", "results": { "1a": null, "2a": 7, "2c3.5": 12 } }
 
 data CorrectInterfaceRequest
   = CorrectInterfaceRequest
-    { ciqName        :: Text
-    , ciqResults     :: Map ExamPartNumber (Maybe Points)
-    , ciqOp          :: Bool  -- not no-op
+    { ciqUser        :: Either Text (CryptoID UUID (Key User))
+    , ciqResults     :: Maybe (NonNull (Map ExamPartNumber (Maybe Points)))
     }
-deriveJSON defaultOptions
-  { fieldLabelModifier     = camelToPathPiece' 1
-  } ''CorrectInterfaceRequest
--- E.g.: { "name": "max", "results": { "1a": null, "2c3.5": 9001.2 }}
- 
+
+instance FromJSON CorrectInterfaceRequest where
+  parseJSON = JSON.withObject "CorrectInterfaceRequest" $ \o -> do
+    ciqUser <- Right <$> o JSON..: "user" <|> Left <$> o JSON..: "user"
+    results <- o JSON..:? "results"
+    ciqResults <- for results $ maybe (fail "Results may not be nullable") return . fromNullable
+    return CorrectInterfaceRequest{..}
+
 
 getECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
 getECorrectR tid ssh csh examn = do
@@ -90,22 +92,30 @@ postECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Vo
 postECorrectR tid ssh csh examn = do
   MsgRenderer mr <- getMsgRenderer
 
-  CorrectInterfaceRequest{ciqName,ciqResults,ciqOp} <- requireCheckJsonBody
+  CorrectInterfaceRequest{ciqUser,ciqResults} <- requireCheckJsonBody
 
   response <- runDB $ do
     Entity eId _ <- fetchExam tid ssh csh examn
+    euid <- traverse decrypt ciqUser
 
     participantMatches <- E.select . E.from $ \(examRegistration `E.InnerJoin` user) -> do
       E.on $ examRegistration E.^. ExamRegistrationUser E.==. user E.^. UserId
       E.where_ $ examRegistration E.^. ExamRegistrationExam E.==. E.val eId
-      E.where_ $ user E.^. UserMatrikelnummer E.==. E.val (Just ciqName)
-           E.||. user E.^. UserMatrikelnummer `E.hasInfix` E.val (Just ciqName)
-           E.||. user E.^. UserSurname E.==. E.val ciqName
-           E.||. user E.^. UserSurname `E.hasInfix` E.val ciqName
-           E.||. user E.^. UserFirstName E.==. E.val ciqName
-           E.||. user E.^. UserFirstName `E.hasInfix` E.val ciqName
-           E.||. user E.^. UserDisplayName E.==. E.val ciqName
-           E.||. user E.^. UserDisplayName `E.hasInfix` E.val ciqName
+
+      let
+        uidMatch   = either (const $ E.val False) (\uid -> user E.^. UserId E.==. E.val uid) euid
+        mUserIdent = euid ^? _Left
+      E.where_ $ uidMatch
+           E.||. user E.^. UserMatrikelnummer E.==. E.val mUserIdent
+           E.||. user E.^. UserMatrikelnummer `E.hasInfix` E.val mUserIdent
+           E.||. (case mUserIdent of
+            Just userIdent -> (user E.^. UserSurname E.==. E.val userIdent
+                        E.||. user E.^. UserSurname `E.hasInfix` E.val userIdent
+                        E.||. user E.^. UserFirstName E.==. E.val userIdent
+                        E.||. user E.^. UserFirstName `E.hasInfix` E.val userIdent
+                        E.||. user E.^. UserDisplayName E.==. E.val userIdent
+                        E.||. user E.^. UserDisplayName `E.hasInfix` E.val userIdent)
+            Nothing -> E.val False)
       return user
 
     let
@@ -120,16 +130,16 @@ postECorrectR tid ssh csh examn = do
 
     if
       -- on no-op request, answer with 200 and a set of all participant matches
-      | not ciqOp -> do
+      | is _Nothing ciqResults -> do
         users <- traverse userToResponse participantMatches
         return CorrectInterfaceResponseNoOp
           { cirnUsers = Set.fromList users
           }
 
       -- on match with exactly one exam participant, insert results and answer with 200
-      | [match@(Entity uid _)] <- participantMatches -> do
+      | [match@(Entity uid _)] <- participantMatches, Just results <- ciqResults -> do
         now <- liftIO getCurrentTime
-        newExamPartResults <- iforM ciqResults $ \partNumber mPartResult -> do
+        newExamPartResults <- iforM (toNullable results) $ \partNumber mPartResult -> do
             examPartId <- getKeyBy404 $ UniqueExamPartNumber eId partNumber
             mOldResult <- getBy $ UniqueExamPartResult examPartId uid
             if

From 890b3ff02589c2b1ae970f10f8009312feee6412 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 21 Jan 2020 16:46:23 +0100
Subject: [PATCH 19/65] chore: add -fobject-code as ghci option

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

diff --git a/ghci.sh b/ghci.sh
index ab5cf41bd..8fbb7aa1e 100755
--- a/ghci.sh
+++ b/ghci.sh
@@ -20,4 +20,4 @@ if [[ -d .stack-work-ghci ]]; then
     trap move-back EXIT
 fi
 
-stack ghci --flag uniworx:dev --flag uniworx:library-only ${@:-uniworx:lib}
+stack ghci --flag uniworx:dev --flag uniworx:library-only ${@:-uniworx:lib} --ghci-options -fobject-code

From e252be2fef3732f04b333a909860df985b786fd5 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 21 Jan 2020 18:49:53 +0100
Subject: [PATCH 20/65] feat(exam-correct): resend option on ambiguous entries
 (TODO refactor)

---
 .../src/utils/exam-correct/exam-correct.js    | 67 +++++++++++++++----
 1 file changed, 55 insertions(+), 12 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 426a7952e..a7b7612a2 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -162,7 +162,10 @@ export class ExamCorrect {
         }
 
         const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
-        if (!partKey) throw new Error('Exam part input without part attribute!');
+        if (!partKey) {
+          console.error('Error while parsing results: Could not detect exam part key attribute');
+          return;
+        }
         results[partKey] = parseFloat(input.value);
       }
     }
@@ -215,13 +218,13 @@ export class ExamCorrect {
     }).then(
       (response) => response.json()
     ).then(
-      (response) => this._processResponse(response, user)
+      (response) => this._processResponse(response, user, results)
     ).catch((error) => {
       console.error('Error while processing response', error);
     });
   }
 
-  _processResponse(response, user) {
+  _processResponse(response, user, results) {
     if (response) {
       if (response.status === 'no-op') {
         if (response.users) {
@@ -247,7 +250,7 @@ export class ExamCorrect {
           setStatus(this._userInputStatus, STATUS.AMBIGUOUS);
           // TODO how to destroy candidate handlers?
           response.users.forEach((userCandidate) => {
-            const candidateItem = document.createElement('li');
+            const candidateItem = document.createElement('LI');
             candidateItem.innerHTML = userToHTML(userCandidate);
             candidateItem.setAttribute(EXAM_CORRECT_USER_ATTR, userCandidate.id);
             
@@ -298,7 +301,7 @@ export class ExamCorrect {
               // TODO set edit button visibility
               status = STATUS.AMBIGUOUS;
               if (response.users) {
-                this._showUserList(userElem, response.users);
+                this._showUserList(row, response.users, results);
               }
               break;
             case 'failure':
@@ -327,9 +330,10 @@ export class ExamCorrect {
   }
 
   // TODO better name
-  _showUserList(elem, users) {
+  _showUserList(row, users, results) {
+    const userElem = row.cells.item(1);
     if (users) {
-      removeAllChildren(elem);
+      removeAllChildren(userElem);
       const list = document.createElement('UL');
       for (const user of users) {
         const listItem = document.createElement('LI');
@@ -337,18 +341,57 @@ export class ExamCorrect {
         listItem.setAttribute(EXAM_CORRECT_USER_ATTR, user.id);
         listItem.setAttribute(EXAM_CORRECT_USER_DNAME_ATTR, user['display-name']);
         // TODO destroy event handler
-        //const acceptCandidateHandler = () => {
-        //  elem.innerHTML = userToHTML(user);
-        //};
-        //listItem.addEventListener('click', acceptCandidateHandler);
+        const acceptCandidateHandler = () => {
+          userElem.innerHTML = userToHTML(user);
+          this._rowToRequest(row, listItem, results);
+        };
+        listItem.addEventListener('click', acceptCandidateHandler);
         list.appendChild(listItem);
       }
-      elem.appendChild(list);
+      userElem.appendChild(list);
     } else {
       console.error('Unable to show users from invalid response');
     }
   }
 
+  _rowToRequest(row, listItem, results) {
+    const now = moment();
+    const timeElem = row.cells.item(0);
+    timeElem.innerHTML = now.format(MOMENT_FORMAT);
+    timeElem.classList.add('exam-correct--local-time');
+    const userElem = row.cells.item(1);
+    const statusElem = row.querySelector('.exam-correct--ambiguous');
+
+    setStatus(statusElem, STATUS.LOADING);
+
+    const body = {
+      user: listItem.getAttribute(EXAM_CORRECT_USER_ATTR),
+      results: results,
+    };
+
+    this._app.httpClient.post({
+      url: EXAM_CORRECT_URL_POST,
+      headers: EXAM_CORRECT_HEADERS,
+      body: JSON.stringify(body),
+    }).then(
+      (response) => response.json()
+    ).then((response) => {
+      switch (response.status) {
+        case 'success':
+          userElem.innerHTML = userToHTML(response.user);
+          // TODO replace part results with results from server
+          timeElem.innerHTML = moment(response.time).format(MOMENT_FORMAT);
+          timeElem.classList.remove('exam-correct--local-time');
+          setStatus(statusElem, STATUS.SUCCESS);
+          break;
+        default:
+          // non-success response on request with a uuid => panic and ignore for now
+      }
+    }).catch((error) => {
+      console.error(error);
+    });
+  }
+
   _clearUserInput() {
     removeAllChildren(this._userInputCandidates);
     clearInput(this._userInput);

From 2e7bca6333deea697e98d4bd84a1aec6ef0c1f77 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 23 Jan 2020 20:41:35 +0100
Subject: [PATCH 21/65] fix(exam-correct): fix returning null if old and new
 results are equal

---
 src/Handler/Exam/Correct.hs | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 79d86b9d6..c1c095096 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -147,20 +147,25 @@ postECorrectR tid ssh csh examn = do
                 delete oldId
                 audit $ TransactionExamPartResultDeleted examPartId uid
                 return Nothing
-              | Just partResult <- mPartResult
-              , fmap (examPartResultResult . entityVal) mOldResult /= fmap ExamAttended mPartResult -> do
-                newExamPartResult <- upsert ExamPartResult
-                  { examPartResultExamPart    = examPartId
-                  , examPartResultUser        = uid
-                  , examPartResultResult      = ExamAttended partResult
-                  , examPartResultLastChanged = now
-                  }
-                  [ ExamPartResultResult      =. ExamAttended partResult
-                  , ExamPartResultLastChanged =. now
-                  ]
-                audit $ TransactionExamPartResultEdit examPartId uid
-                return $ newExamPartResult ^? _entityVal . _examPartResultResult . _ExamAttended
-              | otherwise -> return Nothing
+              | Just partResult <- mPartResult -> let
+                  mOld = (examPartResultResult . entityVal) <$> mOldResult
+                  mNew = ExamAttended <$> mPartResult
+                  resultVal = _entityVal . _examPartResultResult . _ExamAttended
+                in if
+                  | mOld /= mNew -> do
+                    newExamPartResult <- upsert ExamPartResult
+                      { examPartResultExamPart    = examPartId
+                      , examPartResultUser        = uid
+                      , examPartResultResult      = ExamAttended partResult
+                      , examPartResultLastChanged = now
+                      }
+                      [ ExamPartResultResult      =. ExamAttended partResult
+                      , ExamPartResultLastChanged =. now
+                      ]
+                    audit $ TransactionExamPartResultEdit examPartId uid
+                    return $ newExamPartResult ^? resultVal
+                  | otherwise -> return $ mOldResult ^? _Just . resultVal
+                | otherwise -> return Nothing
         user <- userToResponse match
         return CorrectInterfaceResponseSuccess
           { cirsUser    = user

From a7af7ad64b2f1b7ab2125b2d52d2cf163b76f47b Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 23 Jan 2020 20:42:14 +0100
Subject: [PATCH 22/65] chore(exam-correct): add header idents for cell indices

---
 templates/exam-correct.hamlet | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index 9abfdc8d7..672311742 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -2,16 +2,16 @@ $newline never
 
 <section>
   <div uw-hide-columns="exam-correct">
-    <table .table .table--striped uw-exam-correct=#{examCorrectIdent} uw-sort-table=#{examCorrectIdent}>
+    <table .table .table--striped table--hover uw-exam-correct=#{examCorrectIdent} uw-sort-table=#{examCorrectIdent}>
       <thead>
         <tr .table__row .table__row--head>
-          <th .table__th .sortable .sorted-desc uw-hide-column-header="date">
+          <th .table__th .sortable .sorted-desc uw-exam-correct-header="date" uw-hide-column-header="date">
             _{MsgExamCorrectHeadDate}
-          <th .table__th .sortable uw-hide-column-header="participant">
+          <th .table__th .sortable uw-exam-correct-header="user" uw-hide-column-header="user">
             _{MsgExamCorrectHeadParticipant}
             ^{iconTooltip participantHeadTooltip Nothing True}
           $forall ExamPart{examPartNumber,examPartName} <- examParts
-            <th .table__th .sortable uw-hide-column-header=#{examPartNumber}>
+            <th .table__th .sortable uw-exam-correct-header=#{examPartNumber} uw-hide-column-header=#{examPartNumber}>
               $maybe name <- examPartName
                 <span .tooltip>
                   <span>
@@ -20,13 +20,13 @@ $newline never
                     _{MsgExamCorrectHeadPartName name}
               $nothing
                 _{MsgExamCorrectHeadPart examPartNumber}
-          <th .table__th .sortable uw-hide-column-header="status">
+          <th .table__th .sortable uw-exam-correct-header="status" uw-hide-column-header="status">
             _{MsgExamCorrectHeadStatus}
       <tbody #exam-correct__new>
         <tr .table__row>
           <td .table__td>
           <td .table__td .exam-correct--input-status>
-            <input #exam-correct__user type="text">
+            <input #exam-correct__user type="text" autofocus minLength=1>
             <i #exam-correct__user-status .fas .fa-fw>
             <ul #exam-correct__user-candidates>
           $forall ExamPart{examPartNumber} <- examParts

From 53ff6298e2a5f12b2453dd6d9e2bedec6494ecda Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 23 Jan 2020 20:45:25 +0100
Subject: [PATCH 23/65] feat(exam-correct): persist results and more

---
 .../lib/storage-manager/storage-manager.js    |   4 +
 .../src/utils/exam-correct/exam-correct.js    | 227 +++++++++++++-----
 .../src/utils/exam-correct/exam-correct.sass  |   8 +-
 3 files changed, 172 insertions(+), 67 deletions(-)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index d071d0c2b..4f491e92c 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -56,6 +56,10 @@ export class StorageManager {
         this._saveToLocalStorage({ ...this._getFromLocalStorage(), [key]: value });
         break;
       }
+      case LOCATION.SESSION: {
+        this._saveToSessionStorage({ ...this._getFromSessionStorage(), [key]: value });
+        break;
+      }
       case LOCATION.WINDOW: {
         this._saveToWindow({ ...this._getFromLocalStorage(), [key]: value });
         break;
diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index a7b7612a2..4306f6db1 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -28,18 +28,12 @@ const EXAM_CORRECT_USER_DNAME_ATTR = 'exam-correct--user-dname';
 
 const INPUT_EMPTY_CLASS = 'input--invalid';
 
-// TODO get from settings
-const MOMENT_FORMAT = 'DD.MM.YY HH:mm:ss';
-
-// TODO 1 for debugging only, 3 would be a better choice
-const USER_VALIDATION_MIN_LENGTH = 1;
-
 const STATUS = {
-  NONE: 0,
-  SUCCESS: 1,
-  AMBIGUOUS: 2,
-  ERROR: 3,
-  LOADING: 4,
+  NONE: null,
+  SUCCESS: 'success',
+  AMBIGUOUS: 'ambiguous',
+  FAILURE: 'failure',
+  LOADING: 'loading',
 };
 
 
@@ -49,6 +43,7 @@ const STATUS = {
 export class ExamCorrect {
 
   _storageManager = new StorageManager('EXAM_CORRECT', '0.0.0', { location: LOCATION.SESSION, encrypted: true });
+  _dateFormat;
 
   _element;
 
@@ -58,6 +53,9 @@ export class ExamCorrect {
   _userInputCandidates;
   _partInputs;
 
+  _cIndices;
+  _lastColumnIndex;
+
   constructor(element, app) {
     if (!element) {
       throw new Error('Exam Correct utility cannot be setup without an element!');
@@ -75,6 +73,9 @@ export class ExamCorrect {
     this._userInputCandidates = document.getElementById(EXAM_CORRECT_USER_INPUT_CANDIDATES_ID);
     this._partInputs = [...this._element.querySelectorAll(`input[${EXAM_CORRECT_PART_INPUT_ATTR}]`)];
 
+    // TODO get date format by post request
+    this._dateFormat = 'YYYY-MM-DD HH:mm:ss';
+
     if (this._sendBtn)
       this._sendBtn.addEventListener('click', this._sendCorrectionHandler.bind(this));
     else console.error('ExamCorrect utility could not detect send button!');
@@ -90,6 +91,20 @@ export class ExamCorrect {
     if (!this._userInputCandidates) {
       throw new Error('ExamCorrect utility could not detect user input candidate list!');
     }
+
+    this._cIndices = new Map(
+      [...this._element.querySelectorAll('[uw-exam-correct-header]')]
+        .map((header) => [header.getAttribute('uw-exam-correct-header'), header.cellIndex])
+    );
+
+    this._lastColumnIndex = this._element.querySelector('thead > tr').querySelectorAll('th').length - 1;
+
+    // show previously submitted results
+    const previousEntries = this._storageManager.load('entries');
+    if (previousEntries && previousEntries.length > 0) {
+      // TODO sort previous results by current sorting order first
+      previousEntries.forEach((entry) => this._addRow(entry));
+    }
   }
 
   destroy() {
@@ -100,10 +115,10 @@ export class ExamCorrect {
   }
 
   _validateUserInput() {
-    const user = this._userInput.value;
+    (!this._userInput.value) ? this._userInput.classList.add('no-value') : this._userInput.classList.remove('no-value');
 
-    // do nothing in case of empty or too short input
-    if (!user || user.length < USER_VALIDATION_MIN_LENGTH) {
+    // do nothing in case of empty or invalid input
+    if (!this._userInput.value || this._userInput.reportValidity && !this._userInput.reportValidity()) {
       removeAllChildren(this._userInputCandidates);
       setStatus(this._userInputStatus, STATUS.NONE);
       return;
@@ -122,7 +137,7 @@ export class ExamCorrect {
     setStatus(this._userInputStatus, STATUS.LOADING);
 
     const body = {
-      user: user,
+      user: this._userInput.value,
     };
 
     this._app.httpClient.post({
@@ -132,13 +147,20 @@ export class ExamCorrect {
     }).then(
       (response) => response.json()
     ).then(
-      (response) => this._processResponse(response, user)
+      (response) => this._processResponse(response, body.user)
     ).catch((error) => {
       console.error('Error while validating user input', error);
     });
   }
 
   _sendCorrectionHandler() {
+    // TODO avoid code duplication
+    if (this._userInput.reportValidity && !this._userInput.reportValidity()) {
+      removeAllChildren(this._userInputCandidates);
+      setStatus(this._userInput, STATUS.NONE);
+      return;
+    }
+
     // refocus user input element for convenience
     this._userInput.focus();
 
@@ -154,13 +176,11 @@ export class ExamCorrect {
 
     const results = {};
     for (const input of this._partInputs) {
+      if (input.reportValidity && !input.reportValidity()) {
+        input.focus();
+        return;
+      }
       if (input.value) {
-        if (isNaN(input.value)) {
-          input.classList.add('input--invalid');
-          input.focus();
-          return;
-        }
-
         const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
         if (!partKey) {
           console.error('Error while parsing results: Could not detect exam part key attribute');
@@ -173,34 +193,12 @@ export class ExamCorrect {
     // abort send if there are no results (after validation)
     if (Object.keys(results).length <= 0) return;
 
-    // TODO create and use template for this
-    const correctionRow = document.createElement('TR');
-    correctionRow.classList.add('table__row');
-    const dateTD = document.createElement('TD');
-    const now = moment();
-    dateTD.appendChild(document.createTextNode(now.format(MOMENT_FORMAT)));
-    dateTD.setAttribute('date', moment());
-    dateTD.classList.add('exam-correct--local-time');
-    const userTD = document.createElement('TD');
-    userTD.appendChild(document.createTextNode(user));
-    userTD.setAttribute(EXAM_CORRECT_USER_ATTR, user);
-    const partTDs = this._partInputs.map((input) => {
-      const partTD = document.createElement('TD');
-      const partKey = input.getAttribute(EXAM_CORRECT_PART_INPUT_ATTR);
-      if (results[partKey])
-        partTD.appendChild(document.createTextNode(results[partKey]));
-      return partTD;
-    });
-    const statusTD = document.createElement('TD');
-    const statusDiv = document.createElement('DIV');
-    statusDiv.classList.add('exam-correct--loading');
-    statusTD.appendChild(statusDiv);
-    [dateTD,userTD,...partTDs, statusTD].forEach((td) => {
-      td.classList.add('table__td');
-      correctionRow.appendChild(td);
-    });
-    const tableBody = this._element.querySelector(`tbody:not(#${EXAM_CORRECT_INPUT_BODY_ID})`);
-    tableBody.insertBefore(correctionRow, tableBody.firstChild);
+    const rowInfo = {
+      users: [{ id: userId, name: user }],
+      results: results,
+      status: STATUS.LOADING,
+    };
+    this._addRow(rowInfo);
 
     // clear inputs on validation success
     this._clearUserInput();
@@ -218,7 +216,7 @@ export class ExamCorrect {
     }).then(
       (response) => response.json()
     ).then(
-      (response) => this._processResponse(response, user, results)
+      (response) => this._processResponse(response, body.user, results)
     ).catch((error) => {
       console.error('Error while processing response', error);
     });
@@ -270,17 +268,27 @@ export class ExamCorrect {
             this._userInputCandidates.appendChild(candidateItem);
           });
         } else {
+          // TODO what to do in this case?
           setStatus(this._userInputStatus, STATUS.FAILURE);
         }
 
         return;
       }
-    
+
+      const savedEntries = this._storageManager.load('entries') || [];
+      let newEntry = {
+        users: null,
+        results: null,
+        status: STATUS.FAILURE,
+      };
+
+      console.log('response', response);
+
       for (let row of [...this._element.rows]) {
-        const userElem = row.cells.item(1);
-        const userIdent = userElem && userElem.getAttribute(EXAM_CORRECT_USER_ATTR);
+        let userElem = row.cells.item(this._cIndices.get('user'));
+        const userIdent = userElem && userElem.getAttribute(EXAM_CORRECT_USER_ATTR);  // TODO use other attribute identifier
         if (userIdent === user) {
-          let status = STATUS.ERROR;
+          let status = STATUS.FAILURE;
           switch (response.status) {
             // TODO fetch update time from response and replace
             case 'success':
@@ -289,9 +297,11 @@ export class ExamCorrect {
                 userElem.setAttribute(EXAM_CORRECT_USER_ATTR, response.user.id);
                 userElem.innerHTML = userToHTML(response.user);
                 const timeElem = row.cells.item(0);
-                timeElem.innerHTML = moment(response.time).format(MOMENT_FORMAT);
+                timeElem.innerHTML = moment(response.time).format(this._dateFormat);
                 timeElem.classList.remove('exam-correct--local-time');
                 // TODO special style for server time?
+                newEntry.users = [response.user];
+                newEntry.results = response.results;
               }
               // TODO replace results with results from response
               // TODO set edit button visibility
@@ -301,11 +311,15 @@ export class ExamCorrect {
               // TODO set edit button visibility
               status = STATUS.AMBIGUOUS;
               if (response.users) {
-                this._showUserList(row, response.users, results);
+                userElem = this._showUserList(row, response.users, results);
+                newEntry.users = response.users;
+                newEntry.results = results;
               }
               break;
             case 'failure':
               status = STATUS.FAILURE;
+              newEntry.users = [user];
+              newEntry.results = results;
               break;
             default:
               // TODO show tooltip with 'invalid response'
@@ -315,9 +329,17 @@ export class ExamCorrect {
           row.querySelectorAll('.exam-correct--loading').forEach((elem) => {
             setStatus(elem, status);
           });
-          break;
+          newEntry.status = status || STATUS.FAILURE;
+          savedEntries.push(newEntry);
+          this._storageManager.save('entries', savedEntries);
+          return;
         }
       }
+
+      // insert a new row if no previous entry was found
+      // this._addRow(newEntry);
+      // savedEntries.unshift(newEntry);
+      // this._storageManager.save('entries', savedEntries);
     }
   }
 
@@ -331,7 +353,10 @@ export class ExamCorrect {
 
   // TODO better name
   _showUserList(row, users, results) {
-    const userElem = row.cells.item(1);
+    let userElem = row.cells.item(this._cIndices.get('user'));
+    if (!userElem) {
+      userElem = document.createElement('TD');
+    }
     if (users) {
       removeAllChildren(userElem);
       const list = document.createElement('UL');
@@ -352,12 +377,14 @@ export class ExamCorrect {
     } else {
       console.error('Unable to show users from invalid response');
     }
+
+    return userElem;
   }
 
   _rowToRequest(row, listItem, results) {
     const now = moment();
     const timeElem = row.cells.item(0);
-    timeElem.innerHTML = now.format(MOMENT_FORMAT);
+    timeElem.innerHTML = now.format(this._dateFormat);
     timeElem.classList.add('exam-correct--local-time');
     const userElem = row.cells.item(1);
     const statusElem = row.querySelector('.exam-correct--ambiguous');
@@ -377,13 +404,29 @@ export class ExamCorrect {
       (response) => response.json()
     ).then((response) => {
       switch (response.status) {
-        case 'success':
+        case 'success': {
           userElem.innerHTML = userToHTML(response.user);
           // TODO replace part results with results from server
-          timeElem.innerHTML = moment(response.time).format(MOMENT_FORMAT);
+          timeElem.innerHTML = moment(response.time).format(this._dateFormat);
           timeElem.classList.remove('exam-correct--local-time');
           setStatus(statusElem, STATUS.SUCCESS);
+          const savedEntries = this._storageManager.load('entries');
+          for (let i = 0; i < savedEntries.length; i++) {
+            for (let user of savedEntries[i].users) {
+              if (user.id === response.user.id) {
+                savedEntries[i] = {
+                  users: [response.user],
+                  results: response.results,
+                  status: STATUS.SUCCESS,
+                  date: response.time,
+                };
+                break;
+              }
+            }
+          }
+          this._storageManager.save('entries', savedEntries);
           break;
+        }
         default:
           // non-success response on request with a uuid => panic and ignore for now
       }
@@ -392,6 +435,60 @@ export class ExamCorrect {
     });
   }
 
+  _addRow(rowInfo) {
+    console.log('rowInfo', rowInfo);
+    // TODO create and use template for this
+    const newRow = document.createElement('TR');
+    newRow.classList.add('table__row');
+
+    const cells = new Map();
+
+    const dateCell = document.createElement('TD');
+    const date = rowInfo.date ? moment(rowInfo.date) : moment();
+    dateCell.appendChild(document.createTextNode(date.format(this._dateFormat)));
+    dateCell.setAttribute('date', date.utc().format());
+    if (!rowInfo.date) dateCell.classList.add('exam-correct--local-time');
+    cells.set(this._cIndices.get('date'), dateCell);
+
+    let userCell = document.createElement('TD');
+    if (!rowInfo.users || rowInfo.users.length === 0) {
+      console.error('Found rowInfo without users info!');
+    } else if (rowInfo.users.length === 1) {
+      const user = rowInfo.users[0];
+      userCell.innerHTML = userToHTML(user);
+      userCell.setAttribute(EXAM_CORRECT_USER_ATTR, user.id || user.name);
+    } else {
+      userCell = this._showUserList(newRow, rowInfo.users, rowInfo.results);
+    }
+    cells.set(this._cIndices.get('user'), userCell);
+
+    for (const [partKey, partResult] of Object.entries(rowInfo.results)) {
+      const cellIndex = this._cIndices.get(partKey);
+      if (cellIndex === undefined) {
+        console.error('Could not determine cell index from part key!');
+      } else {
+        const partCell = document.createElement('TD');
+        partCell.innerHTML = partResult;
+        cells.set(cellIndex, partCell);
+      }
+    }
+
+    const statusCell = document.createElement('TD');
+    const statusDiv = document.createElement('DIV');
+    setStatus(statusDiv, rowInfo.status);
+    statusCell.appendChild(statusDiv);
+    cells.set(this._cIndices.get('status'), statusCell);
+
+    for (let i = 0; i <= this._lastColumnIndex; i++) {
+      const cell = cells.get(i) || document.createElement('TD');
+      cell.classList.add('table__td');
+      newRow.appendChild(cell);
+    }
+
+    const tableBody = this._element.querySelector(`tbody:not(#${EXAM_CORRECT_INPUT_BODY_ID})`);
+    insertAsFirstChild(newRow, tableBody);
+  }
+
   _clearUserInput() {
     removeAllChildren(this._userInputCandidates);
     clearInput(this._userInput);
@@ -406,16 +503,20 @@ export class ExamCorrect {
 function clearInput(inputElement) {
   inputElement.value = null;
 }
+function insertAsFirstChild(elementToInsert, parentElement) {
+  parentElement.insertBefore(elementToInsert, parentElement.firstChild);
+}
 function removeAllChildren(element) {
   while (element.firstChild) {
     element.removeChild(element.firstChild);
   }
 }
 
-
 function userToHTML(user) {
   if (user && user['display-name'] && user['surname']) {
     return user['display-name'].replace(new RegExp(user['surname']), `<strong>${user['surname']}</strong>`) + (user['mat-nr'] ? ` (${user['mat-nr']})` : '');
+  } else if (user && user.name) {
+    return user.name;
   } else {
     console.error('Unable to format invalid user response');
     return '';
diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index 386ddf327..77ad19399 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -1,9 +1,9 @@
-input.input--invalid
-  border: 2px solid var(--color-error)
+$exam-correct--input-status-margin: 10px
+
+[uw-exam-correct] input:invalid:not(.no-value)
+    border: 2px solid var(--color-error)
 
 .exam-correct--input-status
-  $exam-correct--input-status-margin: 10px
-
   input
     width: calc(100% - 18em/14 - #{$exam-correct--input-status-margin})
   i

From 595f46d860f3f893cdeb6618e361d533b5c90b5c Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 23 Jan 2020 20:56:25 +0100
Subject: [PATCH 24/65] fix(exam-correct): correctly htmlify user on failure

---
 frontend/src/utils/exam-correct/exam-correct.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 4306f6db1..c0f0c84f0 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -513,10 +513,12 @@ function removeAllChildren(element) {
 }
 
 function userToHTML(user) {
-  if (user && user['display-name'] && user['surname']) {
-    return user['display-name'].replace(new RegExp(user['surname']), `<strong>${user['surname']}</strong>`) + (user['mat-nr'] ? ` (${user['mat-nr']})` : '');
-  } else if (user && user.name) {
-    return user.name;
+  if (user) {
+    if (user['display-name'] && user['surname']) {
+      return user['display-name'].replace(new RegExp(user['surname']), `<strong>${user['surname']}</strong>`) + (user['mat-nr'] ? ` (${user['mat-nr']})` : '');
+    } else {
+      return user;
+    }
   } else {
     console.error('Unable to format invalid user response');
     return '';

From a51c849df58feb8f5f2ee0e04cfb4bc8cfe94173 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 24 Jan 2020 09:49:26 +0100
Subject: [PATCH 25/65] refactor(exam-correct): remove old input--invalid class
 usage

---
 frontend/src/utils/exam-correct/exam-correct.js | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index c0f0c84f0..bdf3a253d 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -2,11 +2,11 @@ import { Utility } from '../../core/utility';
 import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-manager';
 import { HttpClient } from '../../services/http-client/http-client';
 
-import './exam-correct.sass';
-
 import Cookies from 'js-cookie';
 import moment from 'moment';
 
+import './exam-correct.sass';
+
 
 const EXAM_CORRECT_URL_POST = 'correct';
 const EXAM_CORRECT_HEADERS = {
@@ -26,8 +26,6 @@ const EXAM_CORRECT_INPUT_BODY_ID = 'exam-correct__new';
 const EXAM_CORRECT_USER_ATTR = 'exam-correct--user-id';
 const EXAM_CORRECT_USER_DNAME_ATTR = 'exam-correct--user-dname';
 
-const INPUT_EMPTY_CLASS = 'input--invalid';
-
 const STATUS = {
   NONE: null,
   SUCCESS: 'success',
@@ -110,7 +108,6 @@ export class ExamCorrect {
   destroy() {
     this._sendBtn.removeEventListener('click', this._sendCorrectionHandler);
     this._userInput.removeEventListener('change', this._validateUserInput);
-    this._userInput.removeEventListener('input', this._removeInputEmptyClassHandler);
     // TODO destroy handlers on user input candidate elements
   }
 
@@ -169,8 +166,6 @@ export class ExamCorrect {
 
     // abort send if the user input is empty
     if (!user && !userId) {
-      this._userInput.classList.add(INPUT_EMPTY_CLASS);
-      this._userInput.addEventListener('input', this._removeInputEmptyClassHandler.bind(this), { once: true });
       return;
     }
 
@@ -343,14 +338,6 @@ export class ExamCorrect {
     }
   }
 
-  _removeInputEmptyClassHandler() {
-    if (this._userInput.value) {
-      this._userInput.classList.remove(INPUT_EMPTY_CLASS);
-    } else {
-      this._userInput.addEventListener('input', this._removeInputEmptyClassHandler, { once: true });
-    }
-  }
-
   // TODO better name
   _showUserList(row, users, results) {
     let userElem = row.cells.item(this._cIndices.get('user'));

From 792da2220466f9e6a880052613c35ea5246452cd Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 24 Jan 2020 09:51:21 +0100
Subject: [PATCH 26/65] fix(exam-correct): fix addRow rowInfo

---
 frontend/src/utils/exam-correct/exam-correct.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index bdf3a253d..de8b77eac 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -189,7 +189,7 @@ export class ExamCorrect {
     if (Object.keys(results).length <= 0) return;
 
     const rowInfo = {
-      users: [{ id: userId, name: user }],
+      users: [userId || user],
       results: results,
       status: STATUS.LOADING,
     };
@@ -297,6 +297,7 @@ export class ExamCorrect {
                 // TODO special style for server time?
                 newEntry.users = [response.user];
                 newEntry.results = response.results;
+                newEntry.date = response.time;
               }
               // TODO replace results with results from response
               // TODO set edit button visibility
@@ -443,7 +444,7 @@ export class ExamCorrect {
     } else if (rowInfo.users.length === 1) {
       const user = rowInfo.users[0];
       userCell.innerHTML = userToHTML(user);
-      userCell.setAttribute(EXAM_CORRECT_USER_ATTR, user.id || user.name);
+      userCell.setAttribute(EXAM_CORRECT_USER_ATTR, user);
     } else {
       userCell = this._showUserList(newRow, rowInfo.users, rowInfo.results);
     }

From c520918eb350adcfc7fbda2b6edb6b8915cc8ea7 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 24 Jan 2020 13:22:05 +0100
Subject: [PATCH 27/65] fix(exam-correct): fix hlint

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

diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index c1c095096..fcc025a95 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -109,12 +109,12 @@ postECorrectR tid ssh csh examn = do
            E.||. user E.^. UserMatrikelnummer E.==. E.val mUserIdent
            E.||. user E.^. UserMatrikelnummer `E.hasInfix` E.val mUserIdent
            E.||. (case mUserIdent of
-            Just userIdent -> (user E.^. UserSurname E.==. E.val userIdent
+            Just userIdent -> user E.^. UserSurname E.==. E.val userIdent
                         E.||. user E.^. UserSurname `E.hasInfix` E.val userIdent
                         E.||. user E.^. UserFirstName E.==. E.val userIdent
                         E.||. user E.^. UserFirstName `E.hasInfix` E.val userIdent
                         E.||. user E.^. UserDisplayName E.==. E.val userIdent
-                        E.||. user E.^. UserDisplayName `E.hasInfix` E.val userIdent)
+                        E.||. user E.^. UserDisplayName `E.hasInfix` E.val userIdent
             Nothing -> E.val False)
       return user
 

From dcb79d4cb8c1cb96f0af61eeab57181cbe20063b Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 24 Jan 2020 13:24:30 +0100
Subject: [PATCH 28/65] fix(exam-correct): also persist local time on
 non-success

---
 frontend/src/utils/exam-correct/exam-correct.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index de8b77eac..598220f3c 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -275,6 +275,7 @@ export class ExamCorrect {
         users: null,
         results: null,
         status: STATUS.FAILURE,
+        date: null,
       };
 
       console.log('response', response);
@@ -294,10 +295,8 @@ export class ExamCorrect {
                 const timeElem = row.cells.item(0);
                 timeElem.innerHTML = moment(response.time).format(this._dateFormat);
                 timeElem.classList.remove('exam-correct--local-time');
-                // TODO special style for server time?
                 newEntry.users = [response.user];
                 newEntry.results = response.results;
-                newEntry.date = response.time;
               }
               // TODO replace results with results from response
               // TODO set edit button visibility
@@ -326,6 +325,7 @@ export class ExamCorrect {
             setStatus(elem, status);
           });
           newEntry.status = status || STATUS.FAILURE;
+          newEntry.date = response.time || moment().utc().format();
           savedEntries.push(newEntry);
           this._storageManager.save('entries', savedEntries);
           return;
@@ -432,10 +432,10 @@ export class ExamCorrect {
     const cells = new Map();
 
     const dateCell = document.createElement('TD');
-    const date = rowInfo.date ? moment(rowInfo.date) : moment();
+    const date = moment(rowInfo.date);
     dateCell.appendChild(document.createTextNode(date.format(this._dateFormat)));
     dateCell.setAttribute('date', date.utc().format());
-    if (!rowInfo.date) dateCell.classList.add('exam-correct--local-time');
+    if (rowInfo.status !== STATUS.SUCCESS) dateCell.classList.add('exam-correct--local-time');
     cells.set(this._cIndices.get('date'), dateCell);
 
     let userCell = document.createElement('TD');

From c623b7c82faebc5133a99d859db518503e1e7448 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 24 Jan 2020 13:54:02 +0100
Subject: [PATCH 29/65] style(exam-correct): style ambiguous entries as links
 for now

---
 frontend/src/utils/exam-correct/exam-correct.sass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index 77ad19399..39a62d212 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -1,7 +1,13 @@
 $exam-correct--input-status-margin: 10px
 
 [uw-exam-correct] input:invalid:not(.no-value)
-    border: 2px solid var(--color-error)
+  border: 2px solid var(--color-error)
+
+[uw-exam-correct] tbody ul
+  list-style: none
+  li
+    cursor: pointer
+    text-decoration: underline
 
 .exam-correct--input-status
   input

From 2ebaa1616b7026913ecb842135fb7c813ba4bf36 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Mon, 27 Jan 2020 14:44:47 +0100
Subject: [PATCH 30/65] refactor(exam-correct): use fa spin class

---
 frontend/src/utils/exam-correct/exam-correct.js   |  4 ++--
 frontend/src/utils/exam-correct/exam-correct.sass | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 598220f3c..4ed6c1f4e 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -321,7 +321,7 @@ export class ExamCorrect {
               // TODO set edit button visibility
               console.error('Invalid response');
           }
-          row.querySelectorAll('.exam-correct--loading').forEach((elem) => {
+          row.querySelectorAll('.fa-spin').forEach((elem) => {
             setStatus(elem, status);
           });
           newEntry.status = status || STATUS.FAILURE;
@@ -517,7 +517,7 @@ function setStatus(elem, status) {
   const successClasses = ['fas', 'fa-fw', 'fa-check', 'exam-correct--success'];
   const ambiguousClasses = ['fas', 'fa-fw', 'fa-question', 'exam-correct--ambiguous'];
   const errorClasses = ['fas', 'fa-fw', 'fa-times', 'exam-correct--error'];
-  const loadingClasses = ['fas', 'fa-fw', 'fa-spinner-third', 'exam-correct--loading'];
+  const loadingClasses = ['fas', 'fa-fw', 'fa-spinner-third', 'fa-spin'];
 
   elem.classList.remove(...successClasses, ...ambiguousClasses, ...errorClasses, ...loadingClasses);
 
diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index 39a62d212..e971a33ae 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -27,13 +27,3 @@ $exam-correct--input-status-margin: 10px
 
 .exam-correct--error
   color: var(--color-error)
-
-// TODO move to general app style
-.exam-correct--loading
-  animation: spin 2s linear infinite
-
-@keyframes spin
-  0%
-    transform: rotate(0deg)
-  100%
-    transform: rotate(360deg)

From 5d7427ad463f114648f6d5b958e5ecba519f0abe Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 09:18:53 +0100
Subject: [PATCH 31/65] feat(exam-correct): use examId instead as
 uw-exam-correct value

---
 src/CryptoID.hs             | 1 +
 src/Handler/Exam/Correct.hs | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/CryptoID.hs b/src/CryptoID.hs
index 1f6c3bf0d..efcc099ca 100644
--- a/src/CryptoID.hs
+++ b/src/CryptoID.hs
@@ -43,6 +43,7 @@ decCryptoIDs [ ''SubmissionId
              , ''SystemMessageId
              , ''SystemMessageTranslationId
              , ''StudyFeaturesId
+             , ''ExamId
              , ''ExamOccurrenceId
              , ''ExamPartId
              , ''AllocationId
diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index fcc025a95..d730ef647 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -66,7 +66,7 @@ getECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Htm
 getECorrectR tid ssh csh examn = do
   MsgRenderer mr <- getMsgRenderer
 
-  (Entity _ Exam{..}, examParts) <- runDB $ do
+  (Entity eId Exam{..}, examParts) <- runDB $ do
     exam@(Entity eId Exam{..}) <- fetchExam tid ssh csh examn
     examParts <- sortOn (view $ _entityVal . _examPartNumber) <$> selectList [ ExamPartExam ==. eId ] [ Asc ExamPartName ]
     return (exam, entityVal <$> examParts)
@@ -81,7 +81,7 @@ getECorrectR tid ssh csh examn = do
     
     participantHeadTooltip = [whamlet| _{MsgExamCorrectHeadParticipantTooltip} |]
 
-    examCorrectIdent = intercalate "-" [toPathPiece tid, toPathPiece ssh, toPathPiece csh, toPathPiece examn]
+  examCorrectIdent <- encrypt eId :: Handler CryptoUUIDExam
 
   siteLayoutMsg heading $ do
     setTitleI heading

From 02276b425f97d9b553b893145619d5757269b817 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 09:24:11 +0100
Subject: [PATCH 32/65] chore(storage-key): add stub

---
 src/Handler/StorageKey.hs | 46 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 src/Handler/StorageKey.hs

diff --git a/src/Handler/StorageKey.hs b/src/Handler/StorageKey.hs
new file mode 100644
index 000000000..ea00a4bd7
--- /dev/null
+++ b/src/Handler/StorageKey.hs
@@ -0,0 +1,46 @@
+module Handler.StorageKey
+  ( postStorageKeyR
+  ) where
+
+import Import
+
+-- import qualified Data.Binary as Binary
+
+
+data StorageKeyType
+  = SKTExamCorrect ExamId
+    -- { sktExamCorrectExamId :: ExamId
+    -- }
+deriveJSON defaultOptions
+  { fieldLabelModifier     = camelToPathPiece' 3
+  , constructorTagModifier = camelToPathPiece' 3
+  } ''StorageKeyType
+
+data StorageKeyRequest
+  = StorageKeyRequest
+    { skReqType      :: StorageKeyType
+    , skReqTimestamp :: Maybe UTCTime
+    , skReqSalt      :: Maybe Text
+    , skReqLength    :: Int
+    }
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 2
+  } ''StorageKeyRequest
+
+data StorageKeyResponse
+  = StorageKeyResponse
+    { skResKey :: Text
+    }
+deriveJSON defaultOptions
+  { fieldLabelModifier     = camelToPathPiece' 2
+  , constructorTagModifier = camelToPathPiece' 2
+  } ''StorageKeyResponse
+
+
+postStorageKeyR :: Handler Value
+postStorageKeyR = do
+  StorageKeyRequest{..} <- requireCheckJsonBody
+
+  let key = "TODO"
+
+  sendResponseStatus ok200 $ toJSON StorageKeyResponse{ skResKey = key }

From b51c466a650743d9df9e954313e9c7501f66c4f0 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 12:00:03 +0100
Subject: [PATCH 33/65] feat(storage-key): postStorageKeyR

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

diff --git a/src/Handler/StorageKey.hs b/src/Handler/StorageKey.hs
index ea00a4bd7..dc18f2047 100644
--- a/src/Handler/StorageKey.hs
+++ b/src/Handler/StorageKey.hs
@@ -4,16 +4,18 @@ module Handler.StorageKey
 
 import Import
 
--- import qualified Data.Binary as Binary
+import Crypto.Hash
+
+import qualified Data.Aeson as Aeson
+import qualified Data.ByteString.Base64 as Base64 (encode, decodeLenient)
+import qualified Data.Binary as Binary (encode)
+import qualified Crypto.KDF.HKDF as HKDF
 
 
 data StorageKeyType
   = SKTExamCorrect ExamId
-    -- { sktExamCorrectExamId :: ExamId
-    -- }
 deriveJSON defaultOptions
-  { fieldLabelModifier     = camelToPathPiece' 3
-  , constructorTagModifier = camelToPathPiece' 3
+  { constructorTagModifier = camelToPathPiece' 3
   } ''StorageKeyType
 
 data StorageKeyRequest
@@ -29,7 +31,9 @@ deriveJSON defaultOptions
 
 data StorageKeyResponse
   = StorageKeyResponse
-    { skResKey :: Text
+    { skResKey       :: Text
+    , skResTimestamp :: UTCTime
+    , skResSalt      :: Text
     }
 deriveJSON defaultOptions
   { fieldLabelModifier     = camelToPathPiece' 2
@@ -39,8 +43,35 @@ deriveJSON defaultOptions
 
 postStorageKeyR :: Handler Value
 postStorageKeyR = do
+  uid   <- requireAuthId
+  sbKey <- secretBoxKey
+
   StorageKeyRequest{..} <- requireCheckJsonBody
 
-  let key = "TODO"
+  now <- liftIO getCurrentTime
 
-  sendResponseStatus ok200 $ toJSON StorageKeyResponse{ skResKey = key }
+  let
+    (lBound,rBound) = case skReqType of
+      SKTExamCorrect _ -> (-30*nominalDay, nominalDay)
+
+    timestampInBounds = maybe False (\ts -> addUTCTime lBound now < ts && addUTCTime rBound now > ts) skReqTimestamp
+
+    timestamp = if
+      | Just ts <- skReqTimestamp, timestampInBounds -> ts
+      | otherwise -> now
+  
+  salt <- let sltSize = hashDigestSize SHA3_256 in if
+    | Just slt <- Base64.decodeLenient . encodeUtf8 <$> skReqSalt
+    , timestampInBounds
+    , length slt == sltSize -> return slt
+    | otherwise -> pack . take sltSize <$> liftIO getRandoms
+
+  let
+    ikm = (toStrict . Aeson.encode) (skReqType, uid, sbKey)
+    key = HKDF.expand (HKDF.extract salt ikm :: HKDF.PRK SHA3_256) (toStrict $ Binary.encode (timestamp,skReqLength)) skReqLength
+
+  sendResponseStatus ok200 $ toJSON StorageKeyResponse
+    { skResKey       = (decodeUtf8 . Base64.encode) key
+    , skResTimestamp = timestamp
+    , skResSalt      = (decodeUtf8 . Base64.encode) salt
+    }

From 4d4dc8f58be9f0c705b52d6bbd42041d41b2749f Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 12:06:52 +0100
Subject: [PATCH 34/65] feat(storage-key): add StorageKeyR to routes; minor
 Handler refactor

---
 routes                    | 3 ++-
 src/Handler/StorageKey.hs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/routes b/routes
index f53703e9b..6019ae09a 100644
--- a/routes
+++ b/routes
@@ -73,6 +73,7 @@
 /user/set-display-email    SetDisplayEmailR    GET POST        !free
 /user/csv-options          CsvOptionsR         GET POST        !free
 /user/lang                 LangR                   POST        !free
+/user/storage-key          StorageKeyR             POST        !free
 
 /exam-office               ExamOfficeR                         !exam-office:
   /                        EOExamsR            GET
@@ -220,4 +221,4 @@
 !/#UUID CryptoUUIDDispatchR GET                               !free -- just redirect
 -- !/*{CI FilePath} CryptoFileNameDispatchR GET                  !free -- Disabled until preliminary check for valid cID exists
 
-!/*WellKnownFileName WellKnownR GET !free
\ No newline at end of file
+!/*WellKnownFileName WellKnownR GET !free
diff --git a/src/Handler/StorageKey.hs b/src/Handler/StorageKey.hs
index dc18f2047..4589364eb 100644
--- a/src/Handler/StorageKey.hs
+++ b/src/Handler/StorageKey.hs
@@ -70,7 +70,7 @@ postStorageKeyR = do
     ikm = (toStrict . Aeson.encode) (skReqType, uid, sbKey)
     key = HKDF.expand (HKDF.extract salt ikm :: HKDF.PRK SHA3_256) (toStrict $ Binary.encode (timestamp,skReqLength)) skReqLength
 
-  sendResponseStatus ok200 $ toJSON StorageKeyResponse
+  return $ toJSON StorageKeyResponse
     { skResKey       = (decodeUtf8 . Base64.encode) key
     , skResTimestamp = timestamp
     , skResSalt      = (decodeUtf8 . Base64.encode) salt

From 1580d3f59bf4d716228ecc15c8af17b8af445250 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 15:25:08 +0100
Subject: [PATCH 35/65] feat(storage-key): add breadcrumb and import

---
 messages/uniworx/de-de-formal.msg | 1 +
 messages/uniworx/en-eu.msg        | 1 +
 src/Application.hs                | 1 +
 src/Foundation.hs                 | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index e47822fed..ff6ea9383 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1270,6 +1270,7 @@ BreadcrumbExternalExamGrades: Prüfungsleistungen
 BreadcrumbExternalExamStaffInvite: Einladung zum Prüfer
 BreadcrumbParticipantsList: Kursteilnehmerlisten
 BreadcrumbParticipants: Kursteilnehmerliste
+BreadcrumbStorageKey: Lokalen Schlüssel generieren
 
 ExternalExamEdit coursen@CourseName examn@ExamName: Bearbeiten: #{coursen}, #{examn}
 ExternalExamGrades coursen@CourseName examn@ExamName: Prüfungsleistungen: #{coursen}, #{examn}
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index e4b7cf356..8482e8153 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1269,6 +1269,7 @@ BreadcrumbExternalExamGrades: Exam results
 BreadcrumbExternalExamStaffInvite: Invitation
 BreadcrumbParticipantsList: Lists of course participants
 BreadcrumbParticipants: Course participants
+BreadcrumbStorageKey: Generate storage key
 
 ExternalExamEdit coursen examn: Edit: #{coursen}, #{examn}
 ExternalExamGrades coursen examn: Exam achievements: #{coursen}, #{examn}
diff --git a/src/Application.hs b/src/Application.hs
index e84ad6bb8..f61813796 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -124,6 +124,7 @@ import Handler.ExamOffice
 import Handler.Metrics
 import Handler.ExternalExam
 import Handler.Participants
+import Handler.StorageKey
 
 
 -- This line actually creates our YesodDispatch instance. It is the second half
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 8b5ffbf7c..eb7c1cca2 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1837,6 +1837,8 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb CsvOptionsR      = i18nCrumb MsgCsvOptions        $ Just ProfileR
   breadcrumb LangR            = i18nCrumb MsgMenuLanguage      $ Just ProfileR
 
+  breadcrumb StorageKeyR      = i18nCrumb MsgBreadcrumbStorageKey Nothing
+
   breadcrumb TermShowR              = i18nCrumb MsgMenuTermShow    $ Just HomeR
   breadcrumb TermCurrentR           = i18nCrumb MsgMenuTermCurrent $ Just TermShowR
   breadcrumb TermEditR              = i18nCrumb MsgMenuTermCreate  $ Just TermShowR

From 000f97c270577194c1e1d5c5adae1969db28b7ea Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 18:08:43 +0100
Subject: [PATCH 36/65] fix(exam-correct): fix attributes in template

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

diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index 672311742..22a6f0457 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -2,7 +2,7 @@ $newline never
 
 <section>
   <div uw-hide-columns="exam-correct">
-    <table .table .table--striped table--hover uw-exam-correct=#{examCorrectIdent} uw-sort-table=#{examCorrectIdent}>
+    <table .table .table--striped table--hover uw-exam-correct=#{toPathPiece examCorrectIdent} uw-sort-table=exam-correct-#{toPathPiece examCorrectIdent}>
       <thead>
         <tr .table__row .table__row--head>
           <th .table__th .sortable .sorted-desc uw-exam-correct-header="date" uw-hide-column-header="date">

From a23a4735c2a4a8a372b6479d79223099d59e3bea Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 18:09:11 +0100
Subject: [PATCH 37/65] fix(storage-key): fix types

---
 src/Handler/StorageKey.hs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Handler/StorageKey.hs b/src/Handler/StorageKey.hs
index 4589364eb..2bb5cf233 100644
--- a/src/Handler/StorageKey.hs
+++ b/src/Handler/StorageKey.hs
@@ -13,9 +13,13 @@ import qualified Crypto.KDF.HKDF as HKDF
 
 
 data StorageKeyType
-  = SKTExamCorrect ExamId
+  = SKTExamCorrect
+    { _sktExam :: CryptoUUIDExam
+    }
 deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 3
+  { fieldLabelModifier     = camelToPathPiece' 1
+  , constructorTagModifier = camelToPathPiece' 1
+  , tagSingleConstructors  = True
   } ''StorageKeyType
 
 data StorageKeyRequest
@@ -27,6 +31,7 @@ data StorageKeyRequest
     }
 deriveJSON defaultOptions
   { fieldLabelModifier = camelToPathPiece' 2
+  , omitNothingFields  = True
   } ''StorageKeyRequest
 
 data StorageKeyResponse

From fe28762d1c3831f914c10615f7744114180e7ab2 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 18:10:29 +0100
Subject: [PATCH 38/65] refactor(http-client): set xsrf token on post requests

---
 frontend/src/services/http-client/http-client.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/services/http-client/http-client.js b/frontend/src/services/http-client/http-client.js
index 6ba2341f0..4ea725d2f 100644
--- a/frontend/src/services/http-client/http-client.js
+++ b/frontend/src/services/http-client/http-client.js
@@ -1,3 +1,5 @@
+import Cookies from 'js-cookie';
+
 export class HttpClient {
 
   static ACCEPT = {
@@ -20,6 +22,8 @@ export class HttpClient {
 
   post(args) {
     args.method = 'POST';
+    args.headers = args.headers || {};
+    args.headers['X-XSRF-TOKEN'] = Cookies.get('XSRF-TOKEN');
     return this._fetch(args);
   }
 

From e7c8b6611bbbc0de6c3b64bdc4464851ceee37a8 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 18:12:13 +0100
Subject: [PATCH 39/65] refactor(exam-correct): refactor xsrf token and
 encryption options

---
 frontend/src/utils/exam-correct/exam-correct.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 4ed6c1f4e..13a73f821 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -2,7 +2,6 @@ import { Utility } from '../../core/utility';
 import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-manager';
 import { HttpClient } from '../../services/http-client/http-client';
 
-import Cookies from 'js-cookie';
 import moment from 'moment';
 
 import './exam-correct.sass';
@@ -10,7 +9,6 @@ import './exam-correct.sass';
 
 const EXAM_CORRECT_URL_POST = 'correct';
 const EXAM_CORRECT_HEADERS = {
-  'X-XSRF-TOKEN': Cookies.get('XSRF-TOKEN'),
   'Content-Type': HttpClient.ACCEPT.JSON,
   'Accept':       HttpClient.ACCEPT.JSON,
 };
@@ -40,7 +38,7 @@ const STATUS = {
 })
 export class ExamCorrect {
 
-  _storageManager = new StorageManager('EXAM_CORRECT', '0.0.0', { location: LOCATION.SESSION, encrypted: true });
+  _storageManager;
   _dateFormat;
 
   _element;
@@ -65,6 +63,9 @@ export class ExamCorrect {
 
     this._element = element;
     this._app = app;
+
+    this._storageManager = new StorageManager('EXAM_CORRECT', '0.0.0', { location: LOCATION.SESSION, encryption: { tag: 'exam-correct', exam: this._element.getAttribute('uw-exam-correct') } });
+
     this._sendBtn = document.getElementById(EXAM_CORRECT_SEND_BTN_ID);
     this._userInput = document.getElementById(EXAM_CORRECT_USER_INPUT_ID);
     this._userInputStatus = document.getElementById(EXAM_CORRECT_USER_INPUT_STATUS_ID);

From 01a5a476c5f402e74f204fb174ae1412a32e7e6e Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 18:14:04 +0100
Subject: [PATCH 40/65] chore(storage-key): fetch storage key and invalidate
 storage on mismatch

---
 .../lib/storage-manager/storage-manager.js    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index 4f491e92c..ed2bad7cc 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -2,6 +2,8 @@
 
 import * as semver from 'semver';
 
+import { HttpClient } from '../../services/http-client/http-client';
+
 export const LOCATION = {
   LOCAL: 'local',
   SESSION: 'session',
@@ -38,6 +40,30 @@ export class StorageManager {
       this._global = window;
     else
       throw new Error('Cannot setup StorageManager without window or global');
+    
+    if (this._options.encryption) {
+      const requestBody = {
+        type   : this._options.encryption,
+        length : 42,
+        ...this.load('encryption'),
+      };
+      this._global.App.httpClient.post({
+        url: '../../../../../../user/storage-key',  // TODO use APPROOT instead
+        headers: {
+          'Content-Type' : HttpClient.ACCEPT.JSON,
+          'Accept'       : HttpClient.ACCEPT.JSON,
+        },
+        body: JSON.stringify(requestBody),
+      }).then(
+        (response) => response.json()
+      ).then((response) => {
+        console.log('storage-manager got key from response:', response);
+        if (response.salt !== requestBody.salt || response.timestamp !== requestBody.timestamp) {
+          this.clear();
+        }
+        this.save('encryption', response);
+      }).catch(console.error);
+    }
   }
 
   save(key, value, options=this._options) {

From 8bee033efaee308731dd62486fee7aba2ae3ddc0 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 28 Jan 2020 19:41:43 +0100
Subject: [PATCH 41/65] fix(storage-manager): save salt and timestamp

---
 frontend/src/lib/storage-manager/storage-manager.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index ed2bad7cc..5ddc1c566 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -16,8 +16,10 @@ export class StorageManager {
 
   namespace;
   version;
+
   _options;
   _global;
+  _encryptionKey;
 
   constructor(namespace, version, options) {
     this.namespace = namespace;
@@ -41,6 +43,7 @@ export class StorageManager {
     else
       throw new Error('Cannot setup StorageManager without window or global');
     
+    // TODO handle salt and timestamp separately per location
     if (this._options.encryption) {
       const requestBody = {
         type   : this._options.encryption,
@@ -61,7 +64,8 @@ export class StorageManager {
         if (response.salt !== requestBody.salt || response.timestamp !== requestBody.timestamp) {
           this.clear();
         }
-        this.save('encryption', response);
+        this.save('encryption', { salt: response.salt, timestamp: response.timestamp });
+        this._encryptionKey = response.key;
       }).catch(console.error);
     }
   }

From 8122ab10b0277069ec4a6de7f77dd34748df3fe5 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 29 Jan 2020 10:53:42 +0100
Subject: [PATCH 42/65] feat(storage-manager): store encryption info per
 location

---
 .../lib/storage-manager/storage-manager.js    | 62 ++++++++++++-------
 .../src/utils/exam-correct/exam-correct.js    |  2 +-
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index 5ddc1c566..01ff44580 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -19,7 +19,8 @@ export class StorageManager {
 
   _options;
   _global;
-  _encryptionKey;
+
+  _encryptionKey = {};
 
   constructor(namespace, version, options) {
     this.namespace = namespace;
@@ -43,30 +44,11 @@ export class StorageManager {
     else
       throw new Error('Cannot setup StorageManager without window or global');
     
-    // TODO handle salt and timestamp separately per location
     if (this._options.encryption) {
-      const requestBody = {
-        type   : this._options.encryption,
-        length : 42,
-        ...this.load('encryption'),
-      };
-      this._global.App.httpClient.post({
-        url: '../../../../../../user/storage-key',  // TODO use APPROOT instead
-        headers: {
-          'Content-Type' : HttpClient.ACCEPT.JSON,
-          'Accept'       : HttpClient.ACCEPT.JSON,
-        },
-        body: JSON.stringify(requestBody),
-      }).then(
-        (response) => response.json()
-      ).then((response) => {
-        console.log('storage-manager got key from response:', response);
-        if (response.salt !== requestBody.salt || response.timestamp !== requestBody.timestamp) {
-          this.clear();
-        }
-        this.save('encryption', { salt: response.salt, timestamp: response.timestamp });
-        this._encryptionKey = response.key;
-      }).catch(console.error);
+      Object.values(LOCATION).forEach((location) => {
+        const encryption = this._options.encryption.all || this._options.encryption[location];
+        if (encryption) this._requestStorageKey({ location: location, encryption: encryption });
+      });
     }
   }
 
@@ -149,6 +131,7 @@ export class StorageManager {
 
           return this._saveToLocalStorage(val);
         }
+        // TODO add LOCATION.SESSION
         case LOCATION.WINDOW: {
           let val = this._getFromWindow();
 
@@ -173,6 +156,7 @@ export class StorageManager {
       switch (location) {
         case LOCATION.LOCAL:
           return this._clearLocalStorage();
+        // TODO add LOCATION.SESSION
         case LOCATION.WINDOW:
           return this._clearWindow();
         default:
@@ -302,4 +286,34 @@ export class StorageManager {
   _clearSessionStorage() {
     window.sessionStorage.removeItem(this.namespace);
   }
+
+  _requestStorageKey(options=this._options) {
+    if (!(options && options.location && options.encryption))
+      throw new Error('Storage Manager cannot request storage key with unsupported options!');
+
+    const requestBody = {
+        type   : options.encryption,
+        length : 42,
+        ...this.load('encryption', options),
+    };
+
+    this._global.App.httpClient.post({
+      url: '../../../../../../user/storage-key',  // TODO use APPROOT instead
+      headers: {
+        'Content-Type' : HttpClient.ACCEPT.JSON,
+        'Accept'       : HttpClient.ACCEPT.JSON,
+      },
+      body: JSON.stringify(requestBody),
+    }).then(
+      (response) => response.json()
+    ).then((response) => {
+      console.log('storage-manager got key from response:', response, 'with options:', options);
+      if (response.salt !== requestBody.salt || response.timestamp !== requestBody.timestamp) {
+        this.clear(options);
+      }
+      this.save('encryption', { salt: response.salt, timestamp: response.timestamp }, options);
+      this._encryptionKey[options.location] = response.key;
+    }).catch(console.error);
+  }
+
 }
diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index 13a73f821..e3c531f4a 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -64,7 +64,7 @@ export class ExamCorrect {
     this._element = element;
     this._app = app;
 
-    this._storageManager = new StorageManager('EXAM_CORRECT', '0.0.0', { location: LOCATION.SESSION, encryption: { tag: 'exam-correct', exam: this._element.getAttribute('uw-exam-correct') } });
+    this._storageManager = new StorageManager('EXAM_CORRECT', '0.0.0', { location: LOCATION.SESSION, encryption: { all: { tag: 'exam-correct', exam: this._element.getAttribute('uw-exam-correct') } } });
 
     this._sendBtn = document.getElementById(EXAM_CORRECT_SEND_BTN_ID);
     this._userInput = document.getElementById(EXAM_CORRECT_USER_INPUT_ID);

From 38b0a8eebc2e0774fb80e11e18736492e6ae2755 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 29 Jan 2020 11:07:29 +0100
Subject: [PATCH 43/65] fix(storage-manager): remove and clear SessionStorage

---
 frontend/src/lib/storage-manager/storage-manager.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index 01ff44580..2f977b5ac 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -131,7 +131,13 @@ export class StorageManager {
 
           return this._saveToLocalStorage(val);
         }
-        // TODO add LOCATION.SESSION
+        case LOCATION.SESSION: {
+          let val = this._getFromSessionStorage();
+
+          delete val[key];
+
+          return this._saveToSessionStorage(val);
+        }
         case LOCATION.WINDOW: {
           let val = this._getFromWindow();
 
@@ -156,7 +162,8 @@ export class StorageManager {
       switch (location) {
         case LOCATION.LOCAL:
           return this._clearLocalStorage();
-        // TODO add LOCATION.SESSION
+        case LOCATION.SESSION:
+          return this._clearSessionStorage();
         case LOCATION.WINDOW:
           return this._clearWindow();
         default:

From 783cd7d87117822175214b2ec8ae518ba1c3ddc8 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 13:54:08 +0100
Subject: [PATCH 44/65] chore: add sodium dependency

---
 package-lock.json | 184 +++++++++++++++++++++++++++++++++-------------
 package.json      |   3 +-
 records.json      |  15 +++-
 3 files changed, 148 insertions(+), 54 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 964ff8b78..951ac6c94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4310,6 +4310,23 @@
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
       "dev": true
     },
+    "blake2b": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/blake2b/-/blake2b-2.1.3.tgz",
+      "integrity": "sha512-pkDss4xFVbMb4270aCyGD3qLv92314Et+FsKzilCLxDz5DuZ2/1g3w4nmBbu6nKApPspnjG7JcwTjGZnduB1yg==",
+      "requires": {
+        "blake2b-wasm": "^1.1.0",
+        "nanoassert": "^1.0.0"
+      }
+    },
+    "blake2b-wasm": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz",
+      "integrity": "sha512-oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA==",
+      "requires": {
+        "nanoassert": "^1.0.0"
+      }
+    },
     "blob": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
@@ -12315,6 +12332,11 @@
       "dev": true,
       "optional": true
     },
+    "nanoassert": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
+      "integrity": "sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40="
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -12520,9 +12542,9 @@
       }
     },
     "npm": {
-      "version": "6.13.4",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-6.13.4.tgz",
-      "integrity": "sha512-vTcUL4SCg3AzwInWTbqg1OIaOXlzKSS8Mb8kc5avwrJpcvevDA5J9BhYSuei+fNs3pwOp4lzA5x2FVDXACvoXA==",
+      "version": "6.13.7",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-6.13.7.tgz",
+      "integrity": "sha512-X967EKTT407CvgrWFjXusnPh0VLERcmR9hZFSVgkEquOomZkvpwLJ5zrQ3qrG9SpPLKJE4bPLUu76exKQ4a3Cg==",
       "requires": {
         "JSONStream": "^1.3.5",
         "abbrev": "~1.1.1",
@@ -12530,7 +12552,7 @@
         "ansistyles": "~0.1.3",
         "aproba": "^2.0.0",
         "archy": "~1.0.0",
-        "bin-links": "^1.1.6",
+        "bin-links": "^1.1.7",
         "bluebird": "^3.5.5",
         "byte-size": "^5.0.1",
         "cacache": "^12.0.3",
@@ -12573,7 +12595,7 @@
         "libnpmorg": "^1.0.1",
         "libnpmsearch": "^2.0.2",
         "libnpmteam": "^1.0.2",
-        "libnpx": "^10.2.0",
+        "libnpx": "^10.2.2",
         "lock-verify": "^2.1.0",
         "lockfile": "^1.0.4",
         "lodash._baseindexof": "*",
@@ -12592,7 +12614,7 @@
         "mississippi": "^3.0.0",
         "mkdirp": "~0.5.1",
         "move-concurrently": "^1.0.1",
-        "node-gyp": "^5.0.5",
+        "node-gyp": "^5.0.7",
         "nopt": "~4.0.1",
         "normalize-package-data": "^2.5.0",
         "npm-audit-report": "^1.3.2",
@@ -12609,7 +12631,7 @@
         "once": "~1.4.0",
         "opener": "^1.5.1",
         "osenv": "^0.1.5",
-        "pacote": "^9.5.11",
+        "pacote": "^9.5.12",
         "path-is-inside": "~1.0.2",
         "promise-inflight": "~1.0.1",
         "qrcode-terminal": "^0.12.0",
@@ -12789,7 +12811,7 @@
           }
         },
         "bin-links": {
-          "version": "1.1.6",
+          "version": "1.1.7",
           "bundled": true,
           "requires": {
             "bluebird": "^3.5.3",
@@ -13269,7 +13291,7 @@
           }
         },
         "env-paths": {
-          "version": "1.0.0",
+          "version": "2.2.0",
           "bundled": true
         },
         "err-code": {
@@ -13572,7 +13594,7 @@
           }
         },
         "get-caller-file": {
-          "version": "1.0.2",
+          "version": "1.0.3",
           "bundled": true
         },
         "get-stream": {
@@ -13767,7 +13789,7 @@
           }
         },
         "invert-kv": {
-          "version": "1.0.0",
+          "version": "2.0.0",
           "bundled": true
         },
         "ip": {
@@ -13925,10 +13947,10 @@
           "bundled": true
         },
         "lcid": {
-          "version": "1.0.0",
+          "version": "2.0.0",
           "bundled": true,
           "requires": {
-            "invert-kv": "^1.0.0"
+            "invert-kv": "^2.0.0"
           }
         },
         "libcipm": {
@@ -14087,7 +14109,7 @@
           }
         },
         "libnpx": {
-          "version": "10.2.0",
+          "version": "10.2.2",
           "bundled": true,
           "requires": {
             "dotenv": "^5.0.1",
@@ -14217,15 +14239,30 @@
             "ssri": "^6.0.0"
           }
         },
+        "map-age-cleaner": {
+          "version": "0.1.3",
+          "bundled": true,
+          "requires": {
+            "p-defer": "^1.0.0"
+          }
+        },
         "meant": {
           "version": "1.0.1",
           "bundled": true
         },
         "mem": {
-          "version": "1.1.0",
+          "version": "4.3.0",
           "bundled": true,
           "requires": {
-            "mimic-fn": "^1.0.0"
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "mimic-fn": {
+              "version": "2.1.0",
+              "bundled": true
+            }
           }
         },
         "mime-db": {
@@ -14239,10 +14276,6 @@
             "mime-db": "~1.35.0"
           }
         },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "bundled": true
-        },
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
@@ -14320,6 +14353,10 @@
           "version": "0.0.7",
           "bundled": true
         },
+        "nice-try": {
+          "version": "1.0.5",
+          "bundled": true
+        },
         "node-fetch-npm": {
           "version": "2.0.2",
           "bundled": true,
@@ -14330,33 +14367,20 @@
           }
         },
         "node-gyp": {
-          "version": "5.0.5",
+          "version": "5.0.7",
           "bundled": true,
           "requires": {
-            "env-paths": "^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",
-            "request": "^2.87.0",
-            "rimraf": "2",
-            "semver": "~5.3.0",
+            "env-paths": "^2.2.0",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.2.2",
+            "mkdirp": "^0.5.1",
+            "nopt": "^4.0.1",
+            "npmlog": "^4.1.2",
+            "request": "^2.88.0",
+            "rimraf": "^2.6.3",
+            "semver": "^5.7.1",
             "tar": "^4.4.12",
-            "which": "1"
-          },
-          "dependencies": {
-            "nopt": {
-              "version": "3.0.6",
-              "bundled": true,
-              "requires": {
-                "abbrev": "1"
-              }
-            },
-            "semver": {
-              "version": "5.3.0",
-              "bundled": true
-            }
+            "which": "^1.3.1"
           }
         },
         "nopt": {
@@ -14550,12 +14574,38 @@
           "bundled": true
         },
         "os-locale": {
-          "version": "2.1.0",
+          "version": "3.1.0",
           "bundled": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          },
+          "dependencies": {
+            "cross-spawn": {
+              "version": "6.0.5",
+              "bundled": 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"
+              }
+            },
+            "execa": {
+              "version": "1.0.0",
+              "bundled": 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"
+              }
+            }
           }
         },
         "os-tmpdir": {
@@ -14570,10 +14620,18 @@
             "os-tmpdir": "^1.0.0"
           }
         },
+        "p-defer": {
+          "version": "1.0.0",
+          "bundled": true
+        },
         "p-finally": {
           "version": "1.0.0",
           "bundled": true
         },
+        "p-is-promise": {
+          "version": "2.1.0",
+          "bundled": true
+        },
         "p-limit": {
           "version": "1.2.0",
           "bundled": true,
@@ -14603,7 +14661,7 @@
           }
         },
         "pacote": {
-          "version": "9.5.11",
+          "version": "9.5.12",
           "bundled": true,
           "requires": {
             "bluebird": "^3.5.3",
@@ -15548,14 +15606,14 @@
           "bundled": true
         },
         "yargs": {
-          "version": "11.0.0",
+          "version": "11.1.1",
           "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",
+            "os-locale": "^3.1.0",
             "require-directory": "^2.1.1",
             "require-main-filename": "^1.0.1",
             "set-blocking": "^2.0.0",
@@ -18517,6 +18575,14 @@
         }
       }
     },
+    "siphash24": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/siphash24/-/siphash24-1.1.1.tgz",
+      "integrity": "sha512-dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA==",
+      "requires": {
+        "nanoassert": "^1.0.0"
+      }
+    },
     "slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -18780,6 +18846,17 @@
         }
       }
     },
+    "sodium-javascript": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz",
+      "integrity": "sha512-UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA==",
+      "requires": {
+        "blake2b": "^2.1.1",
+        "nanoassert": "^1.0.0",
+        "siphash24": "^1.0.1",
+        "xsalsa20": "^1.0.0"
+      }
+    },
     "sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
@@ -20808,6 +20885,11 @@
       "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
       "dev": true
     },
+    "xsalsa20": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.1.0.tgz",
+      "integrity": "sha512-zd3ytX2cm+tcSndRU+krm0eL4TMMpZE7evs5hLRAoOy6gviqLfe3qOlkjF3i5SeAkQUCeJk0lJZrEU56kHRfWw=="
+    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
diff --git a/package.json b/package.json
index 4f5523c9d..2c9a90a5c 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,8 @@
     "js-cookie": "^2.2.1",
     "lodash.throttle": "^4.1.1",
     "moment": "^2.24.0",
-    "npm": "^6.13.4",
+    "npm": "^6.13.7",
+    "sodium-javascript": "^0.5.5",
     "tail.datetime": "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/tail.DateTime.git#master",
     "whatwg-fetch": "^3.0.0"
   }
diff --git a/records.json b/records.json
index 9e7f6c03d..a2a5ae297 100644
--- a/records.json
+++ b/records.json
@@ -248,10 +248,21 @@
   ],
   "modules": {
     "byIdentifier": {
-      "multi frontend/src/polyfill.js frontend/src/main.js": 0
+      "multi frontend/src/polyfill.js frontend/src/main.js": 0,
+      "ignored node_modules/libsodium/dist/modules fs": 1,
+      "ignored node_modules/readable-stream/lib util": 2,
+      "ignored node_modules/readable-stream/lib/internal/streams util": 3,
+      "ignored node_modules/bn.js/lib buffer": 4,
+      "ignored node_modules/brorand crypto": 5,
+      "ignored node_modules/sodium-javascript crypto": 1
     },
     "usedIds": {
-      "0": 0
+      "0": 0,
+      "1": 1,
+      "2": 2,
+      "3": 3,
+      "4": 4,
+      "5": 5
     }
   },
   "chunks": {

From 5393a55482db21b5cb04ae3774d0f97e37789a3c Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 13:54:42 +0100
Subject: [PATCH 45/65] fix: fix webpack config

---
 webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 01ce06558..029b01a10 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -298,7 +298,7 @@ async function webpackConfig() {
         cacheGroups: {
           vendor: {
             test(module, chunk) {
-              return module.context.match(/[\\/]node_modules[\\/]/);
+              return module.context && module.context.match(/[\\/]node_modules[\\/]/);
             },
             name(module, chunks, cacheGroupKey) {
               const moduleFileName = module.identifier().split('/').reduceRight(item => item);

From 001614522e0ae3841b27086e9370c999c24a2963 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 14:10:04 +0100
Subject: [PATCH 46/65] feat(storage-manager): add en-/decryption stub (WIP)
 and restructure

---
 .../lib/storage-manager/storage-manager.js    | 101 ++++++++++++++----
 1 file changed, 82 insertions(+), 19 deletions(-)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index 2f977b5ac..ccc880de6 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -1,6 +1,7 @@
 /* global global:writable */
 
 import * as semver from 'semver';
+import sodium from 'sodium-javascript';
 
 import { HttpClient } from '../../services/http-client/http-client';
 
@@ -45,7 +46,7 @@ export class StorageManager {
       throw new Error('Cannot setup StorageManager without window or global');
     
     if (this._options.encryption) {
-      Object.values(LOCATION).forEach((location) => {
+      [LOCATION.LOCAL, LOCATION.SESSION].forEach((location) => {
         const encryption = this._options.encryption.all || this._options.encryption[location];
         if (encryption) this._requestStorageKey({ location: location, encryption: encryption });
       });
@@ -65,15 +66,15 @@ export class StorageManager {
 
     switch (location) {
       case LOCATION.LOCAL: {
-        this._saveToLocalStorage({ ...this._getFromLocalStorage(), [key]: value });
+        this._saveToLocalStorage(this._updateStorage(this._getFromLocalStorage(options), { [key]: value }, LOCATION.LOCAL, options));
         break;
       }
       case LOCATION.SESSION: {
-        this._saveToSessionStorage({ ...this._getFromSessionStorage(), [key]: value });
+        this._saveToSessionStorage(this._updateStorage(this._getFromSessionStorage(options), { [key]: value }, LOCATION.SESSION, options));
         break;
       }
       case LOCATION.WINDOW: {
-        this._saveToWindow({ ...this._getFromLocalStorage(), [key]: value });
+        this._saveToWindow({ ...this._getFromWindow(), [key]: value });
         break;
       }
       default:
@@ -94,11 +95,11 @@ export class StorageManager {
       
       switch (location) {
         case LOCATION.LOCAL: {
-          val = this._getFromLocalStorage()[key];
+          val = this._getFromLocalStorage(options)[key];
           break;
         }
         case LOCATION.SESSION: {
-          val = this._getFromSessionStorage()[key];
+          val = this._getFromSessionStorage(options)[key];
           break;
         }
         case LOCATION.WINDOW: {
@@ -125,14 +126,14 @@ export class StorageManager {
     for (const location of locations) {
       switch (location) {
         case LOCATION.LOCAL: {
-          let val = this._getFromLocalStorage();
+          let val = this._getFromLocalStorage(options);
 
           delete val[key];
 
           return this._saveToLocalStorage(val);
         }
         case LOCATION.SESSION: {
-          let val = this._getFromSessionStorage();
+          let val = this._getFromSessionStorage(options);
 
           delete val[key];
 
@@ -174,7 +175,7 @@ export class StorageManager {
   }
 
   
-  _getFromLocalStorage() {
+  _getFromLocalStorage(options=this._options) {
     let state;
 
     try {
@@ -190,10 +191,10 @@ export class StorageManager {
     }
 
     if ('state' in state)
-      return state.state;
+      return this._getFromStorage(state.state, LOCATION.LOCAL, options);
     else {
       delete state.version;
-      return state;
+      return this._getFromStorage(state, LOCATION.LOCAL, options);
     }
   }
 
@@ -224,12 +225,12 @@ export class StorageManager {
     if (!this._global.App.Storage)
       this._global.App.Storage = {};
 
-    return this._global.App.Storage[this.namespace] || {};
+    return this._global.App.Storage;
   }
 
   _saveToWindow(value) {
     if (!this._global || !this._global.App) {
-      throw new Error('StorageManager._saveToWindow called when window.App is not available');
+      return console.error('StorageManager._saveToWindow called when window.App is not available');
     }
 
     if (!value)
@@ -243,7 +244,7 @@ export class StorageManager {
 
   _clearWindow() {
     if (!this._global || !this._global.App) {
-      throw new Error('StorageManager._saveToWindow called when window.App is not available');
+      return console.error('StorageManager._saveToWindow called when window.App is not available');
     }
  
     if (this._global.App.Storage) {
@@ -252,7 +253,8 @@ export class StorageManager {
   }
 
 
-  _getFromSessionStorage() {
+  _getFromSessionStorage(options=this._options) {
+    console.log('_getFromSessionStorage with args', options); 
     let state;
 
     try {
@@ -268,10 +270,10 @@ export class StorageManager {
     }
 
     if ('state' in state)
-      return state.state;
+      return this._getFromStorage(state.state, LOCATION.SESSION, options);
     else {
       delete state.version;
-      return state;
+      return this._getFromStorage(state, LOCATION.SESSION, options);
     }
   }
 
@@ -294,6 +296,26 @@ export class StorageManager {
     window.sessionStorage.removeItem(this.namespace);
   }
 
+
+  _getFromStorage(storage, location, options=this._options) {
+    const encryption = options.encryption && (options.encryption.all || options.encryption[location]);
+    if (encryption && storage.encryption) {
+      return { ...storage, ...JSON.parse(decrypt(storage.encryption.ciphertext, encryption.key) || '{}') };
+    } else {
+      return storage;
+    }
+  }
+
+  _updateStorage(storage, update, location, options=this._options) {
+    const encryption = options.encryption && (options.encryption.all || options.encryption[location]);
+    if (encryption && storage.encryption) {
+      const updatedDecryptedStorage = { ...JSON.parse(decrypt(storage.encryption.ciphertext, this._encryptionKey[location]) || '{}'), ...update };
+      return { ...storage, encryption: { ...storage.encryption, ciphertext: encrypt(JSON.stringify(updatedDecryptedStorage), this._encryptionKey[location]) } };
+    } else {
+      return { ...storage, ...update };
+    }
+  }
+
   _requestStorageKey(options=this._options) {
     if (!(options && options.location && options.encryption))
       throw new Error('Storage Manager cannot request storage key with unsupported options!');
@@ -301,7 +323,7 @@ export class StorageManager {
     const requestBody = {
         type   : options.encryption,
         length : 42,
-        ...this.load('encryption', options),
+        ...this.load('encryption', { ...options, encryption: false }),
     };
 
     this._global.App.httpClient.post({
@@ -318,9 +340,50 @@ export class StorageManager {
       if (response.salt !== requestBody.salt || response.timestamp !== requestBody.timestamp) {
         this.clear(options);
       }
-      this.save('encryption', { salt: response.salt, timestamp: response.timestamp }, options);
+      this.save('encryption', { salt: response.salt, timestamp: response.timestamp }, { ...options, encryption: false });
       this._encryptionKey[options.location] = response.key;
     }).catch(console.error);
   }
 
 }
+
+
+// TODO debug unnecessary calls of encrypt
+function encrypt(plaintext, key) {
+  console.log('args encrypt', plaintext, key);
+
+  if (!plaintext) return '';
+  if (!key) throw new Error('Cannot encrypt plaintext without a valid key!');
+
+  /* eslint-disable no-undef */
+  // TODO use const if possible
+  let plaintextB = Buffer.from(plaintext);
+  let cipherB    = Buffer.alloc(plaintextB.length + sodium.crypto_secretbox_MACBYTES);
+  let nonceB     = Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES);
+  let keyB       = Buffer.from(key);
+  /* eslint-enable no-undef */
+
+  sodium.crypto_secretbox_easy(cipherB, plaintextB, nonceB, keyB);
+
+  return cipherB.toString('base64');
+}
+
+// TODO debug unnecessary calls of decrypt
+function decrypt(ciphertext, key) {
+  console.log('args decrypt', ciphertext, key);
+
+  if (!ciphertext) return '';
+  if (!key) throw new Error('Cannot decrypt ciphertext without a valid key!');
+  
+  /* eslint-disable no-undef */
+  // TODO use const if possible
+  let cipherB    = Buffer.from(ciphertext);
+  let plaintextB = Buffer.alloc(cipherB.length - sodium.crypto_secretbox_MACBYTES);
+  let nonceB     = Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES);
+  let keyB       = Buffer.from(key);
+  /* eslint-enable no-undef */
+
+  sodium.crypto_secretbox_open_easy(plaintextB, cipherB, nonceB, keyB);
+
+  return plaintextB.toString();
+}

From 9e9726e173dbfa5a0a4dff0402a19af6ca8dfa51 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 14:57:24 +0100
Subject: [PATCH 47/65] fix(storage-manager): correctly use encryption key in
 decrypt call

---
 frontend/src/lib/storage-manager/storage-manager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index ccc880de6..ed8ad7511 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -300,7 +300,7 @@ export class StorageManager {
   _getFromStorage(storage, location, options=this._options) {
     const encryption = options.encryption && (options.encryption.all || options.encryption[location]);
     if (encryption && storage.encryption) {
-      return { ...storage, ...JSON.parse(decrypt(storage.encryption.ciphertext, encryption.key) || '{}') };
+      return { ...storage, ...JSON.parse(decrypt(storage.encryption.ciphertext, this._encryptionKey[location]) || '{}') };
     } else {
       return storage;
     }
@@ -365,7 +365,7 @@ function encrypt(plaintext, key) {
 
   sodium.crypto_secretbox_easy(cipherB, plaintextB, nonceB, keyB);
 
-  return cipherB.toString('base64');
+  return cipherB;
 }
 
 // TODO debug unnecessary calls of decrypt

From 0d43037fa7bb5c3e9a1b563d403392dd979e68de Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 16:20:35 +0100
Subject: [PATCH 48/65] style(exam-correct): minor style fixes and
 restructuring

---
 frontend/src/utils/exam-correct/exam-correct.js   | 10 ++++++----
 frontend/src/utils/exam-correct/exam-correct.sass | 11 +++++++++++
 templates/exam-correct.hamlet                     | 13 ++++++-------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index e3c531f4a..d802fd60a 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -458,6 +458,7 @@ export class ExamCorrect {
       } else {
         const partCell = document.createElement('TD');
         partCell.innerHTML = partResult;
+        partCell.classList.add('uw-exam-correct--part-cell');
         cells.set(cellIndex, partCell);
       }
     }
@@ -474,8 +475,9 @@ export class ExamCorrect {
       newRow.appendChild(cell);
     }
 
-    const tableBody = this._element.querySelector(`tbody:not(#${EXAM_CORRECT_INPUT_BODY_ID})`);
-    insertAsFirstChild(newRow, tableBody);
+    const tableBody = this._element.querySelector('tbody');
+    const inputRow = document.getElementById(EXAM_CORRECT_INPUT_BODY_ID);
+    tableBody && tableBody.insertBefore(newRow, inputRow ? inputRow.nextSibling : null);
   }
 
   _clearUserInput() {
@@ -492,9 +494,9 @@ export class ExamCorrect {
 function clearInput(inputElement) {
   inputElement.value = null;
 }
-function insertAsFirstChild(elementToInsert, parentElement) {
+/* function insertAsFirstChild(elementToInsert, parentElement) {
   parentElement.insertBefore(elementToInsert, parentElement.firstChild);
-}
+} */
 function removeAllChildren(element) {
   while (element.firstChild) {
     element.removeChild(element.firstChild);
diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index e971a33ae..d807ee0fc 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -1,5 +1,16 @@
 $exam-correct--input-status-margin: 10px
 
+table[uw-exam-correct]
+  table-layout: fixed
+
+  th.uw-exam-correct--user-cell, td.uw-exam-correct--user-cell
+    min-width: 200px
+  th.uw-exam-correct--part-cell, td.uw-exam-correct--part-cell
+    width: 85px
+    input
+      width: 70px
+      padding: 4px 8px
+
 [uw-exam-correct] input:invalid:not(.no-value)
   border: 2px solid var(--color-error)
 
diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index 22a6f0457..ede47363c 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -7,11 +7,11 @@ $newline never
         <tr .table__row .table__row--head>
           <th .table__th .sortable .sorted-desc uw-exam-correct-header="date" uw-hide-column-header="date">
             _{MsgExamCorrectHeadDate}
-          <th .table__th .sortable uw-exam-correct-header="user" uw-hide-column-header="user">
+          <th .table__th .sortable .uw-exam-correct--user-cell uw-exam-correct-header="user" uw-hide-column-header="user">
             _{MsgExamCorrectHeadParticipant}
             ^{iconTooltip participantHeadTooltip Nothing True}
           $forall ExamPart{examPartNumber,examPartName} <- examParts
-            <th .table__th .sortable uw-exam-correct-header=#{examPartNumber} uw-hide-column-header=#{examPartNumber}>
+            <th .table__th .sortable .uw-exam-correct--part-cell uw-exam-correct-header=#{examPartNumber} uw-hide-column-header=#{examPartNumber}>
               $maybe name <- examPartName
                 <span .tooltip>
                   <span>
@@ -22,17 +22,16 @@ $newline never
                 _{MsgExamCorrectHeadPart examPartNumber}
           <th .table__th .sortable uw-exam-correct-header="status" uw-hide-column-header="status">
             _{MsgExamCorrectHeadStatus}
-      <tbody #exam-correct__new>
-        <tr .table__row>
+      <tbody>
+        <tr .table__row #exam-correct__new>
           <td .table__td>
           <td .table__td .exam-correct--input-status>
-            <input #exam-correct__user type="text" autofocus minLength=1>
+            <input #exam-correct__user .uw-exam-correct--user-cell type="text" autofocus minLength=1>
             <i #exam-correct__user-status .fas .fa-fw>
             <ul #exam-correct__user-candidates>
           $forall ExamPart{examPartNumber} <- examParts
-            <td .table__td>
+            <td .table__td .uw-exam-correct--part-cell>
               ^{ptsInput examPartNumber}
           <td #exam-correct__status .table__td>
             <button #exam-correct__send-btn .btn .btn-primary>
               _{MsgExamCorrectButtonSend}
-      <tbody>

From 301c88f2ea9dd0b430e982f11adcf6fd29d74096 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 16:55:09 +0100
Subject: [PATCH 49/65] fix(storage-manager): post salt and timestamp only when
 fetching key

---
 frontend/src/lib/storage-manager/storage-manager.js | 8 +++++---
 frontend/src/utils/exam-correct/exam-correct.js     | 1 +
 frontend/src/utils/exam-correct/exam-correct.sass   | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index ed8ad7511..d93b6efd2 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -320,10 +320,12 @@ export class StorageManager {
     if (!(options && options.location && options.encryption))
       throw new Error('Storage Manager cannot request storage key with unsupported options!');
 
+    const enc = this.load('encryption', { ...options, encryption: false });
     const requestBody = {
-        type   : options.encryption,
-        length : 42,
-        ...this.load('encryption', { ...options, encryption: false }),
+      type      : options.encryption,
+      length    : 42,
+      salt      : enc.salt,
+      timestamp : enc.timestamp,
     };
 
     this._global.App.httpClient.post({
diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index d802fd60a..d231dc79d 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -433,6 +433,7 @@ export class ExamCorrect {
     const cells = new Map();
 
     const dateCell = document.createElement('TD');
+    dateCell.classList.add('uw-exam-correct--date-cell');
     const date = moment(rowInfo.date);
     dateCell.appendChild(document.createTextNode(date.format(this._dateFormat)));
     dateCell.setAttribute('date', date.utc().format());
diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index d807ee0fc..ab6ca571a 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -3,6 +3,11 @@ $exam-correct--input-status-margin: 10px
 table[uw-exam-correct]
   table-layout: fixed
 
+  td.uw-exam-correct--date-cell
+    text-align: right
+  td.uw-exam-correct--part-cell
+    text-align: right
+
   th.uw-exam-correct--user-cell, td.uw-exam-correct--user-cell
     min-width: 200px
   th.uw-exam-correct--part-cell, td.uw-exam-correct--part-cell
@@ -11,6 +16,7 @@ table[uw-exam-correct]
       width: 70px
       padding: 4px 8px
 
+
 [uw-exam-correct] input:invalid:not(.no-value)
   border: 2px solid var(--color-error)
 

From 55b9213825e2efe2421c563028cbb09c9b18fb7e Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 17:00:30 +0100
Subject: [PATCH 50/65] style(exam-correct): exam-correct table as scrolltable

---
 templates/exam-correct.hamlet | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index ede47363c..f629ebfc3 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -1,11 +1,11 @@
 $newline never
 
 <section>
-  <div uw-hide-columns="exam-correct">
+  <div uw-hide-columns="exam-correct" .scrolltable .scrolltable--bordered>
     <table .table .table--striped table--hover uw-exam-correct=#{toPathPiece examCorrectIdent} uw-sort-table=exam-correct-#{toPathPiece examCorrectIdent}>
       <thead>
         <tr .table__row .table__row--head>
-          <th .table__th .sortable .sorted-desc uw-exam-correct-header="date" uw-hide-column-header="date">
+          <th .table__th .sortable .sorted-desc .uw-exam-correct--date-cell uw-exam-correct-header="date" uw-hide-column-header="date">
             _{MsgExamCorrectHeadDate}
           <th .table__th .sortable .uw-exam-correct--user-cell uw-exam-correct-header="user" uw-hide-column-header="user">
             _{MsgExamCorrectHeadParticipant}
@@ -24,7 +24,7 @@ $newline never
             _{MsgExamCorrectHeadStatus}
       <tbody>
         <tr .table__row #exam-correct__new>
-          <td .table__td>
+          <td .table__td .uw-exam-correct--date-cell>
           <td .table__td .exam-correct--input-status>
             <input #exam-correct__user .uw-exam-correct--user-cell type="text" autofocus minLength=1>
             <i #exam-correct__user-status .fas .fa-fw>

From 57f864cac16662f89472da6f4acad561fbf46e88 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 17:11:26 +0100
Subject: [PATCH 51/65] style(exam-correct): minor tweaks

---
 frontend/src/utils/exam-correct/exam-correct.sass | 2 +-
 templates/exam-correct.hamlet                     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index ab6ca571a..6b96b4fe9 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -6,7 +6,7 @@ table[uw-exam-correct]
   td.uw-exam-correct--date-cell
     text-align: right
   td.uw-exam-correct--part-cell
-    text-align: right
+    text-align: center
 
   th.uw-exam-correct--user-cell, td.uw-exam-correct--user-cell
     min-width: 200px
diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index f629ebfc3..267580182 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -5,13 +5,13 @@ $newline never
     <table .table .table--striped table--hover uw-exam-correct=#{toPathPiece examCorrectIdent} uw-sort-table=exam-correct-#{toPathPiece examCorrectIdent}>
       <thead>
         <tr .table__row .table__row--head>
-          <th .table__th .sortable .sorted-desc .uw-exam-correct--date-cell uw-exam-correct-header="date" uw-hide-column-header="date">
+          <th .table__th .uw-exam-correct--date-cell uw-exam-correct-header="date" uw-hide-column-header="date">
             _{MsgExamCorrectHeadDate}
-          <th .table__th .sortable .uw-exam-correct--user-cell uw-exam-correct-header="user" uw-hide-column-header="user">
+          <th .table__th .uw-exam-correct--user-cell uw-exam-correct-header="user" uw-hide-column-header="user">
             _{MsgExamCorrectHeadParticipant}
             ^{iconTooltip participantHeadTooltip Nothing True}
           $forall ExamPart{examPartNumber,examPartName} <- examParts
-            <th .table__th .sortable .uw-exam-correct--part-cell uw-exam-correct-header=#{examPartNumber} uw-hide-column-header=#{examPartNumber}>
+            <th .table__th .uw-exam-correct--part-cell uw-exam-correct-header=#{examPartNumber} uw-hide-column-header=#{examPartNumber}>
               $maybe name <- examPartName
                 <span .tooltip>
                   <span>
@@ -20,7 +20,7 @@ $newline never
                     _{MsgExamCorrectHeadPartName name}
               $nothing
                 _{MsgExamCorrectHeadPart examPartNumber}
-          <th .table__th .sortable uw-exam-correct-header="status" uw-hide-column-header="status">
+          <th .table__th uw-exam-correct-header="status" uw-hide-column-header="status">
             _{MsgExamCorrectHeadStatus}
       <tbody>
         <tr .table__row #exam-correct__new>

From becfcdb1db8b2d028895b62417489f73951c9b35 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 18:23:19 +0100
Subject: [PATCH 52/65] style(exam-correct): minor tweak

---
 frontend/src/utils/exam-correct/exam-correct.sass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index 6b96b4fe9..8fcdac72d 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -1,8 +1,6 @@
 $exam-correct--input-status-margin: 10px
 
 table[uw-exam-correct]
-  table-layout: fixed
-
   td.uw-exam-correct--date-cell
     text-align: right
   td.uw-exam-correct--part-cell

From 93adcd9811d0209897a810860676fdf50cdf262a Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Sat, 1 Feb 2020 18:23:57 +0100
Subject: [PATCH 53/65] chore(storage-manager): proper-ish debug logs

---
 .../lib/storage-manager/storage-manager.js    | 60 ++++++++++++++++---
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index d93b6efd2..df91229d4 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -24,6 +24,8 @@ export class StorageManager {
   _encryptionKey = {};
 
   constructor(namespace, version, options) {
+    this._debugLog('constructor', namespace, version, options);
+
     this.namespace = namespace;
     this.version = semver.valid(version);
 
@@ -54,6 +56,8 @@ export class StorageManager {
   }
 
   save(key, value, options=this._options) {
+    this._debugLog('save', key, value, options);
+
     if (!key) {
       throw new Error('StorageManager.save called with invalid key');
     }
@@ -83,6 +87,8 @@ export class StorageManager {
   }
 
   load(key, options=this._options) {
+    this._debugLog('load', key, options);
+
     if (options && options.location !== undefined && !Object.values(LOCATION).includes(options.location)) {
       throw new Error('StorageManager.load called with unsupported location option');
     }
@@ -117,6 +123,8 @@ export class StorageManager {
   }
 
   remove(key, options=this._options) {
+    this._debugLog('remove', key, options);
+
     if (options && options.location !== undefined && !Object.values(LOCATION).includes(options.location)) {
       throw new Error('StorageManager.load called with unsupported location option');
     }
@@ -153,6 +161,8 @@ export class StorageManager {
   }
 
   clear(options) {
+    this._debugLog('clear', options);
+
      if (options && options.location !== undefined && !Object.values(LOCATION).includes(options.location)) {
       throw new Error('StorageManager.clear called with unsupported location option');
     }
@@ -176,10 +186,12 @@ export class StorageManager {
 
   
   _getFromLocalStorage(options=this._options) {
+    this._debugLog('_getFromLocalStorage', options);
+
     let state;
 
     try {
-      state = JSON.parse(window.localStorage.getItem(this.namespace));
+      state = JSON.parse(window.localStorage.getItem(this.namespace) || null);
     } catch {
       state = null;
     }
@@ -199,6 +211,8 @@ export class StorageManager {
   }
 
   _saveToLocalStorage(state) {
+    this._debugLog('_saveToLocalStorage', state);
+
     if (!state)
       return this._clearLocalStorage();
 
@@ -214,11 +228,15 @@ export class StorageManager {
   }
 
   _clearLocalStorage() {
+    this._debugLog('_clearLocalStorage');
+
     window.localStorage.removeItem(this.namespace);
   }
 
   
   _getFromWindow() {
+    this._debugLog('_getFromWindow');
+
     if (!this._global || !this._global.App)
       return {};
 
@@ -229,6 +247,8 @@ export class StorageManager {
   }
 
   _saveToWindow(value) {
+    this._debugLog('_saveToWindow', value);
+
     if (!this._global || !this._global.App) {
       return console.error('StorageManager._saveToWindow called when window.App is not available');
     }
@@ -243,6 +263,8 @@ export class StorageManager {
   }
 
   _clearWindow() {
+    this._debugLog('_clearWindow');
+
     if (!this._global || !this._global.App) {
       return console.error('StorageManager._saveToWindow called when window.App is not available');
     }
@@ -254,11 +276,12 @@ export class StorageManager {
 
 
   _getFromSessionStorage(options=this._options) {
-    console.log('_getFromSessionStorage with args', options); 
+    this._debugLog('_getFromSessionStorage', options);
+
     let state;
 
     try {
-      state = JSON.parse(window.sessionStorage.getItem(this.namespace));
+      state = JSON.parse(window.sessionStorage.getItem(this.namespace) || null);
     } catch {
       state = null;
     }
@@ -278,6 +301,8 @@ export class StorageManager {
   }
 
   _saveToSessionStorage(state) {
+    this._debugLog('_saveToSessionStorage', state);
+
     if (!state)
       return this._clearSessionStorage();
 
@@ -293,23 +318,30 @@ export class StorageManager {
   }
 
   _clearSessionStorage() {
+    this._debugLog('_clearSessionStorage');
+
     window.sessionStorage.removeItem(this.namespace);
   }
 
 
   _getFromStorage(storage, location, options=this._options) {
+    this._debugLog('_getFromStorage', storage, location, options);
+
     const encryption = options.encryption && (options.encryption.all || options.encryption[location]);
     if (encryption && storage.encryption) {
-      return { ...storage, ...JSON.parse(decrypt(storage.encryption.ciphertext, this._encryptionKey[location]) || '{}') };
+      return { ...storage, ...JSON.parse(decrypt(storage.encryption.ciphertext, this._encryptionKey[location]) || null) };
     } else {
       return storage;
     }
   }
 
   _updateStorage(storage, update, location, options=this._options) {
+    this._debugLog('_updateStorage', storage, update, location, options);
+
     const encryption = options.encryption && (options.encryption.all || options.encryption[location]);
     if (encryption && storage.encryption) {
-      const updatedDecryptedStorage = { ...JSON.parse(decrypt(storage.encryption.ciphertext, this._encryptionKey[location]) || '{}'), ...update };
+      const updatedDecryptedStorage = { ...JSON.parse(decrypt(storage.encryption.ciphertext, this._encryptionKey[location]) || null), ...update };
+      console.log('updatedDecryptedStorage', updatedDecryptedStorage);
       return { ...storage, encryption: { ...storage.encryption, ciphertext: encrypt(JSON.stringify(updatedDecryptedStorage), this._encryptionKey[location]) } };
     } else {
       return { ...storage, ...update };
@@ -317,6 +349,8 @@ export class StorageManager {
   }
 
   _requestStorageKey(options=this._options) {
+    this._debugLog('_requestStorageKey', options);
+
     if (!(options && options.location && options.encryption))
       throw new Error('Storage Manager cannot request storage key with unsupported options!');
 
@@ -347,12 +381,16 @@ export class StorageManager {
     }).catch(console.error);
   }
 
+  _debugLog(fName, ...args) {
+    console.log(`[DEBUGLOG] StorageManager.${fName}`, { args: args, instance: this });
+  }
+
 }
 
 
 // TODO debug unnecessary calls of encrypt
 function encrypt(plaintext, key) {
-  console.log('args encrypt', plaintext, key);
+  console.log('encrypt', plaintext, key);
 
   if (!plaintext) return '';
   if (!key) throw new Error('Cannot encrypt plaintext without a valid key!');
@@ -367,12 +405,14 @@ function encrypt(plaintext, key) {
 
   sodium.crypto_secretbox_easy(cipherB, plaintextB, nonceB, keyB);
 
-  return cipherB;
+  const result = cipherB;
+  console.log('encrypt result', result);
+  return result;
 }
 
 // TODO debug unnecessary calls of decrypt
 function decrypt(ciphertext, key) {
-  console.log('args decrypt', ciphertext, key);
+  console.log('decrypt', ciphertext, key);
 
   if (!ciphertext) return '';
   if (!key) throw new Error('Cannot decrypt ciphertext without a valid key!');
@@ -387,5 +427,7 @@ function decrypt(ciphertext, key) {
 
   sodium.crypto_secretbox_open_easy(plaintextB, cipherB, nonceB, keyB);
 
-  return plaintextB.toString();
+  const result = plaintextB.toString();
+  console.log('decrypt result', result);
+  return result;
 }

From 5d0e376eb48b17ecae8ddb8e255ad5016cb53874 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 4 Feb 2020 09:45:21 +0100
Subject: [PATCH 54/65] refactor(storage-manager): remove unnecessary null
 param for JSON.parse

---
 frontend/src/lib/storage-manager/storage-manager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index df91229d4..6a669e76e 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -191,7 +191,7 @@ export class StorageManager {
     let state;
 
     try {
-      state = JSON.parse(window.localStorage.getItem(this.namespace) || null);
+      state = JSON.parse(window.localStorage.getItem(this.namespace));
     } catch {
       state = null;
     }
@@ -281,7 +281,7 @@ export class StorageManager {
     let state;
 
     try {
-      state = JSON.parse(window.sessionStorage.getItem(this.namespace) || null);
+      state = JSON.parse(window.sessionStorage.getItem(this.namespace));
     } catch {
       state = null;
     }

From 88e9bb26fe67a1423b60b2ced6264ca8a87bee1b Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 4 Feb 2020 09:46:34 +0100
Subject: [PATCH 55/65] style(exam-correct): fix table layout to prevent visual
 offset on submit

---
 frontend/src/utils/exam-correct/exam-correct.sass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index 8fcdac72d..6b96b4fe9 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -1,6 +1,8 @@
 $exam-correct--input-status-margin: 10px
 
 table[uw-exam-correct]
+  table-layout: fixed
+
   td.uw-exam-correct--date-cell
     text-align: right
   td.uw-exam-correct--part-cell

From 001a60027031d84efbfc29c9240341920e6390a1 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 4 Feb 2020 09:48:37 +0100
Subject: [PATCH 56/65] refactor(exam-correct): minor refactor; no persistent
 entries for now

---
 .../src/utils/exam-correct/exam-correct.js    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js
index d231dc79d..75ab62a8e 100644
--- a/frontend/src/utils/exam-correct/exam-correct.js
+++ b/frontend/src/utils/exam-correct/exam-correct.js
@@ -38,10 +38,8 @@ const STATUS = {
 })
 export class ExamCorrect {
 
-  _storageManager;
-  _dateFormat;
-
   _element;
+  _app;
 
   _sendBtn;
   _userInput;
@@ -49,9 +47,12 @@ export class ExamCorrect {
   _userInputCandidates;
   _partInputs;
 
+  _dateFormat;
   _cIndices;
   _lastColumnIndex;
 
+  _storageManager;
+
   constructor(element, app) {
     if (!element) {
       throw new Error('Exam Correct utility cannot be setup without an element!');
@@ -64,7 +65,9 @@ export class ExamCorrect {
     this._element = element;
     this._app = app;
 
-    this._storageManager = new StorageManager('EXAM_CORRECT', '0.0.0', { location: LOCATION.SESSION, encryption: { all: { tag: 'exam-correct', exam: this._element.getAttribute('uw-exam-correct') } } });
+    // TODO work in progress
+    // this._storageManager = new StorageManager('EXAM_CORRECT', '0.0.0', { location: LOCATION.SESSION, encryption: { all: { tag: 'exam-correct', exam: this._element.getAttribute('uw-exam-correct') } } });
+    this._storageManager = new StorageManager('EXAM_CORRECT', '0.0.0', { location: LOCATION.WINDOW });
 
     this._sendBtn = document.getElementById(EXAM_CORRECT_SEND_BTN_ID);
     this._userInput = document.getElementById(EXAM_CORRECT_USER_INPUT_ID);
@@ -72,9 +75,6 @@ export class ExamCorrect {
     this._userInputCandidates = document.getElementById(EXAM_CORRECT_USER_INPUT_CANDIDATES_ID);
     this._partInputs = [...this._element.querySelectorAll(`input[${EXAM_CORRECT_PART_INPUT_ATTR}]`)];
 
-    // TODO get date format by post request
-    this._dateFormat = 'YYYY-MM-DD HH:mm:ss';
-
     if (this._sendBtn)
       this._sendBtn.addEventListener('click', this._sendCorrectionHandler.bind(this));
     else console.error('ExamCorrect utility could not detect send button!');
@@ -91,6 +91,9 @@ export class ExamCorrect {
       throw new Error('ExamCorrect utility could not detect user input candidate list!');
     }
 
+    // TODO get date format by post request
+    this._dateFormat = 'YYYY-MM-DD HH:mm:ss';
+
     this._cIndices = new Map(
       [...this._element.querySelectorAll('[uw-exam-correct-header]')]
         .map((header) => [header.getAttribute('uw-exam-correct-header'), header.cellIndex])
@@ -98,12 +101,12 @@ export class ExamCorrect {
 
     this._lastColumnIndex = this._element.querySelector('thead > tr').querySelectorAll('th').length - 1;
 
-    // show previously submitted results
-    const previousEntries = this._storageManager.load('entries');
+    // TODO show previously submitted results
+    /* const previousEntries = this._storageManager.load('entries');
     if (previousEntries && previousEntries.length > 0) {
       // TODO sort previous results by current sorting order first
       previousEntries.forEach((entry) => this._addRow(entry));
-    }
+    } */
   }
 
   destroy() {

From d19cca6a400e41f8ac2733b474fbaa6cad2b48f6 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 4 Feb 2020 10:40:34 +0100
Subject: [PATCH 57/65] fix: fix merge

---
 messages/uniworx/de-de-formal.msg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 121137bf3..c92ffab3c 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1272,11 +1272,8 @@ BreadcrumbExternalExamGrades: Prüfungsleistungen
 BreadcrumbExternalExamStaffInvite: Einladung zum Prüfer
 BreadcrumbParticipantsList: Kursteilnehmerlisten
 BreadcrumbParticipants: Kursteilnehmerliste
-<<<<<<< HEAD
 BreadcrumbStorageKey: Lokalen Schlüssel generieren
-=======
 BreadcrumbExamAutoOccurrence: Automatische Termin-/Raumverteilung
->>>>>>> master
 
 ExternalExamEdit coursen@CourseName examn@ExamName: Bearbeiten: #{coursen}, #{examn}
 ExternalExamGrades coursen@CourseName examn@ExamName: Prüfungsleistungen: #{coursen}, #{examn}

From cdfca514fc3d6c11205c5559c203fed19b46c6ed Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Tue, 4 Feb 2020 12:30:10 +0100
Subject: [PATCH 58/65] chore: execute yesod via stack if yesod is not in PATH

---
 start.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/start.sh b/start.sh
index 07cf5940a..54bfd2d0e 100755
--- a/start.sh
+++ b/start.sh
@@ -25,6 +25,12 @@ if [[ -d .stack-work-run ]]; then
     trap move-back EXIT
 fi
 
-# stack exec -- yesod devel $@
-
-yesod devel $@
+if ! [ -z "$(which yesod)" ]
+then
+  yesod devel $@
+elif ! [ -z "$(which stack)" ]
+then
+  stack exec -- yesod devel $@
+else
+  exit 1
+fi

From be187ae90727eba0966de59a3b6945080515b3db Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 5 Feb 2020 16:02:48 +0100
Subject: [PATCH 59/65] feat(exam-correct): accept grades besides exam part
 results

---
 src/Handler/Exam/Correct.hs | 53 ++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index d730ef647..21cd87457 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -29,7 +29,8 @@ deriveJSON defaultOptions
 data CorrectInterfaceResponse
   = CorrectInterfaceResponseSuccess
     { cirsUser       :: CorrectInterfaceUser
-    , cirsResults    :: Map ExamPartNumber (Maybe Points)
+    , cirsResults    :: Map ExamPartNumber (Maybe ExamResultPoints)
+    , cirsGrade      :: Maybe ExamResultPassedGrade
     , cirsTime       :: UTCTime
     }
   | CorrectInterfaceResponseAmbiguous
@@ -52,6 +53,7 @@ data CorrectInterfaceRequest
   = CorrectInterfaceRequest
     { ciqUser        :: Either Text (CryptoID UUID (Key User))
     , ciqResults     :: Maybe (NonNull (Map ExamPartNumber (Maybe Points)))
+    , ciqGrade       :: Maybe ExamResultPassedGrade
     }
 
 instance FromJSON CorrectInterfaceRequest where
@@ -59,6 +61,7 @@ instance FromJSON CorrectInterfaceRequest where
     ciqUser <- Right <$> o JSON..: "user" <|> Left <$> o JSON..: "user"
     results <- o JSON..:? "results"
     ciqResults <- for results $ maybe (fail "Results may not be nullable") return . fromNullable
+    ciqGrade <- o JSON..:? "grade"
     return CorrectInterfaceRequest{..}
 
 
@@ -92,10 +95,10 @@ postECorrectR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Vo
 postECorrectR tid ssh csh examn = do
   MsgRenderer mr <- getMsgRenderer
 
-  CorrectInterfaceRequest{ciqUser,ciqResults} <- requireCheckJsonBody
+  CorrectInterfaceRequest{..} <- requireCheckJsonBody
 
   response <- runDB $ do
-    Entity eId _ <- fetchExam tid ssh csh examn
+    Entity eId Exam{..} <- fetchExam tid ssh csh examn
     euid <- traverse decrypt ciqUser
 
     participantMatches <- E.select . E.from $ \(examRegistration `E.InnerJoin` user) -> do
@@ -130,16 +133,17 @@ postECorrectR tid ssh csh examn = do
 
     if
       -- on no-op request, answer with 200 and a set of all participant matches
-      | is _Nothing ciqResults -> do
+      | is _Nothing ciqResults, is _Nothing ciqGrade -> do
         users <- traverse userToResponse participantMatches
         return CorrectInterfaceResponseNoOp
           { cirnUsers = Set.fromList users
           }
 
-      -- on match with exactly one exam participant, insert results and answer with 200
-      | [match@(Entity uid _)] <- participantMatches, Just results <- ciqResults -> do
+      -- on match with exactly one exam participant, insert results and/or grade and answer with 200
+      | [match@(Entity uid _)] <- participantMatches -> do
         now <- liftIO getCurrentTime
-        newExamPartResults <- iforM (toNullable results) $ \partNumber mPartResult -> do
+        newExamPartResults <- if
+          | Just results <- ciqResults -> iforM (toNullable results) $ \partNumber mPartResult -> do
             examPartId <- getKeyBy404 $ UniqueExamPartNumber eId partNumber
             mOldResult <- getBy $ UniqueExamPartResult examPartId uid
             if
@@ -150,7 +154,7 @@ postECorrectR tid ssh csh examn = do
               | Just partResult <- mPartResult -> let
                   mOld = (examPartResultResult . entityVal) <$> mOldResult
                   mNew = ExamAttended <$> mPartResult
-                  resultVal = _entityVal . _examPartResultResult . _ExamAttended
+                  resultVal = _entityVal . _examPartResultResult
                 in if
                   | mOld /= mNew -> do
                     newExamPartResult <- upsert ExamPartResult
@@ -165,11 +169,42 @@ postECorrectR tid ssh csh examn = do
                     audit $ TransactionExamPartResultEdit examPartId uid
                     return $ newExamPartResult ^? resultVal
                   | otherwise -> return $ mOldResult ^? _Just . resultVal
-                | otherwise -> return Nothing
+              | otherwise -> return Nothing
+            | otherwise -> return mempty
+
+        newExamResult <- do
+          mOldResult <- getBy $ UniqueExamResult eId uid
+          if
+            | Just (Entity oldId _) <- mOldResult, is _Nothing ciqGrade -> do
+              delete oldId
+              audit $ TransactionExamResultDeleted eId uid
+              return Nothing
+            | Just result <- ciqGrade -> let
+                mOld = view passedGrade . examResultResult . entityVal <$> mOldResult
+                resultGrade = review passedGrade result
+                passedGrade :: Iso' ExamResultGrade ExamResultPassedGrade
+                passedGrade = iso (fmap $ bool (Left . view passingGrade) Right examShowGrades) (fmap $ either (review passingGrade) id)
+              in if
+                | ciqGrade /= mOld -> do
+                  newResult <- upsert ExamResult
+                    { examResultExam        =  eId
+                    , examResultUser        =  uid
+                    , examResultResult      =  resultGrade
+                    , examResultLastChanged =  now
+                    }
+                    [ ExamResultResult      =. resultGrade
+                    , ExamResultLastChanged =. now
+                    ]
+                  audit $ TransactionExamResultEdit eId uid
+                  return $ newResult ^? _entityVal . _examResultResult . passedGrade
+                | otherwise -> return $ mOldResult ^? _Just . _entityVal . _examResultResult . passedGrade
+            | otherwise -> return Nothing
+              
         user <- userToResponse match
         return CorrectInterfaceResponseSuccess
           { cirsUser    = user
           , cirsResults = newExamPartResults
+          , cirsGrade   = newExamResult
           , cirsTime    = now
           }
 

From 970076e7307d18424837957133e0086aa78bbafb Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 6 Feb 2020 12:54:40 +0100
Subject: [PATCH 60/65] feat(exam-correct): examResult interface, no styling or
 functionality

---
 src/Handler/Exam/Correct.hs   |  7 ++++++-
 templates/exam-correct.hamlet | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 21cd87457..5df19d1a3 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -70,9 +70,11 @@ getECorrectR tid ssh csh examn = do
   MsgRenderer mr <- getMsgRenderer
 
   (Entity eId Exam{..}, examParts) <- runDB $ do
-    exam@(Entity eId Exam{..}) <- fetchExam tid ssh csh examn
+    exam@(Entity eId _) <- fetchExam tid ssh csh examn
     examParts <- sortOn (view $ _entityVal . _examPartNumber) <$> selectList [ ExamPartExam ==. eId ] [ Asc ExamPartName ]
     return (exam, entityVal <$> examParts)
+
+  mayEditResults <- hasWriteAccessTo $ CExamR tid ssh csh examn EUsersR
   
   let
     heading = prependCourseTitle tid ssh csh $ (mr . MsgExamCorrectHeading . CI.original) examName
@@ -84,6 +86,9 @@ getECorrectR tid ssh csh examn = do
     
     participantHeadTooltip = [whamlet| _{MsgExamCorrectHeadParticipantTooltip} |]
 
+    examGrades :: [ExamGrade]
+    examGrades = universeF
+
   examCorrectIdent <- encrypt eId :: Handler CryptoUUIDExam
 
   siteLayoutMsg heading $ do
diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index 267580182..70bfda101 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -20,6 +20,9 @@ $newline never
                     _{MsgExamCorrectHeadPartName name}
               $nothing
                 _{MsgExamCorrectHeadPart examPartNumber}
+          $if mayEditResults
+            <th .table__th .uw-exam-correct--result-cell uw-exam-correct-header="result" uw-hide-column-header="result" colspan=2>
+              _{MsgExamResult}
           <th .table__th uw-exam-correct-header="status" uw-hide-column-header="status">
             _{MsgExamCorrectHeadStatus}
       <tbody>
@@ -32,6 +35,28 @@ $newline never
           $forall ExamPart{examPartNumber} <- examParts
             <td .table__td .uw-exam-correct--part-cell>
               ^{ptsInput examPartNumber}
+          $if mayEditResults
+            <td .table__td>
+              <select #uw-exam-correct__result>
+                <option>
+                  _{MsgExamResultNone}
+                $if examShowGrades
+                  <option>
+                    _{MsgExamResult}
+                $else
+                  <option>
+                    _{MsgExamPassed}
+                  <option>
+                    _{MsgExamNotPassed}
+                <option>
+                  _{MsgExamResultVoided}
+                <option>
+                  _{MsgExamResultNoShow}
+            <td .table__td>
+              <select #uw-exam-correct__result__grade>
+                $forall grade <- (toPathPiece <$> examGrades)
+                  <option>
+                    #{grade}
           <td #exam-correct__status .table__td>
             <button #exam-correct__send-btn .btn .btn-primary>
               _{MsgExamCorrectButtonSend}

From b1b70b9262199006da8f2e3cdd377777073ab58e Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 6 Feb 2020 16:05:29 +0100
Subject: [PATCH 61/65] style(exam-correct): minor examResult style changes

---
 .../src/utils/exam-correct/exam-correct.sass    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index 6b96b4fe9..3e20d67d9 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -16,6 +16,23 @@ table[uw-exam-correct]
       width: 70px
       padding: 4px 8px
 
+  td#uw-exam-correct__result
+    width: min-content
+    select
+      width: max-content
+      min-width: max-content
+      option
+        width: max-content
+        min-width: max-content
+  td#uw-exam-correct__result__grade
+    width: min-content
+    select
+      width: max-content
+      min-width: max-content
+      option
+        width: max-content
+        min-width: max-content
+
 
 [uw-exam-correct] input:invalid:not(.no-value)
   border: 2px solid var(--color-error)

From 1d0be2d6828f1221110af71bee709612fc09f4b4 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 6 Feb 2020 16:08:55 +0100
Subject: [PATCH 62/65] fix(exam-correct): id on td instead of select

---
 templates/exam-correct.hamlet | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index 70bfda101..7b57f6348 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -36,8 +36,8 @@ $newline never
             <td .table__td .uw-exam-correct--part-cell>
               ^{ptsInput examPartNumber}
           $if mayEditResults
-            <td .table__td>
-              <select #uw-exam-correct__result>
+            <td .table__td #uw-exam-correct__result>
+              <select>
                 <option>
                   _{MsgExamResultNone}
                 $if examShowGrades
@@ -52,8 +52,8 @@ $newline never
                   _{MsgExamResultVoided}
                 <option>
                   _{MsgExamResultNoShow}
-            <td .table__td>
-              <select #uw-exam-correct__result__grade>
+            <td .table__td #uw-exam-correct__result__grade>
+              <select>
                 $forall grade <- (toPathPiece <$> examGrades)
                   <option>
                     #{grade}

From 533e7482c9baab10c6b82781f57e610f5ca45129 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 7 Feb 2020 09:06:38 +0100
Subject: [PATCH 63/65] fix(exam-correct): temporarily disable exam results
 (WIP)

---
 src/Handler/Exam/Correct.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 5df19d1a3..311ae4342 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -74,7 +74,9 @@ getECorrectR tid ssh csh examn = do
     examParts <- sortOn (view $ _entityVal . _examPartNumber) <$> selectList [ ExamPartExam ==. eId ] [ Asc ExamPartName ]
     return (exam, entityVal <$> examParts)
 
-  mayEditResults <- hasWriteAccessTo $ CExamR tid ssh csh examn EUsersR
+  -- TODO submit exam results: work in progress
+  -- mayEditResults <- hasWriteAccessTo $ CExamR tid ssh csh examn EUsersR
+  let mayEditResults = False
   
   let
     heading = prependCourseTitle tid ssh csh $ (mr . MsgExamCorrectHeading . CI.original) examName

From b8e48d08d956ecd5176649b0fa959854cd78bbc8 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 7 Feb 2020 09:10:52 +0100
Subject: [PATCH 64/65] style(exam-correct): minor style change

---
 frontend/src/utils/exam-correct/exam-correct.sass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass
index 3e20d67d9..8e73bd7f7 100644
--- a/frontend/src/utils/exam-correct/exam-correct.sass
+++ b/frontend/src/utils/exam-correct/exam-correct.sass
@@ -12,6 +12,7 @@ table[uw-exam-correct]
     min-width: 200px
   th.uw-exam-correct--part-cell, td.uw-exam-correct--part-cell
     width: 85px
+    text-align: center
     input
       width: 70px
       padding: 4px 8px

From af8d77c4a4d97cdc66b7f2e09568c1481768aa73 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 7 Feb 2020 09:49:39 +0100
Subject: [PATCH 65/65] fix(exam-correct): cut off at maxPoints for now (TODO)

---
 src/Handler/Exam/Correct.hs | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/Handler/Exam/Correct.hs b/src/Handler/Exam/Correct.hs
index 311ae4342..daaa269a0 100644
--- a/src/Handler/Exam/Correct.hs
+++ b/src/Handler/Exam/Correct.hs
@@ -151,7 +151,7 @@ postECorrectR tid ssh csh examn = do
         now <- liftIO getCurrentTime
         newExamPartResults <- if
           | Just results <- ciqResults -> iforM (toNullable results) $ \partNumber mPartResult -> do
-            examPartId <- getKeyBy404 $ UniqueExamPartNumber eId partNumber
+            (Entity examPartId ExamPart{..}) <- getBy404 $ UniqueExamPartNumber eId partNumber
             mOldResult <- getBy $ UniqueExamPartResult examPartId uid
             if
               | Just (Entity oldId _) <- mOldResult, is _Nothing mPartResult -> do
@@ -163,18 +163,24 @@ postECorrectR tid ssh csh examn = do
                   mNew = ExamAttended <$> mPartResult
                   resultVal = _entityVal . _examPartResultResult
                 in if
-                  | mOld /= mNew -> do
-                    newExamPartResult <- upsert ExamPartResult
-                      { examPartResultExamPart    = examPartId
-                      , examPartResultUser        = uid
-                      , examPartResultResult      = ExamAttended partResult
-                      , examPartResultLastChanged = now
-                      }
-                      [ ExamPartResultResult      =. ExamAttended partResult
-                      , ExamPartResultLastChanged =. now
-                      ]
-                    audit $ TransactionExamPartResultEdit examPartId uid
-                    return $ newExamPartResult ^? resultVal
+                  | mOld /= mNew -> let
+                      -- cut off part results that exceed the maximum number of points for this exam part for now
+                      -- TODO answer with new failure response type instead
+                      partResult' = if
+                        | Just maxPts <- examPartMaxPoints, maxPts < partResult -> maxPts
+                        | otherwise -> partResult
+                    in do
+                      newExamPartResult <- upsert ExamPartResult
+                        { examPartResultExamPart    = examPartId
+                        , examPartResultUser        = uid
+                        , examPartResultResult      = ExamAttended partResult'
+                        , examPartResultLastChanged = now
+                        }
+                        [ ExamPartResultResult      =. ExamAttended partResult'
+                        , ExamPartResultLastChanged =. now
+                        ]
+                      audit $ TransactionExamPartResultEdit examPartId uid
+                      return $ newExamPartResult ^? resultVal
                   | otherwise -> return $ mOldResult ^? _Just . resultVal
               | otherwise -> return Nothing
             | otherwise -> return mempty