Merge branch 'master' of gitlab.ifi.lmu.de:fradrive/fradrive

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [27.2.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.1.6...v27.2.0) (2023-04-06)
+
+
+### Features
+
+* **letter:** allow printing of multiple course certificates at once ([768f03f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/768f03f6727f54b7c7aa18ecef8bc67302ee27cd))
+
+## [27.1.6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.1.4...v27.1.6) (2023-04-05)
+
+
+### Bug Fixes
+
+* **lms:** lms-direct/deletion-days setting now represent #days to presever lms (used to be #days+1) ([d02e62e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d02e62ec20b8cdc9dd6144de558895885ad1e692))
+* **reachability:** account for e-users being assigned a useless company department ([bb27324](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bb27324ee8dff257da09c1575468048d793bec8e))
+
+## [27.1.5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.1.4...v27.1.5) (2023-04-04)
+
+
+### Bug Fixes
+
+* **lms:** lms-direct/deletion-days setting now represent #days to presever lms (used to be #days+1) ([d02e62e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d02e62ec20b8cdc9dd6144de558895885ad1e692))
+* **reachability:** account for e-users being assigned a useless company department ([bb27324](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bb27324ee8dff257da09c1575468048d793bec8e))
+
 ## [27.1.4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.1.3...v27.1.4) (2023-03-28)
 
 

messages/uniworx/categories/authorization/de-de-formal.msg

@@ -107,7 +107,6 @@ CampusUserInvalidDisplayName: Konnte anhand des Fraport Büko-Logins keinen voll
 CampusUserInvalidGivenName: Konnte anhand des Fraport Büko-Logins keinen Vornamen ermitteln
 CampusUserInvalidSurname: Konnte anhand des Fraport Büko-Logins keinen Nachname ermitteln
 CampusUserInvalidTitle: Konnte anhand des Fraport Büko-Logins keinen akademischen Titel ermitteln
-CampusUserInvalidMatriculation: Konnte anhand des Fraport Büko-Logins keine Matrikelnummer ermitteln
 CampusUserInvalidFeaturesOfStudy parseErr@Text: Konnte anhand des Fraport Büko-Logins keine Studiengänge ermitteln
 CampusUserInvalidAssociatedSchools parseErr@Text: Konnte anhand des Fraport Büko-Logins keine Institute ermitteln
 InvalidCredentialsADNoSuchObject: Benutzereintrag existiert nicht

messages/uniworx/categories/authorization/en-eu.msg

@@ -108,7 +108,6 @@ CampusUserInvalidDisplayName: Could not determine display name during Fraport B
 CampusUserInvalidGivenName: Could not determine given name during Fraport Büko login
 CampusUserInvalidSurname: Could not determine surname during Fraport Büko login
 CampusUserInvalidTitle: Could not determine title during Fraport Büko login
-CampusUserInvalidMatriculation: Could not determine matriculation during Fraport Büko login
 CampusUserInvalidFeaturesOfStudy parseErr: Could not determine features of study during Fraport Büko login
 CampusUserInvalidAssociatedSchools parseErr: Could not determine associated departments during Fraport Büko login
 InvalidCredentialsADNoSuchObject: User entry does not exist

messages/uniworx/categories/avs/de-de-formal.msg

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2022 Steffen Jost <jost@tcs.ifi.lmu.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
-
+AvsPersonInfo: AVS Personendaten
 AvsPersonId: AVS Personen Id 
 AvsPersonNo: AVS Personennummer
 AvsCardNo: Ausweiskartennummer 
@@ -29,4 +29,9 @@ RevokeUnknownLicencesFail: Nicht alle AVS Fahrberechtigungen unbekannter Fahrer
 AvsCommunicationError: AVS Schnittstelle lieferte einen unerwarteten Fehler.
 LicenceTableChangeAvs: Im AVS ändern
 LicenceTableGrantFDrive: In FRADrive erteilen
-LicenceTableRevokeFDrive: In FRADrive entziehen
+LicenceTableRevokeFDrive: In FRADrive entziehen
+TableAvsActiveCards: Gültige Ausweise
+AvsCardColorGreen: Grün
+AvsCardColorBlue: Blau
+AvsCardColorRed: Rot
+AvsCardColorYellow: Gelb

messages/uniworx/categories/avs/en-eu.msg

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2022 Steffen Jost <jost@tcs.ifi.lmu.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
-
+AvsPersonInfo: AVS Person Info
 AvsPersonId: AVS Person Id
 AvsPersonNo: AVS Person Number
 AvsCardNo: Card number
@@ -30,3 +30,8 @@ AvsCommunicationError: AVS interface returned an unexpected error.
 LicenceTableChangeAvs: Change in AVS
 LicenceTableGrantFDrive: Grant in FRADrive
 LicenceTableRevokeFDrive: Revoke in FRADrive
+TableAvsActiveCards: Valid Cards
+AvsCardColorGreen: Green
+AvsCardColorBlue: Blue
+AvsCardColorRed: Red
+AvsCardColorYellow: Yellow

messages/uniworx/categories/courses/courses/de-de-formal.msg

@@ -132,7 +132,7 @@ CourseUserTutorials: Angemeldete Tutorien
 CourseUserExams: Angemeldete Prüfungen
 CourseUserSheets: Übungsblätter
 CsvColumnUserName: Voller Name des/der Teilnehmers/Teilnehmerin
-CsvColumnUserMatriculation: Matrikelnummer des/der Teilnehmers/Teilnehmerin
+CsvColumnUserMatriculation: AVS Nummer des/der Teilnehmers/Teilnehmerin
 CsvColumnUserSex: Geschlecht
 CsvColumnUserBirthday: Geburtstag
 CsvColumnUserEmail: E-Mail-Adresse des/der Teilnehmers/Teilnehmerin

messages/uniworx/categories/courses/courses/en-eu.msg

@@ -132,7 +132,7 @@ CourseUserTutorials: Registered tutorials
 CourseUserExams: Registered exams
 CourseUserSheets: Exercise sheets
 CsvColumnUserName: Participant's full name
-CsvColumnUserMatriculation: Participant's matriculation
+CsvColumnUserMatriculation: Participant's AVS number
 CsvColumnUserSex: Participant's sex
 CsvColumnUserBirthday: Birthday
 CsvColumnUserEmail: Participant's email address

messages/uniworx/categories/print/de-de-formal.msg

@@ -20,5 +20,5 @@ PrintCourse: Kurse
 PrintQualification: Qualifikation
 PrintPDF !ident-ok: PDF
 PrintManualRenewal: Vorfeldführerschein Renewal-Brief testweise versenden
-PrintLmsUser: E-Learning Id
+PrintLmsUser: E‑Learning Id
 PrintJobs: Druckaufräge

messages/uniworx/categories/print/en-eu.msg

@@ -20,5 +20,5 @@ PrintCourse: Course
 PrintQualification: Qualification
 PrintPDF: PDF
 PrintManualRenewal: Manual sending of an apron driver's licence renewal letter
-PrintLmsUser: E-learning id
+PrintLmsUser: E‑learning id
 PrintJobs: Print jobs

messages/uniworx/categories/qualification/de-de-formal.msg

@@ -8,8 +8,8 @@ QualificationDescription: Beschreibung
 QualificationValidDuration: Gültigkeitsdauer
 QualificationAuditDuration: Aufbewahrung Audit Log
 QualificationRefreshWithin: Erneurerungszeitraum
-QualificationRefreshWithinTooltip: Zeitraum für Versand einer Benachrichtigung oder für automatischen Start des E-Learning
+QualificationRefreshWithinTooltip: Zeitraum für Versand einer Benachrichtigung oder für automatischen Start des E‑Learning
-QualificationElearningStart: Wird das E-Learning automatisch gestartet?
+QualificationElearningStart: Wird das E‑Learning automatisch gestartet?
 TableQualificationCountActive: Aktive
 TableQualificationCountActiveTooltip: Anzahl Personen mit momentan gültiger Qualifikation
 TableQualificationCountTotal: Gesamt
@@ -29,7 +29,7 @@ QualificationUserNoRenewal: Läuft ohne Benachrichtigung aus
 QualificationUserNone: Für diese Person sind keine Qualifikationen registriert.
 QualificationBlockReason: Entzugsbegründung
 LmsUser: Inhaber
-LmsURL: Link E-Learning
+LmsURL: Link E‑Learning
 TableLmsEmail: E‑Mail
 TableLmsIdent: LMS Identifikation
 TableLmsElearning: E‑Learning
@@ -41,20 +41,25 @@ TableLmsStaff: Interner Mitarbeiter?
 TableLmsStarted: Begonnen
 TableLmsReceived: Letzte Rückmeldung
 TableLmsNotified: Versand Benachrichtigung
-TableLmsNotifiedTooltip: Benachrichtigungen werden erst versendet wenn das LMS bestätigt die Eröffnung des E-Learning für den Benutzer bestätigt hat, was ein paar Stunden dauern kann!
+TableLmsNotifiedTooltip: Benachrichtigungen werden erst versendet wenn das LMS bestätigt die Eröffnung des E‑Learning für den Benutzer bestätigt hat, was ein paar Stunden dauern kann!
 TableLmsEnded: Beended
 TableLmsStatus: Status E‑Learning
-TableLmsStatusTooltip mbMonth@(Maybe Int): Zeigt an, seit wann ein E-Learning offen ist oder wann es mit Bestanden oder Durchgefalen abgeschlossen wurde. #{maybeToMessage "Anzeige erlischt " (fmap (flip pluralDEeN "Monat") mbMonth) " nach Abschluss."}
+TableLmsStatusTooltip mbMonth@(Maybe Int): Zeigt #{maybeToMessage "bis zu " (fmap (flip pluralDEeN "Monat") mbMonth) " nach Abschluss"} den letzten Zustand eines E‑Learnings an:
-TableLmsStatusDay: Datum letzte Statusänderung E-Learning
+TableLmsStatusDay: Datum letzte Statusänderung E‑Learning
 TableLmsSuccess: Bestanden
 TableLmsFailed: Gesperrt
+LmsStatusBlocked: Durchgefallen wegen zu vieler Fehlversuche
+LmsStatusExpired: Durchgefallen nach Fristablauf
+LmsStatusSuccess: E#{nonBreakableDash}Learning bestanden
+LmsStatusPlanned: E#{nonBreakableDash}Learning wird gerade eröffnet (nur für Admin sichtbar)
+LmsStatusDelay: Hinweis: Statusänderung können in seltenen Fällen mehrere Stunden bis zur Anzeige benötigen.
 FilterLmsValid: Aktuell gültig
 FilterLmsRenewal: Erneuerung anstehend
 FilterLmsNotified: Benachrichtigt
-CsvColumnLmsIdent: E-Learning Identifikator, einzigartig pro Qualifikation und Teilnehmer
+CsvColumnLmsIdent: E‑Learning Identifikator, einzigartig pro Qualifikation und Teilnehmer
-CsvColumnLmsPin: PIN des E-Learning Zugangs
+CsvColumnLmsPin: PIN des E#{nonBreakableDash}Learning Zugangs
 CsvColumnLmsResetPin: Wird die PIN bei der nächsten Synchronisation zurückgesetzt?
-CsvColumnLmsDelete: Wird der Identifikator in der E-Learning Plattform bei der nächsten Synchronisation gelöscht?
+CsvColumnLmsDelete: Wird der Identifikator in der E‑Learning Plattform bei der nächsten Synchronisation gelöscht?
 CsvColumnLmsStaff: Handelt es sich um einen internen Mitarbeiter? (Aus historischen Gründen, wird momentan ignoriert.)
 CsvColumnLmsSuccess: Zeitstempel der erfolgreichen Teilnahme (UTC)
 CsvColumnLmsFailed: User was blocked by LMS, usually due to too many attempts
@@ -65,32 +70,33 @@ 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
-LmsErrorNoRefreshElearning: Fehler: E-Learning wird nicht automatisch gestartet, da die Zeitspanne für den Erneurerungszeitraum nicht festgelegt wurde.
+LmsErrorNoRefreshElearning: Fehler: E‑Learning wird nicht automatisch gestartet, da die Zeitspanne für den Erneurerungszeitraum nicht festgelegt wurde.
 MailSubjectQualificationRenewal qname@Text: Qualifikation #{qname} muss demnächst erneuert werden
 MailSubjectQualificationExpiry qname@Text: Qualifikation #{qname} läuft demnächst ab
 MailSubjectQualificationExpired qname@Text: Qualifikation #{qname} ist ab sofort ungültig
-MailBodyQualificationRenewal qname@Text: Qualifikation #{qname} muss demnächst durch einen E-Learning erneuert werden. Ansprechpartner werden gebeten, die Anmeldedaten im Anhang vertraulich an den Prüfling zu übermitteln.
+MailBodyQualificationRenewal qname@Text: Qualifikation #{qname} muss demnächst durch einen E‑Learning erneuert werden. Ansprechpartner werden gebeten, die Anmeldedaten im Anhang vertraulich an den Prüfling zu übermitteln.
 MailBodyQualificationExpiry: Diese Qualifikation läuft bald ab. Tätigkeiten, welche diese Qualifikation voraussetzen dürfen dann nicht länger ausgeübt werden!
-MailBodyQualificationExpired: Diese Qualifikation is nun abgelaufen. Tätigkeiten, welche diese Qualifikation voraussetzen dürfen ab sofort nicht länger ausgeübt werden! Es ist möglich, dass die Qualifikation vorzeit ungültig wurde, z.B. wegen erfolgloser Teilnahme an einem verpflichtendem E-Learning.
+MailBodyQualificationExpired: Diese Qualifikation is nun abgelaufen. Tätigkeiten, welche diese Qualifikation voraussetzen dürfen ab sofort nicht länger ausgeübt werden! Es ist möglich, dass die Qualifikation vorzeit ungültig wurde, z.B. wegen erfolgloser Teilnahme an einem verpflichtendem E‑Learning.
 QualificationActExpire: Auslaufend markieren - keine Benachrichtigung zur Erneuerung senden
 QualificationActUnexpire: Auslaufend aufheben - kostenpflichtige Benachrichtigung bei anstehender Erneuerung senden
-QualificationSetExpire n@Int64: Benachrichtigung bei anstehender Erneuerung und E-Learning abgeschaltet für #{n} #{pluralDE n "Person" "Personen"}
+QualificationSetExpire n@Int64: Benachrichtigung bei anstehender Erneuerung und E‑Learning abgeschaltet für #{n} #{pluralDE n "Person" "Personen"}
-QualificationSetUnexpire n@Int64: Benachrichtigung bei anstehender Erneuerung und E-Learning aktiviert für #{n} #{pluralDE n "Person" "Personen"}
+QualificationSetUnexpire n@Int64: Benachrichtigung bei anstehender Erneuerung und E‑Learning aktiviert für #{n} #{pluralDE n "Person" "Personen"}
 QualificationActBlockSupervisor: Dauerhaft entziehen, mit sofortiger Wirkung
 QualificationActBlock: Entziehen
 QualificationActUnblock: Entzug löschen
 QualificationStatusBlock   l@QualificationShorthand n@Int m@Int: #{n}/#{m} #{l} entzogen
 QualificationStatusUnblock l@QualificationShorthand n@Int m@Int: #{n}/#{m} #{l} reaktiviert
 LmsRenewalInstructions: Weitere Anweisungen zur Verlängerung finden Sie im angehängten PDF. Um Missbrauch zu verhindern wurde das PDF mit dem im FRADrive hinterlegten PDF-Passwort des Prüflings verschlüsselt. Falls kein PDF-Passwort manuell hinterlegt wurde, ist das PDF-Passwort die Flughafen Ausweisnummer, inklusive Punkt und der Ziffer danach.
-LmsNoRenewal: Leider kann diese Qualifikation nicht alleine durch E-Learning verlängert werden.
+LmsNoRenewal: Leider kann diese Qualifikation nicht alleine durch E‑Learning verlängert werden.
-LmsActNotify: Benachrichtigung E-Learning erneut per Post oder E-Mail versenden
+LmsActNotify: Benachrichtigung E‑Learning erneut per Post oder E-Mail versenden
-LmsActRenewPin: Neue zufällige E-Learning PIN zuweisen
+LmsActRenewPin: Neue zufällige E‑Learning PIN zuweisen
-LmsActRenewNotify: Neue zufällige E-Learning PIN zuweisen und Benachrichtigung per Post oder E-Mail versenden
+LmsActRenewNotify: Neue zufällige E‑Learning PIN zuweisen und Benachrichtigung per Post oder E-Mail versenden
-LmsNotificationSend n@Int: E-Learning Benachrichtigungen an #{n} #{pluralDE n "Prüfling" "Prüflinge"} werden per Post oder E-Mail versendet.
+LmsStatusNotificationSent: Anmeldedaten wurden an Prüfling oder Ansprechpartner per Post oder E#{nonBreakableDash}Mail versendet; E#{nonBreakableDash}Learning ist derzeit offen
-LmsPinRenewal n@Int: E-Learning Pin ausgetauscht für #{n} #{pluralDE n "Prüfling" "Prüflinge"}.
+LmsNotificationSend n@Int: E‑Learning Benachrichtigungen an #{n} #{pluralDE n "Prüfling" "Prüflinge"} werden per Post oder E-Mail versendet.
+LmsPinRenewal n@Int: E‑Learning Pin ausgetauscht für #{n} #{pluralDE n "Prüfling" "Prüflinge"}.
 LmsActionFailed n@Int: Aktion nicht durchgeführt für #{n} #{pluralDE n "Person" "Personen"}, da diese derzeit nicht an einer Prüfung teilnehmen.
-LmsStarted: E-Learning eröffnet
+LmsStarted: E‑Learning eröffnet
 LmsAutomaticQueuing n@Natural: Die folgenden Funktionen werden normalerweise einmal pro Tag um #{show n} Uhr ausgeführt.
 LmsManualQueuing: Die folgenden Funktionen sollten einmal pro Tag ausgeführt werden.
-BtnLmsEnqueue: Nutzer mit ablaufenden Qualifikationen zum E-Learning anmelden und benachrichtigen
+BtnLmsEnqueue: Nutzer mit ablaufenden Qualifikationen zum E‑Learning anmelden und benachrichtigen
-BtnLmsDequeue: Nutzer mit beendetem E-Learning ggf. benachrichtigen und aufräumen 
+BtnLmsDequeue: Nutzer mit beendetem E‑Learning ggf. benachrichtigen und aufräumen 

messages/uniworx/categories/qualification/en-eu.msg

@@ -8,8 +8,8 @@ QualificationDescription: Description
 QualificationValidDuration: Validity period
 QualificationAuditDuration: Audit log keept
 QualificationRefreshWithin: Refresh within
-QualificationRefreshWithinTooltip: Period before expiry to send a notification or to start e-learning
+QualificationRefreshWithinTooltip: Period before expiry to send a notification or to start e‑learning
-QualificationElearningStart: Is e-learning automatically started?
+QualificationElearningStart: Is e‑learning automatically started?
 TableQualificationCountActive: Active
 TableQualificationCountActiveTooltip: Number of currently valid qualification holders
 TableQualificationCountTotal: Total
@@ -41,19 +41,24 @@ TableLmsStaff: Staff?
 TableLmsStarted: Started
 TableLmsReceived: Last update
 TableLmsNotified: Notification sent
-TableLmsNotifiedTooltip: Notfications are not sent before the LMS acknowledges the opening of the e-learning course for the user, which may take several hours!
+TableLmsNotifiedTooltip: Notfications are not sent before the LMS acknowledges the opening of the e‑learning course for the user, which may take several hours!
 TableLmsEnded: Ended
-TableLmsStatus: Status e-learning
+TableLmsStatus: Status e‑learning
-TableLmsStatusTooltip mbMonth: Shows since when an e-learning is open or when it was closed, including the result. #{maybeToMessage "Shown for " (fmap (flip pluralENsN "month") mbMonth) " after closure."}
+TableLmsStatusTooltip mbMonth: Shows #{maybeToMessage "for up to " (fmap (flip pluralENsN "month") mbMonth) " after closure"} the last e#{nonBreakableDash}learning status change:
-TableLmsStatusDay: Date of last e-learning status change
+TableLmsStatusDay: Date of last e‑learning status change
 TableLmsSuccess: Completed
 TableLmsFailed: Blocked
+LmsStatusBlocked: Failed after too many attempts
+LmsStatusExpired: Failed due to expiry
+LmsStatusSuccess: Passed
+LmsStatusPlanned: E#{nonBreakableDash}learning is about to be opened (visible to Admins only)
+LmsStatusDelay: Note that status changes may occassionaly require more than a hour to be displayed here.
 FilterLmsValid: Currently valid
 FilterLmsRenewal: Renewal due
 FilterLmsNotified: Notified
-CsvColumnLmsIdent: E-learning identifier, unique for each qualification and user
+CsvColumnLmsIdent: E#{nonBreakableDash}learning identifier, unique for each qualification and user
-CsvColumnLmsPin: PIN for e-learning access
+CsvColumnLmsPin: PIN for e#{nonBreakableDash}learning access
-CsvColumnLmsResetPin: Will the e-learning PIN be reset upon next synchronisation?
+CsvColumnLmsResetPin: Will the e#{nonBreakableDash}learning PIN be reset upon next synchronisation?
 CsvColumnLmsDelete: Will the identifier be deleted from the E-learning platfrom upon next synchronisation?
 CsvColumnLmsStaff: Is the user an internal staff member? (Legacy, currently ignored)
 CsvColumnLmsSuccess: Timestamp of successful completion (UTC)
@@ -69,13 +74,13 @@ LmsErrorNoRefreshElearning: Error: E-learning will not be started automatically
 MailSubjectQualificationRenewal qname: Qualification #{qname} must be renewed shortly
 MailSubjectQualificationExpiry qname: Qualification #{qname} expires soon
 MailSubjectQualificationExpired qname: Qualification #{qname} is no longer valid
-MailBodyQualificationRenewal qname: The qualification #{qname} must be renewed soon by completing an e-learning course, otherwise it will expire. Supervisors are kindly requested to forward the login data confidentially to the examinee.
+MailBodyQualificationRenewal qname: The qualification #{qname} must be renewed soon by completing an e‑learning course, otherwise it will expire. Supervisors are kindly requested to forward the login data confidentially to the examinee.
 MailBodyQualificationExpiry: This qualification expires soon. You may then no longer execute any duties that require this qualification as a precondition!
-MailBodyQualificationExpired: This qualification is now expired. You may no longer execute any duties that require this qualification as a precondition! It is possible that the qualification expired prematurely, e.g. due to a failed compulsory e-learning.
+MailBodyQualificationExpired: This qualification is now expired. You may no longer execute any duties that require this qualification as a precondition! It is possible that the qualification expired prematurely, e.g. due to a failed compulsory e‑learning.
 QualificationActExpire: Discontinue - qualification expires silently
 QualificationActUnexpire: Continue - send a possibly fee-paying notification upon due renewal
-QualificationSetExpire n: Expiry notification and e-learning deactivated for #{n} #{pluralENs n "person"}
+QualificationSetExpire n: Expiry notification and e‑learning deactivated for #{n} #{pluralENs n "person"}
-QualificationSetUnexpire n: Expiry notification and e-learning activated for #{n} #{pluralENs n "person"}
+QualificationSetUnexpire n: Expiry notification and e‑learning activated for #{n} #{pluralENs n "person"}
 QualificationActBlockSupervisor: Waive permanently, effective immediately
 QualificationActBlock: Revoke
 QualificationActUnblock: Clear revocation
@@ -83,14 +88,15 @@ QualificationStatusBlock   l n m: #{n}/#{m} #{l} revoked
 QualificationStatusUnblock l n m: #{n}/#{m} #{l} reactivated
 LmsRenewalInstructions: Instruction on how to accomplish the renewal are enclosed in the attached PDF. In order to avoid misuse, the PDF is encrypted with the FRADrive PDF-password of the examinee. If no PDF-password had been chosen yet, then the password is the Fraport id card number of the examinee, including the punctuation mark and the digit thereafter.
 LmsNoRenewal: Unfortunately, this particular qualification cannot be renewed through E-learning only. 
-LmsActNotify: Resend e-learning notification by post or email
+LmsActNotify: Resend e‑learning notification by post or email
-LmsActRenewPin: Randomly replace e-learning PIN
+LmsActRenewPin: Randomly replace e‑learning PIN
-LmsActRenewNotify: Randomly replace e-learning PIN and re-send notification by post or email
+LmsActRenewNotify: Randomly replace e‑learning PIN and re-send notification by post or email
+LmsStatusNotificationSent: E-learning pin has been sent to examinee or supervisor by letter post or by email; e‑learning is currently open
 LmsNotificationSend n: E-learning notifications will be sent to #{n} #{pluralENs n "examinee"} by letter post or by email.
 LmsPinRenewal n: E-learning pin replaced randomly for #{n} #{pluralENs n "examinee"}.
 LmsActionFailed n: No action for #{n} #{pluralENs n "person"}, since there was no ongoing examination.
 LmsStarted: E-learning open since
 LmsAutomaticQueuing n@Natural: The following functions are executed daily at #{show n} o'clock.
 LmsManualQueuing: The following functions should be executed daily.
-BtnLmsEnqueue: Enqueue users with expiring qualifications for e-learning and notify them.
+BtnLmsEnqueue: Enqueue users with expiring qualifications for e‑learning and notify them.
-BtnLmsDequeue: Dequeue users with finished e-learning and notify, if appropriate.
+BtnLmsDequeue: Dequeue users with finished e‑learning and notify, if appropriate.

messages/uniworx/categories/user/de-de-formal.msg

@@ -11,7 +11,7 @@ AdminUserDisplayEmail: E-Mail-Adresse
 AdminUserIdent: Identifikation
 AdminUserAuth: Authentifizierung
 AdminUserAuthTooltip: Abhängig von der Auswahl werden neue Benutzer über ihr neues FRADrive Konto benachrichtigt.
-AdminUserMatriculation: Matrikelnummer
+AdminUserMatriculation: AVS Nummer
 AdminUserSex: Geschlecht
 AdminUserBirthday: Geburtsdatum
 AdminUserTelephone: Telefonnummer

messages/uniworx/categories/user/en-eu.msg

@@ -11,7 +11,7 @@ AdminUserDisplayEmail: Email address
 AdminUserIdent: Identification
 AdminUserAuth: Authentication
 AdminUserAuthTooltip: New users may be notified about their FRADrive account depending on this choice.
-AdminUserMatriculation: Matriculation
+AdminUserMatriculation: AVS number
 AdminUserSex: Sex
 AdminUserBirthday: Date of Birth
 AdminUserTelephone: Phone

messages/uniworx/utils/table_column/de-de-formal.msg

@@ -16,7 +16,7 @@ TableTerm !ident-ok: Semester
 TableCourseSchool: Institut
 TableSubmissionGroup: Feste Abgabegruppe
 TableNoSubmissionGroup: Keine feste Abgabegruppe
-TableMatrikelNr: Matrikelnummer
+TableMatrikelNr: AVS Nr
 TableSex: Geschlecht
 TableBirthday: Geburtsdatum
 TableSchool: Institut
@@ -56,7 +56,7 @@ TableTutorialTime: Zeit
 TableTutorialDeregisterUntil: Abmeldungen bis
 TableActionsHead: Aktionen
 TableNoFilter: Keine Einschränkung
-TableUserMatriculation: Matrikelnummer
+TableUserMatriculation: ASV Nummer
 TableColumnStudyFeatures: Studiendaten
 TableSchoolShort: Kürzel
 TableSchoolName !ident-ok: Name

messages/uniworx/utils/table_column/en-eu.msg

@@ -16,7 +16,7 @@ TableTerm: Semester
 TableCourseSchool: Department
 TableSubmissionGroup: Registered submission group
 TableNoSubmissionGroup: No registered submission group
-TableMatrikelNr: Matriculation
+TableMatrikelNr: AVS No
 TableSex: Sex
 TableBirthday: Birthday
 TableSchool: Department
@@ -56,7 +56,7 @@ TableTutorialDeregisterUntil: Deregister until
 TableActionsHead: Actions
 TableTutorialTime: Time
 TableNoFilter: No restriction
-TableUserMatriculation: Matriculation
+TableUserMatriculation: AVS number
 TableColumnStudyFeatures: Features of study
 TableSchoolShort: Shorthand
 TableSchoolName: Name

nix/docker/demo-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "27.1.4"
+  "version": "27.2.0"
 }

nix/docker/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "27.1.4"
+  "version": "27.2.0"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "27.1.4",
+  "version": "27.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "27.1.4",
+  "version": "27.2.0",
   "description": "",
   "keywords": [],
   "author": "",

package.yaml

@@ -1,5 +1,5 @@
 name: uniworx
-version: 27.1.4
+version: 27.2.0
 dependencies:
   - base
   - yesod

routes

@@ -67,6 +67,7 @@
 /admin/tokens                 AdminTokensR     GET POST
 /admin/crontab                AdminCrontabR    GET
 /admin/avs                    AdminAvsR        GET POST
+/admin/avs/#CryptoUUIDUser    AdminAvsUserR    GET
 /admin/ldap                   AdminLdapR       GET POST
 /admin/problems               AdminProblemsR			 GET
 /admin/problems/no-contact    ProblemUnreachableR  GET

src/Foundation/I18n.hs

@@ -251,6 +251,13 @@ embedRenderMessage ''UniWorX ''AvsLicence id -- required by UniWorXAvsMessages
 mkMessageAddition ''UniWorX "Qualification" "messages/uniworx/categories/qualification" "de-de-formal"
 mkMessageAddition ''UniWorX "Avs" "messages/uniworx/categories/avs" "de-de-formal"
 
+instance RenderMessage UniWorX AvsDataCardColor where
+  renderMessage _foundation _ls (AvsCardColorMisc t) = Text.cons '*' t
+  renderMessage f ls AvsCardColorGrün = renderMessage f ls MsgAvsCardColorGreen
+  renderMessage f ls AvsCardColorBlau = renderMessage f ls MsgAvsCardColorBlue
+  renderMessage f ls AvsCardColorRot  = renderMessage f ls MsgAvsCardColorRed
+  renderMessage f ls AvsCardColorGelb = renderMessage f ls MsgAvsCardColorYellow
+
 instance RenderMessage UniWorX TermIdentifier where
   renderMessage _foundation _ls = termToText -- TODO: respect user selected Datetime Format
 

src/Foundation/Navigation.hs

@@ -113,6 +113,7 @@ breadcrumb AdminErrMsgR         = i18nCrumb MsgMenuAdminErrMsg            $ Just
 breadcrumb AdminTokensR         = i18nCrumb MsgMenuAdminTokens            $ Just AdminR
 breadcrumb AdminCrontabR        = i18nCrumb MsgBreadcrumbAdminCrontab     $ Just AdminR
 breadcrumb AdminAvsR            = i18nCrumb MsgMenuAvs                    $ Just AdminR
+breadcrumb AdminAvsUserR{}      = i18nCrumb MsgAvsPersonInfo              $ Just AdminAvsR
 breadcrumb AdminLdapR           = i18nCrumb MsgMenuLdap                   $ Just AdminR
 breadcrumb AdminProblemsR       = i18nCrumb MsgProblemsHeading            $ Just AdminR
 breadcrumb ProblemUnreachableR  = i18nCrumb MsgProblemsUnreachableHeading $ Just AdminProblemsR

src/Foundation/Yesod/Auth.hs

@@ -127,7 +127,7 @@ data CampusUserConversionException
   | CampusUserInvalidGivenName
   | CampusUserInvalidSurname
   | CampusUserInvalidTitle
-  | CampusUserInvalidMatriculation
+  -- | CampusUserInvalidMatriculation
   | CampusUserInvalidFeaturesOfStudy Text
   | CampusUserInvalidAssociatedSchools Text
   deriving (Eq, Ord, Read, Show, Generic)

src/Handler/Admin.hs

@@ -51,11 +51,12 @@ getAdminProblemsR = do
   diffLics <- try retrieveDifferingLicences <&> \case
     -- (Left (UnsupportedContentType "text/html" resp)) -> Left $ text2widget "Html received"
     (Left e) -> Left $ text2widget $ tshow (e :: SomeException)
-    (Right AvsLicenceDifferences{..}) -> Right  ( Set.size avsLicenceDiffRevokeAll
+    (Right AvsLicenceDifferences{..}) -> Right
-                                                , Set.size avsLicenceDiffGrantVorfeld
+      ( Set.size avsLicenceDiffRevokeAll
-                                                , Set.size avsLicenceDiffRevokeRollfeld
+      , Set.size avsLicenceDiffGrantVorfeld
-                                                , Set.size avsLicenceDiffGrantRollfeld
+      , Set.size avsLicenceDiffRevokeRollfeld
-                                                )
+      , Set.size avsLicenceDiffGrantRollfeld
+      )
   -- Attempt to format results in a nicer way failed, since rendering Html within a modal destroyed the page layout itself
   -- let procDiffLics (to0, to1, to2) = Right (Set.size to0, Set.size to1, Set.size to2)
   -- diffLics <- (procDiffLics <$> retrieveDifferingLicences) `catches`
@@ -85,7 +86,7 @@ getAdminProblemsR = do
 
 getProblemUnreachableR :: Handler Html
 getProblemUnreachableR = do
-  unreachables <- runDB retrieveUnreachableUsers'
+  unreachables <- runDB retrieveUnreachableUsers
   siteLayoutMsg MsgProblemsUnreachableHeading $ do
     setTitleI   MsgProblemsUnreachableHeading
     [whamlet|
@@ -94,7 +95,7 @@ getProblemUnreachableR = do
         <ul>
           $forall usr <- unreachables
             <li>
-              ^{linkUserWidget ForProfileR usr} (#{usr ^. _userDisplayEmail} / #{usr ^. _userEmail})
+              ^{linkUserWidget ForProfileDataR usr} (#{usr ^. _userDisplayEmail} / #{usr ^. _userEmail})
     |]
 
 getProblemFbutNoR :: Handler Html
@@ -141,31 +142,30 @@ mkUnreachableUsersTable = do
 -}
 
 areAllUsersReachable :: DB Bool
--- areAllUsersReachable = isNothing <$> E.selectOne retrieveUnreachableUsers
+-- areAllUsersReachable = isNothing <$> E.selectOne retrieveUnreachableUsers'
-areAllUsersReachable = E.selectNotExists retrieveUnreachableUsers
+-- areAllUsersReachable = E.selectNotExists retrieveUnreachableUsers'
+areAllUsersReachable = null <$> retrieveUnreachableUsers
+  
+-- retrieveUnreachableUsers' :: E.SqlQuery (E.SqlExpr (Entity User))
+-- retrieveUnreachableUsers' = do     
+--     user <- E.from $ E.table @User
+--     E.where_ $   E.isNothing (user E.^. UserPostAddress)
+--           E.&&. (E.isNothing (user E.^. UserCompanyDepartment) E.||. user E.^. UserCompanyPersonalNumber `E.ilike` E.justVal "E%")
+--           E.&&. E.not_ ((user E.^. UserDisplayEmail)  `E.like` E.val "%@%.%")
+--           E.&&. E.not_ ((user E.^. UserEmail)         `E.like` E.val "%@%.%")
+--     return user 
 
-retrieveUnreachableUsers :: E.SqlQuery (E.SqlExpr (Entity User))
+retrieveUnreachableUsers :: DB [Entity User]
-retrieveUnreachableUsers = do     
+retrieveUnreachableUsers = do 
-    user <- E.from $ E.table @User
+    emailOnlyUsers <- E.select $ do 
-    E.where_ $  E.isNothing (user E.^. UserPostAddress)
+      user <- E.from $ E.table @User
-          E.&&. E.isNothing (user E.^. UserCompanyDepartment)
+      E.where_ $   E.isNothing (user E.^. UserPostAddress)
-          E.&&. E.not_ ((user E.^. UserDisplayEmail)  `E.like` E.val "%@%.%")
+            E.&&. (E.isNothing (user E.^. UserCompanyDepartment) E.||. user E.^. UserCompanyPersonalNumber `E.ilike` E.justVal "E%")    
-          E.&&. E.not_ ((user E.^. UserEmail)         `E.like` E.val "%@%.%")
+      return user
-    return user 
+    return $ filter hasInvalidEmail emailOnlyUsers
-
+  where 
-retrieveUnreachableUsers' :: DB [Entity User]
+    hasInvalidEmail = isNothing . getEmailAddress . entityVal
-retrieveUnreachableUsers' = do
+  
-  obviousUnreachable <- E.select retrieveUnreachableUsers
-  emailUsers <- E.select $ do 
-    user <- E.from $ E.table @User
-    E.where_ $  E.isNothing (user E.^. UserPostAddress)
-          E.&&. E.isNothing (user E.^. UserCompanyDepartment)
-          E.&&. ( ((user E.^. UserDisplayEmail) `E.like` E.val "%@%.%")
-            E.||. ((user E.^. UserEmail)        `E.like` E.val "%@%.%"))
-    pure user
-  let hasInvalidEmail = isNothing . getEmailAddress . entityVal
-      invaldEmail = filter hasInvalidEmail emailUsers
-  return $ obviousUnreachable ++ invaldEmail
 
 allDriversHaveAvsId :: Day -> DB Bool
 -- allDriversHaveAvsId = fmap isNothing . E.selectOne . retrieveDriversWithoutAvsId

src/Handler/Admin/Avs.hs

@@ -9,6 +9,7 @@
 
 module Handler.Admin.Avs
   ( getAdminAvsR, postAdminAvsR
+  , getAdminAvsUserR
   , getProblemAvsSynchR, postProblemAvsSynchR
   ) where
 
@@ -144,7 +145,7 @@ postAdminAvsR = do
         |]
   mAvsQuery <- getsYesod $ view _appAvsQuery
   case mAvsQuery of
-    Nothing -> return mempty
+    Nothing -> siteLayoutMsg MsgMenuAvs [whamlet|Error: AVS interface configuration is incomplete.|] -- should never occur after initilisation
     Just AvsQuery{..} -> do
       ((presult, pwidget), penctype) <- runFormPost $ makeAvsPersonForm Nothing
 
@@ -365,7 +366,7 @@ postProblemAvsSynchR = getProblemAvsSynchR
 getProblemAvsSynchR = do    
   let catchAllAvs' r = flip catch (\err -> addMessageModal Error (i18n MsgAvsCommunicationError) (Right (text2widget $ tshow (err :: SomeException))) >> redirect r)
       catchAllAvs    = catchAllAvs' ProblemAvsSynchR -- == current route; use only in conditions that are not repeated upon reload; do not call redirect within catchAllAvs actions!
-  AvsLicenceDifferences{..} <- catchAllAvs' AdminR retrieveDifferingLicences
+  (AvsLicenceDifferences{..}, apidStatus) <- catchAllAvs' AdminR retrieveDifferingLicencesStatus
 
   --  
   unknownLicenceOwners' <- whenNonEmpty avsLicenceDiffRevokeAll $ \neZeros ->
@@ -421,10 +422,10 @@ getProblemAvsSynchR = do
 
   -- licence differences
   ((tres0,tb0),(tres1up,tb1up),(tres1down,tb1down),(tres2,tb2)) <- runDB $ (,,,) 
-          <$> mkLicenceTable "avsLicDiffRevokeVorfeld"  AvsLicenceVorfeld   avsLicenceDiffRevokeAll      
+          <$> mkLicenceTable apidStatus "avsLicDiffRevokeVorfeld"  AvsLicenceVorfeld   avsLicenceDiffRevokeAll      
-          <*> mkLicenceTable "avsLicDiffGrantVorfeld"   AvsNoLicence        avsLicenceDiffGrantVorfeld   
+          <*> mkLicenceTable apidStatus "avsLicDiffGrantVorfeld"   AvsNoLicence        avsLicenceDiffGrantVorfeld   
-          <*> mkLicenceTable "avsLicDiffRevokeRollfeld" AvsLicenceRollfeld  avsLicenceDiffRevokeRollfeld 
+          <*> mkLicenceTable apidStatus "avsLicDiffRevokeRollfeld" AvsLicenceRollfeld  avsLicenceDiffRevokeRollfeld 
-          <*> mkLicenceTable "avsLicDiffGrantRollfeld"  AvsNoLicence        avsLicenceDiffGrantRollfeld  
+          <*> mkLicenceTable apidStatus "avsLicDiffGrantRollfeld"  AvsNoLicence        avsLicenceDiffGrantRollfeld  
   
   now <- liftIO getCurrentTime
   let nowaday = utctDay now      
@@ -510,8 +511,8 @@ instance HasUser LicenceTableData where
   hasUser   = resultUser . _entityVal
 
 
-mkLicenceTable :: Text -> AvsLicence -> Set AvsPersonId -> DB (FormResult (LicenceTableActionData, Set AvsPersonId), Widget)
+mkLicenceTable :: AvsPersonIdMapPersonCard -> Text -> AvsLicence -> Set AvsPersonId -> DB (FormResult (LicenceTableActionData, Set AvsPersonId), Widget)
-mkLicenceTable dbtIdent aLic apids = do 
+mkLicenceTable apidStatus dbtIdent aLic apids = do 
   currentRoute <- fromMaybe (error "mkLicenceTable called from 404-handler") <$> liftHandler getCurrentRoute
   avsQualifications <- selectList [QualificationAvsLicence !=. Nothing] []
   now <- liftIO getCurrentTime
@@ -535,7 +536,7 @@ mkLicenceTable dbtIdent aLic apids = do
         [ dbSelect (applying _2) id $ return . view (resultUserAvs . _userAvsPersonId)
                                 -- $ \DBRow{dbrOutput=(_,_,apid,_)} -> return apid -- return . view resultAvsPID -- does not type due to traversal
         , colUserNameLink AdminUserR
-        , sortable (Just "avspersonno")   (i18nCell MsgAvsPersonNo)                  $ \(view      resultUserAvs       -> a) -> avsPersonNoCell a
+        , sortable (Just "avspersonno")   (i18nCell MsgAvsPersonNo)                  $ \(view      resultUserAvs       -> a) -> avsPersonNoLinkedCell a
         -- , colUserCompany 
         , sortable (Just "user-company") (i18nCell MsgTableCompany) $ \(view (resultUser . _entityKey) -> uid) -> flip (set' cellContents) mempty $ do -- why does sqlCell not work here? Mismatch "YesodDB UniWorX" and "RWST (Maybe (Env,FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerFor UniWorX"
             companies' <- liftHandler . runDB . E.select $ E.from $ \(usrComp `E.InnerJoin` comp) -> do
@@ -553,6 +554,7 @@ mkLicenceTable dbtIdent aLic apids = do
         , sortable (Just "first-held")    (i18nCell MsgTableQualificationFirstHeld)  $ \(preview $ resultQualUser . _entityVal . _qualificationUserFirstHeld   -> d)  -> cellMaybe dayCell d
         , sortable (Just "blocked-due")   (i18nCell MsgTableQualificationBlockedDue & cellTooltip MsgTableQualificationBlockedTooltip
                                                                                    ) $ \(preview $ resultQualUser . _entityVal . _qualificationUserBlockedDue  -> b)  -> cellMaybe qualificationBlockedCell b
+        , sortable Nothing (i18nCell MsgTableAvsActiveCards) $ \(view $ resultUserAvs . _userAvsPersonId -> apid) -> foldMap avsPersonCardCell $ Map.lookup apid apidStatus
         ]
       dbtSorting = mconcat
         [ single $ sortUserNameLink queryUser         
@@ -630,4 +632,53 @@ mkLicenceTable dbtIdent aLic apids = do
         let usrSet = Map.keysSet . Map.filter id $ getDBFormResult (const False) usrMap
         return (act, usrSet)
 
-  over _1 postprocess <$> dbTable validator DBTable{..}
+  over _1 postprocess <$> dbTable validator DBTable{..}
+
+
+
+getAdminAvsUserR :: CryptoUUIDUser -> Handler Html
+getAdminAvsUserR uuid = do
+  uid <- decrypt uuid
+  Entity{entityVal=UserAvs{..}} <- runDB $ getBy404 $ UniqueUserAvsUser uid  
+  mAvsQuery <- getsYesod $ view _appAvsQuery
+  resWgt <- case mAvsQuery of
+    Nothing -> return [whamlet|Error: AVS interface configuration is incomplete.|] -- should never occur after initilisation
+    Just AvsQuery{..} -> do 
+      mbContact <- avsQueryContact $ AvsQueryContact $ Set.singleton $ AvsObjPersonId userAvsPersonId
+      mbDataPerson <- lookupAvsUser userAvsPersonId      
+      return [whamlet|
+        <p>
+          Vorläufige Admin Ansicht AVS Daten. 
+          Ansicht zeigt aktuelle Daten. 
+          Es erfolgte damit aber noch kein Update der FRADrive Daten.
+        <p>
+          <dl .deflist>
+            <dt .deflist__dt>InfoPersonContact <br>
+              <i>(bevorzugt)
+            <dd .deflist__dd>
+              $case mbContact
+                $of Left err 
+                  Fehler: #{tshow err}
+                $of Right contactInfo
+                  #{decodeUtf8 (Pretty.encodePretty (toJSON contactInfo))}              
+            <dt .deflist__dt>PersonStatus und mehrere PersonSearch <br>
+              <i>(benötigt mehrere AVS Abfragen)
+            <dd .deflist__dd>
+              $maybe dataPerson <- mbDataPerson
+                #{decodeUtf8 (Pretty.encodePretty (toJSON dataPerson))}
+              $nothing 
+                Keine Daten erhalten.        
+        <h3>
+          Provisorische formatierte Ansicht
+        <p> 
+          Generisch formatierte Ansicht, die zeigt, in welche Richtung die Endansicht gehen könnte. 
+          In der Endansicht wären nur ausgewählte Felder mit besserer Bennenung in einer manuell gewählten Reihenfolge sichtbar.
+        <p>          
+          ^{foldMap jsonWidget mbContact}
+        <p>          
+          ^{foldMap jsonWidget mbDataPerson}
+        |]       
+  let heading = [whamlet|_{MsgAvsPersonNo} #{userAvsNoPerson}|]
+  siteLayout heading $ do 
+    setTitle $ toHtml $ show userAvsNoPerson
+    resWgt

src/Handler/LMS.hs

@@ -91,8 +91,8 @@ postLmsAllR = do
   
   lmsTable <- runDB $ do
     view _2 <$> mkLmsAllTable isAdmin
-  siteLayoutMsg MsgMenuQualifications $ do
+  siteLayoutMsg MsgMenuLms $ do
-    setTitleI MsgMenuQualifications
+    setTitleI   MsgMenuLms
     $(widgetFile "lms-all")
 
 type AllQualificationTableData = DBRow (Entity Qualification, Ex.Value Word64, Ex.Value Word64)
@@ -615,13 +615,13 @@ postLmsR sid qsh = do
       when (diffSelected /= 0)    $ addMessageI Warning $ MsgLmsActionFailed     diffSelected
       redirect currentRoute    
 
-  let heading = citext2widget $ qualificationName quali
+  let heading = citext2widget $ "LMS " <> qualificationName quali
   siteLayout heading $ do
-    setTitle $ toHtml $ unSchoolKey sid <> "-" <> qsh
+    setTitle $ toHtml $ "LMS " <> unSchoolKey sid <> "-" <> qsh
     $(widgetFile "lms")
 
 
--- intended to be viewed primarily in a modal, vie lmsStatusPlusCell'
+-- intended to be viewed primarily in a modal, wie lmsStatusPlusCell
 getLmsUserR :: CryptoUUIDUser -> Handler Html
 getLmsUserR uuid = do  
   uid <- decrypt uuid
@@ -648,6 +648,6 @@ getLmsUserR uuid = do
 
   let heading = [whamlet|_{MsgMenuLmsUser} ^{userWidget user}|]  
   siteLayout heading $ do
-    setTitle $ toHtml $ "Qualifkationen " <> userDisplayName
+    setTitle $ toHtml userDisplayName
     $(widgetFile "lms-user")
     -- $(i18nWidgetFile "lms-user")

src/Handler/Qualification.hs

@@ -18,7 +18,7 @@ import Import
 -- import Jobs
 import Handler.Utils
 -- import Handler.Utils.Csv
--- import Handler.Utils.LMS
+import Handler.Utils.LMS
 
 
 import qualified Data.Set as Set
@@ -460,8 +460,8 @@ postQualificationR sid qsh = do
           -- , sortable (Just "lms-started")   (i18nCell MsgTableLmsElearning <> spacerCell <> i18nCell MsgTableLmsStarted)  
           --                                                                              $ \(preview $ resultLmsUser  . _entityVal . _lmsUserStarted  -> d) -> foldMap dateTimeCell d
           -- , sortable (Just "lms-status")    (i18nCell MsgTableLmsStatus)               $ \(preview $ resultLmsUser  . _entityVal . _lmsUserStatus -> status)  -> foldMap lmsStatusCell $ join status          
-          , sortable (Just "lms-status-plus")(i18nCell MsgTableLmsStatus & cellTooltip (MsgTableLmsStatusTooltip auditMonths))
+          , sortable (Just "lms-status-plus")(i18nCell MsgTableLmsStatus & cellTooltipWgt Nothing (lmsStatusInfoCell isAdmin auditMonths))
-                                                                                       $ \(preview $ resultLmsUser . _entityVal -> lu) -> foldMap (lmsStatusPlusCell' linkLmsUser) lu                                                                                       
+                                                                                       $ \(preview $ resultLmsUser . _entityVal -> lu) -> foldMap (lmsStatusPlusCell linkLmsUser) lu                                                                                       
           ]
         psValidator = def & defaultSorting [SortDescBy "last-refresh"]
     tbl <- mkQualificationTable isAdmin qent acts colChoices psValidator

src/Handler/SAP.hs

@@ -13,6 +13,7 @@ import Import
 
 import Handler.Utils
 import Handler.Utils.Csv
+import Handler.Utils.Profile
 
 -- import qualified Data.CaseInsensitive as CI
 import qualified Data.Csv as Csv
@@ -56,11 +57,11 @@ instance ToNamedRecord SapUserTableCsv where
 -- | Removes all personalNummer which are not numbers between 10000 and 99999 (also excludes E-Accounts), which should not be returned by the query anyway (only qualfications with sap id and users with internal personnel number must be transmitted)
 --   TODO: once temporary suspensions are implemented, a user must be transmitted to SAP in two rows: firstheld->suspensionFrom & suspensionTo->validTo
 sapRes2csv :: [(Ex.Value (Maybe Text), Ex.Value Day, Ex.Value Day, Ex.Value (Maybe Text))] -> [SapUserTableCsv]
-sapRes2csv l = [ res | (Ex.Value (Just persNo), Ex.Value firstHeld, Ex.Value validUntil, Ex.Value (Just sapId)) <- l 
+sapRes2csv l = [ res | (Ex.Value pn@(Just persNo), Ex.Value firstHeld, Ex.Value validUntil, Ex.Value (Just sapId)) <- l 
-               , let persNoAsInt = readMay persNo
+                --  , let persNoAsInt = readMay =<< persNo -- also see Handler.Utils.Profile.validFraportPersonalNumber
-               , persNoAsInt >= Just (10000::Int)       -- filter E-accounts for SAP export
+                --  , persNoAsInt >= Just (10000::Int)       -- filter E-accounts for SAP export
-               , persNoAsInt <= Just (99999::Int)       -- filter E-accounts for SAP export                                      
+                --  , persNoAsInt <= Just (99999::Int)       -- filter E-accounts for SAP export                                                     
-               , let res = SapUserTableCsv
+                , let res = SapUserTableCsv
                             { csvSUTpersonalNummer = persNo
                             , csvSUTqualifikation  = sapId
                             , csvSUTgültigVon      = firstHeld
@@ -68,6 +69,7 @@ sapRes2csv l = [ res | (Ex.Value (Just persNo), Ex.Value firstHeld, Ex.Value val
                             -- , csvSUTsupendiertBis  = blocked
                             , csvSUTausprägung     = "J"
                             }
+                , validFraportPersonalNumber pn
                ]
 
 -- | Deliver all employess with a successful LDAP synch within the last 3 months

src/Handler/Tutorial/Users.hs

@@ -11,6 +11,7 @@ module Handler.Tutorial.Users
 import Import
 
 import Utils.Form
+import Utils.Print
 import Handler.Utils
 import Handler.Utils.Course
 import Handler.Utils.Tutorial
@@ -20,7 +21,7 @@ import qualified Data.CaseInsensitive as CI
 
 import qualified Data.Set as Set
 import qualified Data.Map as Map
-
+import qualified Data.ByteString.Lazy as LBS
 -- import qualified Data.Time.Zones as TZ
 
 import           Database.Esqueleto.Experimental ((:&)(..))
@@ -57,21 +58,19 @@ data TutorialUserActionData
   deriving (Eq, Ord, Read, Show, Generic)
 
 
-getTUsersR, postTUsersR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> Handler Html
+getTUsersR, postTUsersR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> Handler TypedContent
 getTUsersR = postTUsersR
-postTUsersR tid ssh csh tutn = do
+postTUsersR tid ssh csh tutn = do  
-  showSex <- getShowSex
+  (Entity tutid tut@Tutorial{..}, (participantRes, participantTable), qualifications) <- runDB $ do
-  (Entity tutid Tutorial{..}, (participantRes, participantTable), qualifications) <- runDB $ do
     cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-    tut@(Entity tutid _) <- fetchTutorial tid ssh csh tutn    
+    tutEnt@(Entity tutid _) <- fetchTutorial tid ssh csh tutn    
     qualifications <- getCourseQualifications cid
     now <- liftIO getCurrentTime
     let minDur :: Maybe Int = minimumMaybe $ catMaybes (view _qualificationValidDuration <$> qualifications)  -- no instance Ord CalendarDiffDays        
         dayExpiry = flip addGregorianDurationClip (utctDay now) . fromMonths <$> minDur
         colChoices  = mconcat $ catMaybes
           [ pure $ dbSelect (applying _2) id (return . view (hasEntity . _entityKey))
-          , pure $ colUserNameModalHdr MsgTableCourseMembers ForProfileDataR
+          , pure $ colUserNameModalHdr MsgTableCourseMembers ForProfileDataR          
-          , guardOn showSex colUserSex'
           , pure  colUserEmail
           , pure  colUserMatriclenr
           , pure  colUserQualifications
@@ -80,7 +79,7 @@ postTUsersR tid ssh csh tutn = do
         psValidator = def
           & defaultSortingByName
           & restrictSorting (\name _ -> none (== name) ["note", "registration", "tutorials", "exams", "submission-group", "state"]) -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information
-          & restrictFilter (\name _ -> none (== name) ["tutorial", "exam", "submission-group", "active", "has-personalised-sheet-files"])
+          & restrictFilter  (\name _ -> none (== name) ["tutorial", "exam", "submission-group", "active", "has-personalised-sheet-files"])
         isInTut q = E.exists $ do 
           tutorialParticipant <- E.from $ E.table @TutorialParticipant
           E.where_ $ tutorialParticipant E.^. TutorialParticipantUser E.==. queryUser q E.^. UserId
@@ -118,14 +117,29 @@ postTUsersR tid ssh csh tutn = do
         , ( TutorialUserDeregister, pure TutorialUserDeregisterData )
         ]
     table <- makeCourseUserTable cid acts isInTut colChoices psValidator (Just csvColChoices)
-    return (tut, table, qualifications)
+    return (tutEnt, table, qualifications)
 
   let courseQids = Set.fromList (entityKey <$> qualifications)
-  formResult participantRes $ \case
+  tcontent <- formResultMaybe participantRes $ \case
-    (TutorialUserPrintQualificationData{..}, _selectedUsers)
+    (TutorialUserPrintQualificationData{..}, selectedUsers)
       | tuQualification `Set.member` courseQids -> do
-        -- TODO Continue here
+        rcvr <- requireAuth
-        addMessageI Error MsgErrorUnknownFormAction
+        encRcvr <- encrypt $ entityKey rcvr
+        letters <- runDB $ makeCourseCertificates tut Nothing $ toList selectedUsers
+        let mbAletter = anyone letters 
+        case mbAletter of 
+          Nothing -> addMessageI Error MsgErrorUnknownFormAction >> return Nothing -- TODO: better error message
+          Just aletter -> do             
+            now <- liftIO getCurrentTime
+            apcIdent <- letterApcIdent aletter encRcvr now        
+            let fName = letterFileName aletter
+            renderLetters rcvr letters apcIdent >>= \case
+              Left err  -> sendResponseStatus internalServerError500 $ "PDF generation failed: \n" <> err                      
+              Right pdf -> Just <$> sendByteStringAsFile fName (LBS.toStrict pdf) now
+                -- sendResponseByteStringFile "demoPDF.pdf" (LBS.toStrict pdf)
+                -- let typePDF :: ContentType 
+                --     typePDF = "application/pdf"
+                -- sendResponse (typePDF, toContent pdf)          
     (TutorialUserGrantQualificationData{..}, selectedUsers)
       | tuQualification `Set.member` courseQids -> do
         -- today <- localDay . TZ.utcToLocalTimeTZ appTZ <$> liftIO getCurrentTime
@@ -148,16 +162,19 @@ postTUsersR tid ssh csh tutn = do
           ]
         addMessageI Success $ MsgTutorialUsersDeregistered nrDel
         redirect $ CTutorialR tid ssh csh tutn TUsersR
-    _other -> 
+    _other -> addMessageI Error MsgErrorUnknownFormAction >> return Nothing
-        addMessageI Error MsgErrorUnknownFormAction
   
-  tutors <- runDB $ E.select $ do
+  case tcontent of 
-    (tutor :& user) <- E.from $ E.table @Tutor `E.innerJoin` E.table @User
+    Just content -> return content -- abort and return produced content
-      `E.on` (\(tutor :& user) -> tutor E.^. TutorUser E.==. user E.^. UserId)
+    Nothing -> do
-    E.where_ $ tutor E.^. TutorTutorial E.==. E.val tutid
+      tutors <- runDB $ E.select $ do
-    return user
+        (tutor :& user) <- E.from $ E.table @Tutor `E.innerJoin` E.table @User
+          `E.on` (\(tutor :& user) -> tutor E.^. TutorUser E.==. user E.^. UserId)
+        E.where_ $ tutor E.^. TutorTutorial E.==. E.val tutid
+        return user
 
-  let heading = prependCourseTitle tid ssh csh $ CI.original tutorialName
+      let heading = prependCourseTitle tid ssh csh $ CI.original tutorialName
-  siteLayoutMsg heading $ do
+      html <- siteLayoutMsg heading $ do
-    setTitleI heading
+        setTitleI heading
-    $(widgetFile "tutorial-participants")
+        $(widgetFile "tutorial-participants")
+      return $ toTypedContent html

src/Handler/Users.hs

@@ -99,9 +99,7 @@ postUsersR = do
       , sortable (Just "name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
           (AdminUserR <$> encrypt uid)
           (nameWidget userDisplayName userSurname)
---      , sortable (Just "matriculation") (i18nCell MsgTableMatrikelNr) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
+      , sortable (Just "matriculation") (i18nCell MsgTableMatrikelNr) $ \DBRow{ dbrOutput = entUsr } -> cellHasMatrikelnummerLinked entUsr
---          (AdminUserR <$> encrypt uid)
---          (toWgt userMatrikelnummer)
       , sortable (Just "user-company") (i18nCell MsgTableCompany) $ \DBRow{ dbrOutput = Entity uid _ } -> flip (set' cellContents) mempty $ do -- why does sqlCell not work here? Mismatch "YesodDB UniWorX" and "RWST (Maybe (Env,FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerFor UniWorX"
             companies' <- liftHandler . runDB . E.select $ E.from $ \(usrComp `E.InnerJoin` comp) -> do
               E.on $ usrComp E.^. UserCompanyCompany E.==. comp E.^. CompanyId
@@ -215,6 +213,9 @@ postUsersR = do
           , ( "display-name"
             , SortColumn $ \user -> user E.^. UserDisplayName
             )
+           , ( "matriculation"
+            , SortColumn $ \user -> user E.^. UserMatrikelnummer
+            )
           , ( "personal-number"
             , SortColumn $ \user -> user E.^. UserCompanyPersonalNumber
             )
@@ -262,10 +263,10 @@ postUsersR = do
               Just needle -> (E.castString (user E.^. UserEmail) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
                       E.||. (E.castString (user E.^. UserDisplayEmail) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
             )
---          , ( "matriculation", FilterColumn $ \user (criteria :: Set.Set Text) -> if
+         , ( "matriculation", FilterColumn $ \user (criteria :: Set.Set Text) -> if
---                 | Set.null criteria -> E.true -- TODO: why can this be eFalse and work still?
+                | Set.null criteria -> E.true
---                 | otherwise         -> E.any (\c -> user E.^. UserMatrikelnummer `E.hasInfix` E.val c) criteria
+                | otherwise         -> E.any (\c -> user E.^. UserMatrikelnummer `E.hasInfix` E.val c) criteria
---            )
+           )
           , ( "personal-number", FilterColumn $ \user (criteria :: Set.Set Text) -> if
                  | Set.null criteria -> E.true -- TODO: why can this be eFalse and work still?
                  | otherwise         -> E.any (\c -> user E.^. UserCompanyPersonalNumber `E.hasInfix` E.val c) criteria

src/Handler/Utils/Avs.hs

@@ -14,11 +14,13 @@ module Handler.Utils.Avs
   -- , getLicence, getLicenceDB, getLicenceByAvsId -- not supported by interface
   , AvsLicenceDifferences(..)
   , setLicence, setLicenceAvs, setLicencesAvs
-  , retrieveDifferingLicences, computeDifferingLicences
+  , retrieveDifferingLicences, retrieveDifferingLicencesStatus
+  , computeDifferingLicences
   , synchAvsLicences
   , lookupAvsUser, lookupAvsUsers
   , AvsException(..)
   , updateReceivers
+  , AvsPersonIdMapPersonCard
   ) where
 
 import Import
@@ -178,6 +180,18 @@ data AvsLicenceDifferences = AvsLicenceDifferences
     }
   deriving (Show)
 
+#ifdef DEVELOPMENT
+-- avsLicenceDifferences2LicenceIds is not used in DEVELOPMENT build
+#else
+avsLicenceDifferences2LicenceIds :: AvsLicenceDifferences -> Set AvsPersonId
+avsLicenceDifferences2LicenceIds AvsLicenceDifferences{..} = Set.unions 
+  [ avsLicenceDiffRevokeAll     
+  , avsLicenceDiffGrantVorfeld  
+  , avsLicenceDiffRevokeRollfeld
+  , avsLicenceDiffGrantRollfeld 
+  ]
+#endif 
+
 avsLicenceDifferences2personLicences :: AvsLicenceDifferences -> Set AvsPersonLicence
 avsLicenceDifferences2personLicences AvsLicenceDifferences{..} =
      Set.map (AvsPersonLicence AvsNoLicence)       avsLicenceDiffRevokeAll
@@ -188,24 +202,57 @@ avsLicenceDifferences2personLicences AvsLicenceDifferences{..} =
 computeDifferingLicences :: AvsResponseGetLicences -> Handler (Set AvsPersonLicence)
 computeDifferingLicences = fmap avsLicenceDifferences2personLicences . getDifferingLicences
 
-retrieveDifferingLicences :: Handler AvsLicenceDifferences
+type AvsPersonIdMapPersonCard = Map AvsPersonId (Set AvsDataPersonCard)
-retrieveDifferingLicences = do
-#ifdef DEVELOPMENT  
-  avsUsrs <- runDB $ selectList [] [LimitTo 444]
-  getDifferingLicences $ AvsResponseGetLicences $ Set.fromList $
-    [ AvsPersonLicence AvsLicenceVorfeld  $ AvsPersonId 77         -- AVS:1 FD:2
-    , AvsPersonLicence AvsLicenceRollfeld $ AvsPersonId 12345678   -- AVS:2 FD:1
-    , AvsPersonLicence AvsLicenceVorfeld  $ AvsPersonId 5          -- AVS:1 FD:0 (nichts)
-    , AvsPersonLicence AvsLicenceVorfeld  $ AvsPersonId 2          -- AVS:1 FD:0 (ungültig)
-    -- , AvsPersonLicence AvsLicenceVorfeld  $ AvsPersonId 4          -- AVS:1 FD:1
-    ] ++ [AvsPersonLicence AvsLicenceVorfeld avsid | Entity _ UserAvs{userAvsPersonId = avsid} <- avsUsrs]
-#else
-  AvsQuery{..}  <- maybeThrowM AvsInterfaceUnavailable $ getsYesod $ view _appAvsQuery
-  allLicences   <- throwLeftM avsQueryGetAllLicences
-  getDifferingLicences allLicences
-#endif
-  
 
+avsResponseStatusMap :: AvsResponseStatus -> AvsPersonIdMapPersonCard
+avsResponseStatusMap (AvsResponseStatus status) = Map.fromDistinctAscList [(avsStatusPersonID,avsStatusPersonCardStatus) | AvsStatusPerson{..}<- Set.toAscList status]
+
+retrieveDifferingLicences :: Handler AvsLicenceDifferences
+retrieveDifferingLicences = fst <$> retrieveDifferingLicences' False
+
+retrieveDifferingLicencesStatus :: Handler (AvsLicenceDifferences, AvsPersonIdMapPersonCard)
+retrieveDifferingLicencesStatus = retrieveDifferingLicences' True
+
+retrieveDifferingLicences' :: Bool -> Handler (AvsLicenceDifferences, AvsPersonIdMapPersonCard)
+retrieveDifferingLicences' getStatus = do  
+#ifdef DEVELOPMENT
+  avsUsrs <- runDB $ selectList [] [LimitTo 444]
+  let allLicences = AvsResponseGetLicences $ Set.fromList $
+        [ AvsPersonLicence AvsLicenceVorfeld  $ AvsPersonId 77         -- AVS:1 FD:2
+        , AvsPersonLicence AvsLicenceRollfeld $ AvsPersonId 12345678   -- AVS:2 FD:1
+        , AvsPersonLicence AvsLicenceVorfeld  $ AvsPersonId 5          -- AVS:1 FD:0 (nichts)
+        , AvsPersonLicence AvsLicenceVorfeld  $ AvsPersonId 2          -- AVS:1 FD:0 (ungültig)
+        -- , AvsPersonLicence AvsLicenceVorfeld  $ AvsPersonId 4          -- AVS:1 FD:1
+        ] ++ [AvsPersonLicence AvsLicenceVorfeld avsid | Entity _ UserAvs{userAvsPersonId = avsid} <- avsUsrs]
+#else
+  AvsQuery{..} <- maybeThrowM AvsInterfaceUnavailable $ getsYesod $ view _appAvsQuery
+  allLicences  <- throwLeftM avsQueryGetAllLicences
+#endif
+  lDiff <- getDifferingLicences allLicences  
+#ifdef DEVELOPMENT
+  let mkAdpc valid color = AvsDataPersonCard valid Nothing Nothing color (Set.singleton 'F') Nothing Nothing Nothing Nothing (AvsCardNo "1234") "5"
+      lStat = AvsResponseStatus $ bool mempty fakes getStatus -- not really needed, but avoids unused variable error
+      fakes = Set.fromList $ 
+              [ AvsStatusPerson (AvsPersonId 77      ) $ Set.singleton $ mkAdpc True AvsCardColorGelb
+              , AvsStatusPerson (AvsPersonId 12345678) $ Set.fromList [mkAdpc False AvsCardColorGrün, mkAdpc True  AvsCardColorGelb, mkAdpc False AvsCardColorBlau, mkAdpc True  AvsCardColorRot, mkAdpc True $ AvsCardColorMisc "Violett"]
+              , AvsStatusPerson (AvsPersonId 5       ) $ Set.fromList [mkAdpc True  AvsCardColorGrün, mkAdpc False AvsCardColorGelb, mkAdpc True  AvsCardColorBlau, mkAdpc False AvsCardColorRot, mkAdpc True $ AvsCardColorMisc "Pink"]
+              , AvsStatusPerson (AvsPersonId 2       ) $ Set.singleton $ mkAdpc True AvsCardColorGrün
+              ] <> 
+              [ AvsStatusPerson  avsid $ Set.singleton $ mkAdpc (even $ avsPersonId avsid) AvsCardColorGelb | Entity _ UserAvs{userAvsPersonId = avsid} <- avsUsrs ]
+#else
+  let statQry = avsLicenceDifferences2LicenceIds lDiff
+  lStat <- if getStatus && notNull statQry 
+            then -- throwLeftM $ avsQueryStatus $ AvsQueryStatus statQry -- don't throw up here, licence differences are too important! TODO: Warn in Problem-Handler
+              avsQueryStatus (AvsQueryStatus statQry) >>= \case 
+                Left err -> do
+                  addMessage Error $ toHtml $ "avsQueryStatus failed for " <> tshow (length statQry) <> " requests with: \n" <> tshow err <> "\nREQUEST:\n" <> tshow statQry
+                  return $ AvsResponseStatus mempty 
+                Right res -> return res
+            else return $ AvsResponseStatus mempty -- avoid unnecessary avs calls
+#endif
+  return (lDiff, avsResponseStatusMap lStat)
+
+  
 getDifferingLicences :: AvsResponseGetLicences -> Handler AvsLicenceDifferences
 getDifferingLicences (AvsResponseGetLicences licences) = do
   now <- liftIO getCurrentTime
@@ -394,7 +441,7 @@ upsertAvsUserById api = do
             , audSurname          = avsSurname
             , audDisplayName      = avsFirstName <> Text.cons ' ' avsSurname
             , audDisplayEmail     = "" -- Email is unknown in this version of the avs query, to be updated later (FUTURE TODO)
-            , audMatriculation    = Nothing
+            , audMatriculation    = Just $ tshow avsPersonPersonNo
             , audSex              = Nothing
             , audBirthday         = Nothing
             , audMobile           = Nothing
@@ -420,7 +467,7 @@ upsertAvsUserById api = do
       return mbUid
 
     (Just (Entity _ UserAvs{userAvsUser=uid})
-      , Just AvsDataPerson{avsPersonPersonCards, avsPersonInternalPersonalNo, avsPersonFirstName= Text.strip -> avsFirstName, avsPersonLastName= Text.strip -> avsSurname}) -> do -- known user, update address and pinPassword
+      , Just AvsDataPerson{avsPersonPersonCards, avsPersonInternalPersonalNo, avsPersonPersonNo, avsPersonFirstName= Text.strip -> avsFirstName, avsPersonLastName= Text.strip -> avsSurname}) -> do -- known user, update address and pinPassword
       let (mbCompany, mbCoFirmAddr, _) = guessLicenceAddress avsPersonPersonCards          
           userFirmAddr    = plaintextToStoredMarkup <$> mbCoFirmAddr
           pinCard         = Set.lookupMax avsPersonPersonCards
@@ -430,6 +477,7 @@ upsertAvsUserById api = do
         update uid  [ UserFirstName             =. avsFirstName      -- update in case of name changes via AVS; might be changed again through LDAP
                     , UserSurname               =. avsSurname
                     , UserDisplayName           =. avsFirstName <> Text.cons ' ' avsSurname
+                    , UserMatrikelnummer        =. Just (tshow avsPersonPersonNo)  -- TODO: Deactivate this update after Q2/2023; this is only needed since UserMatrikelnummer was used for AVSNO later
                     , UserCompanyPersonalNumber =. avsInternalPersonalNo <$> canonical avsPersonInternalPersonalNo
                     ]        
         oldCards <- selectList [UserAvsCardPersonId ==. api] []

src/Handler/Utils/Download.hs

@@ -4,7 +4,8 @@
 
 module Handler.Utils.Download
   ( sendThisFile
-  , sendByteStringAsFile
+  , sendByteStringAsFile --, sendByteStringAsFileAndExit
+  , sendResponseByteStringFile
   , sendFileReference
   , serveOneFile
   , serveSomeFiles
@@ -176,6 +177,37 @@ sendByteStringAsFile fileTitle content fileModified =
       | null content = Nothing 
       | otherwise    = Just $ yield content
 
+-- THIS DOES NOT WORK:
+-- sendByteStringAsFileAndExit :: ( YesodAuthPersist UniWorX
+--                 , AuthEntity UniWorX ~ User
+--                 , AuthId UniWorX ~ UserId
+--                 , YesodPersistRunner UniWorX
+--                 , MonadCrypto (HandlerFor UniWorX), MonadCryptoKey (HandlerFor UniWorX) ~ CryptoIDKey
+--                 ) => FilePath -> ByteString -> UTCTime -> HandlerFor UniWorX a
+-- sendByteStringAsFileAndExit fileTitle content fileModified= do 
+--   void $ sendByteStringAsFile fileTitle content fileModified
+--   sendResponse ()
+
+
+-- | like sendByteStringAsFile, but uses sendResponse instead of respondSourceDB, ensuring that
+--   remaining handler code is bybassed
+sendResponseByteStringFile :: -- ( YesodAuthPersist UniWorX
+                -- , AuthEntity UniWorX ~ User
+                -- , AuthId UniWorX ~ UserId                
+                -- , MonadCrypto (HandlerFor UniWorX), MonadCryptoKey (HandlerFor UniWorX) ~ CryptoIDKey
+                -- ) => 
+                FilePath -> ByteString -> HandlerFor UniWorX a
+sendResponseByteStringFile fileTitle fileContent = do 
+  -- ensureApprootUserGeneratedMaybe' Nothing
+  when (null fileContent) $ sendResponseStatus noContent204 ()
+  let cType = simpleContentType (mimeLookup $ pack fileTitle) <> "; charset=utf-8"
+      content = (cType, toContent fileContent)
+  -- setCSPSandbox
+  setContentDisposition ContentInline $ Just $ takeFileName fileTitle  -- just displays, but cannot save
+  -- setContentDisposition ContentAttachment $ Just $ takeFileName fileTitle -- saves file pnly, no display
+  -- setContentDisposition' . Just $ takeFileName fileTitle
+  sendResponse content
+
 sendFileReference :: forall file a.
                      ( HasFileReference file
                      , BearerAuthSite UniWorX

src/Handler/Utils/LMS.hs

@@ -20,6 +20,7 @@ module Handler.Utils.LMS
   , lmsDeletionDate
   , lmsUserToDelete, _lmsUserToDelete
   , lmsUserToDeleteExpr
+  , lmsStatusInfoCell
   , lmsStatusIcon, lmsUserStatusWidget
   , randomLMSIdent, randomLMSIdentBut
   , randomLMSpw, maxLmsUserIdentRetries
@@ -103,15 +104,15 @@ makeLmsFilename ftag (citext2lower -> qsh) = do
 getYMTH :: MonadHandler m => m Text
 getYMTH = formatTime' "%Y%m%d%H" =<< liftIO getCurrentTime
 
--- 
+--
 lmsDeletionDate :: Handler Day
-lmsDeletionDate = do 
+lmsDeletionDate = do
   LmsConf{lmsDeletionDays} <- getsYesod $ view _appLmsConf
   addDays (fromIntegral $ negate lmsDeletionDays) . utctDay <$> liftIO getCurrentTime
 
 -- | Decide whether LMS platform should delete an identifier
 lmsUserToDeleteExpr :: Day -> E.SqlExpr (Entity LmsUser) -> E.SqlExpr (E.Value Bool)
-lmsUserToDeleteExpr cutoff lmslist = E.isNothing (lmslist E.^. LmsUserEnded) 
+lmsUserToDeleteExpr cutoff lmslist = E.isNothing (lmslist E.^. LmsUserEnded)
   E.&&. E.not_ (E.isNothing $ lmslist E.^. LmsUserStatus)
   E.&&. E.explicitUnsafeCoerceSqlExprValue "timestamp" ((lmslist E.^. LmsUserStatus) E.#>>. "{day}") E.<=. E.val cutoff
   
@@ -154,29 +155,58 @@ randomLMSIdent = LmsIdent <$> randomText [] lengthIdent -- idents must not conta
 
 randomLMSIdentBut :: MonadIO m => Set LmsIdent -> m (Maybe LmsIdent)
 randomLMSIdentBut banList = untilJustMaxM maxLmsUserIdentRetries getIdentOk
-  where     
+  where
-    getIdentOk = do 
+    getIdentOk = do
       l <- randomLMSIdent
       return $ toMaybe (Set.notMember l banList) l
 
 randomLMSpw :: MonadIO m => m Text -- may contain all kinds of symbols, but our users had trouble with some, like ',' '.' ':' '_'
-randomLMSpw = randomText extra lengthPassword 
+randomLMSpw = randomText extra lengthPassword
   where
     extra = "+=!?" -- you cannot distinguish ;: and ., in printed letters
 
+lmsStatusInfoCell :: Bool -> Maybe Int -> Widget
+lmsStatusInfoCell extendedInfo auditMonths =
+  [whamlet|$newline never
+    <p>
+      _{MsgTableLmsStatusTooltip auditMonths}
+    <p>
+      <dl .glossary>
+        $if extendedInfo
+          <dt>^{icon IconPlanned}
+          <dd>_{MsgLmsStatusPlanned}
+        <dt>^{icon IconNotificationSent}
+        <dd>_{MsgLmsStatusNotificationSent}
+        <dt>^{icon IconNotOK}
+        <dd>_{MsgLmsStatusBlocked}
+        <dt>^{icon IconExpired}
+        <dd>_{MsgLmsStatusExpired}
+        <dt>^{icon IconOK}
+        <dd>_{MsgLmsStatusSuccess}
+    <p>
+      _{MsgLmsStatusDelay}
+  |]
+
 lmsStatusIcon :: LmsStatus -> Icon
 lmsStatusIcon LmsSuccess{} = IconOK
 lmsStatusIcon LmsExpired{} = IconExpired
 lmsStatusIcon _other       = IconNotOK
 
-lmsUserStatusWidget :: LmsUser -> Widget
+lmsUserStatusWidget :: Bool -> LmsUser -> Widget
-lmsUserStatusWidget LmsUser{lmsUserStatus=Just lStat} = 
+lmsUserStatusWidget _ LmsUser{lmsUserStatus=Just lStat} =
   [whamlet|$newline never
-    ^{formatTimeW SelFormatDate (lmsStatusDay lStat)} 
+    ^{formatTimeW SelFormatDate (lmsStatusDay lStat)}
-    \ ^{icon (lmsStatusIcon lStat)} 
+    \ ^{icon (lmsStatusIcon lStat)}
   |]
-lmsUserStatusWidget LmsUser{lmsUserStarted} = 
+-- previously: IconWaitingForUser for lmsUserStatus==Nothing
+lmsUserStatusWidget _ LmsUser{lmsUserNotified=Just d} =
   [whamlet|$newline never
-    ^{formatTimeW SelFormatDate lmsUserStarted} 
+    ^{formatTimeW SelFormatDate d}
-    \ ^{icon IconWaitingForUser}
+    \ ^{icon IconNotificationSent}
   |]
+lmsUserStatusWidget True LmsUser{lmsUserStarted} =  -- E-Learning started, but not yet notified; only intended for Admins
+  [whamlet|$newline never
+    ^{formatTimeW SelFormatDate lmsUserStarted}
+    \ ^{icon IconPlanned}
+  |]
+lmsUserStatusWidget _ _ = mempty

src/Handler/Utils/Profile.hs

@@ -5,12 +5,10 @@
 -- TODO: why is this Handler.Utils.Profile instead of Utils.Profile? 
 -- TODO: consider merging with Handler.Utils.Users?
 module Handler.Utils.Profile
-  ( checkDisplayName
+  ( validDisplayName, checkDisplayName, fixDisplayName
-  , validDisplayName
-  , fixDisplayName
   , validPostAddress  
-  , validEmail, validEmail'
+  , validEmail, validEmail', pickValidEmail, pickValidEmail'
-  , pickValidEmail, pickValidEmail'
+  , validFraportPersonalNumber
   ) where
 
 import Import.NoFoundation
@@ -103,4 +101,11 @@ pickValidEmail' :: UserEmail -> UserEmail -> Maybe UserEmail
 pickValidEmail' x y 
   | validEmail' x = Just x
   | validEmail' y = Just y
-  | otherwise     = Nothing
+  | otherwise     = Nothing
+
+validFraportPersonalNumber :: Maybe Text -> Bool
+validFraportPersonalNumber Nothing = False
+validFraportPersonalNumber (Just t)
+  | (Just pn) <- readMay t
+    = pn >= (10000::Int) && pn <= (99999::Int) -- used to filter for SAP export    
+  | otherwise = False

src/Handler/Utils/Table/Cells.hs

@@ -7,6 +7,7 @@ module Handler.Utils.Table.Cells where
 import Import hiding (link)
 
 import Text.Blaze (ToMarkup(..))
+import qualified Data.Set as Set
 
 import Handler.Utils.Table.Pagination
 import Handler.Utils.DateTime
@@ -217,6 +218,16 @@ cellHasUserModal toLink user =
 cellHasMatrikelnummer :: (IsDBTable m a, HasUser u) => u -> DBCell m a
 cellHasMatrikelnummer = maybe mempty textCell . view _userMatrikelnummer
 
+cellHasMatrikelnummerLinked :: (IsDBTable m a, HasEntity u User) => u -> DBCell m a
+cellHasMatrikelnummerLinked usr 
+    | Just matNr <- usrEntity ^. _userMatrikelnummer = cell $ do 
+        uuid <- liftHandler $ encrypt $ usrEntity ^. _entityKey
+        modal (text2widget matNr) (Left $ SomeRoute $ AdminAvsUserR uuid)
+    | otherwise = mempty
+  where 
+    usrEntity = usr ^. hasEntityUser
+
+
 cellHasEMail :: (IsDBTable m a, HasUser u) => u -> DBCell m a
 cellHasEMail = emailCell . view _userDisplayEmail
 
@@ -356,15 +367,15 @@ cryptoidCell = addCellClass ("cryptoid" :: Text) . textCell . toPathPiece
 lmsStatusCell :: IsDBTable m a => LmsStatus -> DBCell m a
 lmsStatusCell ls = iconCell (lmsStatusIcon ls) <> spacerCell <> dayCell (lmsStatusDay ls)
 
-lmsStatusPlusCell :: IsDBTable m a => LmsUser -> DBCell m a
+-- lmsStatusPlusCell :: IsDBTable m a => LmsUser -> DBCell m a
-lmsStatusPlusCell LmsUser{lmsUserStatus=Just lStat} = lmsStatusCell lStat
+-- lmsStatusPlusCell LmsUser{lmsUserStatus=Just lStat} = lmsStatusCell lStat
-lmsStatusPlusCell LmsUser{lmsUserStarted} = iconCell IconWaitingForUser <> spacerCell <> dateCell lmsUserStarted
+-- lmsStatusPlusCell LmsUser{lmsUserStarted} = iconCell IconWaitingForUser <> spacerCell <> dateCell lmsUserStarted
 
-lmsStatusPlusCell' :: IsDBTable m a => Maybe (CryptoUUIDUser -> Route UniWorX) -> LmsUser -> DBCell m a
+lmsStatusPlusCell :: IsDBTable m a => Maybe (CryptoUUIDUser -> Route UniWorX) -> LmsUser -> DBCell m a
-lmsStatusPlusCell' Nothing        lu = wgtCell $ lmsUserStatusWidget lu
+lmsStatusPlusCell Nothing        lu = wgtCell $ lmsUserStatusWidget False lu
-lmsStatusPlusCell' (Just toLink)  lu = cell $ do 
+lmsStatusPlusCell (Just toLink)  lu = cell $ do 
   uuid <- liftHandler $ encrypt $ lu ^. _lmsUserUser
-  modal (lmsUserStatusWidget lu) (Left $ SomeRoute $ toLink uuid)
+  modal (lmsUserStatusWidget True lu) (Left $ SomeRoute $ toLink uuid)
 
 qualificationBlockedCellNoReason :: IsDBTable m a => Maybe QualificationBlocked -> DBCell m a
 qualificationBlockedCellNoReason Nothing   = mempty 
@@ -379,5 +390,23 @@ qualificationBlockedCell (Just QualificationBlocked{..})
   where
     mkCellWith c = c qualificationBlockedReason <> spacerCell <> iconCell IconBlocked <> spacerCell <> dayCell qualificationBlockedDay
 
-avsPersonNoCell :: (IsDBTable m c, HasUserAvs a) => a -> DBCell m c 
+avsPersonNoCell :: (IsDBTable m c, HasUserAvs a) => a -> DBCell m c
 avsPersonNoCell = numCell . view _userAvsNoPerson
+
+avsPersonNoLinkedCell :: (IsDBTable m c, HasUserAvs a) => a -> DBCell m c
+avsPersonNoLinkedCell a = cell $ do
+  uuid <- liftHandler $ encrypt $ a ^. _userAvsUser
+  modal (toWgt $ toMessage $ a ^. _userAvsNoPerson) (Left $ SomeRoute $ AdminAvsUserR uuid)
+
+avsPersonCardCell :: (IsDBTable m c) => Set AvsDataPersonCard -> DBCell m c
+avsPersonCardCell cards = wgtCell 
+    [whamlet|
+      $newline never
+      <ul .list--iconless .list--inline .list--comma-separated>
+        $forall c <- validColors
+          <li>
+            _{c}
+    |]
+  where 
+    validCards  = Set.filter avsDataValid cards
+    validColors = Set.toDescList $ Set.map avsDataCardColor validCards

src/Handler/Utils/Table/Columns.hs

@@ -442,8 +442,8 @@ fltrUserMatriculationUI :: DBFilterUI
 fltrUserMatriculationUI mPrev = prismAForm (singletonFilter "user-matriculation") mPrev $ aopt textField (fslI MsgTableUserMatriculation)
 
 
-colUserMatriclenr ::  (IsDBTable m c, HasUser a) => Colonnade Sortable a (DBCell m c)
+colUserMatriclenr ::  (IsDBTable m c, HasEntity a User) => Colonnade Sortable a (DBCell m c)
-colUserMatriclenr = sortable (Just "user-matriclenumber") (i18nCell MsgTableMatrikelNr) cellHasMatrikelnummer
+colUserMatriclenr = sortable (Just "user-matriclenumber") (i18nCell MsgTableMatrikelNr) cellHasMatrikelnummerLinked
 
 sortUserMatriclenr :: IsString d => (t -> E.SqlExpr (Entity User)) -> (d, SortColumn t r')
 sortUserMatriclenr queryUser = ("user-matriclenumber", SortColumn $ queryUser >>> (E.^. UserMatrikelnummer))

src/Handler/Utils/Table/Pagination.hs

@@ -48,7 +48,7 @@ module Handler.Utils.Table.Pagination
   , linkEitherCell, linkEitherCellM, linkEitherCellM'
   , maybeAnchorCellM, maybeAnchorCellM', maybeLinkEitherCellM'
   , anchorCellC, anchorCellCM, anchorCellCM', linkEitherCellCM', maybeLinkEitherCellCM'
-  , cellTooltip, cellTooltipIcon
+  , cellTooltip, cellTooltipIcon, cellTooltipWgt
   , listCell, listCell', listCellOf, listCellOf'
   , ilistCell, ilistCell', ilistCellOf, ilistCellOf'
   , formCell, DBFormResult(..), getDBFormResult
@@ -1700,9 +1700,12 @@ cellTooltip :: (RenderMessage UniWorX msg, IsDBTable m a) => msg -> DBCell m a -
 cellTooltip = cellTooltipIcon Nothing
 
 cellTooltipIcon :: (RenderMessage UniWorX msg, IsDBTable m a) => Maybe Icon -> msg -> DBCell m a -> DBCell m a
-cellTooltipIcon icn msg = cellContents.mapped %~ (<> tipWdgt)
+cellTooltipIcon icn = cellTooltipWgt icn . msg2widget
+
+cellTooltipWgt :: (IsDBTable m a) => Maybe Icon -> Widget-> DBCell m a -> DBCell m a
+cellTooltipWgt icn wgt = cellContents.mapped %~ (<> tipWdgt)
   where
-    tipWdgt = iconTooltip (msg2widget msg) icn True
+    tipWdgt = iconTooltip wgt icn True
 
 -- | Always display widget; maybe a link if user is Authorized.
 --   Also see variant `linkEmptyCell`

src/Handler/Utils/Widgets.hs

@@ -13,7 +13,7 @@ import Text.Hamlet (shamletFile)
 import Handler.Utils.DateTime
 
 import qualified Data.Char as Char
-
+import qualified Data.HashMap.Strict as Aeson -- ON UPDATE replace with: import qualified Data.Aeson.KeyMap as Aeson
 
 ---------
 -- Simple utilities for consistent display
@@ -198,3 +198,36 @@ roomReferenceWidget RoomReferenceLink{..} = $(widgetFile "widgets/room-reference
   where
     linkText = uriToString id roomRefLink mempty
     instrModal = modal (i18n MsgRoomReferenceLinkInstructions) $ Right $(widgetFile "widgets/room-reference/link-instructions-modal")
+
+
+----------
+-- JSON --
+----------
+
+-- Data.Aeson.Encode.Pretty.encodePretty did not render in Html properly, hence jsonWidget
+jsonWidget :: ToJSON a => a -> Widget
+jsonWidget x = jsonWidgetAux $ toJSON x
+  where 
+    jsonWidgetAux :: Value -> Widget
+    jsonWidgetAux  Null       = [whamlet|Null|]
+    jsonWidgetAux (Bool   b)  = toWidget $ boolSymbol b
+    jsonWidgetAux (String s)  = [whamlet|#{s}|]
+    jsonWidgetAux (Number n)  = [whamlet|#{show n}|]
+    jsonWidgetAux (Array  l)       
+      | 1 >= length l = foldMap jsonWidgetAux l -- empty arrays don't show
+      | otherwise     =
+        [whamlet|
+          <ul>
+            $forall x <- sort l
+              <li>^{jsonWidgetAux x}
+        |]
+    jsonWidgetAux (Object o)  = case Aeson.toList o of -- toAscList not supported
+      [ ]     -> mempty             -- empty objects don't show
+      [(_,v)] -> jsonWidgetAux v
+      r -> [whamlet|
+          <dl .deflist>
+            $forall (k,v) <- sort r
+              <dt .deflist__dt>#{k}
+              <dd .deflist__dd>^{jsonWidgetAux v}
+        |]
+      

src/Model/Types/Avs.hs

@@ -100,7 +100,7 @@ instance FromJSON AvsInternalPersonalNo where
 instance ToJSON AvsInternalPersonalNo where
   toJSON (AvsInternalPersonalNo ipn) = toJSON $ normalizeAvsInternalPersonalNo ipn
 
-type instance Element AvsInternalPersonalNo = Char 
+type instance Element AvsInternalPersonalNo = Char
 instance MonoFoldable AvsInternalPersonalNo where
   ofoldMap f = ofoldr (mappend . f) mempty . avsInternalPersonalNo
   ofoldr x y = Text.foldr x y . avsInternalPersonalNo 
@@ -207,7 +207,10 @@ instance ToJSON AvsPersonId where
 instance Show AvsPersonId where
   show = show . avsPersonId
 instance Read AvsPersonId where
-  readPrec = fmap AvsPersonId readPrec  
+  readPrec = fmap AvsPersonId readPrec
+
+_AvsPersonId :: Iso AvsPersonId AvsPersonId Int Int
+_AvsPersonId = iso avsPersonId AvsPersonId
 
 -- | Non-existing default, also needed for query all ramp driving licences
 avsPersonIdZero :: AvsPersonId 
@@ -281,12 +284,13 @@ licence2char AvsLicenceRollfeld = 'R'
 data AvsDataCardColor = AvsCardColorMisc Text | AvsCardColorGrün | AvsCardColorBlau | AvsCardColorRot | AvsCardColorGelb
   deriving (Eq, Ord, Read, Show, Generic)
   deriving anyclass (NFData)
+  -- instance RenderMessage declared in Foundation.I18n
 
 instance ToJSON AvsDataCardColor where
-  toJSON AvsCardColorGrün = "Grün"
+  toJSON  AvsCardColorGrün    = "Grün"
-  toJSON AvsCardColorBlau = "Blau"
+  toJSON  AvsCardColorBlau    = "Blau"
-  toJSON AvsCardColorRot  = "Rot"
+  toJSON  AvsCardColorRot     = "Rot"
-  toJSON AvsCardColorGelb = "Gelb"
+  toJSON  AvsCardColorGelb    = "Gelb"
   toJSON (AvsCardColorMisc t) = String t
 
 instance FromJSON AvsDataCardColor where
@@ -657,7 +661,7 @@ deriveJSON defaultOptions
   } ''AvsQueryPerson
 
 newtype AvsQueryStatus = AvsQueryStatus (Set AvsPersonId)
-  deriving (Eq, Ord, Show, Generic)
+  deriving (Eq, Ord, Show, Generic)  
 deriveJSON defaultOptions ''AvsQueryStatus
 
 newtype AvsQueryContact = AvsQueryContact (Set AvsObjPersonId) -- note the difference to AvsQueryStatus, which receives a list of id, whereas here we sent a list of single-field object 

src/Model/Types/DateTime.hs

@@ -15,6 +15,7 @@ module Model.Types.DateTime
 
 import Import.NoModel
 
+import qualified Data.Set as Set
 import Data.Ratio ((%))
 import qualified Data.Text as Text
 -- import Data.Either.Combinators (maybeToRight, mapLeft)
@@ -206,3 +207,16 @@ derivePersistFieldJSON ''Occurrences
 
 
 nullaryPathPiece ''DayOfWeek camelToPathPiece
+
+
+-- | Get bounds for an Occurrences 
+--   TODO: unfinished function, only works for a few selected cases yet
+occurrencesBounds :: Occurrences -> (Maybe Day, Maybe Day)
+occurrencesBounds Occurrences{occurrencesScheduled=scd} | notNull scd = (Nothing, Nothing) -- TODO: case is not yet implemented
+occurrencesBounds Occurrences{occurrencesExceptions=exc} = (Set.lookupMin occDays, Set.lookupMax occDays)    
+  where
+    occDays = Set.foldr getOccDays mempty exc
+
+    getOccDays :: OccurrenceException -> Set Day -> Set Day
+    getOccDays ExceptNoOccur{}        acc = acc                         -- TODO: this case ignores ExceptNoOccur for now!
+    getOccDays ExceptOccur{exceptDay} acc = Set.insert exceptDay acc

src/Utils.hs

@@ -845,6 +845,11 @@ toNothing = const Nothing
 toNothingS :: String -> Maybe b
 toNothingS = const Nothing
 
+-- | change second of maybe pair to Nothing, if both are Just and equal
+eq2nothing :: Eq a => (Maybe a, Maybe a) -> (Maybe a, Maybe a)
+eq2nothing (mx@(Just x), Just y) | x==y = (mx, Nothing)
+eq2nothing p = p
+                
 -- replaced by a more general formulation, see canonical
 -- null2nothing :: MonoFoldable a => Maybe a -> Maybe a
 -- null2nothing (Just x) | null x = Nothing
@@ -1297,6 +1302,12 @@ maxLength :: ( Integral n
 -- ^ @maxLegth n xs = length xs <= n@
 maxLength l = not . minLength (succ l)
 
+-- anyone :: (Foldable t) => t a -> Maybe a
+-- | return any single element from a foldable, if it is not null
+anyone :: (Foldable t, Alternative f) => t a -> f a
+anyone = Fold.foldr ((<|>).pure) empty
+
+
 ------------
 -- Writer --
 ------------

src/Utils/Avs.hs

@@ -68,7 +68,7 @@ mkAvsQuery :: BaseUrl -> BasicAuthData -> ClientEnv -> AvsQuery
 mkAvsQuery _ _ _ = AvsQuery
     { avsQueryPerson          = \_ -> return . Right $ AvsResponsePerson      mempty
     , avsQueryStatus          = \_ -> return . Right $ AvsResponseStatus      mempty
-    , avsQueryContact         = \_ -> return . Right $ AvsResponseContact     $ Set.singleton $ AvsDataContact (AvsPersonId 1234567) (AvsPersonInfo "AVSNO:123" "Heribert" "Sumpfmeier" (-1) Nothing Nothing Nothing Nothing) (AvsFirmInfo "Lange Firma" 7 "Kurz" Nothing Nothing Nothing Nothing Nothing Nothing)
+    , avsQueryContact         = \_ -> return . Right $ AvsResponseContact     $ Set.singleton $ AvsDataContact (AvsPersonId 1234567) (AvsPersonInfo "123123123" "Heribert" "Sumpfmeier" (-1) Nothing Nothing Nothing Nothing) (AvsFirmInfo "Lange Firma" 7 "Kurz" Nothing Nothing Nothing Nothing Nothing Nothing)
     , avsQuerySetLicences     = \_ -> return . Right $ AvsResponseSetLicences mempty
     , avsQueryGetAllLicences  =       return . Right $ AvsResponseGetLicences mempty
     }

src/Utils/Icon.hs

@@ -68,11 +68,14 @@ data Icon
   | IconRegisterTemplate
   | IconNoCorrectors
   | IconTooltipDefault
-  | IconNotificationSuccess
+  | IconNotificationSuccess    -- used for popups
   | IconNotificationInfo
   | IconNotificationWarning
   | IconNotificationError
   | IconNotificationNonactive
+  | IconNotification           -- used for email and lettes
+  | IconNoNotification
+  | IconNotificationSent
   | IconFavourite
   | IconLanguage
   | IconNavContainerClose | IconPageActionChildrenClose
@@ -93,7 +96,6 @@ data Icon
   | IconFileUploadSession
   | IconStandaloneFieldError
   | IconFileUser
-  | IconNotification | IconNoNotification
   | IconPersonalIdentification
   | IconMenuWorkflows
   | IconVideo
@@ -106,7 +108,7 @@ data Icon
   | IconLetter
   | IconAt
   | IconSupervisor
-  | IconWaitingForUser
+  -- | IconWaitingForUser
   | IconExpired
   deriving (Eq, Ord, Enum, Bounded, Show, Read, Generic)
   deriving anyclass (Universe, Finite, NFData)
@@ -180,6 +182,7 @@ iconText = \case
     IconStandaloneFieldError    -> "exclamation"
     IconFileUser                -> "file-user"
     IconNotification            -> "envelope"
+    IconNotificationSent        -> "envelope-open" -- "paper-plane", "shipping-fast", "hourglass-half"
     IconNoNotification          -> "bell-slash"
     IconPersonalIdentification  -> "id-card"
     IconMenuWorkflows           -> "project-diagram"
@@ -192,7 +195,7 @@ iconText = \case
     IconLetter                  -> "mail-bulk" -- Problem "envelope" already used for email as well
     IconAt                      -> "at"
     IconSupervisor              -> "head-side" -- must be notably different to user
-    IconWaitingForUser          -> "user-cog"  -- Waiting on a user to do something
+    -- IconWaitingForUser          -> "user-cog"  -- Waiting on a user to do something
     IconExpired                 -> "hourglass-end"
 
 nullaryPathPiece ''Icon $ camelToPathPiece' 1

src/Utils/Lens.hs

@@ -128,6 +128,9 @@ makeClassyFor_ ''LmsResult
 makeClassyFor_ ''UserAvs
 makeClassyFor_ ''UserAvsCard
 
+makeClassyFor_ ''UserCompany
+makeLenses_ ''Company
+
 _entityKey :: Getter (Entity record) (Key record)
 -- ^ Not a `Lens'` for safety
 _entityKey = to entityKey

src/Utils/Print.hs

@@ -6,16 +6,20 @@
 
 module Utils.Print
   ( renderLetter        -- used for generating letter pdfs
+  , renderLetters
   , sendEmailOrLetter   -- directly print or sends by email
   , printLetter         -- always send a letter
   , letterApcIdent      -- create acknowledge string for APC
+  , letterFileName      -- default filename
   , encryptPDF
-  , sanitizeCmdArg, validCmdArgument
+  , sanitizeCmdArg, sanitizeCmdArg', validCmdArgument
   -- , compileTemplate, makePDF
   , _Meta, addMeta
   , toMeta, mbMeta                           -- single values
-  , mkMeta, appMeta, applyMetas              -- multiple values
+  , mkMeta, appMeta, applyMetas              -- multiple values    
   , LetterRenewQualificationF(..)
+  -- , LetterCourseCertificate()
+  , makeCourseCertificates
   ) where
 
 -- import Import.NoModel
@@ -47,6 +51,7 @@ import Jobs.Handler.SendNotification.Utils
 
 import Utils.Print.Letters
 import Utils.Print.RenewQualification
+import Utils.Print.CourseCertificate
 
 
 -- import Model.Types.Markup -- TODO-QSV: should this module be moved accordingly?
@@ -103,7 +108,7 @@ import Utils.Print.RenewQualification
 
 
 -- | read and writes markdown, applying it as its own template to apply meta
-mdTemplating :: Text -> P.Meta -> HandlerFor UniWorX (Either P.PandocError Text)
+mdTemplating :: Text -> P.Meta -> HandlerFor UniWorX (Either P.PandocError P.Pandoc)
 mdTemplating template meta = runExceptT $ do
   let readerOpts = def  { P.readerExtensions    = P.pandocExtensions
                         , P.readerStripComments = True
@@ -113,21 +118,20 @@ mdTemplating template meta = runExceptT $ do
   let writerOpts = def { P.writerExtensions = P.pandocExtensions
                        , P.writerTemplate = Just tmpl
                        }
-  ExceptT . pure . P.runPure $ P.writeMarkdown writerOpts $ appMeta setIsDeFromLang
+  ExceptT . pure . P.runPure $ do
-                                                          $ addMeta meta doc
+    md_txt <- P.writeMarkdown writerOpts $ appMeta setIsDeFromLang $ addMeta meta doc
+    P.readMarkdown readerOpts md_txt
+
 
 -- | creates a PDF using a LaTeX template
-pdfLaTeX :: LetterKind -> P.Meta -> Text -> HandlerFor UniWorX (Either P.PandocError LBS.ByteString)
+pdfLaTeX :: LetterKind -> P.Pandoc -> HandlerFor UniWorX (Either P.PandocError LBS.ByteString)
-pdfLaTeX lk meta md = do
+pdfLaTeX lk doc = do
   e_tmpl <- $cachedHereBinary ("LetterKind:" <> tshow lk) (liftIO . P.runIO $ compileTemplate $ templateLatex lk)
   actRight e_tmpl $ \tmpl -> liftIO . P.runIO $ do
-      let readerOpts  = def { P.readerExtensions = P.pandocExtensions }
+      let writerOpts  = def { P.writerExtensions = P.pandocExtensions
-          writerOpts  = def { P.writerExtensions = P.pandocExtensions
+                            , P.writerTemplate   = Just tmpl }      
-                            , P.writerTemplate   = Just tmpl }
+      makePDF writerOpts $ appMeta setIsDeFromLang doc
-      doc <- P.readMarkdown readerOpts md
+        
-      makePDF writerOpts
-        $ appMeta setIsDeFromLang
-        $ addMeta meta doc
 
 
 renderLetter :: (MDLetter l) => Entity User -> l -> Text -> Handler (Either Text LBS.ByteString)
@@ -136,20 +140,49 @@ renderLetter rcvrEnt@Entity{entityVal=rcvr} mdl apcIdent = do
   formatter@DateTimeFormatter{ format } <- getDateTimeFormatterUser' rcvr
   let lang = selectDeEn $ rcvr & userLanguages   -- select either German or English only, default de; see Utils.Lang
       kind = getLetterKind $ pure mdl
-      tmpl = getTemplate   $ pure mdl
+      tmpl = getTemplate          mdl
       meta = addApcIdent apcIdent
           <> letterMeta mdl formatter lang rcvrEnt
           <> mkMeta
-            [ toMeta "lang"         lang
+            [ -- toMeta "lang" lang -- receiver language is decided in MDLetter instance, since some letters have fixed languages
-            , toMeta "date"       $ format SelFormatDate now
+              toMeta "date"       $ format SelFormatDate now
             , toMeta "rcvr-name"  $ rcvr & userDisplayName
             , toMeta "address"    $ fromMaybe [rcvr & userDisplayName] $ getPostalAddress rcvr
             --, toMeta "rcvr-email"    $ rcvr & userDisplayEmail -- note that some templates use "email" already otherwise
             ]
   e_md <- mdTemplating tmpl meta
-  result <- actRight e_md $ pdfLaTeX kind meta
+  result <- actRight e_md $ pdfLaTeX kind
   return $ over _Left P.renderError result
 
+-- TODO: apcIdent does not make sense for multiple letters 
+renderLetters :: (MDLetter l, Foldable f) => Entity User -> f l -> Text -> Handler (Either Text LBS.ByteString)
+renderLetters rcvrEnt@Entity{entityVal=rcvr} mdls apcIdent 
+  | Just l <- anyone mdls = do
+      now <- liftIO getCurrentTime  
+      formatter@DateTimeFormatter{ format } <- getDateTimeFormatterUser' rcvr
+      let lang = selectDeEn $ rcvr & userLanguages   -- select either German or English only, default de; see Utils.Lang      
+          kind = getLetterKind $ pure l
+          
+          templateCombine _   err@Left{}  = pure err
+          templateCombine mdl (Right doc1) =
+            let tmpl = getTemplate mdl
+                meta = addApcIdent apcIdent
+                        <> letterMeta mdl formatter lang rcvrEnt
+                        <> mkMeta
+                          [ -- toMeta "lang" lang -- receiver language is decided in MDLetter instance, since some letters have fixed languages
+                            toMeta "date"       $ format SelFormatDate now
+                          , toMeta "rcvr-name"  $ rcvr & userDisplayName
+                          , toMeta "address"    $ fromMaybe [rcvr & userDisplayName] $ getPostalAddress rcvr
+                          --, toMeta "rcvr-email"    $ rcvr & userDisplayEmail -- note that some templates use "email" already otherwise
+                          ]
+            in mdTemplating tmpl meta >>= \case 
+                err@Left{} -> pure err
+                Right doc2 -> pure $ Right $ doc1 <> doc2
+
+      doc <- foldrM templateCombine (Right mempty) mdls
+      result <- actRight doc $ pdfLaTeX kind
+      return $ over _Left P.renderError result
+  | otherwise = return $ Left "renderLetters received empty set of letters"
 
 
 ---------------
@@ -183,22 +216,13 @@ printLetter' pji pdf = do
         , pjiCourse         = printJobCourse
         , pjiQualification  = printJobQualification
         , pjiLmsUser        = printJobLmsUser
+        , pjiFileName       = fName
         } = pji
-  recipient <- join <$> mapM get printJobRecipient
+      printJobFilename = T.unpack $ text2asciiAlphaNum fName <> ".pdf"
-  sender    <- join <$> mapM get printJobSender
-  course    <- join <$> mapM get printJobCourse
-  quali     <- join <$> mapM get printJobQualification
-  let nameRecipient = abbrvName <$> recipient
-      nameSender    = abbrvName <$> sender
-      nameCourse    = CI.original . courseShorthand        <$> course
-      nameQuali     = CI.original . qualificationShorthand <$> quali
-  let jobFullName          = text2asciiAlphaNum $
-                             T.replace " " "-" (T.intercalate "_" . catMaybes $ [Just printJobName, nameQuali, nameCourse, nameSender, nameRecipient])
-      printJobFilename     = T.unpack $ jobFullName <> ".pdf"
       -- printJobFile <- sinkFileDB True $ yield $ LBS.toStrict pdf   -- for PrintJobFile :: FileContentReference use this code
       printJobFile = LBS.toStrict pdf
       printJobAcknowledged = Nothing
-  lprPDF jobFullName pdf >>= \case
+  lprPDF printJobFilename pdf >>= \case
     Left err -> do
       return $ Left err
     Right ok -> do
@@ -217,11 +241,12 @@ printLetter'' _ = do
                 }
 -}
 
-sendEmailOrLetter :: (MDLetter l) => UserId -> l -> Handler Bool
+sendEmailOrLetter :: (MDLetter l, MDMail l) => UserId -> l -> Handler Bool
 sendEmailOrLetter recipient letter = do
   (underling, receivers, undercopy) <- updateReceivers recipient -- TODO: check to avoid this almost circular dependency
   now <- liftIO getCurrentTime
-  let pjid = getPJId letter
+  let pjid  = getPJId letter
+      fName = letterFileName letter
       mailSubject = getMailSubject letter       -- these are only needed if sent by email, but we're lazy anyway
       undername = underling ^. _userDisplayName -- nameHtml' underling
       undermail = CI.original $ underling ^. _userEmail
@@ -272,7 +297,7 @@ sendEmailOrLetter recipient letter = do
           setSubjectI mailSubject
           editNotifications <- mkEditNotifications svr
           addHtmlMarkdownAlternatives $(ihamletFile "templates/mail/genericMailLetter.hamlet")
-          addPart (File { fileTitle     = T.unpack $ pjiName pjid <> ".pdf"
+          addPart (File { fileTitle     = fName
                         , fileModified  = now
                         , fileContent   = Just $ yield $ LBS.toStrict attachment
                         } :: PureFile)
@@ -302,6 +327,10 @@ readProcess' pc = do
 
 sanitizeCmdArg :: Text -> Text
 sanitizeCmdArg =  T.filter (\c -> c /= '\'' && c /= '"' && c/= '\\' && not (isSeparator c))
+
+sanitizeCmdArg' :: String -> String
+sanitizeCmdArg' =  filter (\c -> c /= '\'' && c /= '"' && c/= '\\' && not (isSeparator c))
+
 -- | Returns Nothing if ok, otherwise the first mismatching character
 --   Pin Password is used as a commandline argument in Utils.Print.encryptPDF and hence poses a security risk
 validCmdArgument :: Text -> Maybe Char
@@ -346,8 +375,8 @@ encryptPDF pw bs = over _Left (decodeUtf8 . LBS.toStrict) . exit2either <$> read
 --  > lpr -P fradrive -H fravm017173.fra.fraport.de:515 -T printJobName -
 
 -- | Internal only, use `printLetter` instead
-lprPDF :: (MonadHandler m, HasAppSettings (HandlerSite m)) => Text -> LBS.ByteString -> m (Either Text Text)
+lprPDF :: (MonadHandler m, HasAppSettings (HandlerSite m)) => FilePath -> LBS.ByteString -> m (Either Text Text)
-lprPDF jb bs = do
+lprPDF (sanitizeCmdArg' -> jb) bs = do
     mbLprServerArg <- $cachedHereBinary ("lprServer"::Text) getLprServerArg
     case mbLprServerArg of
       Nothing -> return $ Right "Print command ignored due to setting 'mail-reroute-to' being set."
@@ -359,8 +388,7 @@ lprPDF jb bs = do
                     , "-"                                           -- read from stdin
                     ]
             jobname | null jb   = []
-                    | otherwise = ["-J " <> jb']
+                    | otherwise = ["-J " <> jb]            
-            jb' = T.unpack $ sanitizeCmdArg jb
         exit2either <$> readProcess' pc
   where
     getLprServerArg = do

src/Utils/Print/CourseCertificate.hs

@@ -0,0 +1,95 @@
+-- SPDX-FileCopyrightText: 2023 Steffen Jost <jost@tcs.ifi.lmu.de>
+--
+-- SPDX-License-Identifier: AGPL-3.0-or-later
+
+{-# OPTIONS_GHC -fno-warn-unused-top-binds #-}
+
+module Utils.Print.CourseCertificate where
+
+import Import 
+
+-- import           Data.Char as Char
+import qualified Data.Text as Text
+import qualified Data.CaseInsensitive as CI
+
+import Data.FileEmbed (embedFile)
+
+import Utils.Print.Letters
+import Handler.Utils.Profile
+
+data LetterCourseCertificate = LetterCourseCertificate
+    { ccCourseId          :: CourseId
+    , ccCourseName        :: Text    
+    , ccCourseShorthand   :: Text 
+    , ccCourseSchool      :: Text
+    , ccTutorialName      :: Text 
+    , ccCourseContent     :: Maybe [Text]
+    , ccCourseBegin       :: Maybe Day
+    , ccCourseEnd         :: Maybe Day
+    , ccCourseLang        :: Maybe Lang   -- maybe fix language to fit course content language
+    , ccParticipant       :: UserDisplayName
+    , ccFraNumber         :: Maybe Text
+    , ccFraDepartment     :: Maybe Text
+    , ccCompany           :: Maybe Text
+    }
+  deriving (Eq, Show)
+
+
+instance MDLetter LetterCourseCertificate where  
+  encrypPDFfor      _ = NoPassword
+  getLetterKind     _ = Plain
+  getLetterEnvelope _ = 'c'
+  getTemplate LetterCourseCertificate{ccCourseContent = Just ccc} =
+    Text.replace "%%%course-content%%%" (unlines ccc) $
+    decodeUtf8 $(Data.FileEmbed.embedFile "templates/letter/fraport_qualification.md")
+  getTemplate       _ = decodeUtf8 $(Data.FileEmbed.embedFile "templates/letter/fraport_qualification.md")
+
+  letterMeta LetterCourseCertificate{..} DateTimeFormatter{ format } lang _rcvrEnt = 
+    mkMeta
+      [ toMeta "participant"    ccParticipant
+      , mbMeta "fra-number"     ccFraNumber
+      , mbMeta "fra-department" ccFraDepartment      
+      , mbMeta "company"        ccCompany
+      , toMeta "course-name"    ccCourseName
+      , mbMeta "course-content" ccCourseContent
+      , mbMeta "course-begin"   (format SelFormatDate <$> ccCourseBegin)
+      , mbMeta "course-end"     (format SelFormatDate <$> ccCourseEnd)
+      , toMeta "lang"           (fromMaybe lang ccCourseLang)
+      ] 
+
+  getPJId LetterCourseCertificate{..} = 
+    PrintJobIdentification
+      { pjiName             = "Certificate"
+      , pjiApcAcknowledge   = "cc-" <> ccCourseName
+      , pjiRecipient        = Nothing
+      , pjiSender           = Nothing
+      , pjiCourse           = Just ccCourseId
+      , pjiQualification    = Nothing
+      , pjiLmsUser          = Nothing
+      , pjiFileName         = "cert_" <> ccCourseSchool <> "-" <> ccCourseShorthand <> "-" <> ccTutorialName
+      }
+
+
+makeCourseCertificates :: Traversable t => Tutorial -> Maybe Lang -> t UserId -> DB (t LetterCourseCertificate)
+makeCourseCertificates Tutorial{ tutorialName   = CI.original -> ccTutorialName
+                               , tutorialCourse =                ccCourseId
+                               , tutorialTime   = occurrences
+                               } ccCourseLang participants = do
+  Course{ courseName        = CI.original               -> ccCourseName
+        , courseShorthand   = CI.original               -> ccCourseShorthand
+        , courseSchool      = CI.original . unSchoolKey -> ccCourseSchool
+        , courseDescription = fmap html2textlines       -> ccCourseContent
+        } <- get404 ccCourseId
+  let (ccCourseBegin, ccCourseEnd) = eq2nothing $ occurrencesBounds occurrences      
+  forM participants $ \uid -> do
+    User{userDisplayName=ccParticipant, userCompanyDepartment, userCompanyPersonalNumber} <- get404 uid    
+    (ccFraNumber, ccFraDepartment, ccCompany) <- 
+      if isJust userCompanyDepartment && validFraportPersonalNumber userCompanyPersonalNumber
+      then 
+        return (userCompanyPersonalNumber, userCompanyDepartment, Nothing)
+      else do 
+        usrComp <- selectFirst [UserCompanyUser ==. uid] [Desc UserCompanyId]
+        comp <- forM usrComp (get . userCompanyCompany . entityVal)
+        let res = (comp ^? _Just . _Just . _companyName . _CI) <|> userCompanyDepartment   -- if there is no company, use the department as fallback, if possible
+        return (Nothing, Nothing, res)    
+    return LetterCourseCertificate{..}

src/Utils/Print/Letters.hs

@@ -36,6 +36,8 @@ import Handler.Utils.DateTime
 -- import Model.Types.Markup -- TODO-QSV: should this module be moved accordingly?
 
 
+-- instance P.ToMetaValue (CI Text) where
+--   toMetaValue = P.MetaString . CI.original
 
 ----------------------
 -- Pandoc Functions --
@@ -172,6 +174,7 @@ data PrintJobIdentification = PrintJobIdentification
       , pjiCourse         :: Maybe CourseId
       , pjiQualification  :: Maybe QualificationId
       , pjiLmsUser        :: Maybe LmsIdent
+      , pjiFileName       :: Text -- suggested filename, without suffix ".pdf"
       }
   deriving (Eq, Show)
 
@@ -218,13 +221,12 @@ data EncryptPDFfor = NoPassword | PasswordSupervisor | PasswordUnderling
   deriving (Eq, Show)
 
 class MDLetter l where
-  getMailSubject    :: l -> SomeMessage UniWorX                                                     -- only used if letter is sent by email as pdf attachment
+  letterMeta        :: l -> DateTimeFormatter -> Lang -> Entity User -> P.Meta -- formatter/lang for individual receiver, set Meta "lang" for individually translated letters
-  getMailBody       :: l -> DateTimeFormatter -> HtmlUrlI18n (SomeMessage UniWorX) (Route UniWorX)  -- only used if letter is sent by email as pdf attachment
+  -- NOTE: METAs "date", "rcvr-name", "address" are set automatically by renderLetter for each receiver
-  letterMeta        :: l -> DateTimeFormatter -> Lang -> Entity User -> P.Meta
   getPJId           :: l -> PrintJobIdentification
   getLetterEnvelope :: l -> Char
   getLetterKind     :: Proxy l -> LetterKind
-  getTemplate       :: Proxy l -> Text
+  getTemplate       :: l -> Text
   encrypPDFfor      :: Proxy l -> EncryptPDFfor
 
 letterApcIdent :: (MDLetter l, MonadHandler m) => l -> CryptoUUIDUser -> UTCTime -> m Text
@@ -233,9 +235,23 @@ letterApcIdent l uuid now = do
   tnow <- formatTime' "%y%m%d-%H" now
   return $ mkApcIdent uuid (getLetterEnvelope l) (getLetterKind $ pure l) tnow (pjiApcAcknowledge $ getPJId l)
 
+letterFileName :: (MDLetter l) => l -> FilePath
+letterFileName = Text.unpack . (<> ".pdf") . text2asciiAlphaNum . pjiFileName . getPJId
+
 addApcIdent :: Text -> P.Meta
 addApcIdent = P.Meta . toMeta "apc-ident"
 
 getApcIdent :: P.Meta -> Maybe Text
 getApcIdent (P.lookupMeta "apc-ident" -> Just (P.MetaString t)) = Just t
-getApcIdent _ = Nothing
+getApcIdent _ = Nothing
+
+
+----------------
+-- Mail Class --
+----------------
+
+-- this is for letters that may alternatively be sent as attachments to emails
+
+class MDMail l where -- 
+  getMailSubject    :: l -> SomeMessage UniWorX                                                     -- only used if letter is sent by email as pdf attachment
+  getMailBody       :: l -> DateTimeFormatter -> HtmlUrlI18n (SomeMessage UniWorX) (Route UniWorX)  -- only used if letter is sent by email as pdf attachment

src/Utils/Print/RenewQualification.hs

@@ -1,4 +1,4 @@
--- SPDX-FileCopyrightText: 2022 Steffen Jost <jost@tcs.ifi.lmu.de>
+-- SPDX-FileCopyrightText: 2023 Steffen Jost <jost@tcs.ifi.lmu.de>
 --
 -- SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -45,18 +45,20 @@ letterRenewalQualificationFData LetterRenewQualificationF{lmsLogin} = LetterRene
     lmsUrl      = "https://drive.fraport.de"
     lmsUrlLogin = lmsUrl <> "/?login=" <> lmsIdent
     lmsIdent    = getLmsIdent lmsLogin    
- 
+
-instance MDLetter LetterRenewQualificationF where  
+instance MDMail LetterRenewQualificationF where 
-  encrypPDFfor      _ = PasswordUnderling
-  getLetterKind     _ = PinLetter
-  getLetterEnvelope l = maybe 'q' (Char.toLower . fst) $ Text.uncons (qualShort l)
-  getTemplate       _ = decodeUtf8 $(Data.FileEmbed.embedFile "templates/letter/fraport_renewal.md")
   getMailSubject    l = SomeMessage $ MsgMailSubjectQualificationRenewal $ qualShort l  
   getMailBody l@LetterRenewQualificationF{..} DateTimeFormatter{ format } = 
     let LetterRenewQualificationFData{..} = letterRenewalQualificationFData l
     in $(ihamletFile "templates/mail/body/qualificationRenewal.hamlet")
 
-  letterMeta l@LetterRenewQualificationF{..} DateTimeFormatter{ format } _lang Entity{entityKey=rcvrId, entityVal=User{userDisplayName}} = 
+instance MDLetter LetterRenewQualificationF where  
+  encrypPDFfor      _ = PasswordUnderling
+  getLetterKind     _ = PinLetter
+  getLetterEnvelope l = maybe 'q' (Char.toLower . fst) $ Text.uncons (qualShort l)
+  getTemplate       _ = decodeUtf8 $(Data.FileEmbed.embedFile "templates/letter/fraport_renewal.md")
+
+  letterMeta l@LetterRenewQualificationF{..} DateTimeFormatter{ format } lang Entity{entityKey=rcvrId, entityVal=User{userDisplayName}} = 
     let LetterRenewQualificationFData{..} = letterRenewalQualificationFData l 
         isSupervised = rcvrId /= qualHolderID
     in mkMeta $
@@ -65,7 +67,8 @@ instance MDLetter LetterRenewQualificationF where
       , toMeta "de-opening" ("Sehr geehrte Damen und Herren,"::Text)
       , toMeta "en-opening" ("Dear Sir or Madam,"::Text)
       ] <>
-      [ toMeta "login"          lmsIdent
+      [ toMeta "lang"           lang
+      , toMeta "login"          lmsIdent
       , toMeta "pin"            lmsPin
       , toMeta "examinee"       qualHolderDN
       , toMeta "expiry"         (format SelFormatDate qualExpiry)
@@ -83,4 +86,10 @@ instance MDLetter LetterRenewQualificationF where
       , pjiCourse           = Nothing
       , pjiQualification    = Just qualId
       , pjiLmsUser          = Just lmsLogin
+      , pjiFileName         = "renew_" <> CI.original (unSchoolKey qualSchool) <> "-" <> qualShort <> "_" <> qualHolderSN 
+        -- let nameRecipient = abbrvName <$> recipient
+        --     nameSender    = abbrvName <$> sender
+        --     nameCourse    = CI.original . courseShorthand        <$> course
+        --     nameQuali     = CI.original . qualificationShorthand <$> quali
+        -- in .. = T.replace " " "-" (T.intercalate "_" . catMaybes $ [Just printJobName, nameQuali, nameCourse, nameSender, nameRecipient])
       }

templates/letter/fraport_qualification.md

@@ -1,15 +1,84 @@
 ---
 ### Metaddaten, welche hier eingestellt werden:
-
+# keine 
 ### Metadaten, welche automatisch ersetzt werden:
 lang: de-de
 is-de: true
 date: 11.11.1111
+test1: this **is really** a test
+test2: 'this **is another** test'
+test3: |
+    <h1>First</h1>
+    <p>Here is some text with <em>emphasis</em> to see.
 ...
+\renewcommand{\familydefault}{\sfdefault}
 $if(is-de)$
 
+\medskip
+
+\begin{huge}\sffamily\textbf{Teilnahmebescheinigung}\end{huge}
+
+\vspace{\fill}
+
+# $participant$ {-}
+$if(fra-number)$
+## $fra-number$ $fra-department$ {-}  
+$endif$
+$if(company)$
+## $company$ {-}
+$endif$
+hat
+$if(course-begin)$
+$if(course-end)$
+von $course-begin$ bis $course-end$
+$else$
+am $course-begin$
+$endif$
+$endif$
+an der Veranstaltung  
+\centerline{\sffamily\LARGE{$course-name$}}
+der Fahrerausbildung der Fraport AG teilgenommen.
+
+\vspace{\fill}
+\vspace{\fill}
+
+$if(course-content)$
+## Inhalte: {-}  
+
+
+%%%course-content%%%
+
+
+$endif$
+
+\vspace{\fill}
+\vspace{\fill}
+
+Mit Aushändigung der Teilnahmebescheinigung wird der erfolgreiche Abschluss des Kurses bestätigt.
+Dieses Zertifikat wurde maschinell erstellt.  
+
+\medskip
+
+Frankfurt am Main, $date$  
+Fraport College
+
+\vspace{\fill}
+\vspace{\fill}
+\vspace{\fill}
+\vspace{\fill}
+\vspace{\fill}
+
 <!-- deutsche version -->
 
 $else$
 
-<!-- english version -->
+<!-- english version -->
+
+# Certificate of attendance
+
+**English version is not yet implemened.**
+TODO
+
+$endif$
+
+\clearpage

templates/letter/plain_article.latex

@@ -1,8 +1,9 @@
 %Based upon https://github.com/benedictdudel/pandoc-letter-din5008
 \documentclass[
     paper=A4,
+    version=last,
     firstfoot=false      % first-page footer 
-]{scrlttr2}
+]{scrartcl}
 
 \PassOptionsToPackage{hyphens}{url}
 \PassOptionsToPackage{unicode$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref}
@@ -56,8 +57,9 @@ $endif$
   \usepackage{DejaVuSansMono} % better monofont
 \else 
   % if luatex or xetex
-  \usepackage{fontspec}
+  \usepackage{fontspec}    
   \setmonofont{DejaVu Sans Mono}
+  %\renewcommand{\familydefault}{\sfdefault}
 \fi 
 
 $if(mathspec)$
@@ -84,9 +86,9 @@ $endif$
 
 \usepackage{enumitem}
 
-\setlength{\oddsidemargin}{\useplength{toaddrhpos}}
+%\setlength{\oddsidemargin}{\useplength{toaddrhpos}}
-\addtolength{\oddsidemargin}{-1in}
+%\addtolength{\oddsidemargin}{-1in}
-\setlength{\textwidth}{\useplength{firstheadwidth}}
+%\setlength{\textwidth}{\useplength{firstheadwidth}}
 
 \usepackage[absolute,quiet,overlay]{textpos}%,showboxes
 \setlength{\TPHorizModule}{1mm}
@@ -95,6 +97,8 @@ $endif$
 \providecommand{\tightlist}{%
   \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
 
+\pagestyle{empty}
+
 \begin{document}%    
   $if(apc-ident)$
     \begin{textblock}{200}(5,5)%hpos,vpos

templates/lms-user.hamlet

@@ -34,7 +34,7 @@ $else
               <dd .deflist__dd>^{formatTimeW SelFormatDateTime (lmsUserStarted lmsUsr)}
               $maybe _ <- lmsUserStatus lmsUsr
                 <dt .deflist__dt>_{MsgTableLmsStatus}
-                <dd .deflist__dd>^{lmsUserStatusWidget lmsUsr}
+                <dd .deflist__dd>^{lmsUserStatusWidget True lmsUsr}
               <dt .deflist__dt>_{MsgTableLmsIdent}
               <dd .deflist__dd .email>#{getLmsIdent (lmsUserIdent lmsUsr)}
               <dt .deflist__dt>_{MsgTableLmsPin}

test/Database/Fill.hs

@@ -163,7 +163,7 @@ fillDb = do
     , userAuthentication = pwSimple
     , userLastAuthentication = Nothing
     , userTokensIssuedAfter = Nothing
-    , userMatrikelnummer = Nothing
+    , userMatrikelnummer = Just "94094094094"
     , userEmail  = "e12345@fraport.de"
     , userDisplayEmail = "jost@tcs.ifi.lmu.de"
     , userDisplayName = "Steffen Jost"
@@ -358,7 +358,126 @@ fillDb = do
     , userExamOfficeGetSynced = False
     , userExamOfficeGetLabels = True
     }
-
+  _stranger1 <- insert User
+    { userIdent = "AVSID:996699"
+    , userAuthentication = AuthLDAP
+    , userLastAuthentication = Nothing
+    , userTokensIssuedAfter = Nothing
+    , userMatrikelnummer = Nothing
+    , userEmail = "E996699@fraport.de"
+    , userDisplayEmail = ""
+    , userDisplayName = "Stranger One"
+    , userSurname = "One"
+    , userFirstName = "Stranger"
+    , userTitle = Nothing
+    , userMaxFavourites = userDefaultMaxFavourites
+    , userMaxFavouriteTerms = userDefaultMaxFavouriteTerms
+    , userTheme = ThemeMossGreen
+    , userDateTimeFormat = userDefaultDateTimeFormat
+    , userDateFormat = userDefaultDateFormat
+    , userTimeFormat = userDefaultTimeFormat
+    , userDownloadFiles = userDefaultDownloadFiles
+    , userWarningDays = userDefaultWarningDays
+    , userLanguages = Nothing
+    , userNotificationSettings = def
+    , userCreated = now
+    , userLastLdapSynchronisation = Nothing
+    , userLdapPrimaryKey = Nothing
+    , userCsvOptions = def
+    , userSex = Just SexMale
+    , userBirthday = Nothing
+    , userShowSex = userDefaultShowSex
+    , userTelephone = Nothing
+    , userMobile = Nothing
+    , userCompanyPersonalNumber = Just "E996699"
+    , userCompanyDepartment = Just "AVN-Strange"
+    , userPinPassword = Nothing
+    , userPostAddress = Nothing
+    , userPostLastUpdate = Nothing
+    , userPrefersPostal = False
+    , userExamOfficeGetSynced = False
+    , userExamOfficeGetLabels = True
+    }
+  _stranger2 <- insert User
+    { userIdent = "AVSID:669966"
+    , userAuthentication = AuthLDAP
+    , userLastAuthentication = Nothing
+    , userTokensIssuedAfter = Nothing
+    , userMatrikelnummer = Nothing
+    , userEmail = "E669966@fraport.de"
+    , userDisplayEmail = ""
+    , userDisplayName = "Stranger Two"
+    , userSurname = "Stranger"
+    , userFirstName = "Two"
+    , userTitle = Nothing
+    , userMaxFavourites = userDefaultMaxFavourites
+    , userMaxFavouriteTerms = userDefaultMaxFavouriteTerms
+    , userTheme = ThemeMossGreen
+    , userDateTimeFormat = userDefaultDateTimeFormat
+    , userDateFormat = userDefaultDateFormat
+    , userTimeFormat = userDefaultTimeFormat
+    , userDownloadFiles = userDefaultDownloadFiles
+    , userWarningDays = userDefaultWarningDays
+    , userLanguages = Nothing
+    , userNotificationSettings = def
+    , userCreated = now
+    , userLastLdapSynchronisation = Nothing
+    , userLdapPrimaryKey = Nothing
+    , userCsvOptions = def
+    , userSex = Just SexMale
+    , userBirthday = Nothing
+    , userShowSex = userDefaultShowSex
+    , userTelephone = Nothing
+    , userMobile = Nothing
+    , userCompanyPersonalNumber = Just "669966"
+    , userCompanyDepartment = Just "AVN-Strange"
+    , userPinPassword = Nothing
+    , userPostAddress = Nothing
+    , userPostLastUpdate = Nothing
+    , userPrefersPostal = False
+    , userExamOfficeGetSynced = False
+    , userExamOfficeGetLabels = True
+    }
+  _stranger3 <- insert User
+    { userIdent = "AVSID:6969"
+    , userAuthentication = AuthLDAP
+    , userLastAuthentication = Nothing
+    , userTokensIssuedAfter = Nothing
+    , userMatrikelnummer = Nothing
+    , userEmail = "E6969@fraport.de"
+    , userDisplayEmail = ""
+    , userDisplayName = "Stranger 3 Three"
+    , userSurname = "Three"
+    , userFirstName = "Stranger"
+    , userTitle = Nothing
+    , userMaxFavourites = userDefaultMaxFavourites
+    , userMaxFavouriteTerms = userDefaultMaxFavouriteTerms
+    , userTheme = ThemeMossGreen
+    , userDateTimeFormat = userDefaultDateTimeFormat
+    , userDateFormat = userDefaultDateFormat
+    , userTimeFormat = userDefaultTimeFormat
+    , userDownloadFiles = userDefaultDownloadFiles
+    , userWarningDays = userDefaultWarningDays
+    , userLanguages = Nothing
+    , userNotificationSettings = def
+    , userCreated = now
+    , userLastLdapSynchronisation = Nothing
+    , userLdapPrimaryKey = Nothing
+    , userCsvOptions = def
+    , userSex = Just SexMale
+    , userBirthday = Nothing
+    , userShowSex = userDefaultShowSex
+    , userTelephone = Nothing
+    , userMobile = Nothing
+    , userCompanyPersonalNumber = Just "E996699"
+    , userCompanyDepartment = Just "AVN-Strange"
+    , userPinPassword = Nothing
+    , userPostAddress = Just $ markdownToStoredMarkup ("Kartoffelweg 12  \n666 Höllensumpf  \nFreiland"::Text)
+    , userPostLastUpdate = Nothing
+    , userPrefersPostal = False
+    , userExamOfficeGetSynced = False
+    , userExamOfficeGetLabels = True
+    }
   let
     firstNames = [ "James", "John", "Robert", "Michael"
                  , "William", "David", "Mary", "Richard"
@@ -419,8 +538,8 @@ fillDb = do
       , userShowSex = userDefaultShowSex
       , userTelephone = Nothing
       , userMobile = Nothing
-      , userCompanyPersonalNumber = Nothing
+      , userCompanyPersonalNumber = bool Nothing (Just "E123" ) (even $ length firstName)
-      , userCompanyDepartment = Nothing
+      , userCompanyDepartment     = bool Nothing (Just "AVN-A") (even $ length userSurname)
       , userPinPassword = Nothing
       , userPostAddress = Nothing
       , userPostLastUpdate = Nothing
@@ -823,11 +942,11 @@ fillDb = do
           , courseTerm      = tk
           , courseSchool    = avn
           , courseCapacity  = capacity
-          , courseVisibleFrom     = jtt TermDayStart          0  Nothing       toMidnight
+          , courseVisibleFrom     = jtt TermDayStart          1  Nothing       toMidnight
-          , courseVisibleTo       = jtt TermDayEnd            0  Nothing   beforeMidnight
+          , courseVisibleTo       = jtt TermDayEnd           10  Nothing   beforeMidnight
-          , courseRegisterFrom    = jtt TermDayStart          0  Nothing       toMidnight
+          , courseRegisterFrom    = jtt TermDayLectureStart   0  Nothing       toMidnight
-          , courseRegisterTo      = jtt TermDayLectureStart (-1) Nothing       toMidnight
+          , courseRegisterTo      = jtt TermDayLectureStart   1  Nothing       toMidnight
-          , courseDeregisterUntil = jtt TermDayLectureStart (-5) (Just Monday) toMidnight
+          , courseDeregisterUntil = jtt TermDayLectureStart   5  (Just Monday) toMidnight
           , courseRegisterSecret  = Nothing
           , courseMaterialFree    = True
           }