From 2f1ecd397936f4e4ac018eb4f9aaf49da37e1e81 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel@cip.ifi.lmu.de>
Date: Mon, 7 Feb 2022 20:26:21 +0100
Subject: [PATCH] feat(submissions): Apply suggestions to reduce lines of code

---
 .../categories/courses/submission/de-de-formal.msg |  3 +--
 .../categories/courses/submission/en-eu.msg        |  3 +--
 src/Handler/Submission/List.hs                     | 14 +++-----------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/messages/uniworx/categories/courses/submission/de-de-formal.msg b/messages/uniworx/categories/courses/submission/de-de-formal.msg
index cfe78750e..7a08fde97 100644
--- a/messages/uniworx/categories/courses/submission/de-de-formal.msg
+++ b/messages/uniworx/categories/courses/submission/de-de-formal.msg
@@ -160,8 +160,7 @@ SubmissionDownloadGroups: Mit festen Abgabegruppen
 CorrAutoSetCorrector: Korrekturen verteilen
 CorrDelete: Abgaben löschen
 CorrSetCorrectionsDone: Korrekturen als abgeschlossen markieren
-SetCorrectionsDoneTrue: Korrekturen als abgeschlossen markiert
-SetCorrectionsDoneFalse: Korrekturen als nicht abgeschlossen markiert
+SetCorrectionsDone b@Bool: Korrekturen als #{bool "nicht" "" b} abgeschlossen markiert
 SubmissionCorrected: Korrigiert
 CorrectionSheets: Übersicht Korrekturen nach Blättern
 CorrectionCorrectors: Übersicht Korrekturen nach Korrektor:innen
diff --git a/messages/uniworx/categories/courses/submission/en-eu.msg b/messages/uniworx/categories/courses/submission/en-eu.msg
index 7326ed4af..bc0585cf8 100644
--- a/messages/uniworx/categories/courses/submission/en-eu.msg
+++ b/messages/uniworx/categories/courses/submission/en-eu.msg
@@ -160,8 +160,7 @@ SubmissionDownloadGroups: With registered submission groups
 CorrAutoSetCorrector: Distribute corrections
 CorrDelete: Delete submissions
 CorrSetCorrectionsDone: Set corrections as done
-SetCorrectionsDoneTrue: Set corrections as done
-SetCorrectionsDoneFalse: Set corrections as not done
+SetCorrectionsDone b: Set corrections as #{bool "not" "" b} done
 SubmissionCorrected: Marked
 CorrectionSheets: Corrections by sheet
 CorrectionCorrectors: Corrections by corrector
diff --git a/src/Handler/Submission/List.hs b/src/Handler/Submission/List.hs
index 533d534ca..403564d01 100644
--- a/src/Handler/Submission/List.hs
+++ b/src/Handler/Submission/List.hs
@@ -929,21 +929,13 @@ correctionsR' whereClause displayColumns dbtFilterUI csvSettings psValidator act
             unassigned' <- forM (Set.toList stillUnassigned) $ \sid -> encrypt sid :: DB CryptoFileNameSubmission
             addMessage Warning =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsNotAssignedAuto.hamlet") mr)
       redirect currentRoute
-    (CorrSetCorrectionsDoneData True, subs') -> do
-      subs <- mapM decrypt $ Set.toList subs'
+    (CorrSetCorrectionsDoneData isDone, subs') -> do
       now <- liftIO getCurrentTime
-      runDB $ do
-        _ <- updateWhere [SubmissionId <-. subs]
-                [SubmissionRatingTime    =. Just now]
-        addMessageI Success $ MsgSetCorrectionsDoneTrue
-        auditAllSubEdit subs
-      redirect currentRoute
-    (CorrSetCorrectionsDoneData False, subs') -> do
       subs <- mapM decrypt $ Set.toList subs'
       runDB $ do
         _ <- updateWhere [SubmissionId <-. subs]
-                [SubmissionRatingTime    =. Nothing]
-        addMessageI Success $ MsgSetCorrectionsDoneFalse
+                [SubmissionRatingTime    =. bool Nothing (Just now) isDone]
+        addMessageI Success $ MsgSetCorrectionsDone isDone
         auditAllSubEdit subs
       redirect currentRoute
     (CorrDeleteData, subs) -> do