From b9bda938b4dff30d54a436a60a9b97009d89ece1 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Tue, 22 Mar 2022 18:27:48 +0100 Subject: [PATCH] chore(lms): show all data in qualfication overview page --- .../categories/qualification/de-de-formal.msg | 6 +++- .../categories/qualification/en-eu.msg | 6 +++- messages/uniworx/misc/de-de-formal.msg | 2 ++ messages/uniworx/misc/en-eu.msg | 4 ++- .../utils/navigation/menu/de-de-formal.msg | 2 +- src/Handler/LMS.hs | 2 +- templates/lms.hamlet | 29 +++++++++++++------ 7 files changed, 37 insertions(+), 14 deletions(-) diff --git a/messages/uniworx/categories/qualification/de-de-formal.msg b/messages/uniworx/categories/qualification/de-de-formal.msg index 322e768b4..cd5154eb4 100644 --- a/messages/uniworx/categories/qualification/de-de-formal.msg +++ b/messages/uniworx/categories/qualification/de-de-formal.msg @@ -21,4 +21,8 @@ LmsResultUpdate: LMS Ergebnis aktualisierung LmsResultCsvExceptionDuplicatedKey: CSV Import fand uneindeutigen Schlüssel LmsUserlistCsvExceptionDuplicatedKey: CSV Import fand uneindeutigen Schlüssel LmsDirectUpload: Direkter Upload für automatisierte Systeme -QualificationDescription: Beschreibung \ No newline at end of file +QualificationDescription: Beschreibung +QualificationValidDuration: Gültigkeitsdauer +QualificationAuditDuration: Aufbewahrung Audit Log +QualificationRefreshWithin: Erneurerungszeitraum +QualificationElearningStart: E-Lernen automatisch starten \ No newline at end of file diff --git a/messages/uniworx/categories/qualification/en-eu.msg b/messages/uniworx/categories/qualification/en-eu.msg index 887571665..c41c93063 100644 --- a/messages/uniworx/categories/qualification/en-eu.msg +++ b/messages/uniworx/categories/qualification/en-eu.msg @@ -21,4 +21,8 @@ LmsResultUpdate: Update of LMS result LmsResultCsvExceptionDuplicatedKey: CSV import with ambiguous key LmsUserlistCsvExceptionDuplicatedKey: CSV import with ambiguous key LmsDirectUpload: Direct upload for automated Systems -QualificationDescription: Description \ No newline at end of file +QualificationDescription: Description +QualificationValidDuration: Validity period +QualificationAuditDuration: Audit log keept +QualificationRefreshWithin: Refresh within +QualificationElearningStart: Start e-learning automatically \ No newline at end of file diff --git a/messages/uniworx/misc/de-de-formal.msg b/messages/uniworx/misc/de-de-formal.msg index 03e4a1937..6ff3195b9 100644 --- a/messages/uniworx/misc/de-de-formal.msg +++ b/messages/uniworx/misc/de-de-formal.msg @@ -8,3 +8,5 @@ FieldSecondary: Nebenfach MultiEmailFieldTip: Es sind mehrere, Komma-separierte, E-Mail-Adressen möglich WeekDay: Wochentag LdapIdentificationOrEmail: Fraport AG-Kennung / E-Mail-Adresse +Months num@Int64: #{num} #{pluralDE num "Monat" "Monate"} +Days num@Int64: #{num} #{pluralDE num "Tag" "Tage"} \ No newline at end of file diff --git a/messages/uniworx/misc/en-eu.msg b/messages/uniworx/misc/en-eu.msg index f394a6480..95703d2b9 100644 --- a/messages/uniworx/misc/en-eu.msg +++ b/messages/uniworx/misc/en-eu.msg @@ -7,4 +7,6 @@ FieldPrimary: Major FieldSecondary: Minor MultiEmailFieldTip: Multiple emails addresses may be specified (comma-separated) WeekDay: Day of the week -LdapIdentificationOrEmail: Fraport AG-Kennung / email address \ No newline at end of file +LdapIdentificationOrEmail: Fraport AG-Kennung / email address +Months num: #{num} #{pluralEN num "Month" "Months"} +Days num: #{num} #{pluralEN num "Day" "Days"} \ No newline at end of file diff --git a/messages/uniworx/utils/navigation/menu/de-de-formal.msg b/messages/uniworx/utils/navigation/menu/de-de-formal.msg index f16b9310d..3cffcc93c 100644 --- a/messages/uniworx/utils/navigation/menu/de-de-formal.msg +++ b/messages/uniworx/utils/navigation/menu/de-de-formal.msg @@ -126,7 +126,7 @@ MenuLanguage: Sprache MenuQualification: Qualifkationen MenuLms: Schnittstelle E-Lernen MenuLmsEdit: Bearbeiten E-Lernen -MenuLmsUsers: Empfang E-Lernen Benutzer +MenuLmsUsers: Export E-Lernen Benutzer MenuLmsUserlist: Melden E-Lernen Benutzer MenuLmsResult: Melden Ergebnisse E-Lernen MenuLmsUpload: Hochladen diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs index 5671b0613..6019e1560 100644 --- a/src/Handler/LMS.hs +++ b/src/Handler/LMS.hs @@ -154,7 +154,7 @@ postLmsR sid qsh = do --- old above, new below type LmsResultTableExpr = ( E.SqlExpr (Entity Qualification) - `E.InnerJoin` E.SqlExpr (Entity LmsResult) + `E.InnerJoin` E.SqlExpr (Entity LmsResult) ) `E.LeftOuterJoin` E.SqlExpr (Maybe (Entity LmsUser)) `E.LeftOuterJoin` E.SqlExpr (Maybe (Entity User)) diff --git a/templates/lms.hamlet b/templates/lms.hamlet index b384cbd5c..f64de0b21 100644 --- a/templates/lms.hamlet +++ b/templates/lms.hamlet @@ -5,17 +5,28 @@ $newline never
#{descr} - + $maybe dvalid <- qualificationValidDuration quali +
_{MsgQualificationValidDuration} +
_{MsgMonths (fromIntegral dvalid)} -