From 9da881c0cef3f0f50a954a97013a6d8e7ab72908 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 27 Apr 2022 18:21:03 +0200
Subject: [PATCH] chore(term): add some clarifications to tern settings

---
 messages/uniworx/categories/term/de-de-formal.msg | 4 +++-
 messages/uniworx/categories/term/en-eu.msg        | 4 +++-
 models/lms.model                                  | 2 +-
 src/Handler/Term.hs                               | 6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/messages/uniworx/categories/term/de-de-formal.msg b/messages/uniworx/categories/term/de-de-formal.msg
index f235804ea..bc687a7c6 100644
--- a/messages/uniworx/categories/term/de-de-formal.msg
+++ b/messages/uniworx/categories/term/de-de-formal.msg
@@ -12,7 +12,7 @@ TermEdited  tid@TermId: Semester #{tid} erfolgreich editiert.
 TermNewTitle: Semester editieren/anlegen.
 InvalidInput: Eingaben bitte korrigieren.
 Term !ident-ok: Semester
-TermPlaceholder: JJJJ-MM-TT (Erster Tag einer Schulung)
+TermPlaceholder: JJJJ
 TermStartDay: Erster Tag
 TermEndDay: Letzter Tag
 TermHolidays: Feiertage
@@ -23,6 +23,8 @@ TermLectureEnd: Ende Vorlesungen
 TermLectureStartTooltip: Muss am oder nach dem Beginn liegen
 TermLectureEndTooltip: Muss am oder vor dem Ende liegen
 TermActive: Aktiv
+TermActiveTooltip: Zeitraum in dem Lehrende Kurse anlegen dürfen; kann auf angegebene Lehrende eingeschränkt werden
+TermActiveForPlaceholder: Email (optional)
 NumCourses num@Int64: #{num} #{pluralDE num "Kurs" "Kurse"}
 TermsHeading: Semesterübersicht
 TermEditHeading: Semester editieren/anlegen
diff --git a/messages/uniworx/categories/term/en-eu.msg b/messages/uniworx/categories/term/en-eu.msg
index d27a2ecf1..661e37a8a 100644
--- a/messages/uniworx/categories/term/en-eu.msg
+++ b/messages/uniworx/categories/term/en-eu.msg
@@ -12,7 +12,7 @@ TermEdited tid: Successfully edited semester #{tid}
 TermNewTitle: Edit/create semester
 InvalidInput: Invalid input
 Term: Semester
-TermPlaceholder: YYYY-MM-DD (First day of courses)
+TermPlaceholder: YYYY
 TermStartDay: Starting day
 TermEndDay: Last day
 TermHolidays: Legal holidays
@@ -23,6 +23,8 @@ TermLectureEnd: Lectures end
 TermLectureStartTooltip: Must be on or after starting day 
 TermLectureEndTooltip: Must be before or on ending day 
 TermActive: Active
+TermActiveTooltip: Timeframe when lecturers may add courses; maybe restricted for specified lecturers
+TermActiveForPlaceholder: E-Mail (optional)
 NumCourses num: #{num} #{pluralEN num "course" "courses"}
 TermsHeading: Semesters
 TermEditHeading: Edit semester
diff --git a/models/lms.model b/models/lms.model
index 8183e99c4..73ebd11a5 100644
--- a/models/lms.model
+++ b/models/lms.model
@@ -4,7 +4,7 @@ Qualification
   shorthand           (CI Text)
   name                (CI Text)
   description         StoredMarkup Maybe        -- user-defined large Html, ought to contain full description
-  validDuration       Word Maybe    -- qualification is valid indefinitely or for a specified time period
+  validDuration       Word Maybe    -- qualification is valid indefinitely or for a specified number of months
   auditDuration       Word Maybe                -- number of month to keep audit log; or indefinitely
   refreshWithin       CalendarDiffDays Maybe    -- notify users about renewal within this number of month/days before expiry
   elearningStart      Bool                      -- automatically schedule e-refresher
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index c5e655a8a..93bc0f445 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -332,7 +332,7 @@ newTermForm mtid template = validateForm validateTerm $ \html -> do
           miAdd mkUnique submitView csrf = do
             (fromRes, fromView) <- mpreq utcTimeField ("" & addName (mkUnique "from")) Nothing
             (toRes, toView) <- mopt utcTimeField ("" & addName (mkUnique "to")) Nothing
-            (forRes, forView) <- mopt (checkMap (first $ const MsgTermFormActiveUserNotFound) Right $ userField False Nothing) ("" & addName (mkUnique "for")) Nothing
+            (forRes, forView) <- mopt (checkMap (first $ const MsgTermFormActiveUserNotFound) Right $ userField False Nothing) ("" & addName (mkUnique "for") & addPlaceholder (mr MsgTermActiveForPlaceholder)) Nothing
             
             let res = TermActiveForm <$> fromRes <*> toRes <*> forRes
                 res' = res <&> \newDat oldDat -> if
@@ -350,11 +350,11 @@ newTermForm mtid template = validateForm validateTerm $ \html -> do
           miLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "term/active-mass-input/layout")
           miIdent :: Text
           miIdent = "active-periods"
-          fSettings = fslI MsgTermActive
+          fSettings = fslI MsgTermActive & setTooltip MsgTermActiveTooltip
           fRequired = False
     flip (renderAForm FormStandard) html $ TermForm
       <$> tidForm
-      <*> areq dayField  (fslI MsgTermStartDay) (tftStart template)
+      <*> areq dayField  (fslI MsgTermStartDay)   (tftStart template)
       <*> areq dayField  (fslI MsgTermEndDay  )   (tftEnd   template)
       <*> (ungroupHolidays <$> holidayForm (groupHolidays <$> tftHolidays template))
       <*> areq dayField  (fslI MsgTermLectureStart & setTooltip MsgTermLectureStartTooltip) (tftLectureStart template)