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

chore(lms): show all data in qualfication overview page

Browse Source
This commit is contained in:
Steffen Jost 2022-03-22 18:27:48 +01:00
parent 1f9a5e377d
commit b9bda938b4
7 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
messages/uniworx/categories/qualification/de-de-formal.msg
View File

@ -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
QualificationDescription: Beschreibung
QualificationValidDuration: Gültigkeitsdauer
QualificationAuditDuration: Aufbewahrung Audit Log
QualificationRefreshWithin: Erneurerungszeitraum
QualificationElearningStart: E-Lernen automatisch starten

6
messages/uniworx/categories/qualification/en-eu.msg
View File

@ -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
QualificationDescription: Description
QualificationValidDuration: Validity period
QualificationAuditDuration: Audit log keept
QualificationRefreshWithin: Refresh within
QualificationElearningStart: Start e-learning automatically

2
messages/uniworx/misc/de-de-formal.msg
View File

@ -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"}

4
messages/uniworx/misc/en-eu.msg
View File

@ -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
LdapIdentificationOrEmail: Fraport AG-Kennung / email address
Months num: #{num} #{pluralEN num "Month" "Months"}
Days num: #{num} #{pluralEN num "Day" "Days"}

2
messages/uniworx/utils/navigation/menu/de-de-formal.msg
View File

@ -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

2
src/Handler/LMS.hs
View File

@ -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))

29
templates/lms.hamlet
View File

@ -5,17 +5,28 @@ $newline never
<dd .deflist__dd>
<div>
#{descr}
$maybe dvalid <- qualificationValidDuration quali
<dt .deflist__dt>_{MsgQualificationValidDuration}
<dd .deflist__dd>_{MsgMonths (fromIntegral dvalid)}
<ul>
<li> <a href=@{LmsUsersR sid qsh}>Export Users
<li> <a href=@{LmsUserlistR sid qsh}>Import Userlist
<li> <a href=@{LmsResultR sid qsh}>Import Result
!!!THIS PAGE IS NOT YET FUNCTIONAL!!!
$maybe daudit <- qualificationAuditDuration quali
<dt .deflist__dt>_{MsgQualificationAuditDuration}
<dd .deflist__dd>_{MsgMonths (fromIntegral daudit)}
$maybe drefresh <- qualificationRefreshWithin quali
<dt .deflist__dt>_{MsgQualificationRefreshWithin}
<dd .deflist__dd>
$with drm <- cdMonths drefresh
$with drd <- cdDays drefresh
$if drm > 0
_{MsgMonths (fromIntegral drm)}
$if drd > 0
, #
$if drd > 0
_{MsgDays (fromIntegral drd)}
<dt .deflist__dt>_{MsgQualificationElearningStart}
<dd .deflist__dd>#{boolSymbol (qualificationElearningStart quali)}
^{lmsTable}