From 87bda1607e23fd44ac32279b9f36088554cdf56f 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] 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 3dab84200..69f1002af 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1395,6 +1395,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 cedc17073..e1c20ce35 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1393,6 +1393,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 217b3f767..037bdbb07 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}