From b3ce3dd93a576dd3b5c6a8ecb1b278556067806a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gregor.kleen@ifi.lmu.de>
Date: Wed, 15 Jan 2020 17:17:21 +0100
Subject: [PATCH] fix: ui improvements for (external-)exams

---
 messages/uniworx/de-de-formal.msg               | 1 +
 messages/uniworx/en-eu.msg                      | 1 +
 missing-translations.sh                         | 2 ++
 src/Handler/ExamOffice/Exam.hs                  | 1 +
 src/Handler/ExamOffice/ExternalExam.hs          | 4 +++-
 templates/exam-office/exam-results.hamlet       | 4 ++++
 templates/exam-office/externalExamGrades.hamlet | 6 ++++++
 7 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 templates/exam-office/externalExamGrades.hamlet

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 3b1dbedec..d4c0d6d6d 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1552,6 +1552,7 @@ ExamBonusRule: Prüfungsbonus aus Übungsbetrieb
 ExamNoBonus': Kein automatischer Bonus
 ExamBonusPoints': Umrechnung von Übungspunkten
 ExamBonusManual': Manuelle Berechnung
+ExamGradesExplanation: Diese Ansicht zeigt die selben Daten an, wie die Tabelle von Prüfungsteilnehmern. Anpassen der Teilnehmerdaten und Ergebnisse ist nur dort möglich. Hier können Sie vor Allem einsehen und markieren, welche Prüfungsleistungen von den zuständigen Prüfungsbeauftragten bereits vollständig bearbeitet wurden.
 
 ExamRegisterForOccurrence: Anmeldung zur Klausur erfolgt durch Anmeldung zu einem Termin/Raum
 
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index eecb01017..807fc4330 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1550,6 +1550,7 @@ ExamBonusRule: Bonus points from exercises
 ExamNoBonus': No automatic exam bonus
 ExamBonusPoints': Compute from exercise achievements
 ExamBonusManual': Manual computation
+ExamGradesExplanation: This view shows the same data as the table of exam participants. Changing participant's data and achievements is only possible via the table of exam participants. Primarily, this view allows you to check and adjust which exam achievements were properly handled by the relevant exam offices.
 
 ExamRegisterForOccurrence: Registration for this exam is done by registering for an occurrence/room
 
diff --git a/missing-translations.sh b/missing-translations.sh
index a138a50e1..6cfa7daef 100755
--- a/missing-translations.sh
+++ b/missing-translations.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env zsh
 
+set -e
+
 function translations() {
     msgFile=$1
 
diff --git a/src/Handler/ExamOffice/Exam.hs b/src/Handler/ExamOffice/Exam.hs
index 0e3d0bce2..fbb18a591 100644
--- a/src/Handler/ExamOffice/Exam.hs
+++ b/src/Handler/ExamOffice/Exam.hs
@@ -437,6 +437,7 @@ postEGradesR tid ssh csh examn = do
   whenIsJust usersResult join
 
   closeWgt <- examCloseWidget (SomeRoute $ CExamR tid ssh csh examn EGradesR) eId
+  hasUsers <- hasReadAccessTo $ CExamR tid ssh csh examn EUsersR
 
   siteLayoutMsg (prependCourseTitle tid ssh csh MsgExamOfficeExamUsersHeading) $ do
     setTitleI $ prependCourseTitle tid ssh csh MsgExamOfficeExamUsersHeading
diff --git a/src/Handler/ExamOffice/ExternalExam.hs b/src/Handler/ExamOffice/ExternalExam.hs
index 234e9616c..2d7978fbc 100644
--- a/src/Handler/ExamOffice/ExternalExam.hs
+++ b/src/Handler/ExamOffice/ExternalExam.hs
@@ -26,6 +26,8 @@ postEEGradesR tid ssh coursen examn = do
 
   whenIsJust usersResult join
 
+  hasUsers <- hasReadAccessTo $ EExamR tid ssh coursen examn EEUsersR
+
   siteLayoutMsg (MsgExternalExamGrades coursen examn) $ do
     setTitleI MsgBreadcrumbExternalExamGrades
-    table
+    $(widgetFile "exam-office/externalExamGrades")
diff --git a/templates/exam-office/exam-results.hamlet b/templates/exam-office/exam-results.hamlet
index efa46523c..29d1ad6c1 100644
--- a/templates/exam-office/exam-results.hamlet
+++ b/templates/exam-office/exam-results.hamlet
@@ -2,4 +2,8 @@ $newline never
 <section>
   ^{closeWgt}
 <section>
+  $if hasUsers
+    <div .notification .notification-info .fa-question .notification--broad>
+      <div .notification__content>
+        _{MsgExamGradesExplanation}
   ^{examUsersTable}
diff --git a/templates/exam-office/externalExamGrades.hamlet b/templates/exam-office/externalExamGrades.hamlet
new file mode 100644
index 000000000..66541d890
--- /dev/null
+++ b/templates/exam-office/externalExamGrades.hamlet
@@ -0,0 +1,6 @@
+$newline never
+$if hasUsers
+  <div .notification .notification-info .fa-question .notification--broad>
+    <div .notification__content>
+      _{MsgExamGradesExplanation}
+^{table}