fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(term): add some clarifications to tern settings

Browse Source
This commit is contained in:
Steffen Jost 2022-04-27 18:21:03 +02:00
parent c7c0cf89ab
commit 9da881c0ce
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
messages/uniworx/categories/term/de-de-formal.msg
View File

@ -12,7 +12,7 @@ TermEdited tid@TermId: Semester #{tid} erfolgreich editiert.
TermNewTitle: Semester editieren/anlegen. TermNewTitle: Semester editieren/anlegen.
InvalidInput: Eingaben bitte korrigieren. InvalidInput: Eingaben bitte korrigieren.
Term !ident-ok: Semester Term !ident-ok: Semester
TermPlaceholder: JJJJ-MM-TT (Erster Tag einer Schulung) TermPlaceholder: JJJJ
TermStartDay: Erster Tag TermStartDay: Erster Tag
TermEndDay: Letzter Tag TermEndDay: Letzter Tag
TermHolidays: Feiertage TermHolidays: Feiertage
@ -23,6 +23,8 @@ TermLectureEnd: Ende Vorlesungen
TermLectureStartTooltip: Muss am oder nach dem Beginn liegen TermLectureStartTooltip: Muss am oder nach dem Beginn liegen
TermLectureEndTooltip: Muss am oder vor dem Ende liegen TermLectureEndTooltip: Muss am oder vor dem Ende liegen
TermActive: Aktiv 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"} NumCourses num@Int64: #{num} #{pluralDE num "Kurs" "Kurse"}
TermsHeading: Semesterübersicht TermsHeading: Semesterübersicht
TermEditHeading: Semester editieren/anlegen TermEditHeading: Semester editieren/anlegen

4
messages/uniworx/categories/term/en-eu.msg
View File

@ -12,7 +12,7 @@ TermEdited tid: Successfully edited semester #{tid}
TermNewTitle: Edit/create semester TermNewTitle: Edit/create semester
InvalidInput: Invalid input InvalidInput: Invalid input
Term: Semester Term: Semester
TermPlaceholder: YYYY-MM-DD (First day of courses) TermPlaceholder: YYYY
TermStartDay: Starting day TermStartDay: Starting day
TermEndDay: Last day TermEndDay: Last day
TermHolidays: Legal holidays TermHolidays: Legal holidays
@ -23,6 +23,8 @@ TermLectureEnd: Lectures end
TermLectureStartTooltip: Must be on or after starting day TermLectureStartTooltip: Must be on or after starting day
TermLectureEndTooltip: Must be before or on ending day TermLectureEndTooltip: Must be before or on ending day
TermActive: Active 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"} NumCourses num: #{num} #{pluralEN num "course" "courses"}
TermsHeading: Semesters TermsHeading: Semesters
TermEditHeading: Edit semester TermEditHeading: Edit semester

2
models/lms.model
View File

@ -4,7 +4,7 @@ Qualification
shorthand (CI Text) shorthand (CI Text)
name (CI Text) name (CI Text)
description StoredMarkup Maybe -- user-defined large Html, ought to contain full description 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 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 refreshWithin CalendarDiffDays Maybe -- notify users about renewal within this number of month/days before expiry
elearningStart Bool -- automatically schedule e-refresher elearningStart Bool -- automatically schedule e-refresher

6
src/Handler/Term.hs
View File

@ -332,7 +332,7 @@ newTermForm mtid template = validateForm validateTerm $ \html -> do
miAdd mkUnique submitView csrf = do miAdd mkUnique submitView csrf = do
(fromRes, fromView) <- mpreq utcTimeField ("" & addName (mkUnique "from")) Nothing (fromRes, fromView) <- mpreq utcTimeField ("" & addName (mkUnique "from")) Nothing
(toRes, toView) <- mopt utcTimeField ("" & addName (mkUnique "to")) 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 let res = TermActiveForm <$> fromRes <*> toRes <*> forRes
res' = res <&> \newDat oldDat -> if 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") miLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "term/active-mass-input/layout")
miIdent :: Text miIdent :: Text
miIdent = "active-periods" miIdent = "active-periods"
fSettings = fslI MsgTermActive fSettings = fslI MsgTermActive & setTooltip MsgTermActiveTooltip
fRequired = False fRequired = False
flip (renderAForm FormStandard) html $ TermForm flip (renderAForm FormStandard) html $ TermForm
<$> tidForm <$> tidForm
<*> areq dayField (fslI MsgTermStartDay) (tftStart template) <*> areq dayField (fslI MsgTermStartDay) (tftStart template)
<*> areq dayField (fslI MsgTermEndDay ) (tftEnd template) <*> areq dayField (fslI MsgTermEndDay ) (tftEnd template)
<*> (ungroupHolidays <$> holidayForm (groupHolidays <$> tftHolidays template)) <*> (ungroupHolidays <$> holidayForm (groupHolidays <$> tftHolidays template))
<*> areq dayField (fslI MsgTermLectureStart & setTooltip MsgTermLectureStartTooltip) (tftLectureStart template) <*> areq dayField (fslI MsgTermLectureStart & setTooltip MsgTermLectureStartTooltip) (tftLectureStart template)