diff --git a/.gitignore b/.gitignore index 133c5eb8e..fad426bf0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ node_modules/ **/assets/icons **/assets/favicons bin/ +assets/fonts/ *.hi *.o *.sqlite3 @@ -67,4 +68,4 @@ manifest.json **/result-* .develop.cmd /.vscode -.ghc/ghci_history +backend/.ghc/ghci_history diff --git a/assets/icons-src/fontawesome.json b/assets/icons-src/fontawesome.json index 32bd6f55a..ef5dee6ee 100644 --- a/assets/icons-src/fontawesome.json +++ b/assets/icons-src/fontawesome.json @@ -29,6 +29,7 @@ "file-upload": "file-arrow-up", "file-zip": "file-zipper", "file-csv": "file-csv", +"file-missing": "file-circle-minus", "sft-question": "circle-question", "sft-hint": "life-ring", "sft-solution": "circle-exclamation", @@ -76,12 +77,13 @@ "submission-no-users": "user-slash", "reset": "arrow-rotate-left", "blocked": "ban", -"certificate": "certificate", +"certificate": "car-side", "print-center": "envelopes-bulk", "letter": "envelopes-bulk", "at": "at", "supervisor": "person", "supervisor-foreign": "person-rays", +"superior": "user-tie", "waiting-for-user": "user-gear", "expired": "hourglass-end", "locked": "lock", @@ -89,9 +91,18 @@ "trash": "trash", "reset-tries": "trash-can-arrow-up", "company": "building", +"company-warning": "building-circle-exclamation", "edit": "pen-to-square", "user-edit": "user-pen", "loading": "spinner", -"placeholder": "notdef" +"placeholder": "notdef", +"reroute": "diamond-turn-right", +"top": "award", +"wildcard": "asterisk", +"user-unknown": "user-slash", +"user-badge": "id-badge", +"glasses": "glasses", +"missing": "question", +"pin-protect": "key" } diff --git a/backend/config/develop-settings.yml b/backend/config/develop-settings.yml new file mode 100644 index 000000000..3b16a381d --- /dev/null +++ b/backend/config/develop-settings.yml @@ -0,0 +1,32 @@ +# SPDX-FileCopyrightText: 2024 Steffen Jost +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +# Values formatted like "_env:ENV_VAR_NAME:default_value" can be overridden by the specified environment variable. +# See https://github.com/yesodweb/yesod/wiki/Configuration#overriding-configuration-values-with-environment-variables +# NB: If you need a numeric value (e.g. 123) to parse as a String, wrap it in single quotes (e.g. "_env:PGPASS:'123'") +# See https://github.com/yesodweb/yesod/wiki/Configuration#parsing-numeric-values-as-strings + + +# DEVELOPMENT ONLY, NOT TO BE USED IN PRODUCTION + +avs-licence-synch: + times: [12] + level: 4 + reason-filter: "(firm|block)" + max-changes: 999 + +mail-reroute-to: + name: "FRADrive-QA-Umleitungen" + email: "FRADrive-TEST-Umleitungen@fraport.de" + +# Enqueue at specified hour, a few minutes later +job-lms-qualifications-enqueue-hour: 16 +job-lms-qualifications-dequeue-hour: 4 + +# Using these setting kills the job-workers somehow +# job-workers: 5 +# job-flush-interval: 600 +# job-stale-threshold: 3600 +# job-move-threshold: 60 + diff --git a/backend/config/settings.yml b/backend/config/settings.yml index 04f69e649..d5d64e7c5 100644 --- a/backend/config/settings.yml +++ b/backend/config/settings.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel , Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Wolfgang Witt +# SPDX-FileCopyrightText: 2022-2025 Sarah Vaupel , Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Wolfgang Witt ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -83,6 +83,7 @@ health-check-matching-cluster-config-timeout: "_env:HEALTHCHECK_MATCHING_CLUSTER synchronise-ldap-users-within: "_env:SYNCHRONISE_LDAP_WITHIN:1209600" # 14 Tage in Sekunden synchronise-ldap-users-interval: "_env:SYNCHRONISE_LDAP_INTERVAL:3600" # jede Stunde +synchronise-ldap-users-expire: "_env:SYNCHRONISE_LDAP_EXPIRE:15897600" # halbes Jahr in Sekunden synchronise-avs-users-within: "_env:SYNCHRONISE_AVS_WITHIN:5702400" # alle 66 Tage synchronise-avs-users-interval: "_env:SYNCHRONISE_AVS_INTERVAL:21600" # alle 6 Stunden @@ -90,10 +91,6 @@ synchronise-avs-users-interval: "_env:SYNCHRONISE_AVS_INTERVAL:21600" # alle 6 study-features-recache-relevance-within: 172800 study-features-recache-relevance-interval: 293 -# Enqueue at specified hour, a few minutes later -# job-lms-qualifications-enqueue-hour: 15 -# job-lms-qualifications-dequeue-hour: 3 - log-settings: detailed: "_env:DETAILED_LOGGING:false" all: "_env:LOG_ALL:false" @@ -149,18 +146,22 @@ ldap: ldap-re-test-failover: 60 lms-direct: - upload-header: "_env:LMSUPLOADHEADER:true" - upload-delimiter: "_env:LMSUPLOADDELIMITER:" - download-header: "_env:LMSDOWNLOADHEADER:true" - download-delimiter: "_env:LMSDOWNLOADDELIMITER:," - download-cr-lf: "_env:LMSDOWNLOADCRLF:true" - deletion-days: "_env:LMSDELETIONDAYS:7" + upload-header: "_env:LMSUPLOADHEADER:true" + upload-delimiter: "_env:LMSUPLOADDELIMITER:" + download-header: "_env:LMSDOWNLOADHEADER:true" + download-delimiter: "_env:LMSDOWNLOADDELIMITER:," + download-cr-lf: "_env:LMSDOWNLOADCRLF:true" + orphan-deletion-days: "_env:LMSORPHANDELETIONDAYS:33" + orphan-deletion-batch: "_env:LMSORPHANDELETIONBATCH:12" + orphan-deletion-repeat-hours: "_env:LMSORPHANDELETIONREPEATHOURS:24" avs: - host: "_env:AVSHOST:skytest.fra.fraport.de" - port: "_env:AVSPORT:443" - user: "_env:AVSUSER:fradrive" - pass: "_env:AVSPASS:" + host: "_env:AVSHOST:skytest.fra.fraport.de" + port: "_env:AVSPORT:443" + user: "_env:AVSUSER:fradrive" + pass: "_env:AVSPASS:\"0000\"" + timeout: "_env:AVSTIMEOUT:42" + cache-expiry: "_env:AVSCACHEEXPIRY:420" lpr: host: "_env:LPRHOST:fravm017173.fra.fraport.de" @@ -207,9 +208,6 @@ memcached: timeout: "_env:MEMCACHED_TIMEOUT:20" expiration: "_env:MEMCACHED_EXPIRATION:300" memcache-auth: true -memcached-local: - maximum-ghost: 512 - maximum-weight: 104857600 # 100MiB upload-cache: host: "_env:UPLOAD_S3_HOST:localhost" # should be optional, but all file transfers will be empty without an S3 cache @@ -278,8 +276,8 @@ user-defaults: max-favourites: 0 max-favourite-terms: 2 theme: Default - date-time-format: "%d %b %y %R" - date-format: "%d %b %Y" + date-time-format: "%d.%m.%Y %R" + date-format: "%d.%m.%y" time-format: "%R" download-files: false warning-days: 1209600 @@ -321,17 +319,6 @@ fallback-personalised-sheet-files-keys-expire: 2419200 download-token-expire: 604801 -file-source-arc: - maximum-ghost: 512 - maximum-weight: 1073741824 # 1GiB -file-source-prewarm: - maximum-weight: 1073741824 # 1GiB - start: 1800 # 30m - end: 600 # 10m - inhibit: 3600 # 60m - steps: 20 - max-speedup: 3 - bot-mitigations: - only-logged-in-table-sorting - unauthorized-form-honeypots diff --git a/backend/config/test-settings.yml b/backend/config/test-settings.yml index 0ea3e4c5c..5ec83701a 100644 --- a/backend/config/test-settings.yml +++ b/backend/config/test-settings.yml @@ -16,5 +16,4 @@ log-settings: auth-dummy-login: true server-session-acid-fallback: true -job-cron-interval: null -job-workers: 1 +job-workers: 20 \ No newline at end of file diff --git a/backend/load/Load.hs b/backend/load/Load.hs index 843127132..fd1c47886 100644 --- a/backend/load/Load.hs +++ b/backend/load/Load.hs @@ -96,7 +96,7 @@ sampleIntegral = sampleN scaleIntegral instance PathPiece DiffTime where toPathPiece = (toPathPiece :: Pico -> Text) . MkFixed . diffTimeToPicoseconds fromPathPiece t = fromPathPiece t <&> \(MkFixed ps :: Pico) -> picosecondsToDiffTime ps - + data LoadSimulation = LoadSheetDownload @@ -214,13 +214,13 @@ runSimulation sim = do delays <- replicateM (fromIntegral p) $ do d <- view $ _2 . _simDelay sampleNDiffTime d - + forConcurrently_ ([1..p] `zip` sort delays) $ \(n, d') -> do begin <- liftIO getCurrentTime dur <- view $ _2 . _simDuration tDuration <- sampleNDiffTime dur - + let MkFixed us = realToFrac d' :: Micro threadDelay $ fromInteger us start <- liftIO getCurrentTime @@ -268,7 +268,7 @@ runSimulation' LoadSheetSubmission = do -- Just formData <- return . getFormData FIDsubmission $ resp ^. responseBody -- Just addButtonData <- return . flip (runFormScraper FIDsubmission) (resp ^. responseBody) $ do -- let btnSel = "button" Scalpel.@: [Scalpel.hasClass "btn-mass-input-add"] - + -- name <- Scalpel.attr "name" btnSel -- value <- Scalpel.attr "value" btnSel -- guard $ value == "add__0__0" @@ -305,7 +305,7 @@ runSimulation' LoadSheetSubmission = do procEnd <- join $ asks runtime print ("proc", procEnd - procStart) - + resp3 <- liftIO . httpRetry $ Session.post session (uriToString id formURI mempty) subData void . evaluate $! resp3 where @@ -328,11 +328,11 @@ runSimulation' LoadSheetSubmission = do -> m () logRetry shouldRetry err status = liftIO . putStrLn . pack $ Retry.defaultLogMsg shouldRetry err status - + -- runSimulation' other = terror $ "Not implemented: " <> tshow other runFormScraper :: FormIdentifier -> Scalpel.Scraper Lazy.ByteString a -> Lazy.ByteString -> Maybe a -runFormScraper fid innerS = fmap join . flip Scalpel.scrapeStringLike $ +runFormScraper fid innerS = fmap join . flip Scalpel.scrapeStringLike $ fmap listToMaybe . Scalpel.chroots "form" $ do fid' <- Scalpel.attr "value" $ "input" Scalpel.@: ["name" Scalpel.@= "form-identifier"] guard $ fid' == encodeUtf8 (fromStrict $ toPathPiece fid) @@ -341,11 +341,11 @@ runFormScraper fid innerS = fmap join . flip Scalpel.scrapeStringLike $ getFormData :: FormIdentifier -> Lazy.ByteString -> Maybe [FormParam] getFormData = flip runFormScraper $ - Scalpel.chroots ("input") $ do + Scalpel.chroots "input" $ do name <- Scalpel.attr "name" Scalpel.anySelector value <- Scalpel.attr "value" Scalpel.anySelector <|> pure "" return $ toStrict name := value - + newLoadSession :: ReaderT SimulationContext IO Session newLoadSession = do @@ -354,7 +354,7 @@ newLoadSession = do let withToken = case loadToken of Nothing -> id Just (Jwt bs) -> (:) (hAuthorization, "Bearer " <> bs) . filter ((/= hAuthorization) . fst) - + liftIO . Session.newSessionControl (Just mempty) $ tlsManagerSettings { managerModifyRequest = \req -> return $ req { requestHeaders = withToken $ requestHeaders req } diff --git a/backend/messages/uniworx/categories/admin/de-de-formal.msg b/backend/messages/uniworx/categories/admin/de-de-formal.msg index eb6cfe753..a6edf0fdb 100644 --- a/backend/messages/uniworx/categories/admin/de-de-formal.msg +++ b/backend/messages/uniworx/categories/admin/de-de-formal.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Gregor Kleen ,Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -67,6 +67,7 @@ BearerTokenExpiresTip: Wird der Ablaufzeitpunkt überschrieben und kein Ablaufze BearerTokenOverrideStart: Startzeitpunkt BearerTokenOverrideStartTip: Wird kein Startzeitpunkt angegeben, wird bei Verwendung des Tokens nur der Ablaufzeitpunkt überprüft. HeadingAdminTokens: Tokens ausstellen +UserUnknown: Unbekannter Benutzer:in #templates adminFeautures StudyFeaturesDegrees: Abschlüsse @@ -101,18 +102,20 @@ ProblemsHeadingDrivers: Fahrberechtigungen ProblemsHeadingNotifications: Benachrichtigungen ProblemsHeadingMisc: Allgemein ProblemsAvsProblem: Synchronisation mit AVS/MoBaKo komplett fehlgeschlagen -ProblemsDriverSynch n@Int: #{tshow n} Diskrepanzen zwischen AVS und FRADrive +ProblemsDriverSynch n@Int: #{n} #{pluralDE n "Diskrepanz" "Diskrepanzen"} zwischen AVS und FRADrive ProblemsDriverSynch0: Alle Sperrungen von Vorfeld-Fahrberechtigungen 'F' sind im AVS eingetragen ProblemsDriverSynch1down: Alle Sperrungen von Rollfeld-Fahrberechtigungen 'R' sind im AVS eingetragen ProblemsDriverSynch1up: Alle gültigen Vorfeld-Fahrberechtigungen 'F' sind im AVS eingetragen ProblemsDriverSynch2: Alle gültigen Rollfeld-Fahrberechtigungen 'R' sind im AVS eingetragen ProblemsRDriversHaveFs: Alle Inhaber einer Rollfeld-Fahrberechtigung besitzen auch eine gültige Vorfeld-Fahrberechtigung ProblemsDriversHaveAvsIds: Alle Inhaber einer Fahrberechtigung konnten einer AVS Identifikationsnummer zugeordnet werden -ProblemsUsersAreReachable: Für alle Benutzer ist eine E-Mail oder postalische Adresse bekannt -ProblemsNoStalePrintJobs n@Integer: Alle Briefversandaufträge der vergangenen #{show n} Tage wurden von der Druckerei bestätigt +ProblemsUsersAreReachable: Für alle Benutzer ist eine E-Mail oder postalische Adresse bekannt +ProblemsNoStalePrintJobs n@Integer: Alle Briefversandaufträge #{pluralDE n "des vergangenen Tages" ("der vergangenen "<> tshow n <> " Tage")} wurden von der Druckerei bestätigt ProblemsNoBadAPCIds: Alle kürzlich empfangenen Druckauftragsbestätigungen waren gültig +ProblemsNoInsaneCompanySupervisions: Sind alle Firmen-bezogenen Ansprechpartnerbeziehungen zwischen passenden Firmenangehörigen? ProblemsUnreachableHeading: Unerreichbare Benutzer ProblemsUnreachableBody: Benutzer ohne E-Mail oder Postadresse, welche z.B. bei ablaufenden Berechtigungen nicht benachrichtigt werden können: +ProblemsUnreachableButtons: Synchronisation für Unerreichbare starten ProblemsRWithoutFHeading: Fahrer mit R ohne F ProblemsRWithoutFBody: Diese Fahrer sind wegen einer ungültigen Vorfeld-Fahrberechtigung komplett gesperrt, obwohl eine gültige Rollfeld-Fahrberechtigung besteht: ProblemsNoAvsIdHeading: Fahrer ohne AVS-Id @@ -120,6 +123,25 @@ ProblemsNoAvsIdBody: Fahrer mit gültiger Fahrberechtigung in FRADrive, welche t ProblemsAvsSynchHeading: Synchronisation AVS Fahrberechtigungen ProblemsAvsErrorHeading: Fehlermeldungen ProblemsInterfaceSince: Berücksichtigt werden nur Erfolge und Fehler seit +ProblemAvsUsrHadR: Momentan gültiges R im AVS +ProblemLastCheckTime t@Text: Letzte Prüfung vor #{t} + +AdminProblemSolved: Erledigt +AdminProblemSolver: Bearbeitet von +AdminProblemCreated: Erkannt +AdminProblemInfo: Problembeschreibung +AdminProblemsSolved n@Int: #{pluralDEeN n "Admin Problem"} als erledigt markiert +AdminProblemsReopened n@Int: #{pluralDEeN n "Admin Problem"} erneut eröffnet +AdminProblemNewCompany: Neue Firma über AVS automatisch erstellt; prüfen und ggf. Standardansprechpartner eintragen +AdminProblemSupervisorNewCompany b@Bool: Standardansprechpartner #{boolText mempty "mit Standardumleitung" b} wechselte zu neuer Firma +AdminProblemSupervisorLeftCompany b@Bool: Einziger Standardansprechpartner #{boolText mempty "mit Standardumleitung" b} dieses Fahrers wechselte zu neuer Firma +AdminProblemCompanySuperiorChange: Neuer firmenweiter Vorgesetzter. +AdminProblemCompanySuperiorNotFound t@Text: Neuer unbekannter firmenweiter Vorgesetzter mit E-Mail #{t}, keine Ansprechpartnerbeziehungen eingerichtet. +AdminProblemCompanySuperiorPrevious: Ehemaliger Vorgesetzter: +AdminProblemNewlyUnsupervised: Fahrer hat keinen Firmenansprechpartner mehr nach AVS Firmenwechsel zu Firma +AdminProblemUser: Betroffener +ProblemTableMarkSolved: Als erledigt markieren +ProblemTableMarkUnsolved: Erledigt Markierung löschen InterfacesOk: Schnittstellen sind ok. InterfacesFail n@Int: #{pluralDEeN n "Schnittstellenproblem"}! @@ -130,4 +152,13 @@ InterfaceSubtype: Betreffend InterfaceWrite: Schreibend InterfaceSuccess: Rückmeldung InterfaceInfo: Nachricht -InterfaceFreshness: Prüfungszeitraum (h) \ No newline at end of file +InterfaceFreshness: Maximale Zugriffsfrist +InterfaceFreshnessTooltip: Zeitspanne innerhalb der ein erneuter erfolgreicher Schnittstellenzugriff erfolgen muss, ohne Warnungen auszulösen +ConfigInterfacesHeading: Konfiguration Zugriffsfristen + +IWTActAdd: Hinzufügen/Ändern +IWTActDelete: Entfernen +InterfaceWarningAdded: Schnittstellenwarnungszeit hinzugefügt oder geändert +InterfaceWarningDeleted n@Int: #{pluralDEeN n "Schnittstellenwarnungszeit"} gelöscht +InterfaceWarningDisabledEntirely: Alle Fehler ignorieren +InterfaceWarningDisabledInterval: Keine Zugriffsfrist \ No newline at end of file diff --git a/backend/messages/uniworx/categories/admin/en-eu.msg b/backend/messages/uniworx/categories/admin/en-eu.msg index 13f35ed9f..1724bd06f 100644 --- a/backend/messages/uniworx/categories/admin/en-eu.msg +++ b/backend/messages/uniworx/categories/admin/en-eu.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Sarah Vaupel ,Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Sarah Vaupel ,Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -18,10 +18,10 @@ NoNameCandidatesInferred: No new name-mappings inferred AllNameIncidencesDeleted: Successfully deleted all name observations AllParentIncidencesDeleted: Successfully deleted all parent-relation observations AllStandaloneIncidencesDeleted: Successfully deleted all standalone observations -IncidencesDeleted n: Successfully deleted #{show n} #{pluralEN n "observation" "observations"} -RedundantParentCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralEN n "parent-candidate" "parent-candidates"} -RedundantStandaloneCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralEN n "standalone-candidate" "standalone-candidates"} -ParentCandidatesInferred n: Successfully inferred #{n} field #{pluralEN n "parent-relation" "parent-reliations"} +IncidencesDeleted n: Successfully deleted #{pluralENsN n "observation"} +RedundantParentCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralENs n "parent-candidate"} +RedundantStandaloneCandidatesRemoved n: Successfully removed #{n} rendundant #{pluralENs n "standalone-candidate"} +ParentCandidatesInferred n: Successfully inferred #{n} field #{pluralENs n "parent-relation"} NoParentCandidatesInferred: No new parent-relations inferred StudyDegreeChangeSuccess: Successfully updated degrees StudyTermsShort: Field shorthand @@ -67,6 +67,7 @@ BearerTokenExpiresTip: If no expiration time is given, the token will not expire BearerTokenOverrideStart: Start time BearerTokenOverrideStartTip: If no start time is given, only the expiration time will be checked when the token is used. HeadingAdminTokens: Issue tokens +UserUnknown: User unknown #templates adminfeatures StudyFeaturesDegrees: Degrees @@ -101,7 +102,7 @@ ProblemsHeadingDrivers: Driving Licences ProblemsHeadingNotifications: User communication ProblemsHeadingMisc: Miscellaneous ProblemsAvsProblem: Synchronisation with AVS/MoBaKo failed entirely -ProblemsDriverSynch n: #{tshow n} mismatches between AVS and FRADrive +ProblemsDriverSynch n: #{tshow n} #{pluralEN n "mismatch" "mismatches"} between AVS and FRADrive ProblemsDriverSynch0: All revocations of apron driving licences 'F' were successfully registered with AVS ProblemsDriverSynch1down: All revocations of maneuvering area driving licences 'R' were successfully registered with AVS ProblemsDriverSynch1up: All valid apron driving licences 'F' were successfully registered with AVS @@ -109,17 +110,38 @@ ProblemsDriverSynch2: All valid maneuvering area driving licences 'R' were succe ProblemsRDriversHaveFs: All driving licence 'R' holders also have a valid 'F' licence ProblemsDriversHaveAvsIds: All driving licence holder could be matched with their AVS id ProblemsUsersAreReachable: Either Email or postal address is known for all users -ProblemsNoStalePrintJobs n: All requests for letter mailing within the last #{show n} days were acknowledged as printed by the airport printing center +ProblemsNoStalePrintJobs n: All requests for letter mailing within the last #{pluralENsN n "day"} were acknowledged as printed by the airport printing center ProblemsNoBadAPCIds: All recently received print job ids from Airport Print Center were legit +ProblemsNoInsaneCompanySupervisions: All company related supervisions are between company-associated users ProblemsUnreachableHeading: Unreachable Users ProblemsUnreachableBody: Users without Email nor postal address, who thus cannot be notified about expiring qualifications: +ProblemsUnreachableButtons: Start synchronisation for unreachable users only ProblemsRWithoutFHeading: Drivers having 'R' but not 'F' ProblemsRWithoutFBody: Drivers without apron driving licence are prohibited from driving, even if they own a valid maneuvering driving licence: ProblemsNoAvsIdHeading: Drivers without AVS id ProblemsNoAvsIdBody: Drivers having a valid apron driving licence within FRADrive only, but who may not drive since a missing AVS id prevents communication of the driving licence to AVS: ProblemsAvsSynchHeading: Synchronisation AVS Driving Licences ProblemsAvsErrorHeading: Error Log -ProblemsInterfaceSince: Only considering successes and errors since +ProblemsInterfaceSince: Only considering successes and errors since +ProblemAvsUsrHadR: Currenlt R valid in AVS +ProblemLastCheckTime t: Last checked #{t} ago + +AdminProblemSolved: Done +AdminProblemSolver: Solved by +AdminProblemCreated: Recognized +AdminProblemInfo: Problem +AdminProblemsSolved n: #{pluralENsN n "admin problem"} marked as solved +AdminProblemsReopened n: #{pluralENsN n "admin problem"} reopened +AdminProblemNewCompany: New company from AVS; verify and add default supervisors +AdminProblemSupervisorNewCompany b: Default company supervisor #{boolText mempty "with reroute" b} changed to new company +AdminProblemSupervisorLeftCompany b: Only default company supervisor #{boolText mempty "with reroute" b} for this user changed to new company +AdminProblemCompanySuperiorChange: New company wide superior. +AdminProblemCompanySuperiorNotFound t: Unable to set supervision for new unknown company wide superior having Email #{t}. +AdminProblemCompanySuperiorPrevious: Previous superior: +AdminProblemNewlyUnsupervised: Driver has no longer a company default supervisor after AVS update at new company +AdminProblemUser: Affected +ProblemTableMarkSolved: Mark done +ProblemTableMarkUnsolved: Reopen as undone InterfacesOk: Interfaces are ok. InterfacesFail n: #{pluralENsN n "interface problem"}! @@ -130,4 +152,13 @@ InterfaceSubtype: Affecting InterfaceWrite: Write InterfaceSuccess: Returned InterfaceInfo: Message -InterfaceFreshness: Check hours \ No newline at end of file +InterfaceFreshness: Maximum usage period +InterfaceFreshnessTooltip: Time period within which the next successful interface access must occur to avoid a warning +ConfigInterfacesHeading: Configure interface usage warnings + +IWTActAdd: Add/Edit +IWTActDelete: Delete +InterfaceWarningAdded: Interface warning time added/changed +InterfaceWarningDeleted n: #{pluralENsN n "interface warning time"} deleted +InterfaceWarningDisabledEntirely: Ignore all errors +InterfaceWarningDisabledInterval: No maximum usage period \ No newline at end of file diff --git a/backend/messages/uniworx/categories/authorization/en-eu.msg b/backend/messages/uniworx/categories/authorization/en-eu.msg index b539efbf1..085dfdeac 100644 --- a/backend/messages/uniworx/categories/authorization/en-eu.msg +++ b/backend/messages/uniworx/categories/authorization/en-eu.msg @@ -26,30 +26,30 @@ UnauthorizedSiteAdmin: You are no system-wide administrator. UnauthorizedSchoolAdmin: You are no administrator for this department. UnauthorizedAdminEscalation: You aren't an administrator for all departments for which this user is an administrator. UnauthorizedExamOffice: You are not part of an exam office. -UnauthorizedEvaluation: You are not charged with course type evaluation. +UnauthorizedEvaluation: You are not charged with course category evaluation. UnauthorizedExamExamOffice: You are not part of the appropriate exam office for any of the participants of this exam. UnauthorizedSchoolExamOffice: You are not part of an exam office for this school. UnauthorizedSystemExamOffice: You are not charged with system wide exam administration. UnauthorizedSystemPrinter: You are not charged with system wide letter printing. UnauthorizedExternalExamExamOffice: You are not part of the appropriate exam office for any of the participants of this exam. UnauthorizedSchoolLecturer: You are no course administrator for this department. -UnauthorizedLecturer: You are no administrator for this course type. -UnauthorizedCorrector: You are no sheet corrector for this course type. +UnauthorizedLecturer: You are no administrator for this course category. +UnauthorizedCorrector: You are no sheet corrector for this course category. UnauthorizedSheetCorrector: You are no corrector for this sheet. UnauthorizedExamCorrector: You are no corrector for this exam. -UnauthorizedCorrectorAny: You are no corrector for any course type. -UnauthorizedRegistered: You are no participant in this course type. +UnauthorizedCorrectorAny: You are no corrector for any course category. +UnauthorizedRegistered: You are no participant in this course category. UnauthorizedRegisteredExam: You are not registered for this exam. UnauthorizedRegisteredAnyExam: You are not registered for an exam. UnauthorizedExamResult: You have no results in this exam. UnauthorizedExamOccurrenceRegistration: Registration for exam is not done including occurrence/room. UnauthorizedExternalExamResult: You have no results in this exam. -UnauthorizedParticipant: The specified user is no participant of this course type. -UnauthorizedParticipantSelf: You are no participant of this course type. -UnauthorizedCourseTime: This course type is not currently available. -UnauthorizedCourseRegistrationTime: This course type does not currently allow enrollment. +UnauthorizedParticipant: The specified user is no participant of this course category. +UnauthorizedParticipantSelf: You are no participant of this course category. +UnauthorizedCourseTime: This course category is not currently available. +UnauthorizedCourseRegistrationTime: This course category does not currently allow enrollment. UnauthorizedSheetTime: This sheet is not currently available. -UnauthorizedMaterialTime: This course type material is not currently available. +UnauthorizedMaterialTime: This course category material is not currently available. UnauthorizedTutorialTime: This course does not currently allow registration. UnauthorizedCourseNewsTime: This news item is not currently available. UnauthorizedExamTime: This exam is not currently available. @@ -61,7 +61,7 @@ UnauthorizedUserSubmission: Users may not directly submit for this exercise shee UnauthorizedCorrectorSubmission: Correctors may not create submissions for this exercise sheet. UnauthorizedCorrectionAnonymous: Correction is not anonymised. DeprecatedRoute: This view is deprecated and will be removed. -UnfreeMaterials: Course type material are not publicly accessable. +UnfreeMaterials: Course category material are not publicly accessable. UnauthorizedWrite: You do not have the write permission necessary to perform this action UnauthorizedSystemMessageTime: This system-message is not currently available. UnauthorizedSystemMessageAuth: This system-message is only available to logged in users. @@ -94,7 +94,7 @@ WorkflowRoleAlreadyInitiated: This workflow was already initiated WorkflowRoleNoSuchWorkflowWorkflow: The given workflow could not be found WorkflowRoleNoPayload: This workflow does not contain any data -CourseNoCapacity: Course type has reached maximum capacity +CourseNoCapacity: Course category has reached maximum capacity TutorialNoCapacity: Course has reached maximum capacity ExamOccurrenceNoCapacity: Occurrence/Room has reached maximum capacity CourseNotEmpty: There are currently no participants enrolled for this course. diff --git a/backend/messages/uniworx/categories/avs/de-de-formal.msg b/backend/messages/uniworx/categories/avs/de-de-formal.msg index bd5c01716..7e2cb7b8a 100644 --- a/backend/messages/uniworx/categories/avs/de-de-formal.msg +++ b/backend/messages/uniworx/categories/avs/de-de-formal.msg @@ -1,18 +1,22 @@ -# SPDX-FileCopyrightText: 2022 Steffen Jost +# SPDX-FileCopyrightText: 2022-25 Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later AvsPersonInfo: AVS Personendaten -AvsPersonId: AVS Personen Id +AvsPersonId: AVS Personen Id AvsPersonNo: AVS Personennummer +AvsPersonNoNotId: AVS Personennummer dient zur menschlichen Kommunikation mit der Ausweisstelle und darf nicht verwechselt werden mit der maschinell verwendeten AVS Personen Id +AvsPersonNoMismatch: AVS Personennummer hat sich geändert und wurde in FRADrive noch nicht aktualisiert +AvsPersonNoDiffers: Es sind derzeit zwei verschiedene AVS Personennummern zugeordnet. Bitte einen Administrator kontaktieren. AvsCardNo: Ausweiskartennummer AvsFirstName: Vorname AvsLastName: Nachname +AvsPrimaryCompany: Primäre Firma AvsInternalPersonalNo: Personalnummer (nur Fraport AG) AvsVersionNo: Versionsnummer +AvsQueryNeeded: Benötigt Verbindung zum AVS. AvsQueryEmpty: Bitte mindestens ein Anfragefeld ausfüllen! AvsQueryStatusInvalid t@Text: Nur numerische IDs eingeben, durch Komma getrennt! Erhalten: #{show t} AvsLicence: Fahrberechtigung -AvsPersonNoNotId: AVS Personennummer dient zur menschlichen Kommunikation mit der Ausweisstelle und darf nicht verwechselt werden mit der maschinell verwendeten AVS Personen Id AvsTitleLicenceSynch: Abgleich Fahrberechtigungen zwischen AVS und FRADrive BtnAvsRevokeUnknown: Fahrberechtigungen im AVS sofort entziehen BtnAvsImportUnknown: AVS Daten unbekannter Personen importieren @@ -27,13 +31,37 @@ RevokeFraDriveLicences alic@AvsLicence n@Int: _{alic} in FRADrive entzogen für RevokeUnknownLicencesOk: AVS Fahrberechtigungen unbekannter Fahrer wurden gesperrt RevokeUnknownLicencesFail: Nicht alle AVS Fahrberechtigungen unbekannter Fahrer konnten entzogen werden, siehe Log für Details AvsCommunicationError: AVS Schnittstelle lieferte einen unerwarteten Fehler. +AvsCommunicationTimeout: AVS Schnittstelle antwortete nicht. LicenceTableChangeAvs: Im AVS ändern LicenceTableGrantFDrive: In FRADrive erteilen LicenceTableRevokeFDrive: In FRADrive entziehen TableAvsActiveCards: Gültige Ausweise +TableAvsCardValid: Aktuell gültig +TableAvsCardIssueDate: Ausgestellt am +TableAvsCardValidTo: Gültig bis +AvsCardAreas: Ausweiszusätze +AvsCardColor: Ausweisfarbe AvsCardColorGreen: Grün AvsCardColorBlue: Blau AvsCardColorRed: Rot AvsCardColorYellow: Gelb LastAvsSynchronisation: Letzte AVS-Synchronisation +LastAvsSyncedBefore: Letzte AVS-Synchronisation vor LastAvsSynchError: Letzte AVS-Fehlermeldung + +AvsInterfaceUnavailable: AVS Schnittstelle nicht richtig konfiguriert oder antwortet nicht +AvsUserUnassociated user@UserDisplayName: AVS Id unbekannt für Nutzer #{user} +AvsUserUnknownByAvs api@AvsPersonId: AVS kennt Id #{tshow api} nicht (mehr) +AvsUserAmbiguous api@AvsPersonId: AVS Id #{tshow api} ist nicht eindeutig +AvsStatusSearchEmpty: AVS lieferte keine Ausweisinformationen +AvsPersonSearchEmpty: Suche im AVS lieferte kein Ergebnis +AvsPersonSearchAmbiguous: Suche im AVS lieferte mehrere uneindeutige Ergebnisse +AvsSetLicencesFailed reason@Text: Setzen der Fahrlizenz im AVS fehlgeschlagen. Grund: #{reason} +AvsIdMismatch api1@AvsPersonId api2@AvsPersonId: AVS Suche für Id #{tshow api1} lieferte stattdessen Id #{tshow api2} +AvsUserCreationFailed api@AvsPersonId: Für AVS Id #{tshow api} konnte kein neuer Benutzer angelegt werden, da es eine gemeinsame Id (z.B. Personalnummer) mit einem existierenden, aber verschiedenen Nutzer gibt. +AvsCardsEmpty: Suche im AVS lieferte keinerlei Ausweiskarten +AvsCurrentData: Alle angezeigte Daten wurden kürzlich direkt über die AVS Schnittstelle abgerufen. +AvsUpdateDayCheck: Zusätzlich wird im Hintergrund ein AVS Datenabgleich für alle in der Tagesansicht vorkommenden Personen angestoßen (einmal pro Tag). + +AvsNoApronCard: Kein gültiger Ausweis mit Vorfeld-Zugang vorhanden +AvsNoCompanyCard mcn@(Maybe CompanyName): Für buchende Firma #{maybeEmpty mcn ciOriginal} liegt kein gültiger Ausweis vor diff --git a/backend/messages/uniworx/categories/avs/en-eu.msg b/backend/messages/uniworx/categories/avs/en-eu.msg index ec7288d7d..2f3ba4b7c 100644 --- a/backend/messages/uniworx/categories/avs/en-eu.msg +++ b/backend/messages/uniworx/categories/avs/en-eu.msg @@ -1,18 +1,23 @@ -# SPDX-FileCopyrightText: 2022 Steffen Jost +# SPDX-FileCopyrightText: 2022-25 Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later -AvsPersonInfo: AVS Person Info -AvsPersonId: AVS Person Id -AvsPersonNo: AVS Person Number +AvsPersonInfo: AVS person info +AvsPersonId: AVS person id +AvsPersonNo: AVS person number +AvsPersonNoNotId: AVS person number is used in human communication only and must not be mistaken for the AVS personen id used in machine communications +AvsPersonNoMismatch: AVS person number has changed and was not yet updated in FRADrive +AvsPersonNoDiffers: There are currently two differing AVS person numbers associated with this user. Please contact an administrator to resolve this. AvsCardNo: Card number AvsFirstName: First name AvsLastName: Last name +AvsPrimaryCompany: Primary company AvsInternalPersonalNo: Personnel number (Fraport AG only) AvsVersionNo: Version number +AvsQueryNeeded: AVS connection required. AvsQueryEmpty: At least one query field must be filled! AvsQueryStatusInvalid t: Numeric IDs only, comma seperated! #{show t} AvsLicence: Driving Licence -AvsPersonNoNotId: AVS person number is used in human communication only and must not be mistaken for the AVS personen id used in machine communications + AvsTitleLicenceSynch: Synchronisation driving licences between AVS and FRADrive BtnAvsRevokeUnknown: Revoke AVS driving licences for unknown persons immediately BtnAvsImportUnknown: Import AVS data for unknown persons @@ -27,13 +32,37 @@ RevokeFraDriveLicences alic@AvsLicence n@Int: _{alic} revoked in FRADrive for #{ RevokeUnknownLicencesOk: AVS driving licences of unknown drivers revoked RevokeUnknownLicencesFail: Not all AVS driving licences of unknown drivers could be revoked, see log for details AvsCommunicationError: AVS interface returned an unexpected error. +AvsCommunicationTimeout: AVS interface returned no response within timeout limit. LicenceTableChangeAvs: Change in AVS LicenceTableGrantFDrive: Grant in FRADrive LicenceTableRevokeFDrive: Revoke in FRADrive TableAvsActiveCards: Valid Cards +TableAvsCardValid: Currently valid +TableAvsCardIssueDate: Issued +TableAvsCardValidTo: Valid to +AvsCardAreas: Card areas +AvsCardColor: Color AvsCardColorGreen: Green AvsCardColorBlue: Blue AvsCardColorRed: Red AvsCardColorYellow: Yellow LastAvsSynchronisation: Last AVS synchronisation -LastAvsSynchError: Last AVS Error \ No newline at end of file +LastAvsSyncedBefore: Last AVS synchronisation before +LastAvsSynchError: Last AVS Error + +AvsInterfaceUnavailable: AVS interface was not configured correctly or does not respond +AvsUserUnassociated user: AVS id unknown for user #{user} +AvsUserUnknownByAvs api: AVS reports id #{tshow api} as unknown (or no longer known) +AvsUserAmbiguous api: Multiple matching users found for #{tshow api} +AvsStatusSearchEmpty: AVS returned no card information +AvsPersonSearchEmpty: AVS search returned empty result +AvsPersonSearchAmbiguous: AVS search returned more than one result +AvsSetLicencesFailed reason: Set driving licence within AVS failed. Reason: #{reason} +AvsIdMismatch api1 api2: AVS search for id #{tshow api1} returned id #{tshow api2} instead +AvsUserCreationFailed api@AvsPersonId: No new user could be created for AVS Id #{tshow api}, since an existing user shares at least one id presumed as unique +AvsCardsEmpty: AVS search returned no id cards +AvsCurrentData: All shown data has been recently received via the AVS interface. +AvsUpdateDayCheck: In addition, a background AVS update has been scheduled for all persons occrring within the day agenda (once per Day). + +AvsNoApronCard: No valid card granting apron access found +AvsNoCompanyCard mcn@(Maybe CompanyName): No valid card for booking company #{maybeEmpty mcn ciOriginal} found diff --git a/backend/messages/uniworx/categories/courses/courses/de-de-formal.msg b/backend/messages/uniworx/categories/courses/courses/de-de-formal.msg index d8faf2d87..60115f17f 100644 --- a/backend/messages/uniworx/categories/courses/courses/de-de-formal.msg +++ b/backend/messages/uniworx/categories/courses/courses/de-de-formal.msg @@ -70,6 +70,10 @@ CourseInvalidInput: Eingaben bitte korrigieren. CourseEditTitle: Kursart editieren/anlegen CourseEditOk tid@TermId ssh@SchoolId csh@CourseShorthand: Kursart #{tid}-#{ssh}-#{csh} wurde erfolgreich geändert. CourseEditDupShort tid@TermId ssh@SchoolId csh@CourseShorthand: Kursart #{tid}-#{ssh}-#{csh} konnte nicht geändert werden: Es gibt bereits einen andere Kursart mit dem selben Kürzel oder Titel in diesem Jahr und Bereich. +CourseEditQualificationFail: Eine Qualifikation konnte uas unbekanntem Grund nicht mit diesem Kurs assoziiert werden. +CourseEditQualificationFailRights qsh@QualificationShorthand ssh@SchoolId: Qualifikation #{qsh} konnte nicht mit diesem Kurs assoziiert werden, da Ihre Berechtigungen für Bereich #{ssh} dazu nicht ausreichen. +CourseEditQualificationFailExists: Diese Qualifikation ist bereits assoziiert +CourseEditQualificationFailOrder: Diese Sortierpriorität existiert bereits CourseLecturer: Kursverwalter:in MailSubjectParticipantInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{tid}-#{ssh}-#{csh}] Einladung zur Kursartteilnahme CourseParticipantInviteHeading courseName@Text: Einladung zum Kursartteilnahmer für #{courseName} @@ -90,6 +94,8 @@ CourseParticipantsRegisterTutorialFieldTip: Ist aktuell keine Kurs mit diesem Na CourseParticipantsRegisterNoneGiven: Es wurden keine anzumeldenden Personen angegeben! CourseParticipantsRegisterNotFoundInAvs n@Int: Zu #{n} #{pluralDE n "Angabe konnte keine übereinstimmende Person" "Angaben konnten keine übereinstimmenden Personen"} im AVS gefunden werden CourseParticipantsRegisterTutorialFirstDayTip: Wenn ein neuer Kurs gemäß einer Vorlage erstellt wird, werden die Zeiten gemäß dem Starttag angepasst +CourseParticipantsTutorialType: Typ der Vorlage +CourseParticipantsTutorialTypeTooltip: Ein neuer Kurs wird wie ein Kurs namens "Vorlage_[typ]" erstellt, wobei zuerst in der aktuellen Kursart, danach in Kursarten gleichen Namens und möglichst neuem Datum gesucht wird. CourseParticipantsInvited n@Int: #{n} #{pluralDE n "Einladung" "Einladungen"} per E-Mail verschickt CourseParticipantsAlreadyRegistered n@Int: #{n} #{pluralDE n "Teinehmer:in" "Teilnehmer:innen"} #{pluralDE n "ist" "sind"} bereits zur Kursart angemeldet @@ -131,6 +137,9 @@ CourseUserTutorialsDeregistered count@Int64: Teilnehmer:in von #{show count} #{p CourseUserNoTutorialsDeregistered: Teilnehmer:in ist zu keinem der gewählten Kurse angemeldet CourseUserTutorials: Angemeldete Kurse CourseUserExams: Angemeldete Prüfungen +CourseUserExamOccurrences: Prüfungstermin +CourseUserExamOccurrenceOverride: Ggf. vorhandenen Prüfungstermin überschreiben +CourseUserExamOccurrenceAgainExaminer: Ggf. vorherige Prüfer erneut erlauben CourseUserSheets: Übungsblätter CsvColumnUserName: Voller Name des/der Teilnehmers/Teilnehmerin CsvColumnUserMatriculation: AVS Nummer des/der Teilnehmers/Teilnehmerin @@ -235,7 +244,7 @@ UtilEditedBy name@Text time@Text: #{time} durch #{name} CourseDate: Datum MailSubjectLecturerInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{tid}-#{ssh}-#{csh}] Einladung als Kursverwalter:in LecturerInvitationAccepted lType@Text csh@CourseShorthand: Sie wurden als #{lType} für #{csh} eingetragen -CourseExamRegistrationTime: Angemeldet seit +CourseExamRegistrationTime: Angemeldet am CourseParticipantStateIsActiveFilter: Ansicht CourseApply: Zur Kursart bewerben CourseAdministrator: Kursadministrator:in diff --git a/backend/messages/uniworx/categories/courses/courses/en-eu.msg b/backend/messages/uniworx/categories/courses/courses/en-eu.msg index 9f14a46a7..5e6262c3d 100644 --- a/backend/messages/uniworx/categories/courses/courses/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/courses/en-eu.msg @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -FilterCourse: Course +FilterCourse: Course category FilterCourseShort: Shorthand FilterTerm: Year FilterCourseSchoolShort: Department @@ -15,7 +15,7 @@ FilterCourseRegisterOpen: Enrolment is allowed CourseRegistered: Enrolled CourseRegistration: Enrolment CourseDescription: Description -CommCourseHeading: Course type message +CommCourseHeading: Course category message CourseLecturers: Course administrators CourseLecturerEmail: Email CourseLecturerAlreadyAdded: This user is already configured as a course administrator @@ -25,12 +25,12 @@ CourseLecturerRightsIdentical: All sorts of course administrators have the same CourseAcceptSubstitutesUntil: Accept substitute registrations until CourseAcceptSubstitutesUntilTip: Until which time should substitute registrations through the central allocation be accepted to fill free places in the course? If left empty no substitute registrations will be made. This deadline should not arbitrarily be set early or ommitted so as to not be an unneccesarily restrictive for students. For a seminar a valid choice might be a few hours before the first meeting in which topics will be assigned. CourseDeregisterNoShow: Record “no show” when deregistering -CourseDeregisterNoShowTip: Should “no show” be recorded as the exam achievement for all exams associated with this course type automatically whenever a course type participant deregisters themselves? This would be done once upon deregistration (if no other achievement exists for the given exam) and automatically whenever a new exam is created. +CourseDeregisterNoShowTip: Should “no show” be recorded as the exam achievement for all exams associated with this course category automatically whenever a course category participant deregisters themselves? This would be done once upon deregistration (if no other achievement exists for the given exam) and automatically whenever a new exam is created. CourseSchool: Department CourseSchoolMultipleTip: You may select from among multiple departments. Please ensure that you select the appropriate department for your course. CourseName: Title CourseShorthand: Shorthand -CourseShorthandUnique: Needs to be unique within school and year. Will be used verbatim within the url of the course type page. +CourseShorthandUnique: Needs to be unique within school and year. Will be used verbatim within the url of the course category page. CourseSemester: Year CourseDescriptionPlaceholder: Please include the module description CourseHomepageExternalPlaceholder: Optional external URL @@ -38,14 +38,14 @@ CourseHomepageExternal: External homepage CourseSemesterMultipleTip: You are currently allowed to select from among multiple years. Please ensure that you select the appropriate year for your course. CourseVisibleFrom: Visible from CourseVisibleTo: Visible to -CourseVisibleFromTip: The course type will be visible to others from this date onward. When left empty the course type will never be visible to other users. This does not affect course administrators, assistants, instructors, correctors, enrolled participants and applicants of/to this course. If the course type participates in a central allocation, the course type visibility will be forced during the application phase. -CourseVisibleToTip: Other users will be able to see the course type from "Visible From" up to this date. When left empty visible courses will remain visible indefinitely. -CourseMaterialFree: Course type material is publicly accessible +CourseVisibleFromTip: The course category will be visible to others from this date onward. When left empty the course category will never be visible to other users. This does not affect course administrators, assistants, instructors, correctors, enrolled participants and applicants of/to this course. If the course category participates in a central allocation, the course category visibility will be forced during the application phase. +CourseVisibleToTip: Other users will be able to see the course category from "Visible From" up to this date. When left empty visible courses will remain visible indefinitely. +CourseMaterialFree: Course category material is publicly accessible CourseFormSectionRegistration: Registration CourseFormSectionAdministration: Administration CourseCapacity: Capacity CourseCapacityTip: Maximum permissable number of enrolments for this course; leave empty for unlimited capacity -CourseSecretTip: Enrollment for this course type will require the password, if set +CourseSecretTip: Enrollment for this course category will require the password, if set CourseSecretFormat: Arbitrary string CourseSecretWrong: Wrong password CourseSecret: Access password @@ -59,19 +59,23 @@ CourseVisibilityEndMustBeAfterStart: The end of the visibility period must be af CourseRegistrationEndMustBeAfterStart: The end of the registration period must be after its start CourseDeregistrationEndMustBeAfterStart: The end of the deregistration period must be after the start of the registration period CourseUserMustBeLecturer: The current user needs to be a course administrator -CourseShorthandTooLong: Long course type shorthands may lead to display issues and might complicate communication with students. Please choose a more concise shorthand if possible. -CourseNotAlwaysVisibleDuringRegistration: To allow for students to register, the course type should also be visible during the entire registration period (which is currently not the case). +CourseShorthandTooLong: Long course category shorthands may lead to display issues and might complicate communication with students. Please choose a more concise shorthand if possible. +CourseNotAlwaysVisibleDuringRegistration: To allow for students to register, the course category should also be visible during the entire registration period (which is currently not the case). NoSuchTerm tid: Year #{tid} does not exist. NoSuchSchool ssh: Department #{ssh} does not exist. -NoSuchCourseShorthand csh: There is no course type with shorthand #{csh}. -NoSuchCourse: No such course type found. -CourseNewDupShort tid ssh csh: Could not create course type #{tid}-#{ssh}-#{csh}. Another course type with the same shorthand or title already exists for the given year and school. +NoSuchCourseShorthand csh: There is no course category with shorthand #{csh}. +NoSuchCourse: No such course category found. +CourseNewDupShort tid ssh csh: Could not create course category #{tid}-#{ssh}-#{csh}. Another course category with the same shorthand or title already exists for the given year and school. CourseInvalidInput: Invalid input CourseEditTitle: Edit/Create course -CourseEditOk tid ssh csh: Successfully edited course type #{tid}-#{ssh}-#{csh} -CourseEditDupShort tid ssh csh: Could not edit course type #{tid}-#{ssh}-#{csh}. Another course type with the same shorthand or title already exists for the given year and school. +CourseEditOk tid ssh csh: Successfully edited course category #{tid}-#{ssh}-#{csh} +CourseEditDupShort tid ssh csh: Could not edit course category #{tid}-#{ssh}-#{csh}. Another course category with the same shorthand or title already exists for the given year and school. +CourseEditQualificationFail: A qualifikation could not be associated with this course for unknown reasons. +CourseEditQualificationFailRights qsh ssh: Qualification #{qsh} could not be associated with this course, due to your insufficient rights for department #{ssh}. +CourseEditQualificationFailExists: This qualification is already associated +CourseEditQualificationFailOrder: This sort order priority is used already CourseLecturer: Course administrator -MailSubjectParticipantInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{tid}-#{ssh}-#{csh}] Invitaion to join the course +MailSubjectParticipantInvitation tid ssh csh: [#{tid}-#{ssh}-#{csh}] Invitaion to join the course CourseParticipantInviteHeading courseName: Invitation to enrol for #{courseName} CourseParticipantInviteExplanation: You were invited to be a participant of a course. CourseParticipantInviteField: Email addresses to invite @@ -79,21 +83,23 @@ CourseParticipantInvitationAccepted courseName: You were enrolled in #{courseNam CourseParticipantEnlistDirectly: Enrol known users directly CourseSubmissionGroup: Registered submission group SubmissionGroupEmptyIsUnsetTip: Leave empty to remove users from their respective submission groups -CourseParticipantsRegisterHeading: Add course type participants -CourseParticipantsRegisterActionAddParticipants: Add course type participants +CourseParticipantsRegisterHeading: Add course category participants +CourseParticipantsRegisterActionAddParticipants: Add course category participants CourseParticipantsRegisterActionAddTutorialMembers: Add course participants CourseParticipantsRegisterUsersField: Persons to register for course CourseParticipantsRegisterUsersFieldTip: Please enter id card no (including dot), Fraport personnel number or email. Please separate multiple entries with comma or space. -CourseParticipantsRegisterTutorialOption: Register course type participants for course? +CourseParticipantsRegisterTutorialOption: Register course category participants for course? CourseParticipantsRegisterTutorialField: Course -CourseParticipantsRegisterTutorialFieldTip: If there is no course with this name, a new one will be created. If there is a course with this name, the course type participants will be registered for it. +CourseParticipantsRegisterTutorialFieldTip: If there is no course with this name, a new one will be created. If there is a course with this name, the course category participants will be registered for it. CourseParticipantsRegisterNoneGiven: No persons given to register! CourseParticipantsRegisterNotFoundInAvs n: For #{n} #{pluralEN n "entry no corresponding person" "entries no corresponding persons"} could be found in AVS CourseParticipantsRegisterTutorialFirstDayTip: If a new course is created and a template exists, its dates are adjusted according to the start date CourseParticipantsRegisterUnnecessary: All requested registrations have already been saved. No actions have been performed. +CourseParticipantsTutorialType: Template type +CourseParticipantsTutorialTypeTooltip: A new course creation copies a course named "Template_[typ]", preferably from the same course category or another having the same name, the most recent being preferred. CourseParticipantsInvited n: #{n} #{pluralEN n "invitation" "invitations"} sent via email -CourseParticipantsAlreadyRegistered n: #{n} #{pluralEN n "participant is" "participants are"} already course type #{pluralEN n "member" "members"} +CourseParticipantsAlreadyRegistered n: #{n} #{pluralEN n "participant is" "participants are"} already course category #{pluralEN n "member" "members"} CourseParticipantsAlreadyTutorialMember n: #{n} #{pluralEN n "participant is" "participants are"} already registered for this course CourseParticipantsRegistered n: Successfully registered #{n} #{pluralEN n "participant" "participants"} for course CourseParticipantsRegisteredTutorial n: Successfully registered #{n} #{pluralEN n "participant" "participants"} for course @@ -106,9 +112,9 @@ CourseRegistrationFiles: Registration file(s) CourseRegistrationFilesNeedReupload: Registration files need to be reuploaded every time the registration is changed CourseRegistrationFile: Registration file CourseRegistrationArchive: Zip archive of registration files -CourseDeregistrationNoShow: If you deregister from this course type “no show” will be recorded as your exam achievement for all exams associated with this course. If you have good reasons why you shold not be held accountable for leaving the course, please contact a course administrator. Course administrators can deregister you without incurring a permanent record. -CourseDeregistrationFromInvisibleCourse: This course type is only visible to enrolled participants and applicants. If you deregister now, you will not be able to access the course type again! -CourseDeregistrationNoReRegistration: If you deregister from the course type now, you will not be able to re-register yourself. +CourseDeregistrationNoShow: If you deregister from this course category “no show” will be recorded as your exam achievement for all exams associated with this course. If you have good reasons why you shold not be held accountable for leaving the course, please contact a course administrator. Course administrators can deregister you without incurring a permanent record. +CourseDeregistrationFromInvisibleCourse: This course category is only visible to enrolled participants and applicants. If you deregister now, you will not be able to access the course category again! +CourseDeregistrationNoReRegistration: If you deregister from the course category now, you will not be able to re-register yourself. LoginNecessary: Please log in first! RegisterRetry: You haven't been enrolled. Press "Enrol for course" to enrol CourseRegisterOk: Successfully enrolled for course @@ -131,6 +137,9 @@ CourseUserTutorialsDeregistered count: Sucessfully deregistered participant from CourseUserNoTutorialsDeregistered: Participant is not registered for any of the selected courses CourseUserTutorials: Registered courses CourseUserExams: Registered exams +CourseUserExamOccurrences: Exam occurrence +CourseUserExamOccurrenceOverride: Override other registrations for this exam, if any +CourseUserExamOccurrenceAgainExaminer: Possibly allow previous examiners again CourseUserSheets: Exercise sheets CsvColumnUserName: Participant's full name CsvColumnUserMatriculation: Participant's AVS number @@ -144,7 +153,7 @@ CsvColumnUserExam: Exams which the user is registered for, separated by semicolo CsvColumnUserSubmissionGroup: Registered submission group CsvColumnUserSurname: Participant's surname CsvColumnUserFirstName: Participant's given name -CsvColumnUserNote: Course type notes for the participant +CsvColumnUserNote: Course category notes for the participant CourseUserCsvName tid ssh csh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-participants CourseUserTutorial: Registered course CourseUserExam: Registered exam @@ -171,21 +180,21 @@ AssistantsFor: Assistants CourseAdminFor: Course administration TutorsFor n: #{pluralENs n "Instructor" } CorrectorsFor n: #{pluralEN n "Corrector" "Correctors"} -CourseParticipantsHeading: Course type participants +CourseParticipantsHeading: Course category participants CourseParticipantsCount n: #{n} CourseParticipantsCountOf n m: #{n} of #{m} CourseVisibility: Visibility -CourseInvisible: This course type is currently only visible to course administrators, assistants, instructors, correctors, enrolled participants and applicants. +CourseInvisible: This course category is currently only visible to course administrators, assistants, instructors, correctors, enrolled participants and applicants. CourseRegistrationInterval: Enrolment CourseDirectRegistrationInterval: Direct enrolment CourseDeregisterUntil time: Deregistration only until #{time} NotRegistered: Note enrolled for this course CourseMaterial: Material -CourseMaterialNotFree: Course type material is only accessible to members of the course, e.g. for participants, instructors, correctors or administratiors. -CourseMaterialsFoundHere: Material for this course type is available here -CourseMaterialsNoneVisible: Currently there is no material for this course type or only material to which you don't have access (e.g. because of visibility settings) -CourseSheetsFoundHere: Exercise sheets for this course type are available here -CourseSheetsNoneVisible: Currently there are no exercise sheets for this course type or only exercise sheets to which you don't have access (e.g. because of visibility settings) +CourseMaterialNotFree: Course category material is only accessible to members of the course, e.g. for participants, instructors, correctors or administratiors. +CourseMaterialsFoundHere: Material for this course category is available here +CourseMaterialsNoneVisible: Currently there is no material for this course category or only material to which you don't have access (e.g. because of visibility settings) +CourseSheetsFoundHere: Exercise sheets for this course category are available here +CourseSheetsNoneVisible: Currently there are no exercise sheets for this course category or only exercise sheets to which you don't have access (e.g. because of visibility settings) SheetListCourse: Exercise sheets CourseExams: Exams CourseTutorials: Courses @@ -228,13 +237,13 @@ TutorialRegisterFrom: Register from TutorialRegisterTo: Register to CourseDeleteQuestion: Are you sure you want to delete the below-mentioned course? -CourseDeleted: Course type deleted +CourseDeleted: Course category deleted UtilEditedBy name time: #{time} by #{name} CourseDate: Date MailSubjectLecturerInvitation tid ssh csh: [#{tid}-#{ssh}-#{csh}] Invitation to be a course administrator LecturerInvitationAccepted lType csh: You were registered as #{lType} for #{csh} -CourseExamRegistrationTime: Registered since +CourseExamRegistrationTime: Registered on CourseParticipantStateIsActiveFilter: View CourseApply: Apply for course CourseAdministrator: Course administrator diff --git a/backend/messages/uniworx/categories/courses/courses/event/de-de-formal.msg b/backend/messages/uniworx/categories/courses/courses/event/de-de-formal.msg index e6ef8820f..a5351eddf 100644 --- a/backend/messages/uniworx/categories/courses/courses/event/de-de-formal.msg +++ b/backend/messages/uniworx/categories/courses/courses/event/de-de-formal.msg @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-or-later CourseEvents: Termine -CourseEventType: Art +CourseEventType: Kategorie CourseEventTypePlaceholder: Vorlesung, Zentralübung, ... CourseEventTime: Zeit CourseEventRoom: Regulärer Raum diff --git a/backend/messages/uniworx/categories/courses/courses/event/en-eu.msg b/backend/messages/uniworx/categories/courses/courses/event/en-eu.msg index 0984a73c0..2f9568c3c 100644 --- a/backend/messages/uniworx/categories/courses/courses/event/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/courses/event/en-eu.msg @@ -8,17 +8,17 @@ CourseEventTypePlaceholder: Lecture, Exercise discussion, ... CourseEventTime: Time CourseEventRoom: Regular room CourseEventRoomHidden: Room only for participants -CourseEventRoomHiddenTip: Should the room only be displayde to course type participants? +CourseEventRoomHiddenTip: Should the room only be displayde to course category participants? CourseEventRoomIsUnset: — -CourseEventRoomIsHidden: Room is only displayed to course type associated persons (participants, instructors, correctors, etc.) +CourseEventRoomIsHidden: Room is only displayed to course category associated persons (participants, instructors, correctors, etc.) CourseEventNote: Note CourseEventActions: Actions CourseEventsActionEdit: Edit CourseEventsActionDelete: Delete CourseEventsActionCreate: New occurrence -CourseEventCreated: Successfully created course type occurrence -CourseEventEdited: Successfully edited course type occurrence -CourseEventDeleteQuestion: Are you sure you want to delete the course type occurrence mentioned below? -CourseEventDeleted: Successfully deleted course type occurrence -CourseEventEdit: Edit course type occurrence -CourseEventNew: New course type occurrence \ No newline at end of file +CourseEventCreated: Successfully created course category occurrence +CourseEventEdited: Successfully edited course category occurrence +CourseEventDeleteQuestion: Are you sure you want to delete the course category occurrence mentioned below? +CourseEventDeleted: Successfully deleted course category occurrence +CourseEventEdit: Edit course category occurrence +CourseEventNew: New course category occurrence \ No newline at end of file diff --git a/backend/messages/uniworx/categories/courses/courses/news/en-eu.msg b/backend/messages/uniworx/categories/courses/courses/news/en-eu.msg index e1a0297a6..6aa05c529 100644 --- a/backend/messages/uniworx/categories/courses/courses/news/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/courses/news/en-eu.msg @@ -9,17 +9,17 @@ CourseNewsLastEdited time: Last changed: #{time} CourseNewsActionEdit: Edit CourseNewsActionDelete: Delete CourseNewsActionCreate: Create new item -CourseNewsVisibleFromEditWarning: This item of course type news has already been published and should no longer be changed sind this might confuse participants. +CourseNewsVisibleFromEditWarning: This item of course category news has already been published and should no longer be changed sind this might confuse participants. CourseNewsVisibleFromTip: If left empty this item is never visible. Leave empty for unfinished items CourseNewsTitle: Title CourseNewsSummary: Summary -CourseNewsSummaryTip: If specified this only the summary will be shown on the course type page, saving space. The content will be shown in a popup +CourseNewsSummaryTip: If specified this only the summary will be shown on the course category page, saving space. The content will be shown in a popup CourseNewsContent: Content -CourseNewsParticipantsOnly: Only for course type participants +CourseNewsParticipantsOnly: Only for course category participants CourseNewsVisibleFrom: Visible from -CourseNewsCreated: Successfully created item of course type news -CourseNewsEdited: Successfully edited item of course type news -CourseNewsDeleteQuestion: Are you sure you want to delete the item of course type news listed below? -CourseNewsDeleted: Successfully deleted item of course type news -CourseNewsNew: Add course type news -CourseNewsEdit: Edit item of course type news +CourseNewsCreated: Successfully created item of course category news +CourseNewsEdited: Successfully edited item of course category news +CourseNewsDeleteQuestion: Are you sure you want to delete the item of course category news listed below? +CourseNewsDeleted: Successfully deleted item of course category news +CourseNewsNew: Add course category news +CourseNewsEdit: Edit item of course category news diff --git a/backend/messages/uniworx/categories/courses/exam/exam/de-de-formal.msg b/backend/messages/uniworx/categories/courses/exam/exam/de-de-formal.msg index bd87559c7..0bd1d6775 100644 --- a/backend/messages/uniworx/categories/courses/exam/exam/de-de-formal.msg +++ b/backend/messages/uniworx/categories/courses/exam/exam/de-de-formal.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Gregor Kleen ,Sarah Vaupel ,Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -35,7 +35,7 @@ ExamEditHeading examn@ExamName: #{examn} bearbeiten ExamNameTip: Muss innerhalb der Veranstaltung eindeutig sein ExamDescription: Beschreibung ExamFormTimes: Zeiten -ExamFormOccurrences: Prüfungstermine/Räume +ExamFormOccurrences: Prüfungstermine / Räume ExamFormAutomaticFunctions: Automatische Funktionen ExamFormCorrection: Korrektur ExamFormParts: Teile @@ -43,12 +43,13 @@ ExamFormMode: Ausgestaltung der Prüfung ExamFormGrades: Prüfungsleistungen ExamStart: Beginn ExamEnd: Ende -ExamTimeTip: Nur zur Information der Studierenden, die tatsächliche Zeitangabe erfolgt pro Prüfungstermin/Raum +ExamTimeTip: Nur zur Information, die tatsächliche Zeitangabe erfolgt pro Prüfungstermin/Raum. +ExamTimeFilterTip: In der Kursansicht für Kursverwaltende wird diese Zeit zur Filterung verwendet. ExamVisibleFrom: Sichtbar ab ExamVisibleFromTip: Ohne Datum nie sichtbar und keine Anmeldung möglich ExamRegisterFrom: Anmeldung ab ExamRegisterTo: Anmeldung bis -ExamRegisterFromTip: Zeitpunkt ab dem sich Kursartteilnehmer:innen selbständig zur Prüfung anmelden können; ohne Datum ist keine Anmeldung möglich +ExamRegisterFromTip: Zeitpunkt ab dem sich Kursartteilnehmer:innen selbständig zur Prüfung anmelden können; ohne Datum ist keine selbständige Anmeldung möglich ExamDeregisterUntil: Abmeldung bis ExamPublishOccurrenceAssignments: Termin- bzw. Raumzuteilung den Teilnehmer:innen mitteilen um ExamPublishOccurrenceAssignmentsTip: Ab diesem Zeitpunkt können Teilnehmer:innen einsehen zu welcher Teilprüfung bzw. welchen Raum sie angemeldet sind @@ -64,14 +65,15 @@ ExamAutomaticGradingTip: Sollen die Gesamtleistungen der Teilnehmer:innen automa ExamBonus: Bonuspunkte-System ExamGradingMode: Bewertungsmodus ExamGradingModeTip: In welcher Form werden Prüfungsleistungen für diese Prüfung eingetragen? -ExamStaff: Prüfer:innen/Verantwortliche Hochschullehrer:innen -ExamStaffTip: Geben Sie bitte in jedem Fall einen Namen an, der Prüfer:in/Veranstalter:in/Hochschullehrer:in eindeutig identifiziert! Sollte der Name des Prüfers/der Prüferin allein womöglich nicht eindeutig sein, so geben Sie bitte eindeutig identifizierende Zusatzinfos, wie beispielsweise den Lehrstuhl bzw. die LFE o.Ä., an. +ExamStaff: Hauptverantworliche:r +ExamStaffTip: Hauptverantwortliche:r Prüfer:in, Textfeld zur reinen Information der Teilnehmenden. ExamExamOfficeSchools: Zusätzliche Bereiche ExamExamOfficeSchoolsTip: Prüfungsbeauftragte von Bereichen, die Sie hier angeben, erhalten im System (zusätzlich zum primären Bereich der zugehörigen Kursart) volle Einsicht in sämtliche für diese Prüfung hinterlegten Leistungen, unabhängig von den Studiendaten der Teilnehmer:innen. ExamCorrectorEmail: E-Mail -ExamCorrectors: Korrektor:innen -ExamCorrectorsTip: Hier eingetragene Korrektor:innen können zwischen Beginn der Prüfung und "Bewertung abgeschlossen ab" Ergebnisse für alle Teilprüfungen und alle Teilnehmer:innen im System hinterlegen. -ExamCorrectorAlreadyAdded: Ein Korrektor/eine Korrektorin mit dieser E-Mail ist bereits für diese Prüfung eingetragen +ExamCorrectors: Prüfer:innen +ExamCorrectorsTip: Hier eingetragene Prüfer:innen können zwischen Beginn der Prüfung und "Bewertung abgeschlossen ab" Ergebnisse für alle Teilprüfungen und alle Teilnehmer:innen im System hinterlegen. +ExamCorrectorAlreadyAdded: Ein Prüfer:innen mit dieser E-Mail ist bereits für diese Prüfung eingetragen +ExamParticipant: Prüfungsteilnehmer:in ExamRoom: Raum ExamRoomManual': Keine automatische bzw. selbstständige Zuteilung ExamRoomSurname': Nach Nachname @@ -86,6 +88,7 @@ ExamRoomAlreadyExists: Prüfung ist bereits eingetragen ExamRoomName: Interne Bezeichnung ExamRoomCapacity: Kapazität ExamRoomCapacityNegative: Kapazität darf nicht negativ sein +ExamRoomCapacityInsufficient n@Int: Kapazität reicht nicht aus, #{noneOneMoreDE n "keine Plätze" "nur noch ein Platz" ("nur noch " <> tshow n <> " Plätze")} verfügbar ExamRoomTime: Termin ExamRoomStart: Beginn ExamRoomEnd: Ende @@ -123,6 +126,8 @@ ExamOccurrenceStartMustBeAfterExamStart eoName@ExamOccurrenceName: Beginn des Te ExamOccurrenceEndMustBeBeforeExamEnd eoName@ExamOccurrenceName: Ende des Termins #{eoName} liegt nach dem Ende der Prüfung ExamOccurrenceDuplicate eoRoom@Text eoRange@Text: Raum #{eoRoom}, Termin #{eoRange} kommt mehrfach mit der selben Beschreibung vor ExamOccurrenceDuplicateName eoName@ExamOccurrenceName: Interne Terminbezeichnung #{eoName} kommt mehrfach vor +ExamOccurrenceExaminerIsUnset !ident-ok: — +ExamOccurrenceExaminerIsHidden: Prüfer wird nur Teilnehmer:innen angezeigt ExamOccurrenceRoomIsUnset !ident-ok: — ExamOccurrenceRoomIsHidden: Raum wird nur Teilnehmer:innen angezeigt ExamOccurrenceCannotBeDeletedDueToRegistrations eoName@ExamOccurrenceName: Termin #{eoName} kann nicht gelöscht werden, da noch Teilnehmer:innen diesem Termin zugewiesen sind. Über die Liste von Prüfungsteilnehmern können Sie zunächst die entsprechenden Terminzuweisungen entfernen. @@ -217,6 +222,13 @@ ExamOccurrenceRuleParticipant: Termin- bzw. Raumzuteilungsverfahren ExamRegisteredCount: Anmeldungen ExamRegisteredCountOf num@Int64 count@Int64 !ident-ok: #{num}/#{count} ExamOccurrences: Termine +ExamOccurrencesCopied num@Int: #{pluralDEeN num "Prüfungstermin"} kopiert +ExamOccurrencesEdited num@Int del@Int: #{pluralENsN num "Prüfungstermin"} geändert #{guardMonoid (del > 0) ("und " <> pluralENsN num "Prüfungstermin" <> " gelöscht")} +ExamOccurrenceCopyNoStartDate: Dieser Kurs hat noch keine eigene Termine um Prüfungstermine zeitlich damit zu assoziieren +ExamOccurrenceCopyFail: Keine passenden Prüfungstermine zum Kopieren gefunden +ExaminerReocurrence examiner@Text: Mehrfache Prüfung durch #{examiner}! +ExamProblemReoccurrence: Prüfungen mit wiederholt gleichem Prüfer +ExamNoProblemReoccurrence: Heute keine Prüfungen mit wiederholtem Prüfer. GradingFrom: Ab ExamNoShow: Nicht erschienen ExamVoided: Entwertet @@ -264,6 +276,7 @@ ExamAutoOccurrenceExceptionRoomTooSmall: Automatische Verteilung gescheitert. Ei ExamBonusInfoPoints: Zur Berechnung von Bonuspunkten werden nur jene Blätter herangezogen, deren Aktivitätszeitraum vor Start des jeweiligen Termin/Prüfung begonnen hat ExamUserCsvSheetName tid@TermId ssh@SchoolId csh@CourseShorthand examn@ExamName: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase examn} Teilnehmer +ExamRoomExaminerTip: Nur bereits eingetragene Prüfer:innen sind hier erlaubt ExamRoomCapacityTip: Maximale Anzahl an Prüfungsteilnehmern für diesen Termin/Raum; leer lassen für unbeschränkte Teilnehmeranzahl ExamRoomMappingRandom: Verteilung ExamFinishHeading: Prüfungsergebnisse sichtbar schalten diff --git a/backend/messages/uniworx/categories/courses/exam/exam/en-eu.msg b/backend/messages/uniworx/categories/courses/exam/exam/en-eu.msg index 32ffda98e..8fa6275e2 100644 --- a/backend/messages/uniworx/categories/courses/exam/exam/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/exam/exam/en-eu.msg @@ -1,11 +1,11 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Gregor Kleen ,Sarah Vaupel ,Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later ExamRegistrationInviteDeadline: Invitation valid until ExamRegistrationEnlistDirectly: Register known users directly ExamRegistrationEnlistDirectlyTip: Should users whose email addresses are known to the system be registered for the exam directly? Otherwise invitations will be sent to alle users, which they will have to accept first in order to be registered. Unknown users always receive an invitation. -ExamRegistrationRegisterCourse: Also enroll users in course type +ExamRegistrationRegisterCourse: Also enroll users in course category ExamRegistrationRegisterCourseTip: Users that aren't enrolled already won't be registered for the exam otherwise. ExamRegistrationInviteField: Email addresses ExamParticipantsRegisterHeading: Add exam participants @@ -35,7 +35,7 @@ ExamEditHeading examn: Edit #{examn} ExamNameTip: Needs to be unique within the course ExamDescription: Description ExamFormTimes: Times -ExamFormOccurrences: Occurrences/rooms +ExamFormOccurrences: Occurrences / Rooms ExamFormAutomaticFunctions: Automatic functions ExamFormCorrection: Correction ExamFormParts: Exam parts @@ -43,12 +43,13 @@ ExamFormMode: Exam design ExamFormGrades: Exam achievements ExamStart: Start ExamEnd: End -ExamTimeTip: Only for informational purposes. The actual times are set for each occurrence/room +ExamTimeTip: Only for informational purposes. The actual times are set for each occurrence/room. +ExamTimeFilterTip: Also used for Filtering in the course administrator course view. ExamVisibleFrom: Visible from -ExamVisibleFromTip: If left empty the exam is never visible and course type participants may not register. +ExamVisibleFromTip: If left empty the exam is never visible and course category participants may not register. ExamRegisterFrom: Register from ExamRegisterTo: Register to -ExamRegisterFromTip: Start of the period in which course type participants may register themselves for the exam. If left empty participants are never allowed to register. +ExamRegisterFromTip: Start of the period in which course category participants may register themselves for the exam. If left empty participants are never allowed to register themselves. ExamDeregisterUntil: Deregister until ExamPublishOccurrenceAssignments: Publish occurrence/room-assignments ExamPublishOccurrenceAssignmentsTip: At this time participants can find out to which occurrence/room they are assigned @@ -64,14 +65,15 @@ ExamAutomaticGradingTip: Should the exam achievement be automatically computed f ExamBonus: Bonus point system ExamGradingMode: Grading mode ExamGradingModeTip: In which format should grades for this exam be entered? -ExamStaff: Examiner/Responsible university teacher -ExamStaffTip: Please always specify a name that uniquely identifies the examiner/organiser/repsonsible university teacher! If there is a possibility that the name alone is ambiguous please also specify some additional information e.g. the professorial chair or the educational and research unit. +ExamStaff: Chief examiner +ExamStaffTip: Primary responsible examiner, arbirary text field for pure informational purposes. ExamExamOfficeSchools: Additional departments ExamExamOfficeSchoolsTip: Exam offices of departments you specify here will also have full access to all results for this exam disregarding the individual participants' features of study. ExamCorrectorEmail: Email -ExamCorrectors: Correctors -ExamCorrectorsTip: Correctors configured here may, after the start of the exam and until "Results visible from", enter exam part results for all exam parts and participants. -ExamCorrectorAlreadyAdded: A corrector with this email address already exists +ExamCorrectors: Examiner +ExamCorrectorsTip: Examiners configured here may, after the start of the exam and until "Results visible from", enter exam part results for all exam parts and participants. +ExamCorrectorAlreadyAdded: An examiner with this email address already exists +ExamParticipant: Examinee ExamRoom: Room ExamRoomManual': No automatic or autonomous assignment ExamRoomSurname': By surname @@ -86,6 +88,7 @@ ExamRoomAlreadyExists: Occurrence already configured ExamRoomName: Internal name ExamRoomCapacity: Capacity ExamRoomCapacityNegative: Capacity may not be negative +ExamRoomCapacityInsufficient n@Int: Insufficient capacity, #{noneOneMoreEN n "none" "just one" ("only " <> tshow n)} remaining ExamRoomTime: Time ExamRoomStart: Start ExamRoomEnd: End @@ -123,8 +126,10 @@ ExamOccurrenceStartMustBeAfterExamStart eoName: Start of the occurrence #{eoName ExamOccurrenceEndMustBeBeforeExamEnd eoName: End of the occurrence #{eoName} must be before the exam end ExamOccurrenceDuplicate eoRoom eoRange: Combination of room #{eoRoom} and occurrence #{eoRange} occurs multiple times ExamOccurrenceDuplicateName eoName: Internal name #{eoName} occurs multiple times +ExamOccurrenceExaminerIsUnset !ident-ok: — +ExamOccurrenceExaminerIsHidden: Examiner only displayed to participants registered for this occurrence ExamOccurrenceRoomIsUnset: — -ExamOccurrenceRoomIsHidden: Room is only displayed to participants registered for this occurrence/room +ExamOccurrenceRoomIsHidden: Room only displayed to participants registered for this occurrence ExamOccurrenceCannotBeDeletedDueToRegistrations eoName: Occurrence #{eoName} cannot be deleted because participants are registered for it. You can remove the offending registrations via the list of exam participants. ExamRegistrationMustFollowSchoolSeparationFromStart dayCount: As per school rules there #{pluralEN dayCount "needs" "need"} to be at least #{dayCount} #{pluralEN dayCount "day" "days"} between "Register from" and "Start". ExamRegistrationMustFollowSchoolDuration dayCount: As per school rules there #{pluralEN dayCount "needs" "need"} to be at least #{dayCount} #{pluralEN dayCount "day" "days"} between "Register from" and "Register to". @@ -159,7 +164,7 @@ CsvColumnExamUserExercisePassesMax: Maximum number of exercise sheets the partic CsvColumnExamUserBonus: Exam bonus points CsvColumnExamUserParts: Number of points the participant achieved per exam part. One column per exam part if applicable. CsvColumnExamUserResult: Exam achievement; "passed", "failed", "no-show", "voided", or any number grade ("1.0", "1.3", "1.7", ..., "4.0", "5.0") -CsvColumnExamUserCourseNote: Course type notes for the participant +CsvColumnExamUserCourseNote: Course category notes for the participant CsvColumnExamOfficeExamUserOccurrenceStart: Exam occurrence (ISO 8601) CsvColumnUserStudyFeatures: All relevant features of study for the participant, separated by semicolon (;) ExamUserCsvName tid ssh csh examn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase examn}-participants @@ -176,7 +181,7 @@ ExamAction: Action ExamUsersExamDataRequiresRegistration: If exam data (part-/result, occurrence/room, bonus) is to be modified/set, the relenvant participant needs to be registered for the exam. ExamNoOccurrence: No occurrence/room ExamBonusNone: No bonus points -ExamUserCsvCourseNoteDeleted: Course type note will be deleted +ExamUserCsvCourseNoteDeleted: Course category note will be deleted ExamUsersDeregistered count: Successfully deregistered #{show count} #{pluralEN count "participant" "participants"} ExamUsersOccurrenceUpdated count: Successfully assigned occurrence/room for #{show count} #{pluralEN count "participant" "participants"} ExamUsersResultsAccepted count: Successfully accepted computed result for #{show count} #{pluralEN count "participant" "participants"} @@ -217,6 +222,13 @@ ExamOccurrenceRuleParticipant: Occurrence/room assignment procedure ExamRegisteredCount: Registrations ExamRegisteredCountOf num count: #{num}/#{count} ExamOccurrences: Exams +ExamOccurrencesCopied num: #{pluralENsN num "exam occurrence"} copied +ExamOccurrencesEdited num del: #{pluralENsN num "exam occurrence"} edited #{guardMonoid (del > 0) ("and " <> pluralENsN num "exam occurrence" <> " deleted")} +ExamOccurrenceCopyNoStartDate: This course needs its own occurrence to copy associated exam occurrences. +ExamOccurrenceCopyFail: No suitable exam occurrences found to copy from. +ExaminerReocurrence examiner: Multiple examinations by #{examiner}! +ExamProblemReoccurrence: Exams with reoccurring examiner +ExamNoProblemReoccurrence: Today there are no exams with a reoccurring examiner. GradingFrom: From #templates widgets/bonus-rule @@ -262,6 +274,8 @@ ExamAutoOccurrenceExceptionNoUsers: No participants can be distributed with the ExamAutoOccurrenceExceptionRoomTooSmall: Automatic distribution failed. A different distribution procedure might succeed. Alternatively, minimizing rooms or removing small rooms might help. ExamBonusInfoPoints: When calculating an exam bonus only those sheets will be considered, for which the submission period started before the start of the relevant occurrence/room ExamUserCsvSheetName tid ssh csh examn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase examn} Participants + +ExamRoomExaminerTip: Only examiners allowed here, add beforehand ExamRoomCapacityTip: Maximum number of participants for this occurrence/room; leave empty for unlimited capacity ExamRoomMappingRandom: Distribution ExamFinishHeading: Make results visible @@ -302,9 +316,9 @@ ExamUserCsvOverrideResult: Override exam result in contradiction of computed val ExamUserCsvSetBonus: Set bonus points ExamUserCsvSetResult: Set exam result ExamUserCsvSetPartResult: Set result for exam part -ExamUserCsvSetCourseNote: Modify course type participant notes -ExamUserCsvExceptionNoMatchingUser: Course type participant could not be identified uniquely. All identifiers (given name(s), surname, display name, matriculation, ..) must match exactly. You can try to remove some of the identifiers for the given line (i.e. all but matriculation). Uni2work will then search for users using only the remaining identifiers. In this case special care should be taken that Uni2work correctly identifies the intended user. -ExamUserCsvExceptionMultipleMatchingUsers: Course type participant could not be identified uniquely. There are multiple users that match the given identifiers. You can try to add more identifiers for the given line to ensure that only the intended user can be identified with them. +ExamUserCsvSetCourseNote: Modify course category participant notes +ExamUserCsvExceptionNoMatchingUser: Course category participant could not be identified uniquely. All identifiers (given name(s), surname, display name, matriculation, ..) must match exactly. You can try to remove some of the identifiers for the given line (i.e. all but matriculation). Uni2work will then search for users using only the remaining identifiers. In this case special care should be taken that Uni2work correctly identifies the intended user. +ExamUserCsvExceptionMultipleMatchingUsers: Course category participant could not be identified uniquely. There are multiple users that match the given identifiers. You can try to add more identifiers for the given line to ensure that only the intended user can be identified with them. ExamUserCsvExceptionNoMatchingStudyFeatures: The specified field did not match with any of the participant's fields of study. You can try to remove the field of study for the given line. Uni2work will then automatically choose a field of study. ExamUserCsvExceptionNoMatchingOccurrence: Occurrence/room could not be identified uniquely. Please ensure that the given line only contains internal room identifiers exactly as they have been configured for this exam. ExamUserCsvExceptionMismatchedGradingMode expectedGradingMode actualGradingMode: The imported data contained an exam achievement which does not match the grading mode for this exam. The expected grading mode can be changed at "Edit exam" ("Passed/Failed", "Numeric grades", or "Mixed"). diff --git a/backend/messages/uniworx/categories/courses/exam/external_exam/en-eu.msg b/backend/messages/uniworx/categories/courses/exam/external_exam/en-eu.msg index 933b7acbc..b95793046 100644 --- a/backend/messages/uniworx/categories/courses/exam/external_exam/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/exam/external_exam/en-eu.msg @@ -15,8 +15,8 @@ ExternalExamCorrectErrorNeedleTooShort: This identifier is too short. UnauthorizedExternalExamCorrectorGrade: You may not enter overall exam achievements for this exam. ExternalExamCorrectErrorMultipleMatchingUsers: This identifier matches on multiple students. ExternalExamCorrectErrorNoMatchingUsers: This identifier does not match any student. -ExternalExamEdited coursen@CourseName examn@ExamName: Succesfully edited exam “#{examn}” for course type “#{coursen}”. -ExternalExamExists coursen@CourseName examn@ExamName: Exam “#{examn}” already exists for course type “#{coursen}”. +ExternalExamEdited coursen@CourseName examn@ExamName: Succesfully edited exam “#{examn}” for course category “#{coursen}”. +ExternalExamExists coursen@CourseName examn@ExamName: Exam “#{examn}” already exists for course category “#{coursen}”. ExternalExamEdit coursen examn: Edit: #{coursen}, #{examn} ExternalExamSemester: Year ExternalExamSchool: Department @@ -41,10 +41,10 @@ ExternalExamStaffTip: The list of ssociated persons is shown to exam offices and ExternalExamStaffAlreadyAdded: Person is already associated with the exam. ExternalExamStaffEmail: Email ExternalExamUserMustBeStaff: You yourself must always be an associated person for exams you create. -ExternalExamCourseExists: This course type already exists with FRADrive. Exams for courses that exist within FRADrive should be associated with the course type directly instead of being created as an external exam. +ExternalExamCourseExists: This course category already exists with FRADrive. Exams for courses that exist within FRADrive should be associated with the course category directly instead of being created as an external exam. HeadingExternalExamList: External exams HeadingExternalExamNew: New external exam -ExternalExamCreated coursen@CourseName examn@ExamName: Succesfully created exam “#{examn}” for course type “#{coursen}”. +ExternalExamCreated coursen@CourseName examn@ExamName: Succesfully created exam “#{examn}” for course category “#{coursen}”. MailSubjectExternalExamStaffInvitation coursen examn: Invitation to act as examiner for “#{examn}” of “#{coursen}” ExternalExamOccurrenceEdited count: Successfully edited #{count} #{pluralEN count "occurrence" "occurrences"} ExternalExamResultEdited count: Successfully edited #{count} #{pluralEN count "exam result" "exam results"} diff --git a/backend/messages/uniworx/categories/courses/material/de-de-formal.msg b/backend/messages/uniworx/categories/courses/material/de-de-formal.msg index 92427fff9..aeb213d80 100644 --- a/backend/messages/uniworx/categories/courses/material/de-de-formal.msg +++ b/backend/messages/uniworx/categories/courses/material/de-de-formal.msg @@ -4,7 +4,7 @@ MaterialList !ident-ok: Material MaterialName !ident-ok: Name -MaterialType: Art +MaterialType: Typ MaterialTypePlaceholder: Folien, Code, Beispiel, ... MaterialTypeSlides: Folien MaterialTypeCode !ident-ok: Code diff --git a/backend/messages/uniworx/categories/courses/material/en-eu.msg b/backend/messages/uniworx/categories/courses/material/en-eu.msg index b0f2039dd..bd93eae0f 100644 --- a/backend/messages/uniworx/categories/courses/material/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/material/en-eu.msg @@ -11,27 +11,27 @@ MaterialTypeCode: Code MaterialTypeExample: Example MaterialDescription: Description MaterialVisibleFrom: Visible to participants from -MaterialVisibleFromTip: Never visible to participants if left empty; leaving the date empty is only sensible for unfinished course type material or when course type material should be provided only to sheet correctors -MaterialVisibleFromEditWarning: This course type material has already been published and should not be edited. Doing so might confuse the participants. -MaterialInvisible: This course type material is currently invisible to participants! +MaterialVisibleFromTip: Never visible to participants if left empty; leaving the date empty is only sensible for unfinished course category material or when course category material should be provided only to sheet correctors +MaterialVisibleFromEditWarning: This course category material has already been published and should not be edited. Doing so might confuse the participants. +MaterialInvisible: This course category material is currently invisible to participants! MaterialFiles: Files MaterialHeading materialName: #{materialName} -MaterialListHeading: Course type materials -MaterialNewHeading: Publish new course type material -MaterialNewTitle: New course type material -MaterialEditHeading materialName: Edit course type material “#{materialName}” -MaterialEditTitle materialName: Edit course type material “#{materialName}” -MaterialSaveOk tid ssh csh materialName: Successfully saved “#{materialName}” for course type #{tid}-#{ssh}-#{csh} -MaterialNameDup tid ssh csh materialName: Course type material with the name “#{materialName}” already exists for course type #{tid}-#{ssh}-#{csh} -MaterialDeleteCaption: Do you really want to delete the course type material mentioned below? +MaterialListHeading: Course category materials +MaterialNewHeading: Publish new course category material +MaterialNewTitle: New course category material +MaterialEditHeading materialName: Edit course category material “#{materialName}” +MaterialEditTitle materialName: Edit course category material “#{materialName}” +MaterialSaveOk tid ssh csh materialName: Successfully saved “#{materialName}” for course category #{tid}-#{ssh}-#{csh} +MaterialNameDup tid ssh csh materialName: Course category material with the name “#{materialName}” already exists for course category #{tid}-#{ssh}-#{csh} +MaterialDeleteCaption: Do you really want to delete the course category material mentioned below? MaterialDelHasFiles count: including #{count} #{pluralEN count "file" "files"} -MaterialIsVisible: Caution, this course type material has already been published. -MaterialDeleted materialName: Successfully deleted course type material “#{materialName}” +MaterialIsVisible: Caution, this course category material has already been published. +MaterialDeleted materialName: Successfully deleted course category material “#{materialName}” MaterialArchiveName tid ssh csh materialName: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase materialName} MaterialVideo materialName: #{materialName} - Video MaterialVideoUnsupported: Your browser does not seem to support embedded video MaterialVideoDownload: Download -MaterialFree: Course type material is publicly available. +MaterialFree: Course category material is publicly available. AccessibleSince: Accessible since VisibleFrom: Published FilterMaterialNameSearch !ident-ok: Name diff --git a/backend/messages/uniworx/categories/courses/participants/en-eu.msg b/backend/messages/uniworx/categories/courses/participants/en-eu.msg index 5c98bb4e4..ea8d67211 100644 --- a/backend/messages/uniworx/categories/courses/participants/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/participants/en-eu.msg @@ -2,16 +2,16 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -ParticipantsList: Lists of course type participants -ParticipantsIntersect: Common course type participants +ParticipantsList: Lists of course category participants +ParticipantsIntersect: Common course category participants ParticipantsCsvName tid ssh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-participants ParticipantsIntersectCourseOption tid@TermId ssh@SchoolId coursen@CourseName: #{tid} - #{ssh} - #{coursen} ParticipantsIntersectCourses: Courses CourseParticipantsRegisteredWithoutField n: #{n} #{pluralEN n "participant was" "participants were"} registered without #{pluralEN n "an associated field of study" "associated fields of study"}, because #{pluralEN n "it" "they"} could not be determined uniquely. ParticipantsCsvSheetName tid ssh: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)} Participants -CourseParticipants n: Currently #{n} course type #{pluralEN n "participant" "participants"} +CourseParticipants n: Currently #{n} course category #{pluralEN n "participant" "participants"} ParticipantsIntersectNotOne: Intersection AllUsersUnion: Union of all participants AllUsersIntersection: Intersection of all participants -CourseDeleteActiveParticipants: This course type still has active participants. Remove all active participants first if you really want to delete this course. -CourseDeleteExistExams: This course type cannot be deleted, for as long as associated exams exist. \ No newline at end of file +CourseDeleteActiveParticipants: This course category still has active participants. Remove all active participants first if you really want to delete this course. +CourseDeleteExistExams: This course category cannot be deleted, for as long as associated exams exist. \ No newline at end of file diff --git a/backend/messages/uniworx/categories/courses/sheet/en-eu.msg b/backend/messages/uniworx/categories/courses/sheet/en-eu.msg index a71932447..17dbe54cf 100644 --- a/backend/messages/uniworx/categories/courses/sheet/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/sheet/en-eu.msg @@ -13,8 +13,8 @@ SheetDeleteQuestion: Do you really want to delete the below-mentioned exercise s SheetDeleted: Successfully deleted exercise sheet SheetArchiveName tid ssh csh shn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase shn} SheetTypeArchiveName tid ssh csh shn renderedSft: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase shn}-#{foldCase renderedSft} -SheetEditOk tid ssh csh sheetName: Successfully saved exercise sheet #{sheetName} in course type #{tid}-#{ssh}-#{csh} -SheetNameDup tid ssh csh sheetName: There already is an exercise sheet #{sheetName} in course type #{tid}-#{ssh}-#{csh} +SheetEditOk tid ssh csh sheetName: Successfully saved exercise sheet #{sheetName} in course category #{tid}-#{ssh}-#{csh} +SheetNameDup tid ssh csh sheetName: There already is an exercise sheet #{sheetName} in course category #{tid}-#{ssh}-#{csh} SheetVisibleFrom: Visible from (for participants) SheetVisibleFromTip: Always invisible for participants and no submission possible if left empty; only leave this field empty for temporary/unfinished sheets SheetActiveFrom: Active from/Submission period start @@ -24,7 +24,7 @@ SheetSolutionFromTip: Always invisible for participants if left empty; corrector SheetName: Name SheetDescription: Description SheetRequireExam: Require registration for an exam? -SheetRequireExamTip: If registration for an exam is required, only course type participants that are registered for that exam at the time of submission will be allowed to create submission. Download of sheet files will also be restricted to course type participants registered for the exam. +SheetRequireExamTip: If registration for an exam is required, only course category participants that are registered for that exam at the time of submission will be allowed to create submission. Download of sheet files will also be restricted to course category participants registered for the exam. SheetRequiredExam: Exam SheetFormType: Valuation & submission SheetFormTimes: Times @@ -37,15 +37,15 @@ SheetMarkingFiles: Correction SheetMarkingTip: Instructions for correction, visible only to correctors SheetPersonalisedFilesDownload: Download personalised sheet files SheetPersonalisedFiles: Personalised sheet files -SheetPersonalisedFilesTip: Should course type participants be assigned personalised sheet files in addition to the files configured above? Only the user to which a file has been assigned may view it. +SheetPersonalisedFilesTip: Should course category participants be assigned personalised sheet files in addition to the files configured above? Only the user to which a file has been assigned may view it. SheetPersonalisedFilesUpload: Personalised sheet files SheetPersonalisedFilesUploadTip: Download the template for a ZIP-archive of personalised sheet files, move files into the directories corresponding to the desired users and upload the archive again. If the name of a personalised file matches the name of an unpersonalised file, the personalised file replaces the unpersonalised one from the respective participants' point of view. SheetPersonalisedFilesKeepExisting: Keep existing files SheetPersonalisedFilesKeepExistingTip: Should the personalised files you upload be added to the already existing ones, if applicable? Otherwise the files you upload will completely replace any existing files. SheetPersonalisedFilesAllowNonPersonalisedSubmission: Allow non-personalised submission -SheetPersonalisedFilesAllowNonPersonalisedSubmissionTip: Should course type participants with no assigned personalised files be allowed to submit anyway? +SheetPersonalisedFilesAllowNonPersonalisedSubmissionTip: Should course category participants with no assigned personalised files be allowed to submit anyway? SheetPersonalisedFilesDownloadTemplateHere: You can download a template for a ZIP-archive of personalised sheet files with the structure that Uni2work expects here: -SheetPersonalisedFilesUsersList: List of course type participants who have personalised sheet files +SheetPersonalisedFilesUsersList: List of course category participants who have personalised sheet files SheetPersonalisedFilesMetaYAMLSeedComment: This string was generated cryptographically from data uniquely identifying the user and exercise sheet. You can use it as a seed for a pseudorandom generator for generating (parts of) the personalised files. SheetPersonalisedFilesMetaYAMLNoSeedComment: There is not enough information available to generate a seed. You will have to create the exercise sheet in Uni2work first. Once seeds can be generated they will be generated cryptographically and you may use them to generate (parts of) the personalised files. SheetActiveFromTip: The exercise sheet's assignment will only be available for download and submission starting at this time. If left empty no submission or download of assignment is ever allowed @@ -63,7 +63,7 @@ SheetErrDeadlineEarly: "Submission period end" must be after "Submission period SheetErrHintEarly: "Hint from" must be after "Submission period start" SheetErrSolutionEarly: "Solution from" must be after "Submission period end" SheetErrVisibleWithoutActive: If “Visible from (for participants)” is specified “Active from/Submission period start” must also be specified -SheetSubmissionModeNoneWithoutNotGraded: The sheet was configured to be "No submission" but not "Not marked". Course type participants will not be able to submit. +SheetSubmissionModeNoneWithoutNotGraded: The sheet was configured to be "No submission" but not "Not marked". Course category participants will not be able to submit. SheetWarnNoActiveTo: “Active to/Submission period end” should always be specified CountTutProp: Courses count against proportion CountTutPropTip: If submissions are assigned by course, do those assignments count with regard to the set proportion? @@ -82,13 +82,13 @@ RatingPercent: Achieved IsRated: Marked SheetTypeIsExam: Rating „as an exam part“ SheetGradingSummaryTitle intgr: #{intgr} #{pluralEN intgr "sheet" "sheets"} -PersonalisedSheetFilesIgnored count: #{count} uploaded #{pluralEN count "file was" "files were"} ignored because #{pluralEN count "it" "they"} could not be associated with both a sheet file type and a course type participant. +PersonalisedSheetFilesIgnored count: #{count} uploaded #{pluralEN count "file was" "files were"} ignored because #{pluralEN count "it" "they"} could not be associated with both a sheet file type and a course category participant. PersonalisedSheetFilesIgnoredIntro: The following files were ignored: PersonalisedSheetFilesDownloadRestrictByExamNone: No restriction PersonalisedSheetFilesDownloadRestrictByExam: Restrict to exam participants PersonalisedSheetFilesDownloadRestrictByExamTip: Only download personalised sheet files for participants also registered to a certain exam? PersonalisedSheetFilesDownloadAnonymousField: Anonymisation -PersonalisedSheetFilesDownloadAnonymousFieldTip: Should the ZIP-archive of personalised files be anonymised (it would then contain no immediately identifiable information regard the course type participants) or should directory names be decorated with an identifiable feature of the user and the files of meta information contain additional personal data? +PersonalisedSheetFilesDownloadAnonymousFieldTip: Should the ZIP-archive of personalised files be anonymised (it would then contain no immediately identifiable information regard the course category participants) or should directory names be decorated with an identifiable feature of the user and the files of meta information contain additional personal data? PersonalisedSheetFilesMetaFilename uid: meta-information_#{toPathPiece uid}.yaml PersonalisedSheetFilesArchiveName tid ssh csh shn: #{foldCase (termToText (unTermKey tid))}-#{foldedCase (unSchoolKey ssh)}-#{foldedCase csh}-#{foldedCase shn}-personalised_files SheetGeneratePseudonym: Generate diff --git a/backend/messages/uniworx/categories/courses/submission/en-eu.msg b/backend/messages/uniworx/categories/courses/submission/en-eu.msg index 0467e4d20..5cd8a1330 100644 --- a/backend/messages/uniworx/categories/courses/submission/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/submission/en-eu.msg @@ -49,10 +49,10 @@ SubmissionArchive: Zip-archive of submission files SubmissionArchiveCorrected: Zip-archive of submission files including corrections SubmissionFile: Submission file SubmissionFiles: Submitted files -EmailInvitationWarningPrevCoSubmittors: This address could not be matched to any course type participant with whom you have submitted for this course type before. An Invitation will be sent via email. -EmailInvitationWarningCourseParticipants: This address coulde not be matched to any course type participant. An Invitation will be sent via email. -MultiUserFieldExplanationPrevCoSubmittors: This input searches through the addresses of all course type participants for whom it could be determined, that you have already submitted with that person for this course. -MultiUserFieldExplanationCourseParticipants: This input searches through the addresses of all course type participants. +EmailInvitationWarningPrevCoSubmittors: This address could not be matched to any course category participant with whom you have submitted for this course category before. An Invitation will be sent via email. +EmailInvitationWarningCourseParticipants: This address coulde not be matched to any course category participant. An Invitation will be sent via email. +MultiUserFieldExplanationPrevCoSubmittors: This input searches through the addresses of all course category participants for whom it could be determined, that you have already submitted with that person for this course. +MultiUserFieldExplanationCourseParticipants: This input searches through the addresses of all course category participants. SubmissionAlreadyExistsFor email: #{email} already has a submission for this sheet. SubmissionUsersEmpty: Submissions may not be created without submittors. SubmissionUserAlreadyAdded: This user is already configured as a submittor @@ -155,7 +155,7 @@ SubmissionSomeUsersDuplicateWarning: Some submittors are also submittors for a d EMailUnknown email: Email #{email} does not belong to any known user. CorDeficitProportion: Deficit (proportion) -CosubmittorTip: Invitations are sent via email to exactly those addresses for which it cannot be determined, that you have already submitted for this course type with the associated person, at least once. If one of the specified addresses can be matched to a person with whom you have submitted at least once for this course type already, the name of that person will be shown and the submission will immediately be made in their name as well. +CosubmittorTip: Invitations are sent via email to exactly those addresses for which it cannot be determined, that you have already submitted for this course category with the associated person, at least once. If one of the specified addresses can be matched to a person with whom you have submitted at least once for this course category already, the name of that person will be shown and the submission will immediately be made in their name as well. CorrDownload: Download SubmissionDownloadAnonymous: Anonymized SubmissionDownloadSurnames: With surnames @@ -237,9 +237,9 @@ SubmissionFilterAuthorshipStatementCurrent: Current wording SubmissionNoUsers: This submission has no associated users! -CsvColumnCorrectionTerm: Term of the course type of the submission -CsvColumnCorrectionSchool: School of the course type of the submission -CsvColumnCorrectionCourse: Shorthand of the course type of the submission +CsvColumnCorrectionTerm: Term of the course category of the submission +CsvColumnCorrectionSchool: School of the course category of the submission +CsvColumnCorrectionCourse: Shorthand of the course category of the submission CsvColumnCorrectionSheet: Name of the sheet of the submission CsvColumnCorrectionSubmission: Number of the submission (uwa…) CsvColumnCorrectionSurname: Submittor's surnames, separated by semicolon (;) diff --git a/backend/messages/uniworx/categories/courses/tutorial/de-de-formal.msg b/backend/messages/uniworx/categories/courses/tutorial/de-de-formal.msg index 5a4cef6b6..875139f6c 100644 --- a/backend/messages/uniworx/categories/courses/tutorial/de-de-formal.msg +++ b/backend/messages/uniworx/categories/courses/tutorial/de-de-formal.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -36,6 +36,7 @@ TutorialDelete: Löschen TutorialsHeading: Kurse TutorialNew: Neuer Kurs TutorialRegisteredSuccess tutn@TutorialName: Erfolgreich zum Kurs #{tutn} angemeldet +TutorialRegisteredFail tutn@TutorialName: Anmeldung zum Kurs #{tutn} fehlgeschlagen. Existiert bereits eine Anmeldung? TutorialDeregisteredSuccess tutn@TutorialName: Erfolgreich vom Kurs #{tutn} abgemeldet MailSubjectTutorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand tutn@TutorialName: [#{tid}-#{ssh}-#{csh}] Einladung zum Ausbilder für #{tutn} TutorInviteHeading tutn@TutorialName: Einladung zum Ausbilder/zur Ausbilderin für #{tutn} @@ -46,7 +47,26 @@ TutorialUserDeregister: Vom Kurs abmelden TutorialUserSendMail: Mitteilung verschicken TutorialUserPrintQualification: Zertifikat drucken TutorialUserGrantQualification: Qualifikation vergeben +TutorialUserGrantQualificationDateTooltip: Leer lassen, um das Ablaufdatum auf das heutige Datum plus Standardgültigkeitsdauer zu setzen. +TutorialUserGrantQualificationDateError qsh@QualificationShorthand: Qualifikation #{qsh} hat keine Standardgültigkeitsdauer, daher ist ein explizites Ablaufdatum erforderlich! TutorialUserRenewQualification: Qualifikation regulär verlängern -TutorialUserRenewedQualification n@Int: Qualifikation für #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} regulär verlängert -TutorialUserGrantedQualification n@Int: Qualifikation erfolgreich an #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} vergeben -CommTutorial: Kursmitteilung \ No newline at end of file +TutorialUserRenewedQualification qsh@QualificationShorthand n@Int: Qualifikation #{qsh} für #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} regulär verlängert. +TutorialUserGrantedQualification qsh@QualificationShorthand day@Text n@Int: Qualifikation #{qsh} bis #{day} erfolgreich an #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} vergeben. +TutorialUserAssignExam: Zur Prüfung einteilen +TutorialUserExamAssignedFor n@Int m@Int p@Text: #{n}/#{m} zur Prüfung #{p} eingeteilt +CommTutorial: Kursmitteilung +TutorialDrivingPermit: Führerschein +TutorialEyeExam: Sehtest +TutorialNote: Kursnotiz +TutorialDayAttendance day@Text: Anwesenheit #{day} +TutorialDayNote day@Text: Anwesenheitsnotiz #{day} +TutorialParticipantsDayEdits day@Text: Kursteilnehmer-Tagesnotizen aktualisiert für #{day} + +PossibleCheckResults: Mögliche Prüfungsergebnisse +CheckEyePermitMissing: Sehtest oder Führerschein fehlen noch +CheckEyePermitIncompatible: Sehtest und Führerschein passen nicht zusammen + +GenTutActOccCopyLast: Prüfungstermine von früherem Kurs kopieren +GenTutActOccCopyWeek: Prüfungstermine von früherer Woche kopieren +GenTutActOccEdit: Relevante Prüfungstermine bearbeiten +GenTutActShowExam: Prüfungsergebnisse der Kursteilnehmer anzeigen \ No newline at end of file diff --git a/backend/messages/uniworx/categories/courses/tutorial/en-eu.msg b/backend/messages/uniworx/categories/courses/tutorial/en-eu.msg index 20df36d50..4315f700b 100644 --- a/backend/messages/uniworx/categories/courses/tutorial/en-eu.msg +++ b/backend/messages/uniworx/categories/courses/tutorial/en-eu.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -12,16 +12,16 @@ TutorialEdited tutn: Successfully edited course #{tutn} TutorialEditHeading tutn: Edit #{tutn} TutorEmail: Email TutorialTutorAlreadyAdded: An user with this email address is already registered as instructor -TutorialNameTip: Needs to be unique within the course type +TutorialNameTip: Needs to be unique within the course category TutorialTypePlaceholder: Tutorial, Driving lesson, ... TutorialTypeTip: Only for informational purposes -TutorialRegGroupTip: Course type participants may only register for a maximum of one course per registration group. Courses that do not have a registration group are treated as being in different registration groups +TutorialRegGroupTip: Course category participants may only register for a maximum of one course per registration group. Courses that do not have a registration group are treated as being in different registration groups TutorialRegGroup: Registration group TutorialTutorControlled: Instructors may edit course TutorialTutorControlledTip: Should instructors be allowed to edit arbitrary aspects of this course (name, registration group, room, time, other instructors, ...) at will? TutorialCapacity: Capacity TutorialCapacityNonPositive: Capacity may not be negative -TutorialCapacityTip: Limits how many course type participants may register for this course +TutorialCapacityTip: Limits how many course category participants may register for this course TutorialRoomHiddenTip: Should the room only be displayed to course participants? RegisterFrom: Enrolment starts RegisterTo: Enrolment ends @@ -36,18 +36,37 @@ TutorialDelete: Delete TutorialsHeading: Courses TutorialNew: New course TutorialRegisteredSuccess tutn: Successfully registered for the course #{tutn} +TutorialRegisteredFail tutn: Registering for the course #{tutn} failed. Probably already registered? TutorialDeregisteredSuccess tutn: Successfully de-registered for the course #{tutn} MailSubjectTutorInvitation tid ssh csh tutn: [#{tid}-#{ssh}-#{csh}] Invitation to be a instructor for #{tutn} TutorInviteHeading tutn: Invitation to be instructor for #{tutn} TutorInviteExplanation: You were invited to be a instructor. TutorCorrectorInvitationAccepted shn: You are now a corrector for #{shn} TutorialUsersDeregistered count: Successfully deregistered #{show count} participants from course - TutorialUserDeregister: Deregister from course TutorialUserSendMail: Send mail TutorialUserPrintQualification: Print certificate TutorialUserGrantQualification: Grant qualification +TutorialUserGrantQualificationDateTooltip: Leave blank for expiry on today's date plus standard qualification valid duration. +TutorialUserGrantQualificationDateError qsh@QualificationShorthand: Qualification #{qsh} has no standard valid duration. Please provide an explicit expiry date! TutorialUserRenewQualification: Renew qualification -TutorialUserRenewedQualification n@Int: Successfully renewed qualification #{tshow n} course #{pluralEN n "user" "users"} -TutorialUserGrantedQualification n: Successfully granted qualification #{tshow n} course #{pluralEN n "user" "users"} +TutorialUserRenewedQualification qsh n: Successfully renewed #{qsh} qualification for #{pluralENsN n "course participant"} +TutorialUserGrantedQualification qsh day n: Successfully granted #{qsh} qualification until #{day} to #{pluralENsN n "course participant"} +TutorialUserAssignExam: Register for examination +TutorialUserExamAssignedFor n@Int m@Int p@Text: #{n}/#{m} enrolled for exam #{p} CommTutorial: Course message +TutorialDrivingPermit: Driving permit +TutorialEyeExam: Eye exam +TutorialNote: Course note +TutorialDayAttendance day: Attendance #{day} +TutorialDayNote day: Attendance note #{day} +TutorialParticipantsDayEdits day: course participant day notes updated for #{day} + +PossibleCheckResults: Possible results +CheckEyePermitMissing: Eye exam or driving permit missing +CheckEyePermitIncompatible: Eye exam and driving permit are incompatible + +GenTutActOccCopyLast: Copy exam occurrences from previous course +GenTutActOccCopyWeek: Copy exam occurrences from course on previous week +GenTutActOccEdit: Edit relevant exam occurrences +GenTutActShowExam: Show exam results for course participants \ No newline at end of file diff --git a/backend/messages/uniworx/categories/firm/de-de-formal.msg b/backend/messages/uniworx/categories/firm/de-de-formal.msg index c7a92efb3..f6af62a89 100644 --- a/backend/messages/uniworx/categories/firm/de-de-formal.msg +++ b/backend/messages/uniworx/categories/firm/de-de-formal.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Steffen Jost +# SPDX-FileCopyrightText: 2023-25 Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -7,7 +7,6 @@ FirmSuperForeign: Firmenfremde Ansprechpartner FirmSuperIrregular: Irreguläre Ansprechpartner FirmAssociates: Firmenangehörige FirmContact: Firmenkontakt -FirmNoContact: Keine allgemeinen Kontaktinformationen bekannt. FirmEmail: Allgemeine Email FirmAddress: Postanschrift FirmDefaultPreferenceInfo: Diese Voreinstellungen gelten nur für neue Firmenangehörige @@ -16,11 +15,18 @@ FirmActionInfo: Betrifft alle Firmenangehörigen unter Ihrer Aufsicht. FirmActNotify: Mitteilung versenden FirmActResetSupervision: Ansprechpartner für alle Firmenangehörigen zurücksetzen FirmActResetSuperKeep: Bisherige Ansprechpartner der Firmenangehörigen zusätzlich beibehalten? +FirmActRemoveSupers: Alle rein firmenbezogenen Ansprechpartnerbeziehungen für diese Personen entfernen? FirmActResetMutualSupervision: Ansprechpartner beaufsichtigen sich gegenseitig -FirmActAddSupersvisors: Ansprechpartner hinzufügen -FirmActAddSupersEmpty: Es konnten keine Ansprechpartner hinzugefügt werden +FirmActResetSupersKeepAll: Alle behalten +FirmActResetSupersRemoveAps: Nur Standardansprechpartner entfernen +FirmActResetSupersRemoveAll: Alle entfernen +FirmActAddSupervisors: Ansprechpartner hinzufügen +FirmActAddAssociates: Firmenangehörige hinzufügen +FirmActAddSupersEmpty: Es konnten keine neuen Ansprechpartner hinzugefügt werden! FirmActAddSupersSet n@Int64 postal@(Maybe Bool): #{n} Standardansprechpartner geändert #{maybeBoolMessage postal "" "und auf Briefversand geschaltet" "und Benachrichtigungen per Email gesetzt"}, aber nicht nicht aktiviert. -RemoveSupervisors ndef@Int64 nact@Int64: #{ndef} Standard Ansprechpartner entfernt#{bool ", aber noch nicht deaktiviert" (", " <> tshow nact <> " aktive Ansprechpartnerbeziehungen gelöscht") (nact > 0)} +FirmActAddAssocsEmpty: Es konnten keine neuen Firmenangehörige hinzugefügt werden! +FirmActAddAssocs n@Int64: #{n} Firmenangehörige hinzugefügt. +RemoveSupervisors ndef@Int64: #{ndef} Standardansprechpartner entfernt. FirmActChangeContactUser: Kontaktinformationen von allen Firmenangehörigen ändern FirmActChangeContactFirm: Kontaktinformationen der Firma ändern FirmActChangeContactFirmInfo: Firmenkontaktinformationen werden nur für neue Firmenangehörige verwendet, für die sonst keine Kontaktinformationen vorliegen. @@ -28,17 +34,23 @@ FirmActChangeContactFirmResult: Firmenkontaktinformationen geändert. Betrifft n FirmUserActNotify: Mitteilung versenden FirmUserActResetSupervision: Ansprechpartner auf Firmenstandard zurücksetzen FirmUserActSetSupervisor: Ansprechpartner ändern +FirmUserActChangeContact: Kontaktinformationen für ausgewählte Firmenangehörige ändern +FirmUserActChangeDetails: Firmenassoziation bearbeiten +FirmUserActRemove: Firmenassoziation entfernen +FirmUserActMkSuper: Zum Firmenansprechpartner ernennen +FirmUserActChangeDetailsResult n@Int64 t@Int64: Firmenassoziation von #{n}/#{t} #{pluralDE n "Firmenangehörigen" "Firmenangehörige"} wurden aktualisiert +FirmUserActChangeResult n@Int64 t@Int64: Benachrichtigungseinstellung für #{n}/#{t} #{pluralDE n "Firmenangehörigen" "Firmenangehörige"} wurden geändert +FirmUserActRemoveResult uc@Int64: #{uc} #{pluralDE uc "Firmenassoziation" "Firmenassoziationen"} entfernt. +FirmRemoveSupervision sup@Int64 sub@Int64: #{noneMoreDE sup "" (tshow sup <> " Ansprechpartnerbeziehungen wegen entferntem Ansprechpartner gelöscht. ")} #{noneOneMoreDE sub "Keine Ansprechpartnerbeziehung" "Eine Ansprechpartnerbeziehung" (tshow sup <> " Ansprechpartnerbeziehungen")} wegen entferntem Klienten gelöscht. FirmNewSupervisor: Neue individuelle Ansprechpartner hinzufügen FirmSetSupervisor: Existierende Ansprechpartner hinzufügen FirmSetSupersReport nusr@Int64 nspr@Int64 nrem@Int64: Für #{nusr} Firmenangehörige wurden #{nspr} individuelle Ansprechpartner eingetragen#{bool "." (" und " <> tshow nrem <> " individuelle Ansprechpartnerbeziehungen gelöscht.") (nrem >0)} -FirmUserActMkSuper: Zum Firmenansprechpartner ernennen -FirmUserActChangeContact: Kontaktinformationen für ausgewählte Firmenangehörige ändern FirmResetSupervision rem@Int64 set@Int64: #{tshow set} Ansprechpartner gesetzt#{bool mempty (", " <> tshow rem <> " zuvor gelöscht") (rem > 0)} FirmSuperActNotify: Mitteilung versenden FirmSuperActSwitchSuper: Standard Firmenansprechpartner abändern FirmSuperActSwitchSuperInfo: Betrifft keine firmenfremden Ansprechpartner und ändert keine aktiven individuellen Ansprechpartnerbeziehungen. Gegebenfalls im Anschluss die Funktion "Ansprechpartner auf Firmenstandard zurücksetzen" nutzen. FirmSuperActRMSuperDef: Firmenansprechpartner entfernen -FirmSuperActRMSuperActive: Auch aktive Ansprechpartnerbeziehungen innerhalb dieser Firma beenden +FirmSuperActRMSuperActive: Aktive Ansprechpartnerbeziehungen innerhalb dieser Firma beenden? FirmsNotification: Firmen E-Mail versenden FirmNotification fsh@CompanyShorthand: E-Mail an #{fsh} senden FirmsNotificationTitle: Firmen benachrichtigen @@ -47,14 +59,39 @@ FilterSupervisor: Hat aktiven Ansprechpartner FilterSupervisorCompany fsh@CompanyShorthand: Hat aktiven Ansprechpartner, #{fsh} der angehört FilterSupervisorForeign fsh@CompanyShorthand: Hat aktiven Ansprechpartner, der selbst nicht #{fsh} angehört FilterForeignSupervisor: Hat firmenfremde Ansprechpartner +FilterIsForeignSupervisee: Ist Ansprechpartner für Firmenfremde FilterFirmExtern: Externe Firma +FilterFirmExternTooltip: Hat die Firma eine Postanschrift im AVS? +FilterFirmPrimary: Ist primäre Firma in FRADrive +FilterHasQualification: Hat Firmenangehörige mit aktuell gültiger Qualifikation FirmSupervisorOf fsh@CompanyShorthand: Ansprechpartner #{fsh} angehörig FirmSupervisorIndependent: Ansprechpartner ohne jegliche Firmenzugehörigkeit FirmEmployeeOf fsh@CompanyShorthand: Firmenangehörige #{fsh} NoCompanySelected: Bitte wählen Sie mindestens eine Firma aus. TableIsDefaultSupervisor: Standardansprechpartner +TableSuperior: Vorgesetzter TableIsDefaultReroute: Standardumleitung FormFieldPostal: Benachrichtigungseinstellung FormFieldPostalTip: Gilt für alle Benachrichtigungen an diese Person, nicht nur für Umleitungen an diesen Ansprechpartner -FirmUserChanges n@Int64: Benachrichtigungseinstellung für #{n} Firmenangehörige wurden geändert -FirmSupervisionKeyData: Kennzahlen Ansprechpartner \ No newline at end of file +FormFieldPinPass: Sensible PDF-E-Mail-Anhänge mit Passwort schützen? +FormFieldPinPassRemove: Passwortschutz für PDF-E-Mail-Anhänge entfernen? +FirmSupervisionKeyData: Kennzahlen Ansprechpartner +CompanyUserPriority: Firmenpriorität +CompanyUserPriorityTip: Firmenpriorität ist lediglich relativ zu anderen Firmenassoziation der Person +CompanyUserUseCompanyAddress: Verwendet Firmenkontaktaddresse +CompanyUserUseCompanyAddressTip: sofern im Benutzer keine Postanschrift hinterlegt ist +CompanyUserUseCompanyPostalError: Postalische Adresse muss leer bleiben, damit die Firmenanschrift genutzt wird! +CompanySupervisorCompanyMissing fsh@CompanyShorthand: Empfänger ist nicht mit Firma #{fsh} aus Ansprechpartnerbeziehung assoziiert +CompanySuperviseeCompanyMissing fsh@CompanyShorthand: Klient ist nicht mit Firma #{fsh} aus Ansprechpartnerbeziehung assoziiert +FirmSupervisionRInfo: In folgenden Ansprechpartnerbeziehungen gehören entweder der Ansprechpartner oder der Klient nicht mehr der Firma an, welche als Begründung für die Beziehung eingetragen ist. +SupervisionViolationChoice: Firmenassoziation fehlt für +SupervisionViolationEither: Egal +SupervisionViolationSupervisor: Ansprechpartner +SupervisionViolationClient: Klient +SupervisionViolationBoth: Beide +SupervisionsRemoved n@Int64 m@Int64: #{n}/#{m} #{pluralDE n "Ansprechpartnerbeziehung" "Ansprechpartnerbeziehungen"} entfernt. +SupervisionsEdited n@Int64 m@Int64: #{n}/#{m} #{pluralDE n "Ansprechpartnerbeziehung" "Ansprechpartnerbeziehungen"} geändert. +ASChangeCompany: Begründungen für Ansprechpartnerbeziehung abändern +ASRemoveAssociation: Ansprechpartnerbeziehung löschen +FirmNameNotFound: Keine Firma mit diesen Namen/Kürzel/AVS-Nr gefunden. +FirmNameAmbiguous: Firmenname/-kürzel oder AVS-Nr ist nicht eindeutig. diff --git a/backend/messages/uniworx/categories/firm/en-eu.msg b/backend/messages/uniworx/categories/firm/en-eu.msg index 043312a20..d918c3809 100644 --- a/backend/messages/uniworx/categories/firm/en-eu.msg +++ b/backend/messages/uniworx/categories/firm/en-eu.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Steffen Jost +# SPDX-FileCopyrightText: 2023-25 Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -7,7 +7,6 @@ FirmSuperForeign: External supervisor FirmSuperIrregular: Irregular supervisor FirmAssociates: Company associated users FirmContact: Company Contact -FirmNoContact: No general contact information known. FirmEmail: General company email FirmAddress: Postal address FirmDefaultPreferenceInfo: Default setting for new company associates only @@ -16,11 +15,18 @@ FirmActionInfo: Affects alle company associates under your supervision. FirmActNotify: Send message FirmActResetSupervision: Reset supervisors for all company associates FirmActResetSuperKeep: Additionally keep existing supervisors of company associates? +FirmActRemoveSupers: Terminate all company related supervisionships? FirmActResetMutualSupervision: Supervisors supervise each other -FirmActAddSupersvisors: Add supervisors -FirmActAddSupersEmpty: No supervisors added +FirmActResetSupersKeepAll: Keep all +FirmActResetSupersRemoveAps: Remove default supervisors only +FirmActResetSupersRemoveAll: Remove all +FirmActAddSupervisors: Add supervisors +FirmActAddAssociates: Associate users with company +FirmActAddSupersEmpty: No new supervisors added! FirmActAddSupersSet n postal: #{n} default company supervisors changed #{maybeBoolMessage postal "" "and switched to postal notifications" "and switched to email notifications"}, but not yet activated. -RemoveSupervisors ndef nact: #{ndef} default supervisors removed#{bool ", but not yet deactivated" (" and " <> tshow nact <> " active supervisions terminated") (nact > 0)} +FirmActAddAssocsEmpty: No new company associated users added! +FirmActAddAssocs n: #{pluralENsN n "company associated user"} added. +RemoveSupervisors ndef: #{ndef} default supervisors removed. FirmActChangeContactUser: Change contact data for all company associates FirmActChangeContactFirm: Change company contact data FirmActChangeContactFirmInfo: The company contact data is only used for new company associates that would habe no contact information of their own otherwise. @@ -28,17 +34,23 @@ FirmActChangeContactFirmResult: Company contact data changed, affecting future c FirmUserActNotify: Send message FirmUserActResetSupervision: Reset supervisors to company default FirmUserActSetSupervisor: Change supervision +FirmUserActChangeContact: Change contact data for selected company associates +FirmUserActChangeDetails: Edit company association +FirmUserActRemove: Delete company association +FirmUserActMkSuper: Mark as company supervisor +FirmUserActChangeDetailsResult n t: #{n}/#{t} #{pluralENs n "company association"} updated +FirmUserActChangeResult n t: Notification settings changed for #{n}/#{t} company #{pluralENs n "associate"} +FirmUserActRemoveResult uc: #{pluralENsN uc "Company association"} deleted. +FirmRemoveSupervision sup sub: #{noneMoreEN sup "" ((pluralENsN sup "supervision") <> " removed due to eliminated supervisors.")} #{noneMoreEN sub "No supervision" (pluralENsN sub "supervision")} removed due to eliminated supervisees. FirmNewSupervisor: Appoint new individual supervisors FirmSetSupervisor: Add existing supervisors -FirmSetSupersReport nusr@Int64 nspr@Int64 nrem@Int64: #{nspr} individal supervisors set for #{nusr} company associates#{bool "." (" and " <> tshow nrem <> " other individual supervisions terminated.") (nrem >0)} +FirmSetSupersReport nusr nspr nrem: #{nspr} individual supervisors set for #{nusr} company associates#{bool "." (" and " <> tshow nrem <> " other individual supervisions terminated.") (nrem >0)} FirmResetSupervision rem set: #{tshow set} supervisors set#{bool mempty (", " <> tshow rem <> " deleted before") (rem > 0)} -FirmUserActChangeContact: Change contact data for selected company associates -FirmUserActMkSuper: Mark as company supervisor FirmSuperActNotify: Send message FirmSuperActSwitchSuper: Change default company supervisor -FirmSuperActSwitchSuperInfo: Does not affect company-external supervisors and does not change any active individal supervisions. Additionally use reset action, if desired. +FirmSuperActSwitchSuperInfo: Does not affect company-external supervisors and does not change any active individual supervisions. Additionally use reset action, if desired. FirmSuperActRMSuperDef: Remove default supervisor -FirmSuperActRMSuperActive: Also remove active supervisions within this company +FirmSuperActRMSuperActive: Terminate active supervisions within this company? FirmsNotification: Send company notification e-mail FirmNotification fsh: Send e-mail to #{fsh} FirmsNotificationTitle: Company notification @@ -47,14 +59,39 @@ FilterSupervisor: Has active supervisor FilterSupervisorCompany fsh: Has active company supervisor belonging to #{fsh} FilterSupervisorForeign fsh: Has active supervisor not belonging to #{fsh} FilterForeignSupervisor: Has company-external supervisors +FilterIsForeignSupervisee: Supervisor for company external users FilterFirmExtern: External company +FilterFirmExternTooltip: i.e. is a postal address registered within AVS? +FilterFirmPrimary: Is primary company in FRADrive +FilterHasQualification: Has company associates with currently valid qualification FirmSupervisorOf fsh@CompanyShorthand: Supervisors belonging to #{fsh} FirmSupervisorIndependent: Independent supervisors FirmEmployeeOf fsh@CompanyShorthand: #{fsh} associated users NoCompanySelected: Select at least one company, please. TableIsDefaultSupervisor: Default supervisor +TableSuperior: Superior TableIsDefaultReroute: Default reroute FormFieldPostal: Notification type FormFieldPostalTip: Affects all notifications to this person, not just reroutes to this supervisor -FirmUserChanges n: Notification settings changed for #{n} company associates -FirmSupervisionKeyData: Supervision key data \ No newline at end of file +FormFieldPinPass: Protect sensitive PDF e-mail attachments by password? +FormFieldPinPassRemove: Remove password protection for PDF e-mail attachments? +FirmSupervisionKeyData: Supervision key data +CompanyUserPriority: Company priority +CompanyUserPriorityTip: Company priority is relative to other company associations for a user +CompanyUserUseCompanyAddress: Use company postal address +CompanyUserUseCompanyAddressTip: if and only if the postal address of the user is empty +CompanyUserUseCompanyPostalError: Individual postal address must left empty for the company address to be used! +CompanySupervisorCompanyMissing fsh: Receiver is not associated with #{fsh} given as reroute reason +CompanySuperviseeCompanyMissing fsh: Supervisee is not associated with #{fsh} detailed as supervisionship reason +FirmSupervisionRInfo: Shown are supervisionships where either supervisor or supervisee no longer belong to the company associated with the supervisionship. +SupervisionViolationChoice: Company association missing for +SupervisionViolationEither: anyone +SupervisionViolationSupervisor: Supervisor +SupervisionViolationClient: Supervisee +SupervisionViolationBoth: both +SupervisionsRemoved n m: #{n}/#{m} #{pluralENs n "Supervisionship"} removed. +SupervisionsEdited n m: #{n}/#{m} #{pluralENs n "Supervisionship"} edited. +ASChangeCompany: Change supervisionship annotations +ASRemoveAssociation: Delete supervisionship +FirmNameNotFound: No company found with this name/shorthand or AVS number. +FirmNameAmbiguous: Company name/shorthand or AVS number is amiguous. \ No newline at end of file diff --git a/backend/messages/uniworx/categories/info/en-eu.msg b/backend/messages/uniworx/categories/info/en-eu.msg index a370481a8..bb14ddb88 100644 --- a/backend/messages/uniworx/categories/info/en-eu.msg +++ b/backend/messages/uniworx/categories/info/en-eu.msg @@ -6,7 +6,7 @@ HeadingLegal: Legal InfoSupervisorTitle: Information for supervisors InfoLecturerTitle: Information for course administrators InfoLecturerCourses: Courses -InfoLecturerExercises: Course type exercises +InfoLecturerExercises: Course category exercises InfoLecturerTutorials: Courses InfoLecturerExams: Exams LecturerInfoTooltipNew: New feature @@ -20,8 +20,8 @@ KnownBugs: Known bugs ImplementationDetails: Implementation Clone: Cloning Administrator: Administrator -CommCourse: Course type message +CommCourse: Course category message Corrector: Corrector -DefinitionCourseEvents: Course type occurrences -DefinitionCourseNews: Course type news +DefinitionCourseEvents: Course category occurrences +DefinitionCourseNews: Course category news Invitations: Invitations diff --git a/backend/messages/uniworx/categories/print/de-de-formal.msg b/backend/messages/uniworx/categories/print/de-de-formal.msg index 32fe30556..df4a729fb 100644 --- a/backend/messages/uniworx/categories/print/de-de-formal.msg +++ b/backend/messages/uniworx/categories/print/de-de-formal.msg @@ -17,7 +17,8 @@ PrintJobReprint n@Int m@Int: #{n}/#{m} #{pluralDE n "Druckauftrag" "Druckaufräg PrintJobAcknowledgeFailed: Keine Druckaufträge bestätigt aufgrund zwischenzeitlicher Änderungen. Bitte die Seite im Browser aktualisieren! PrintJobAcknowledgeQuestion n@Int d@Text: #{n} #{pluralDE n "Druckauftrag" "Druckaufräge"} vom #{d} als gedruckt und versendet bestätigen? PrintJobAcknowledgements: Versanddatum von Briefen an -PrintRecipient: Empfänger +PrintRecipient: Empfänger:innen +PrintAffected: Betroffener PrintSender !ident-ok: Sender PrintCourse: Kursarten PrintQualification: Qualifikation @@ -25,4 +26,10 @@ PrintPDF !ident-ok: PDF PrintManualRenewal: Vorfeldführerschein Renewal-Brief testweise versenden PrintLmsUser: E‑Learning Id PrintJobs: Druckaufräge -PrintLetterType: Brieftypkürzel \ No newline at end of file +PrintLetterType: Brieftypkürzel + +MCActResendEmail: E‑Mail Kopie versenden +MCActResendEmailTooltip: Eine unveränderte Kopie der E‑Mail erneut versenden. Nur die vorherigen Empfänger werden offiziell aufgeführt, sie erhalten jedoch keine neue Kopie. +MCActResendEmailInfo n@Int recv@Text: #{pluralDEnN n "E‑Mail Kopie"} wurden an #{recv} versandt. + +CCActDummy: Platzhalter \ No newline at end of file diff --git a/backend/messages/uniworx/categories/print/en-eu.msg b/backend/messages/uniworx/categories/print/en-eu.msg index 053fd1a7e..11b58c159 100644 --- a/backend/messages/uniworx/categories/print/en-eu.msg +++ b/backend/messages/uniworx/categories/print/en-eu.msg @@ -18,11 +18,18 @@ PrintJobAcknowledgeFailed: No print-jobs acknowledged, due to intermediate chang PrintJobAcknowledgeQuestion n d: Mark #{n} #{pluralENs n "print-job"} issued on #{d} as printed and mailed already? PrintJobAcknowledgements: Sent-dates for Letter to PrintRecipient: Recipient +PrintAffected: Affetcted PrintSender: Sender -PrintCourse: Course type +PrintCourse: Course category PrintQualification: Qualification PrintPDF: PDF PrintManualRenewal: Manual sending of an apron driver's licence renewal letter PrintLmsUser: E‑learning id PrintJobs: Print jobs -PrintLetterType: Letter type shorthand \ No newline at end of file +PrintLetterType: Letter type shorthand + +MCActResendEmail: Resend email copy +MCActResendEmailTooltip: Resend an unchanged copy of the email. Only previous recipients will officially be listed, but they will not receive another copy. +MCActResendEmailInfo n recv: #{n} #{noneOneMoreEN n "email copy" "email copy" "email copies"} were sent to #{recv} only. + +CCActDummy: Placeholder \ No newline at end of file diff --git a/backend/messages/uniworx/categories/qualification/de-de-formal.msg b/backend/messages/uniworx/categories/qualification/de-de-formal.msg index e0fee7cb8..e5e196fb5 100644 --- a/backend/messages/uniworx/categories/qualification/de-de-formal.msg +++ b/backend/messages/uniworx/categories/qualification/de-de-formal.msg @@ -1,31 +1,43 @@ -# SPDX-FileCopyrightText: 2022 Steffen Jost ,Steffen Jost +# SPDX-FileCopyrightText: 2022-25 Steffen Jost ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later QualificationShort: Kürzel QualificationName: Qualifikation QualificationDescription: Beschreibung +QualificationValidReason qsh@Text: #{qsh} Gültigkeit QualificationValidIndicator: Gültigkeit QualificationValidDuration: Gültigkeitsdauer -QualificationAuditDuration: Aufbewahrung Audit Log -QualificationAuditDurationTooltip n@Int: Optionaler Zeitraum zur Löschung von E‑Learning Daten. Hinweis: Der E‑Learning Server kann seine anonymisierten Daten schon früher löschen, aber spätestens #{n} Tage nach Abschluss. +QualificationAuditDuration: Aufbewahrungszeitraum E‑Learning Log +QualificationAuditDurationTooltip: Anzahl Tage zur Löschung von E‑Learning Daten. Hinweis: Der E‑Learning Server kann seine anonymisierten Daten schon früher löschen. +QualificationAuditDurationReuseInfo: Aufbewahrungszeitraum E‑Learning Log wird ignoriert, da das E‑Learning einer anderen Qualifikation mitbenutzt wird. QualificationRefreshWithin: Erneurerungszeitraum -QualificationRefreshWithinTooltip: Optionaler Zeitraum vor Ablauf für automatischen Start des E‑Learnings und Versand einer Benachrichtigung per Brief oder Email. -QualificationRefreshReminder: 2. Erinnerung -QualificationRefreshReminderTooltip: Optionaler Zeitraum vor Ablauf zur Versendung einer zweiten Erinnerung per Brief oder Email mit identischen Zugangsdaten, sofern in diesem Zeitraum vor Ablauf noch keine Ablaufbenachrichtigung versendet wurde. +QualificationRefreshWithinTooltip: Optionaler Zeitraum vor Ablauf für eine Benachrichtigung per Email. Bei aktiviertem automatischem E‑Learning wird dieses gestartet und die Benachrichtigung erfolgt per Brief oder Email. +QualificationRefreshReminder: Zweite Erinnerung +QualificationRefreshReminderTooltip: Optionaler Zeitraum vor Ablauf zur Versendung einer zweiten Erinnerung per Brief oder Email mit identischen E‑Learning Zugangsdaten, sofern die Qualifikation noch gültig und das E‑Learning noch offen ist. QualificationElearningStart: Wird das E‑Learning automatisch gestartet? +QualificationElearningRenew: Verlängert ein erfolgreiches E‑Learning die Qualifikation automatisch um die reguläre Gültigkeitsdauer? +QualificationElearningLimit: Limit Anzahl E‑Learning Versuche +QualificationElearningLimitExplain: Ist die Anzahl der E‑Learning Versuche limitiert? +QualificationElearningLimitMax n@Int: Maximal #{n} Versuche +QualificationElearningNoLimit: Nicht limitiert QualificationExpiryNotification: Ungültigkeitsbenachrichtigung? -QualificationExpiryNotificationTooltip: Nutzer werden benachrichtigt, wenn die Qualifikation ungültig wird, sofern der jeweilige Nutzer in seinen Benutzereinstellungen diese Art Benachrichtigung aktiviert hat. +QualificationExpiryNotificationTooltip: Nutzer werden benachrichtigt, wenn die Qualifikation ungültig wird, sofern der jeweilige Nutzer in seinen Benutzereinstellungen diese Art Benachrichtigung nicht deaktiviert hat. +QualificationAvsLicence: AVS Qualifikation +QualificationSapId: SAP Qualifikations Id TableQualificationCountActive: Aktive TableQualificationCountActiveTooltip: Anzahl Personen mit momentan gültiger Qualifikation TableQualificationCountTotal: Gesamt +TableQualificationLmsReuses: LMS nutzt +TableQualificationLmsReusesTooltip: Diese Qualifikation hat kein eigenes E‑Learning, sondern wird über das E‑Learning der angegebenen Qualifikation abgewickelt. TableQualificationIsAvsLicence: AVS TableQualificationIsAvsLicenceTooltip: Unter welchem Namen wird diese Qualifikation mit dem Ausweisverwaltungssystem (AVS) synchronisiert? Betrifft nur Benutzer mit AVS PersonenID. TableQualificationSapExport: SAP TableQualificationSapExportTooltip: Wird die Qualifikation an das SAP übermittelt? Betrifft nur Benutzer mit Fraport Personalnummer. LmsQualificationValidUntil: Gültig bis TableQualificationLastRefresh: Zuletzt erneuert -TableQualificationLastNotified: Letzte Benachrichtigung +TableQualificationLastNotified: Letzte Benachrichtigung über erfolgte Gültigkeitsänderung +TableQualificationLastNotifiedTooltip: Hier werden ausschließlich Benachrichtigungen berücksichtigt, die über einen bereits erfolgten Ablauf/Entzug/Wiedererteilung informieren. Dies ignoriert insbesondere reguläre Verlängerung, z.B. durch E-Learning. TableQualificationFirstHeld: Erstmalig TableQualificationBlockedDue: Entzug TableQualificationBlockedTooltip: Wann wurde die Qualifikation vorübergehend außer Kraft gesetzt und warum wurde dies veranlasst? @@ -46,11 +58,13 @@ QualificationExpired: Ungültig seit LmsUser: Inhaber LmsURL: Link E‑Learning TableLmsEmail: E‑Mail -TableLmsIdent: E-Learning Benutzer +TableLmsIdent: E‑Learning Benutzer TableLmsElearning: E‑Learning +TableLmsElearningRenews: Automatische Verlängerung +TableLmsElearningLimit: Maximale Versuche TableLmsPin: E‑Learning Passwort -TableLmsResetPin: E-Learning Passwort zurücksetzen? -TableLmsDatePin: E-Learning Passwort erstellt +TableLmsResetPin: E‑Learning Passwort zurücksetzen? +TableLmsDatePin: E‑Learning Passwort erstellt TableLmsDate: Datum TableLmsDelete: Löschen? TableLmsStaff: Interner Mitarbeiter? @@ -60,7 +74,7 @@ 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! TableLmsEnded: Beendet TableLmsStatus: Status E‑Learning -TableLmsStatusTooltip mbMonth@(Maybe Int): Zeigt #{maybeToMessage "bis zu " (fmap (flip pluralDEeN "Monat") mbMonth) " nach Abschluss"} den letzten Zustand eines E‑Learnings an: +TableLmsStatusTooltip n@Int: Zeigt bis zu #{pluralDEeN n "Tag"} nach Abschluss den letzten Zustand eines E‑Learnings an: TableLmsStatusDay: Datum letzte Statusänderung E‑Learning TableLmsSuccess: Bestanden TableLmsLock: Gesperrt @@ -70,6 +84,7 @@ LmsStatusExpired: Durchgefallen nach Fristablauf LmsStatusSuccess: E#{nonBreakableDash}Learning bestanden LmsStatusPlanned: E#{nonBreakableDash}Learning wird gerade noch eröffnet (nur für Admin sichtbar) LmsStatusDelay: Hinweis: Statusänderung können in seltenen Fällen mehrere Stunden bis zur Anzeige benötigen. +FilterLmsLongValid: Längerfristig gültig FilterLmsValid: Aktuell gültig FilterLmsRenewal: Erneuerung anstehend FilterLmsNotified: Benachrichtigt @@ -88,7 +103,8 @@ LmsReportInsert: Neues LMS Ereignis LmsReportUpdate: LMS Ereignis Aktualisierung LmsReportCsvExceptionDuplicatedKey: CSV-Import LmsReport 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 Erneuerungszeitraum nicht festgelegt wurde! +LmsErrorNoRenewElearning: Fehler: Erfolgreiches E‑Learning verlängert die Qualifikation nicht automatisch, da die Gültigkeitsdauer 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 @@ -105,24 +121,30 @@ QualificationActBlock: Entziehen QualificationActUnblock: Entzug aufheben QualificationActRenew: Qualifikation regulär verlängern QualificationActGrant: Qualifikation vergeben -QualificationActGrantWarning: Diese Funktion ist nur für seltene Ausnahmefälle vorgesehen! Ein Entzug wird ggf. aufgehoben. +QualificationActGrantWarning: Diese Funktion ist nur für seltene Ausnahmefälle vorgesehen! Ein Entzug wird ggf. aufgehoben; E‑Learning wird ggf. beendet. +QualificationActStartELearning: E‑Learning für gültige Inhaber (neu) starten +QualificationActStartELearningStatus l@QualificationShorthand n@Int m@Int: E‑Learning #{l} für #{n}/#{m} Teilnehmer (neu) gestartet. Hinweis: Es kann länger dauern, bis das LMS tatsächlich startet. QualificationStatusBlock l@QualificationShorthand n@Int m@Int: #{n}/#{m} #{l} entzogen QualificationStatusUnblock l@QualificationShorthand n@Int m@Int: #{n}/#{m} #{l} reaktiviert LmsInactive: Aktuell kein E‑Learning aktiv 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. Bitte setzen Sie sich mit uns in Verbindung, wenn Sie die Qualifikation verlängern möchten und noch nicht wissen, wie Sie das tun können. Ignorieren Sie diese automatisch generierte Erinnerung, falls Sie sich bereits um die Verlängerung gekümmert haben LmsRenewalReminder: Erinnerung LmsActNotify: Benachrichtigung E‑Learning erneut per Post oder E-Mail versenden -LmsActRenewPin: Neues zufällige E‑Learning Passwort zuweisen -LmsActRenewNotify: Neue zufällige E‑Learning Passwort zuweisen und Benachrichtigung per Post oder E-Mail versenden +LmsActRenewNotify: Neues zufälliges E‑Learning Passwort zuweisen und Benachrichtigung per Post oder E-Mail versenden LmsActReset: E‑Learning Fehlversuche zurücksetzen und entsperren LmsActResetInfo: E‑Learning Login, Passwort und Fortschritt bleiben unverändert, eine neue Benachrichtigung ist nicht notwendig. Nur möglich für bereits gesperrte Lerner. Es kann bis zu 2 Stunden dauern, bis das LMS die Anfrage umgesetzt hat. LmsActResetFeedback n@Int m@Int: Für #{n}/#{m} E‑Learning Nutzer wurden alle Fehlversuche zurückgesetzt. LmsActRestart: E‑Learning komplett neu starten -LmsActRestartWarning: Das vorhandene E‑Learning wird komplett gelöscht! Für Inhaber einer gültigen Fahrlizenz werden später Benutzer und Passwort neu vergeben und es sollte eine neue Benachrichtigung versendet werden. Hinweis: Es kann mehrere Stunden dauern, bis das LMS diese Anfrage umgesetzt hat. +LmsActRestartWarning: Das vorhandene E‑Learning wird komplett gelöscht! Für Inhaber einer gültigen Lizenz werden später Benutzer und Passwort neu vergeben und es sollte eine neue Benachrichtigung versendet werden. Hinweis: Es kann mehrere Stunden dauern, bis das LMS diese Anfrage umgesetzt hat. LmsActRestartFeedback n@Int m@Int: #{n}/#{m} E‑Learning Nutzer wurden komplett neu gestartet mit neuem Login und Passwort. LmsActRestartExtend: Gültig bis ggf. erhöhen für die nächsten # Tage LmsActRestartUnblock: Entzug ggf. aufheben +LmsActTerminate: E‑Learning abbrechen +LmsActTerminateInfo: Ein späterer automatischer Neustart des E‑Learning wird dadurch nicht verhindert, wenn eine gültige Qualifikation bald abläuft und E‑Learning für diese Qualifikation generell automatisch startet. +LmsActTerminateFeedback n@Int m@Int: #{n}/#{m} E‑Learning Nutzer wurden zur Löschung freigegeben. +LmsActTerminated n@Int: E‑Learning für #{n} Nutzer wurde beendet. +LmsActTerminateWarning: ACHTUNG: Ein Ergebnis würde ohne Warnung verworfen, sollte ein Nutzer sein E‑Learning absolvieren, bevor die Löschung beim E‑learning Server effektiv wurde. LmsStateOpen: E‑Learning offen LmsStatusLocked: E‑Learning gesperrt, wird ggf. bald geöffnet LmsStatusUnlocked: E‑Learning offen, wird ggf. bald gesperrt @@ -134,3 +156,18 @@ LmsActionFailed n@Int: Aktion nicht durchgeführt für #{n} #{pluralDE n "Person LmsStarted: E‑Learning eröffnet BtnLmsEnqueue: Nutzer mit ablaufenden Qualifikationen zum E‑Learning anmelden und benachrichtigen BtnLmsDequeue: Nutzer mit beendetem E‑Learning aufräumen und ggf. benachrichtigen + +QualificationEditNote: Hinweis: Die Änderungen treten sofort in Kraft. Bitte vergewissern Sie sich vorher, dass alles korrekt eingestellt wurde! +QualificationCreated qsh@Text: Qualifikation #{qsh} wurde angelegt. +QualificationEdit qsh@Text: Qualifikation #{qsh} wurde geändert. +QualFormErrorDuplShort qsh@Text: Es gibt bereits eine Qualifikation mit Kürzel #{qsh}! +QualFormErrorDuplName qname@Text: Es gibt bereits eine Qualifikation mit Namen #{qname}! +QualFormErrorSshMismatch: Qualifikationänderungsformular enthält unglültige Bereichsangabe. Bitte versuchen Sie erneut, nachdem Sie Seite neu geladen haben. + +LmsOrphans: Verwaiste Logins +LmsOrphanNr n@Int: #{n} verwaiste E‑Learning Logins für diese Qualifikation erkannt. +LmsOrphanSeenFirst: Zuerst erkannt +LmsOrphanSeenLast: Zuletzt erhalten +LmsOrphanDeletedLast: Zuletzt Löschung beantragt +LmsOrphanReason: Bemerkung +LmsOrphanPreviewFltr: Löschungen bei nächstem Abruf anfordern? \ No newline at end of file diff --git a/backend/messages/uniworx/categories/qualification/en-eu.msg b/backend/messages/uniworx/categories/qualification/en-eu.msg index c886cb843..077dd530c 100644 --- a/backend/messages/uniworx/categories/qualification/en-eu.msg +++ b/backend/messages/uniworx/categories/qualification/en-eu.msg @@ -1,31 +1,43 @@ -# SPDX-FileCopyrightText: 2022 Steffen Jost ,Steffen Jost +# SPDX-FileCopyrightText: 2022-25 Steffen Jost ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later QualificationShort: Shorthand QualificationName: Qualification QualificationDescription: Description +QualificationValidReason qsh: #{qsh} Validity QualificationValidIndicator: Validity QualificationValidDuration: Validity period QualificationAuditDuration: Audit log retention period -QualificationAuditDurationTooltip n@Int: Optional period for deletion of e‑learning data. Note that the e‑learning server may delete its anonymised data earlier, at most #{n} days after closing. +QualificationAuditDurationTooltip: Days for deletion of e‑learning data. Note that the e‑learning server may delete its anonymised data earlier. +QualificationAuditDurationReuseInfo: E‑learning audit log retention period ignore, since the e‑learning from another qualification is reused. QualificationRefreshWithin: Refresh within -QualificationRefreshWithinTooltip: Optional period before expiry to start e‑learning and send a notification by post or email. -QualificationRefreshReminder: 2. Reminder -QualificationRefreshReminderTooltip: Optional period before expiry to send a second notification by post or email once more, provided that no renewal notification was sent in this period before expiry. +QualificationRefreshWithinTooltip: Optional period before expiry to send a notification by email. If e‑learning is set to start automatically, it will be started and e‑learning credentials are send with this notification by post or email. +QualificationRefreshReminder: Second reminder +QualificationRefreshReminderTooltip: Optional period before expiry to send a second notification by post or email once more, including the existing credentials, provided that the e‑learning is still undecided and the qualification has not yet expired. QualificationElearningStart: Is e‑learning automatically started? -QualificationExpiryNotification: Invalidity notification? -QualificationExpiryNotificationTooltip: Qualification holder are notfied upon invalidity, provided they have activated such notification in their user settings. +QualificationElearningRenew: Does successful e‑learning automatically extend a qualification by the default validity period? +QualificationElearningLimit: Limit of e‑learning attempts +QualificationElearningLimitExplain: Is the number of e‑learning attempts limited? +QualificationElearningLimitMax n: #{n} attempts maximum +QualificationElearningNoLimit: No limit +QualificationExpiryNotification: Notification upon invalidation? +QualificationExpiryNotificationTooltip: Qualification holder are notfied upon invalidation, provided they have not deactivated such notification in their user settings. +QualificationAvsLicence: AVS Qualification +QualificationSapId: SAP Qualification Id TableQualificationCountActive: Active TableQualificationCountActiveTooltip: Number of currently valid qualification holders TableQualificationCountTotal: Total +TableQualificationLmsReuses: Reuse LMS +TableQualificationLmsReusesTooltip: This qualification reuses the e‑learning of the given qualification, instead of having a separate e‑learning of its own. TableQualificationIsAvsLicence: AVS driving license TableQualificationIsAvsLicenceTooltip: Under which name is this qualification synchronized with AVS, if any? Only applies to qualification holders having an AVS PersonID. TableQualificationSapExport: Sent to SAP TableQualificationSapExportTooltip: Is this qualification transmitted to SAP? Only applies to qualification holder having a Fraport AG personnel number. LmsQualificationValidUntil: Valid until TableQualificationLastRefresh: Last renewed -TableQualificationLastNotified: Last notified +TableQualificationLastNotified: Last notified about validity change +TableQualificationLastNotifiedTooltip: The date of the last notification about any already effective change in validity due to revocation or reissue. This does not entail regular validity extensions, e.g. due to e-learning. TableQualificationFirstHeld: First held TableQualificationBlockedDue: Revocations TableQualificationBlockedTooltip: Why and when was this qualification temporarily suspended? @@ -49,6 +61,8 @@ TableLmsEmail: Email TableLmsIdent: E‑learning user TableLmsPin: E‑learning password TableLmsElearning: E‑learning +TableLmsElearningRenews: Automatic renewal +TableLmsElearningLimit: Max attempts TableLmsResetPin: Reset E‑learning password? TableLmsDatePin: E‑learning password created TableLmsDate: Date @@ -57,10 +71,10 @@ 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 type for the user, which may take several hours! +TableLmsNotifiedTooltip: Notfications are not sent before the LMS acknowledges the opening of the e‑learning course category for the user, which may take several hours! TableLmsEnded: Ended TableLmsStatus: Status e‑learning -TableLmsStatusTooltip mbMonth: Shows #{maybeToMessage "for up to " (fmap (flip pluralENsN "month") mbMonth) " after closure"} the last e#{nonBreakableDash}learning status change: +TableLmsStatusTooltip n: Shows for up to #{pluralENsN n "day"} after closure the last e#{nonBreakableDash}learning status change: TableLmsStatusDay: Date of last e‑learning status change TableLmsSuccess: Completed TableLmsLock: Locked @@ -70,6 +84,7 @@ LmsStatusExpired: Failed due to expiry LmsStatusSuccess: Passed LmsStatusPlanned: E#{nonBreakableDash}learning is about to be opened soon (visible to Admins only) LmsStatusDelay: Note that status changes may occassionaly require more than a hour to be displayed here. +FilterLmsLongValid: Long-term valid FilterLmsValid: Currently valid FilterLmsRenewal: Renewal due FilterLmsNotified: Notified @@ -88,7 +103,8 @@ LmsReportInsert: New LMS event LmsReportUpdate: Update of LMS event LmsReportCsvExceptionDuplicatedKey: CSV Import LmsReport with ambiguous key LmsDirectUpload: Direct upload for automated systems -LmsErrorNoRefreshElearning: Error: E‑learning will not be started automatically due to refresh-within time period not being set. +LmsErrorNoRefreshElearning: Error: E‑learning will not be started automatically due to refresh-within time period not being set! +LmsErrorNoRenewElearning: Error: E‑learning will not automatically extend validity due to validity duration not being set! MailSubjectQualificationRenewal qname: Qualification #{qname} must be renewed shortly MailSubjectQualificationExpiry qname: Qualification #{qname} expires soon MailSubjectQualificationExpired qname: Qualification #{qname} is no longer valid @@ -105,15 +121,16 @@ QualificationActBlock: Revoke QualificationActUnblock: Clear revocation QualificationActRenew: Renew qualification QualificationActGrant: Grant qualification -QualificationActGrantWarning: Use with caution in rare exceptional cases only! Any revocation will be undone. +QualificationActGrantWarning: Use with caution in rare exceptional cases only! Any revocation will be undone; any e‑learning terminated +QualificationActStartELearning: Manually (re)start e‑learning for valid qualification holders +QualificationActStartELearningStatus l n m: E‑learning #{l} (re)started for #{n}/#{m} users. Note: It may take a while, until the e‑learning is activated. QualificationStatusBlock l n m: #{n}/#{m} #{l} revoked QualificationStatusUnblock l n m: #{n}/#{m} #{l} reactivated LmsInactive: Currently no active e‑learning 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. +LmsNoRenewal: Unfortunately, this particular qualification cannot be renewed through e‑learning only. Please contact us, if you do not yet know how to renew this qualification. Ignore this automatically generated reminder email, if you have made arrangements for the renewal of this qualification already. LmsRenewalReminder: Reminder LmsActNotify: Resend e‑learning notification by post or email -LmsActRenewPin: Randomly replace e‑learning password LmsActRenewNotify: Randomly replace e‑learning password and re-send notification by post or email LmsActReset: Reset and unlock e‑learning LmsActResetInfo: E‑learning login, password and progress remain unchanged; a notification is thus not necessary. This is only possible for already failed learners. Note that the reset procedure may take up to 2 hours. @@ -122,7 +139,12 @@ LmsActRestart: Restart e‑learning LmsActRestartWarning: The existing e‑learning will be erased immediately! For drivers with a valid licence, user and password will later be generated anew and a notification will be queued as usual, which may take several hours. LmsActRestartExtend: Ensure validity for the next # days LmsActRestartUnblock: Undo any revocations -LmsActRestartFeedback n@Int m@Int: #{n}/#{m} e-learnings were completely restarted with new login credentials. +LmsActRestartFeedback n m: #{n}/#{m} e-learnings were completely restarted with new login credentials. +LmsActTerminate: Abort e‑learning +LmsActTerminateInfo: E‑learning may restart later, if a valid qualification is about to expire and e-learning starting automatically for this qualification. +LmsActTerminateFeedback n m: #{n}/#{m} e‑learnings marked for termination. +LmsActTerminated n: #{n} e‑learnings were terminated. +LmsActTerminateWarning: WARNING: Results will be discarded without warning if a user completes their e-learning in the meantime, before the deletion became effective on the e‑learning server. LmsStateOpen: E‑learning open LmsStatusLocked: E‑learning locked, may be opened soon LmsStatusUnlocked: E‑learning still open, may be locked soon @@ -134,3 +156,18 @@ LmsActionFailed n: No action for #{n} #{pluralENs n "person"}, since there was n LmsStarted: E‑learning open since BtnLmsEnqueue: Enqueue users with expiring qualifications for e‑learning and notify them BtnLmsDequeue: Dequeue users with finished e‑learning and notify failed users + +QualificationEditNote: Changes are effective immediately. Please double check that all settings are correct before submitting the changes! +QualificationCreated qsh@Text: Qualification #{qsh} created. +QualificationEdit qsh@Text: Qualification #{qsh} edited. +QualFormErrorDuplShort qsh@Text: There already exists a qualification with shorthand #{qsh}! +QualFormErrorDuplName qname@Text: There already exists a qualification with name #{qname}! +QualFormErrorSshMismatch: Qualification edit form department mismatch. Please try again after reloading the page. + +LmsOrphans: Orphaned logins +LmsOrphanNr n@Int: #{n} orphaned e‑learning login detected for this qualification. +LmsOrphanSeenFirst: First seen +LmsOrphanSeenLast: Last seen +LmsOrphanDeletedLast: Deletion requested +LmsOrphanReason: Note +LmsOrphanPreviewFltr: Deletion request next synch? diff --git a/backend/messages/uniworx/categories/school/de-de-formal.msg b/backend/messages/uniworx/categories/school/de-de-formal.msg index eedea789f..9d678454f 100644 --- a/backend/messages/uniworx/categories/school/de-de-formal.msg +++ b/backend/messages/uniworx/categories/school/de-de-formal.msg @@ -40,4 +40,6 @@ SchoolAuthorshipStatementSheetDefinitionTip: Bitte in sowohl deutscher als auch SchoolAuthorshipStatementSheetExamDefinition: Eigenständigkeitserklärung für prüfungszugehörige Übungsblattabgaben SchoolAuthorshipStatementSheetExamDefinitionTip: Bitte in sowohl deutscher als auch englischer Sprache angeben. SchoolAuthorshipStatementSheetAllowOther: Abweichende Eigenständigkeitserklärungen für nicht-prüfungszugehörige Übungsblätter erlauben? -SchoolAuthorshipStatementSheetExamAllowOther: Abweichende Eigenständigkeitserklärungen für prüfungszugehörige Übungsblätter erlauben? \ No newline at end of file +SchoolAuthorshipStatementSheetExamAllowOther: Abweichende Eigenständigkeitserklärungen für prüfungszugehörige Übungsblätter erlauben? + +DailyActDummy: Platzhalter ohne Funktion \ No newline at end of file diff --git a/backend/messages/uniworx/categories/school/en-eu.msg b/backend/messages/uniworx/categories/school/en-eu.msg index 32109bfa4..bfc8892ee 100644 --- a/backend/messages/uniworx/categories/school/en-eu.msg +++ b/backend/messages/uniworx/categories/school/en-eu.msg @@ -26,7 +26,7 @@ SchoolCreated ssh: Successfully created #{ssh} SchoolExists ssh: A department named „#{ssh}“ already exists SchoolAdmin: Admin SchoolLecturer: Lecturer -SchoolEvaluation: Course type evaluation +SchoolEvaluation: Course category evaluation SchoolExamOffice: Exam office SchoolAuthorshipStatementSection: Statements of Authorship @@ -40,4 +40,6 @@ SchoolAuthorshipStatementSheetDefinitionTip: Please enter both german and englis SchoolAuthorshipStatementSheetExamDefinition: Statement of Authorship for exam-related exercise sheets SchoolAuthorshipStatementSheetExamDefinitionTip: Please enter both german and english statements. SchoolAuthorshipStatementSheetAllowOther: Allow adaptations for exam-unrelated exercise sheets? -SchoolAuthorshipStatementSheetExamAllowOther: Allow adaptations for exam-related exercise sheets? \ No newline at end of file +SchoolAuthorshipStatementSheetExamAllowOther: Allow adaptations for exam-related exercise sheets? + +DailyActDummy: Placholder without function \ No newline at end of file diff --git a/backend/messages/uniworx/categories/send/send_notifications/en-eu.msg b/backend/messages/uniworx/categories/send/send_notifications/en-eu.msg index 04fe30088..ce9fd73e2 100644 --- a/backend/messages/uniworx/categories/send/send_notifications/en-eu.msg +++ b/backend/messages/uniworx/categories/send/send_notifications/en-eu.msg @@ -9,17 +9,17 @@ MailCorrectionsTitle: Assigned corrections #correctionsNotDistributed.hs + templates MailSubjectSubmissionsUnassigned csh sheetName: Corrections for #{sheetName} of #{csh} could not be distributed -MailSubmissionsUnassignedIntro n courseName termDesc sheetName: #{n} corrections for #{sheetName} of the course type #{courseName} (#{termDesc}) could not be automatically distributed. +MailSubmissionsUnassignedIntro n courseName termDesc sheetName: #{n} corrections for #{sheetName} of the course category #{courseName} (#{termDesc}) could not be automatically distributed. #courseRegistered.hs + templates MailSubjectCourseRegistered csh: You were enrolled for #{csh} MailSubjectCourseRegisteredOther displayName csh: #{displayName} was enrolled for #{csh} -MailCourseRegisteredIntro courseName termDesc: You were enrolled for the course type “#{courseName}” (#{termDesc}) -MailCourseRegisteredIntroOther displayName courseName termDesc: #{displayName} was enrolled for the course type “#{courseName}” (#{termDesc}). +MailCourseRegisteredIntro courseName termDesc: You were enrolled for the course category “#{courseName}” (#{termDesc}) +MailCourseRegisteredIntroOther displayName courseName termDesc: #{displayName} was enrolled for the course category “#{courseName}” (#{termDesc}). #examActive.hs + templates MailSubjectExamRegistrationActive csh examn: Registration is now allowed for #{examn} of #{csh} -MailExamRegistrationActiveIntro courseName termDesc examn: You may now register for #{examn} of the course type #{courseName} (#{termDesc}). +MailExamRegistrationActiveIntro courseName termDesc examn: You may now register for #{examn} of the course category #{courseName} (#{termDesc}). MailSubjectExamRegistrationSoonInactive csh examn: The registration period for #{examn} of #{csh} ends shortly MailExamRegistrationSoonInactiveIntro courseName termDesc examn: Soon you will no longer be allowed to register for #{examn} of #{courseName} (#{termDesc}). MailSubjectExamDeregistrationSoonInactive csh examn: Deregistration for #{examn} in #{csh} ends shortly @@ -27,15 +27,15 @@ MailExamDeregistrationSoonInactiveIntro courseName termDesc examn: Soon you will #examOffice.hs + templates MailSubjectExamOfficeExamResults coursen examn: Results for #{examn} of #{coursen} are now available -MailExamOfficeExamResultsIntro courseName termDesc examn: A course administrator has made the results for #{examn} of the course type #{courseName} (#{termDesc}) available. +MailExamOfficeExamResultsIntro courseName termDesc examn: A course administrator has made the results for #{examn} of the course category #{courseName} (#{termDesc}) available. MailSubjectExamOfficeExamResultsChanged coursen examn: Results for #{examn} of #{coursen} were changed -MailExamOfficeExamResultsChangedIntro courseName termDesc examn: A course administrator has changed exam results for #{examn} of the course type #{courseName} (#{termDesc}). +MailExamOfficeExamResultsChangedIntro courseName termDesc examn: A course administrator has changed exam results for #{examn} of the course category #{courseName} (#{termDesc}). MailSubjectExamOfficeExternalExamResults coursen@CourseName examn@ExamName: Results for #{examn} in #{coursen} -MailExamOfficeExternalExamResultsIntro coursen@CourseName termDesc@Text examn@ExamName: A course administrator has changed or initially made available the results for #{examn} of the course type {coursen} (#{termDesc}). +MailExamOfficeExternalExamResultsIntro coursen@CourseName termDesc@Text examn@ExamName: A course administrator has changed or initially made available the results for #{examn} of the course category {coursen} (#{termDesc}). #examOffice.hs + templates MailSubjectExamResult csh examn: Results for #{examn} in #{csh} are now available -MailExamResultIntro courseName termDesc examn: You may now view your result for #{examn} of the course type #{courseName} (#{termDesc}). +MailExamResultIntro courseName termDesc examn: You may now view your result for #{examn} of the course category #{courseName} (#{termDesc}). #sheetActive.hs + templates MailSubjectSheetActive csh sheetName: #{sheetName} in #{csh} was released @@ -47,10 +47,10 @@ MailSheetSolutionIntro courseName termDesc sheetName: You may now download the s #sheetInactive.hs + templates MailSubjectSheetSoonInactive csh sheetName: The submission period for #{sheetName} of #{csh} ends shortly -MailSheetSoonInactiveIntro courseName termDesc sheetName: Soon you will no longer be allowed to submit for #{sheetName} of the course type #{courseName} (#{termDesc}). +MailSheetSoonInactiveIntro courseName termDesc sheetName: Soon you will no longer be allowed to submit for #{sheetName} of the course category #{courseName} (#{termDesc}). MailSubjectSheetInactive csh sheetName: The submission period for #{sheetName} of #{csh} has ended -MailSheetInactiveIntro courseName termDesc sheetName n num: The submission period for #{sheetName} of the course type #{courseName} (#{termDesc}) has ended. #{noneOneMoreEN num "" "One participant" (toMessage num <> " participants")}#{noneOneMoreEN n "" "" (" made " <> toMessage num)}#{noneOneMoreEN n "There were no submissions" " made one submission" " submissions"}. -MailSheetInactiveIntroNoUserSubmission courseName termDesc sheetName n num: The submission period for #{sheetName} of the course type #{courseName} (#{termDesc}) has ended. #{noneOneMoreEN num "" "One participant already" (toMessage num <> " participants already")}#{noneOneMoreEN n "" "" (" made " <> toMessage num)}#{noneOneMoreEN n "" " made one submission" " submissions"}. +MailSheetInactiveIntro courseName termDesc sheetName n num: The submission period for #{sheetName} of the course category #{courseName} (#{termDesc}) has ended. #{noneOneMoreEN num "" "One participant" (toMessage num <> " participants")}#{noneOneMoreEN n "" "" (" made " <> toMessage num)}#{noneOneMoreEN n "There were no submissions" " made one submission" " submissions"}. +MailSheetInactiveIntroNoUserSubmission courseName termDesc sheetName n num: The submission period for #{sheetName} of the course category #{courseName} (#{termDesc}) has ended. #{noneOneMoreEN num "" "One participant already" (toMessage num <> " participants already")}#{noneOneMoreEN n "" "" (" made " <> toMessage num)}#{noneOneMoreEN n "" " made one submission" " submissions"}. MailSheetInactivePseudonymsCount n: The number of submissions above accounts only for the submissions already made directly in FRADrive. #{n} #{pluralEN n "pseudonym was" "pseudonyms were"} generated. MailSheetInactiveParticipantsCount n: There #{pluralEN n "is" "are"} currently #{n} #{pluralEN n "participant" "participants"} registered for the course. diff --git a/backend/messages/uniworx/categories/settings/auth_settings/en-eu.msg b/backend/messages/uniworx/categories/settings/auth_settings/en-eu.msg index 562846f1a..de5bdba6c 100644 --- a/backend/messages/uniworx/categories/settings/auth_settings/en-eu.msg +++ b/backend/messages/uniworx/categories/settings/auth_settings/en-eu.msg @@ -14,7 +14,7 @@ AuthTagAdmin: User is administrator AuthTagExamOffice: User is part of an exam office AuthTagSystemExamOffice: User is charged with system wide exam administration AuthTagSystemPrinter: User is responsible for system wide letter printing -AuthTagEvaluation: User is charged with course type evaluation +AuthTagEvaluation: User is charged with course category evaluation AuthTagToken: User is presenting an authorisation-token AuthTagNoEscalation: User permissions are not being expanded to other departments AuthTagDeprecated: Page is not deprecated @@ -26,7 +26,7 @@ AuthTagTutor: User is instructor AuthTagTutorControl: Instructors have control over their course AuthTagTime: Time restrictions are fulfilled AuthTagStaffTime: Time restrictions for teaching staff are fulfilled -AuthTagCourseTime: Time restrictions for course type visibility are fulfilled +AuthTagCourseTime: Time restrictions for course category visibility are fulfilled AuthTagCourseRegistered: User is enrolled in course AuthTagTutorialRegistered: User is course participant AuthTagExamRegistered: User is exam participant @@ -37,11 +37,11 @@ AuthTagParticipant: User participates in course AuthTagRegisterGroup: User is not participant in any course of the same registration group AuthTagCapacity: Capacity is sufficient AuthTagEmpty: Resource is “empty” -AuthTagMaterials: Course type material is publicly accessable +AuthTagMaterials: Course category material is publicly accessable AuthTagOwner: User is owner AuthTagPersonalisedSheetFiles: User has been assigned personalised sheet files AuthTagRated: Submission is marked -AuthTagUserSubmissions: Submissions are made by course type participants +AuthTagUserSubmissions: Submissions are made by course category participants AuthTagCorrectorSubmissions: Submissions are registered by correctors AuthTagCorrectionAnonymous: Correction is anonymised AuthTagSelf: User is only accessing their only data diff --git a/backend/messages/uniworx/categories/settings/en-eu.msg b/backend/messages/uniworx/categories/settings/en-eu.msg index 1a4790f5e..c4a7719e5 100644 --- a/backend/messages/uniworx/categories/settings/en-eu.msg +++ b/backend/messages/uniworx/categories/settings/en-eu.msg @@ -31,7 +31,7 @@ DownloadFilesTip: When set, files are automatically treated as downloads. Otherw WarningDays: Deadline-preview WarningDaysTip: How many days ahead should deadlines regarding exams etc. be displayed on the homepage? ShowSex: Show sex of other users -ShowSexTip: Should users' sex be displayed in (among others) lists of course type participants? +ShowSexTip: Should users' sex be displayed in (among others) lists of course category participants? PDFPassword: Password to lock PDF email attachments PDFPasswordTip: Please note that this password is displayed to FRADrive admins and is saved unencrypted @@ -53,14 +53,14 @@ UserSchoolsTip: You will only receive department-wide notifications for the sele NotificationSettings: Desired notifications NotificationTriggerKindAll: For all users -NotificationTriggerKindCourseParticipant: For course type participants +NotificationTriggerKindCourseParticipant: For course category participants NotificationTriggerKindExamParticipant: For exam participants NotificationTriggerKindCorrector: For correctors NotificationTriggerKindLecturer: For course administrators NotificationTriggerKindCourseLecturer: For course administrators NotificationTriggerKindAdmin: For administrators NotificationTriggerKindExamOffice: For the exam office -NotificationTriggerKindEvaluation: For course type evaluations +NotificationTriggerKindEvaluation: For course category evaluations NotificationTriggerKindSubmissionUser: For participants in an exercise sheet submission NotificationTriggerSubmissionRatedGraded: My submission for an exercise sheet was marked (not purely informational) diff --git a/backend/messages/uniworx/categories/settings/personal_settings/de-de-formal.msg b/backend/messages/uniworx/categories/settings/personal_settings/de-de-formal.msg index cc01e920d..e0946ee3a 100644 --- a/backend/messages/uniworx/categories/settings/personal_settings/de-de-formal.msg +++ b/backend/messages/uniworx/categories/settings/personal_settings/de-de-formal.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Steffen Jost ,Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Gregor Kleen ,Steffen Jost ,Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -19,19 +19,25 @@ ProfileSubmissionGroups: Abgabegruppen ProfileSubmissions: Abgaben ProfileRemark: Hinweis ProfileQualifications: Eigene Qualifikationen +ProfileEnrolledExams: Angemeldete Prüfungen PersonalInfoExamAchievementsWip: Die Anzeige von Prüfungsergebnissen wird momentan an dieser Stelle leider noch nicht unterstützt. PersonalInfoOwnTutorialsWip: Die Anzeige von Kurse, zu denen Sie als Ausbilder eingetragen sind wird momentan an dieser Stelle leider noch nicht unterstützt. PersonalInfoTutorialsWip: Die Anzeige von Kurse, zu denen Sie angemeldet sind wird momentan an dieser Stelle leider noch nicht unterstützt. ProfileGroupSubmissionDates: Bei Gruppenabgaben wird kein Datum angezeigt, wenn Sie die Gruppenabgabe nie selbst hochgeladen haben. ProfileCorrectorRemark: Die oberhalb angezeigte Tabelle zeigt nur prinzipielle Einteilungen als Korrektor zu einem Übungsblatt. Auch ohne Einteilung können Korrekturen einzeln zugewiesen werden, welche hier dann nicht aufgeführt werden. ProfileCorrections: Auflistung aller zugewiesenen Korrekturen -Remarks: Hinweise +Remarks: Hinweis: -ProfileSupervisor: Übergeordnete Ansprechpartner -ProfileSupervisee: Ist Ansprechpartner für +ProfileNoSupervisor: Keine übergeordneten Ansprechpartner vorhanden +ProfileSupervisor n@Int m@Int: #{n} #{pluralDE n "übergeordneter" "übergeordnete"} Ansprechpartner#{noneMoreDE m "" (", davon " <> tshow m <> " mit Benachrichtigungsumleitung")} +ProfileSupervisorRemark n@Int m@Int l@Int: #{m} von #{n} #{pluralDE m "übergeordneter" "übergeordnete"} Ansprechpartner mit Benachrichtigungsumleitung#{noneMoreDE l "" (", davon " <> tshow l <> " mit postalischer Benachrichtigung")} +ProfileNoSupervisee: Ist kein Ansprechpartner für irgendjemand +ProfileSupervisee n@Int m@Int: Ist Ansprechpartner für #{n} #{pluralDE n "Person" "Personen"}#{noneMoreDE m "" (", davon " <> tshow m <> " mit Benachrichtigungsumleitung")} +ProfileSuperviseeRemark n@Int m@Int: Dieser Nutzer ist Ansprechpartner für #{n} #{pluralDE n "Person" "Personen"}#{noneMoreDE m "" (", davon " <> tshow m <> " mit Benachrichtigungsumleitung")} UserTelephone: Telefon UserMobile: Mobiltelefon Company: Firmenzugehörigkeit -CompanyPersonalNumber: Personalnummer (nur Fraport AG) +CompanyPersonalNumber: Personalnummer +CompanyPersonalNumberFraport: Personalnummer (nur Fraport AG) CompanyDepartment: Abteilung \ No newline at end of file diff --git a/backend/messages/uniworx/categories/settings/personal_settings/en-eu.msg b/backend/messages/uniworx/categories/settings/personal_settings/en-eu.msg index b61ac5678..97aae6f85 100644 --- a/backend/messages/uniworx/categories/settings/personal_settings/en-eu.msg +++ b/backend/messages/uniworx/categories/settings/personal_settings/en-eu.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Steffen Jost ,Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Steffen Jost ,Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -11,7 +11,7 @@ LastLogin: Last login NeverSet: Never ProfileCorrector: Corrector ProfileCourses: Own courses -ProfileCourseParticipations: Course type registrations +ProfileCourseParticipations: Course category registrations ProfileCourseExamResults: Exam achievements ProfileTutorials: Own courses ProfileTutorialParticipations: Courses @@ -19,19 +19,25 @@ ProfileSubmissionGroups: Submission groups ProfileSubmissions: Submissions ProfileRemark: Remarks ProfileQualifications: Owned Qualifications +ProfileEnrolledExams: Enrolled Exams PersonalInfoExamAchievementsWip: The feature to display your exam achievements has not yet been implemented. PersonalInfoOwnTutorialsWip: The feature to display courses you have been assigned to as instructor has not yet been implemented. PersonalInfoTutorialsWip: The feature to display courses you have registered for has not yet been implemented. ProfileGroupSubmissionDates: No date is shown for group submissions if you have never uploaded the submission yourself. ProfileCorrectorRemark: The table above only shows registration as a corrector in principle. Even without registration corrections can be assigned individually and are not listed. ProfileCorrections: List of all assigned corrections -Remarks: Remarks +Remarks: Remark: -ProfileSupervisor: Supervised by -ProfileSupervisee: Supervises +ProfileNoSupervisor: Is not supervised by anynone +ProfileSupervisor n m: #{pluralENsN n "supervisor"} #{noneMoreEN m "" ("with " <> tshow m <> " active notification rerouting")} +ProfileSupervisorRemark n@Int m@Int l@Int: #{m} of #{n} #{pluralENs m "supervisor"} with active notification rerouting#{noneMoreEN l "" (", and " <> tshow l <> "of these prefer postal notifications")} +ProfileNoSupervisee: Does not supervise anynone +ProfileSupervisee n m: Supervises #{pluralENsN n "person"} #{noneMoreEN m "" ("with " <> tshow m <> " active notification rerouting")} +ProfileSuperviseeRemark n m: This person supervises #{pluralENsN n "person"}#{noneMoreEN m "" (" with " <> tshow m <> " having active notifications rerouting to this user")} UserTelephone: Phone UserMobile: Mobile -Company: Company affilitaion -CompanyPersonalNumber: Personnel number (Fraport AG only) +Company: Company affiliation +CompanyPersonalNumber: Personnel number +CompanyPersonalNumberFraport: Personnel number (Fraport AG only) CompanyDepartment: Department \ No newline at end of file diff --git a/backend/messages/uniworx/categories/user/de-de-formal.msg b/backend/messages/uniworx/categories/user/de-de-formal.msg index a3c630c46..1f3b163c1 100644 --- a/backend/messages/uniworx/categories/user/de-de-formal.msg +++ b/backend/messages/uniworx/categories/user/de-de-formal.msg @@ -22,6 +22,7 @@ AdminUserPostAddress: Postalische Anschrift AdminUserPrefersPostal: Briefe anstatt Email bevorzugt AdminUserPinPassword: Passwort zur Verschlüsselung von PDF Anhängen in Emails AdminUserNoPassword: Kein Passwort gesetzt +AdminUserPinPassNotIncluded: Hinweis: Das Passwort wird hier zur Bequemlichkeit zusätzlich angezeigt und ist selbstverständlich nicht im originalem Inhalt enthalten. AdminUserAssimilate: Diesen Benutzer assimilieren von UserAdded: Benutzer erfolgreich angelegt UserCollision: Benutzer konnte wegen Eindeutigkeit nicht angelegt werden @@ -37,10 +38,12 @@ AuthPWHashAlreadyConfigured: Nutzer:in meldet sich bereits mit FRADrive spezifis AuthPWHashConfigured: Nutzer:in meldet sich nun mit FRADrive spezifischer Kennung an UsersCourseSchool: Bereich ActionNoUsersSelected: Keine Benutzer:innen ausgewählt -SynchroniseAvsUserQueued n@Int: AVS-Synchronisation von #{n} #{pluralDE n "Benutzer:in" "Benutzer:innen"} angestoßen -SynchroniseLdapUserQueued n@Int: LDAP-Synchronisation von #{n} #{pluralDE n "Benutzer:in" "Benutzer:innen"} angestoßen -SynchroniseLdapAllUsersQueued: LDAP-Synchronisation von allen Benutzer:innen angestoßen +SynchroniseAvsUserQueued n@Int: AVS-Synchronisation von #{n} #{pluralDE n "Benutzer:in" "Benutzer:innen"} zwingend angestoßen, die Ausführung wird mehrere Minuten benötigen! +SynchroniseAvsAllUsersQueued n@Int64: AVS-Synchronisation von allen #{n} #{pluralDE n "Benutzer:in" "Benutzer:innen"} angestoßen, welche heute noch nicht synchronisiert wurden, die Ausführung wird eine Weile brauchen! +SynchroniseLdapUserQueued n@Int: LDAP-Synchronisation von #{n} #{pluralDE n "Benutzer:in" "Benutzer:innen"} angestoßen, die Ausführung wird mehrere Minuten benötigen! +SynchroniseLdapAllUsersQueued: LDAP-Synchronisation von allen Benutzer:innen angestoßen, die Ausführung kann eine Weile brauchen! UserListTitle: Komprehensive Benutzerliste +UserRecipientsTitle name@Text: Benachrichtigungsempfänger für #{name} AccessRightsSaved: Berechtigungen erfolgreich verändert AccessRightsNotChanged: Berechtigungen wurden nicht verändert AuthLDAPLookupFailed: Nutzer:in konnte aufgrund eines LDAP-Fehlers nicht nachgeschlagen werden @@ -89,12 +92,19 @@ NewPasswordLink: Neues Passwort setzen UserAccountDeleteWarning: Achtung, dies löscht den kompletten Benutzer/die komplette Benutzerin unwiderruflich und mit allen assoziierten Daten aus der Datenbank. Prüfungsdaten müssen jedoch langfristig gespeichert bleiben! UserAvsSync: AVS-Synchronisieren UserLdapSync: LDAP-Synchronisieren -AllUsersLdapSync: Alle LDAP-Synchronisieren UserHijack: Sitzung übernehmen UserAddSupervisor: Ansprechpartner hinzufügen UserSetSupervisor: Ansprechpartner ersetzen UserRemoveSupervisor: Alle Ansprechpartner entfernen +UserRemoveClients: Alle Ansprechpartnerbeziehungen zu Klienten beenden UserIsSupervisor: Ist Ansprechpartner +UserAvsSwitchCompany: Als Primärfirma verwenden +UserAvsSwitchCompanyField: Primärfirma auswählen +UserAvsCompanySwitched c@CompanyShorthand: Primärfirma gewechselt zu #{tshow c} +AllUsersLdapSync: Alle LDAP-Synchronisieren +AllUsersAvsSync: Alle AVS-Synchronisieren +ThisUserLdapSync: LDAP Synchronisation +ThisUserAvsSync: AVS Synchronisation AuthKindLDAP: Fraport AG Kennung AuthKindPWHash: FRADrive Kennung AuthKindNoLogin: Kein Login möglich @@ -102,3 +112,10 @@ Name !ident-ok: Name UsersChangeSupervisorsSuccess usr@Int spr@Int: #{tshow spr} Ansprechpartner für #{tshow usr} Benutzer gesetzt. UsersChangeSupervisorsWarning usr@Int spr@Int bad@Int: Nur _{MsgUsersChangeSupervisorsSuccess usr spr} #{tshow bad} Ansprechpartner #{pluralDE bad "wurde" "wurden"} nicht gefunden! UsersRemoveSupervisors usr@Int: Alle Ansprechpartner für #{tshow usr} Benutzer gelöscht. +UsersRemoveClients usr@Int: Alle Ansprechpartnerbeziehungen für #{tshow usr} #{pluralDE usr "ehemaligen" "ehemalige"} Ansprechpartner gelöscht. +UserCompanyReason: Begründung der Firmenassoziation +UserCompanyReasonTooltip: Optionale Notiz für besondere Fälle. Kann ggf. autmatische Entfernung bei AVS Firmenwechsel verhindern. +UserSupervisorReason: Begründung Ansprechpartner +UserSupervisorReasonTooltip: Optionale Notiz für besondere Fälle. Kann ggf. autmatische Entfernung bei AVS Firmenwechsel verhindern. +UserSupervisorCompany: Ansprechpartner wegen Firma +AdminUserAllNotifications: Alle Benachrichtigungen and diesen Benutzer \ No newline at end of file diff --git a/backend/messages/uniworx/categories/user/en-eu.msg b/backend/messages/uniworx/categories/user/en-eu.msg index 10c42830d..a3d0ebf05 100644 --- a/backend/messages/uniworx/categories/user/en-eu.msg +++ b/backend/messages/uniworx/categories/user/en-eu.msg @@ -22,6 +22,7 @@ AdminUserPostAddress: Postal Address AdminUserPrefersPostal: Prefers postal letters over email AdminUserPinPassword: Password used for PDF attachments to emails AdminUserNoPassword: No password set +AdminUserPinPassNotIncluded: Note: the password is shown here only for convenience, but is not contained in the original content, of course. AdminUserAssimilate: Assimilate user by another user UserAdded: Successfully added user UserCollision: Could not create user due to uniqueness constraint @@ -37,10 +38,12 @@ AuthPWHashAlreadyConfigured: User already logs in using their FRADrive specific AuthPWHashConfigured: User now logs in using their FRADrive specific account UsersCourseSchool: Department ActionNoUsersSelected: No users selected -SynchroniseAvsUserQueued n: Triggered AVS synchronisation of #{n} #{pluralEN n "user" "users"}. -SynchroniseLdapUserQueued n: Triggered LDAP synchronisation of #{n} #{pluralEN n "user" "users"}. -SynchroniseLdapAllUsersQueued: Triggered LDAP synchronisation of all users +SynchroniseAvsUserQueued n: Triggered forced AVS synchronisation of #{n} #{pluralEN n "user" "users"}, which may take several minutes to complete. +SynchroniseAvsAllUsersQueued n: Triggered AVS synchronisation of all #{n} #{pluralEN n "user" "users"} that were not already synchronised today, which may take quite a while to complete. +SynchroniseLdapUserQueued n: Triggered LDAP synchronisation of #{n} #{pluralEN n "user" "users"}, which may take several minutes to complete. +SynchroniseLdapAllUsersQueued: Triggered LDAP synchronisation of all users, which may take quite a while to complete. UserListTitle: Comprehensive list of users +UserRecipientsTitle name: Notificationrecipients for #{name} AccessRightsSaved: Successfully updated permissions AccessRightsNotChanged: Permissions left unchanged AuthLDAPLookupFailed: User could not be looked up due to a LDAP error @@ -89,16 +92,30 @@ NewPasswordLink: Set password UserAccountDeleteWarning: Caution, this permanently deletes users and all of their associated data. Exam results must be stored long term! UserAvsSync: Synchronise with AVS UserLdapSync: Synchronise with LDAP -AllUsersLdapSync: Synchronise all with LDAP UserHijack: Hijack session UserAddSupervisor: Add supervisor UserSetSupervisor: Replace supervisors UserRemoveSupervisor: Set to unsupervised +UserRemoveClients: Remove all clients UserIsSupervisor: Is supervisor +UserAvsSwitchCompany: Use as primary company +UserAvsSwitchCompanyField: Select primary company +UserAvsCompanySwitched c: Primary company switched to #{tshow c} +AllUsersLdapSync: Synchronise all with LDAP +AllUsersAvsSync: Synchronise all with AVS +ThisUserLdapSync: Synchronise user with LDAP +ThisUserAvsSync: Synchronise user with AVS AuthKindLDAP: Fraport AG account AuthKindPWHash: FRADrive account AuthKindNoLogin: No login Name: Name UsersChangeSupervisorsSuccess usr spr: #{pluralENsN spr "supervisor"} for #{pluralENsN usr "user"} set. UsersChangeSupervisorsWarning usr spr bad: Only _{MsgUsersChangeSupervisorsSuccess usr spr} #{pluralENsN bad "supervisors"} could not be identified! -UsersRemoveSupervisors usr: Removed all supervisors for #{pluralENsN usr "user"}. \ No newline at end of file +UsersRemoveSupervisors usr: Removed all supervisors for #{pluralENsN usr "user"}. +UsersRemoveClients usr: Removed all clients for #{pluralENsN usr "previous supervisor"}. +UserCompanyReason: Reason for company association +UserCompanyReasonTooltip: Optional note for special cases. In some case this may prevent automatic removel upon AVS user company changes. +UserSupervisorReason: Reason for supervision +UserSupervisorReasonTooltip: Optional note for special cases. In some case this may prevent automatic removel upon AVS user company changes. +UserSupervisorCompany: Supervisor for company +AdminUserAllNotifications: All notification sent to this user \ No newline at end of file diff --git a/backend/messages/uniworx/misc/de-de-formal.msg b/backend/messages/uniworx/misc/de-de-formal.msg index 3fcd6ffe6..c34f39545 100644 --- a/backend/messages/uniworx/misc/de-de-formal.msg +++ b/backend/messages/uniworx/misc/de-de-formal.msg @@ -4,24 +4,42 @@ #messages or constructors that are used all over the code -Logo !ident-ok: Uni2work -EmailInvitationWarning: Diese Adresse konnte keinem Uni2work-Benutzer/keiner Uni2work-Benutzerin zugeordnet werden. Es wird eine Einladung per E-Mail versandt. +Logo !ident-ok: FRADrive +LdapIdentificationOrEmail: Fraport AG-Kennung / E-Mail-Adresse +EmailInvitationWarning: Diese Adresse konnte keinem FRADrive-Benutzer/-Benutzerin zugeordnet werden. Es wird eine Einladung per E-Mail versandt. BoolIrrelevant !ident-ok: — FieldPrimary: Hauptfach FieldSecondary: Nebenfach MultiEmailFieldTip: Es sind mehrere, Komma-separierte, E-Mail-Adressen möglich MultiSelectTip: Mehrfachauswahl und Abwählen mit Strg-Klick WeekDay: Wochentag -LdapIdentificationOrEmail: Fraport AG-Kennung / E-Mail-Adresse +Hours: Stunden +SomeMonths: Monate +SomeDays: Tage Months num@Int64: #{num} #{pluralDE num "Monat" "Monate"} Days num@Int64: #{num} #{pluralDE num "Tag" "Tage"} +NoAutomaticUpdateTip: Dieser Wert wurde manuell editiert und wird daher nicht mehr automatisch durch as AVS aktualisiert. +AddressIsLinkedTip: Verlinkte Postaddresse: Für diesen Benutzer ist keine individuelle Postadresse gespeichert, die Adresse wurde stattdessen aus der Firmenzugehörigkeit abgeleitet. ClusterVolatileQuickActionsEnabled: Schnellzugriffsmenü aktiv AvsNoLicence: Keine Fahrberechtigung AvsLicenceVorfeld: Vorfeld Fahrberechtigung AvsLicenceRollfeld: Rollfeld Fahrberechtigung +AvsNoLicenceGuest: Keine Fahrberechtigung (Gast, Fahrberechtigungserwerb nicht möglich) PaginationSize: Einträge pro Seite PaginationPage: Angzeigte Seite -PaginationError: Paginierung Parameter dürfen nicht negativ sein \ No newline at end of file +PaginationError: Paginierung Parameter dürfen nicht negativ sein + +NullDeletes: Zum Löschen NULL eingeben. +SortPriority: Sortierungspriorität +NoProblem: Keine Probleme gefunden +Unknown: ist unbekannt +UnknownOrNotAllowed: ist unbekannt oder hier nicht erlaubt +Ambiguous: ist uneindeutig +Action: Aktion +For: für +Address: Adresse +NoContactAddress: Keinerlei Kontaktdaten bekannt! +StarKeepsEmptyDeletes: Stern zum Beibehalten, leer lassen zum Löschen \ No newline at end of file diff --git a/backend/messages/uniworx/misc/en-eu.msg b/backend/messages/uniworx/misc/en-eu.msg index ed8bda4db..6a94c7370 100644 --- a/backend/messages/uniworx/misc/en-eu.msg +++ b/backend/messages/uniworx/misc/en-eu.msg @@ -4,24 +4,42 @@ #messages or constructors that are used all over the Code -Logo: Uni2work -EmailInvitationWarning: This address could not be matched to any Uni2work user. An invitation will be sent via email. +Logo: FRADrive +LdapIdentificationOrEmail: Fraport AG-Kennung / email address +EmailInvitationWarning: This address could not be matched to any FRADrive user. An invitation will be sent via email. BoolIrrelevant: — FieldPrimary: Major FieldSecondary: Minor MultiEmailFieldTip: Multiple emails addresses may be specified (comma-separated) MultiSelectTip: Multiple selection and desection via Ctrl-Click WeekDay: Day of the week -LdapIdentificationOrEmail: Fraport AG-Kennung / email address +Hours: Hours +SomeMonths: Months +SomeDays: Days Months num: #{num} #{pluralEN num "Month" "Months"} Days num: #{num} #{pluralEN num "Day" "Days"} +NoAutomaticUpdateTip: This particular value receives no automatic AVS updates, since it has been edited manually. +AddressIsLinkedTip: Linked postal address: No individual postal address is stored for this user, instead a postal address was inferred from the user's company association. ClusterVolatileQuickActionsEnabled: Quick actions enabled AvsNoLicence: No driving licence AvsLicenceVorfeld: Apron driving licence AvsLicenceRollfeld: Maneuvering area driving licence +AvsNoLicenceGuest: No driving licence (Guest account, cannot acquire a diriving licence) PaginationSize: Rows per Page PaginationPage: Page to show -PaginationError: Pagination parameter must not be negative \ No newline at end of file +PaginationError: Pagination parameter must not be negative + +NullDeletes: Enter NULL to delete. +SortPriority: Sort order priority +NoProblem: No Probleme found +Unknown: is unknown +UnknownOrNotAllowed: is unknown or not allowed here +Ambiguous: is ambiguous +Action: Action +For: for +Address: Address +NoContactAddress: No contact details known! +StarKeepsEmptyDeletes: A star to keep unchanged, blank removes \ No newline at end of file diff --git a/backend/messages/uniworx/utils/buttons/de-de-formal.msg b/backend/messages/uniworx/utils/buttons/de-de-formal.msg index 8252a3a1c..7ac6b8081 100644 --- a/backend/messages/uniworx/utils/buttons/de-de-formal.msg +++ b/backend/messages/uniworx/utils/buttons/de-de-formal.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Steffen Jost ,Winnie Ros ,Sarah Vaupel +# SPDX-FileCopyrightText: 2022-24 Gregor Kleen ,Steffen Jost ,Winnie Ros ,Sarah Vaupel ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -55,6 +55,8 @@ BtnUserAssimilate: Assimilieren BtnCloseExam: Prüfung abschließen BtnFinishExam: Prüfungsergebnisse sichtbar schalten BtnConfirm: Bestätigen +BtnPerform: Ausführen BtnCourseRegisterAdd: Personen suchen BtnCourseRegisterConfirm: Ausgewählte Personen anmelden -BtnCourseRegisterAbort: Abbrechen \ No newline at end of file +BtnCourseRegisterAbort: Abbrechen +BtnCloseReload: Schließen und aktualisieren \ No newline at end of file diff --git a/backend/messages/uniworx/utils/buttons/en-eu.msg b/backend/messages/uniworx/utils/buttons/en-eu.msg index a83a7b3aa..1f4a6133a 100644 --- a/backend/messages/uniworx/utils/buttons/en-eu.msg +++ b/backend/messages/uniworx/utils/buttons/en-eu.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Steffen Jost ,Winnie Ros ,Sarah Vaupel +# SPDX-FileCopyrightText: 2022-24 Steffen Jost ,Winnie Ros ,Sarah Vaupel ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -55,6 +55,8 @@ BtnUserAssimilate: Assimilate BtnCloseExam: Close exam BtnFinishExam: Make results visible BtnConfirm: Confirm +BtnPerform: Perform BtnCourseRegisterAdd: Search persons BtnCourseRegisterConfirm: Register selected persons -BtnCourseRegisterAbort: Abort \ No newline at end of file +BtnCourseRegisterAbort: Abort +BtnCloseReload: Close and reload \ No newline at end of file diff --git a/backend/messages/uniworx/utils/handler_form/occurrences/de-de-formal.msg b/backend/messages/uniworx/utils/handler_form/occurrences/de-de-formal.msg index e70c0a30d..24119b496 100644 --- a/backend/messages/uniworx/utils/handler_form/occurrences/de-de-formal.msg +++ b/backend/messages/uniworx/utils/handler_form/occurrences/de-de-formal.msg @@ -20,3 +20,7 @@ ExceptionNoOccurAt: Termin ExceptionKind: Termin ... ExceptionKindOccur: Findet statt ExceptionKindNoOccur: Findet nicht statt +DayNext: Folgetag +DayPrev: Vortag +WeekNext: Nächste Woche +WeekPrev: Vorherige Woche diff --git a/backend/messages/uniworx/utils/handler_form/occurrences/en-eu.msg b/backend/messages/uniworx/utils/handler_form/occurrences/en-eu.msg index 1c325ea7f..62f629add 100644 --- a/backend/messages/uniworx/utils/handler_form/occurrences/en-eu.msg +++ b/backend/messages/uniworx/utils/handler_form/occurrences/en-eu.msg @@ -20,3 +20,7 @@ ExceptionNoOccurAt: Event ExceptionKind: Event ... ExceptionKindOccur: Does occur ExceptionKindNoOccur: Does not occur +DayNext: Next day +DayPrev: Previous day +WeekNext: Next week +WeekPrev: Previous week \ No newline at end of file diff --git a/backend/messages/uniworx/utils/navigation/breadcrumbs/de-de-formal.msg b/backend/messages/uniworx/utils/navigation/breadcrumbs/de-de-formal.msg index 9087f1ca0..649db00c6 100644 --- a/backend/messages/uniworx/utils/navigation/breadcrumbs/de-de-formal.msg +++ b/backend/messages/uniworx/utils/navigation/breadcrumbs/de-de-formal.msg @@ -71,6 +71,7 @@ BreadcrumbError: Fehler BreadcrumbUpload !ident-ok: Upload BreadcrumbUserAdd: Benutzer:in anlegen BreadcrumbUserNotifications: Benachrichtigungs-Einstellungen +BreadcrumbUserRecipients: Benachrichtigungs-Empfänger BreadcrumbUserPassword: Passwort BreadcrumbAdminHeading !ident-ok: Administration BreadcrumbAdminFeaturesHeading: Studiengänge diff --git a/backend/messages/uniworx/utils/navigation/breadcrumbs/en-eu.msg b/backend/messages/uniworx/utils/navigation/breadcrumbs/en-eu.msg index 5763051d1..920bb3624 100644 --- a/backend/messages/uniworx/utils/navigation/breadcrumbs/en-eu.msg +++ b/backend/messages/uniworx/utils/navigation/breadcrumbs/en-eu.msg @@ -6,7 +6,7 @@ BreadcrumbCsvOptions: csv-options BreadcrumbSubmissionFile: File BreadcrumbSubmissionUserInvite: Invitation to participate in a submission BreadcrumbCryptoIDDispatch: CryptoID-redirect -BreadcrumbCourseNotes: Course type notes +BreadcrumbCourseNotes: Course category notes BreadcrumbHiWis: Correctors BreadcrumbMaterial: Material BreadcrumbSheet: Exercise sheet @@ -14,7 +14,7 @@ BreadcrumbTutorial: Course BreadcrumbExam: Exam BreadcrumbCourseRegister: Register BreadcrumbCourseFavourite: Favourite -BreadcrumbCourse: Course type +BreadcrumbCourse: Course category BreadcrumbTerm: Year BreadcrumbSchool: Department BreadcrumbUser: User @@ -28,11 +28,11 @@ BreadcrumbUserDelete: Delete user account BreadcrumbUserHijack: Hijack user session BreadcrumbSystemMessage: System message BreadcrumbSubmission: Submission -BreadcrumbCourseNews: Course type news -BreadcrumbCourseNewsDelete: Delete course type news -BreadcrumbCourseEventDelete: Delete course type occurrence +BreadcrumbCourseNews: Course category news +BreadcrumbCourseNewsDelete: Delete course category news +BreadcrumbCourseEventDelete: Delete course category occurrence BreadcrumbProfile: Settings -BreadcrumbCourseParticipantInvitation: Invitation to be a course type participant +BreadcrumbCourseParticipantInvitation: Invitation to be a course category participant BreadcrumbMaterialArchive: Archive BreadcrumbMaterialFile: File BreadcrumbMaterialVideo: Video @@ -57,8 +57,8 @@ BreadcrumbExternalExamUsers: Participants BreadcrumbExternalExamGrades: Exam results BreadcrumbExternalExamStaffInvite: Invitation BreadcrumbExternalExamCorrect: Enter exam results -BreadcrumbParticipantsList: Lists of course type participants -BreadcrumbParticipants: Course type participants +BreadcrumbParticipantsList: Lists of course category participants +BreadcrumbParticipants: Course category participants BreadcrumbExamAutoOccurrence: Automatic occurrence/room distribution BreadcrumbStorageKey: Generate storage key BreadcrumbMessageHide: Hide @@ -71,6 +71,7 @@ BreadcrumbError: Error BreadcrumbUpload: Upload BreadcrumbUserAdd: Add user BreadcrumbUserNotifications: Notification settings +BreadcrumbUserRecipients: Notification recipients BreadcrumbUserPassword: Password BreadcrumbAdminHeading: Administration BreadcrumbAdminFeaturesHeading: Features of study @@ -96,7 +97,7 @@ BreadcrumbTermShow: Years BreadcrumbTermCreate: Create new year BreadcrumbTermEdit: Edit year BreadcrumbTermCurrent: Current year -BreadcrumbParticipantsIntersect: Common course type participants +BreadcrumbParticipantsIntersect: Common course category participants BreadcrumbCourseList: Courses BreadcrumbCourseNew: Create new course BreadcrumbCourseEdit: Edit course @@ -105,14 +106,14 @@ BreadcrumbCourseAddMembers: Add participants BreadcrumbCourseExamOffice: Exam offices BreadcrumbCorrectionsAssign: Assign corrections BreadcrumbSheetList: Exercise sheets -BreadcrumbCourseCommunication: Course type message (email) +BreadcrumbCourseCommunication: Course category message (email) BreadcrumbTutorialList: Courses BreadcrumbTutorialNew: Create new course BreadcrumbCourseDelete: Delete course -BreadcrumbCourseNewsNew: Add course type news -BreadcrumbCourseNewsEdit: Edit course type news -BreadcrumbCourseEventNew: New course type occurrence -BreadcrumbCourseEventEdit: Edit course type occurrence +BreadcrumbCourseNewsNew: Add course category news +BreadcrumbCourseNewsEdit: Edit course category news +BreadcrumbCourseEventNew: New course category occurrence +BreadcrumbCourseEventEdit: Edit course category occurrence BreadcrumbExamList: Exams BreadcrumbExamNew: Create new exam BreadcrumbExamEdit: Edit exam @@ -122,7 +123,7 @@ BreadcrumbExamAddMembers: Add exam participants BreadcrumbExamCorrect: Grade exams BreadcrumbTutorialDelete: Delete course BreadcrumbTutorialEdit: Edit course -BreadcrumbTutorialComm: Send course type message +BreadcrumbTutorialComm: Send course category message BreadcrumbSheetEdit: Edit exercise sheet BreadcrumbSheetDelete: Delete exercise sheet BreadcrumbSubmissions: Submissions diff --git a/backend/messages/uniworx/utils/navigation/menu/de-de-formal.msg b/backend/messages/uniworx/utils/navigation/menu/de-de-formal.msg index eab4f204e..f8914c000 100644 --- a/backend/messages/uniworx/utils/navigation/menu/de-de-formal.msg +++ b/backend/messages/uniworx/utils/navigation/menu/de-de-formal.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Steffen Jost ,Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Steffen Jost ,Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -33,6 +33,7 @@ MenuCourseIcon: Kurse MenuCourseMembers: Kursartteilnehmer:innen MenuCourseAddMembers: Kursartteilnehmer:innen hinzufügen MenuTutorialAddMembers: Kursteilnehmer:innen hinzufügen +MenuTutorialExam exn@ExamName: Kursprüfung #{exn} bearbeiten MenuCourseCommunication: Kursartmitteilung (E‑Mail) MenuCourseExamOffice: Prüfungsbeauftragte MenuTermShow: Jahr @@ -87,6 +88,7 @@ MenuTutorialComm: Mitteilung an Teilnehmer:innen MenuExamList: Prüfungen MenuExamNew: Neue Prüfung anlegen MenuExamEdit: Prüfung bearbeiten +MenuExamEditComplete: Prüfung vollständig überarbeiten MenuExamUsers: Teilnehmer:innen MenuExamGrades: Prüfungsleistungen MenuExamAddMembers: Prüfungsteilnehmer hinzufügen @@ -97,6 +99,8 @@ MenuExamOfficeUsers: Benutzer:innen MenuLecturerInvite: Funktionäre hinzufügen MenuSchoolList: Bereiche MenuSchoolNew: Neuen Bereich anlegen +MenuSchoolDay ssh@SchoolId d@Text: #{d} #{unSchoolKey ssh} Tagesansicht +MenuSchoolDayCheck: Konsistenzprüfung MenuExternalExamGrades: Prüfungsleistungen MenuExternalExamUsers: Teilnehmer:innen MenuExternalExamEdit: Bearbeiten @@ -119,8 +123,9 @@ MenuCourseEventEdit: Kursarttermin bearbeiten MenuLanguage: Sprache MenuQualifications: Qualifikationen +MenuQualificationEdit: Bearbeiten +MenuQualificationNew: Neue Qualifikation erstellen MenuLms !ident-ok: E‑Learning -MenuLmsEdit: Bearbeiten E‑Learning MenuLmsUser: Benutzerqualifikationen MenuLmsUserSchool: Bereichs Benutzerqualifikationen MenuLmsUserAll: Alle Benutzerqualifikationen @@ -136,6 +141,7 @@ MenuFirms: Firmen MenuFirmUsers: Angehörige MenuFirmSupervisors: Ansprechpartner MenuFirmsComm: Mitteilung +MenuFirmsSupervision: Probleme Ansprechpartnerbeziehungen MenuInterfaces: Schnittstellen MenuSap: SAP Schnittstelle @@ -143,12 +149,18 @@ MenuSap: SAP Schnittstelle MenuAvs: AVS Schnittstelle MenuAvsSynchError: AVS Problemübersicht MenuLdap: LDAP Schnittstelle -MenuApc: Druckerei +MenuApc: Druck MenuPrintSend: Manueller Briefversand MenuPrintDownload: Brief herunterladen MenuPrintLog: LPR Schnittstelle MenuPrintAck: Druckbestätigung +MenuCommCenter: Benachrichtigungen +MenuMailCenter: E‑Mails +MenuMailHtml !ident-ok: Html +MenuMailPlain !ident-ok: Text +MenuMailAttachment: Anhang + MenuApiDocs: API-Dokumentation (Englisch) MenuSwagger !ident-ok: OpenAPI 2.0 (Swagger) diff --git a/backend/messages/uniworx/utils/navigation/menu/en-eu.msg b/backend/messages/uniworx/utils/navigation/menu/en-eu.msg index 526c6d871..f3aad5cdf 100644 --- a/backend/messages/uniworx/utils/navigation/menu/en-eu.msg +++ b/backend/messages/uniworx/utils/navigation/menu/en-eu.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Winnie Ros +# SPDX-FileCopyrightText: 2022-25 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -6,7 +6,7 @@ MenuAdminHeading: Administration MenuAdminFeaturesHeading: Features of study MenuInfoLecturerTitle: Information for course administrators MenuInfoLecturerCourses: Courses -MenuInfoLecturerExercises: Course type Exercises +MenuInfoLecturerExercises: Course category Exercises MenuInfoLecturerTutorials: Courses MenuInfoLecturerExams: Exams MenuCsvOptions: CSV-options @@ -28,12 +28,13 @@ MenuHelp: Support MenuProfile: Settings MenuLogin: Login MenuLogout: Logout -MenuCourseList: Course types +MenuCourseList: Course categorys MenuCourseIcon: Courses MenuCourseMembers: Participants -MenuCourseAddMembers: Add course type participants +MenuCourseAddMembers: Add course category participants MenuTutorialAddMembers: Add course participants -MenuCourseCommunication: Course type message (email) +MenuTutorialExam exn@ExamName: Edit course exam #{exn} +MenuCourseCommunication: Course category message (email) MenuCourseExamOffice: Exam offices MenuTermShow: Semesters MenuSubmissionDelete: Delete submission @@ -48,7 +49,7 @@ MenuAdminErrMsg: Decrypt error message MenuAdminTokens: Issue tokens MenuProfileData: Personal information MenuTermCreate: Create new year -MenuCourseNew: Create new course type +MenuCourseNew: Create new course category MenuTermEdit: Edit year MenuTermCurrent: Current year MenuCorrection: Correction @@ -83,10 +84,11 @@ MenuCorrectionsAssignSheet name: Assign corrections for #{name} MenuAuthPreds: Authorisation settings MenuTutorialDelete: Delete course MenuTutorialEdit: Edit course -MenuTutorialComm: Send course type message +MenuTutorialComm: Send course category message MenuExamList: Exams MenuExamNew: Create new exam MenuExamEdit: Edit exam +MenuExamEditComplete: Revise entire exam MenuExamUsers: Participants MenuExamGrades: Exam results MenuExamAddMembers: Add exam participants @@ -97,14 +99,16 @@ MenuExamOfficeUsers: Users MenuLecturerInvite: Add functionaries MenuSchoolList: Departments MenuSchoolNew: Create new department +MenuSchoolDay ssh d: #{d} #{unSchoolKey ssh} Agenda +MenuSchoolDayCheck: Consistence check MenuExternalExamGrades: Exam results MenuExternalExamUsers: Participants MenuExternalExamEdit: Edit MenuExternalExamNew: New external exam MenuExternalExamList: External exams MenuExternalExamCorrect: Enter exam results -MenuParticipantsList: Lists of course type participants -MenuParticipantsIntersect: Common course type participants +MenuParticipantsList: Lists of course category participants +MenuParticipantsIntersect: Common course category participants MenuFaq: FAQ MenuSheetPersonalisedFiles: Download personalised sheet files MenuCourseSheetPersonalisedFiles: Download template for personalised sheet files @@ -112,17 +116,18 @@ MenuAdminCrontab: Crontab MenuAdminJobs: Job queue MenuGlossary: Glossary MenuVersion: Version history -MenuCourseNewsNew: Add course type news -MenuCourseNewsEdit: Edit course type news -MenuCourseEventNew: New course type occurrence -MenuCourseEventEdit: Edit course type occurrence +MenuCourseNewsNew: Add course category news +MenuCourseNewsEdit: Edit course category news +MenuCourseEventNew: New course category occurrence +MenuCourseEventEdit: Edit course category occurrence MenuLanguage: Language MenuQualifications: Qualifications +MenuQualificationEdit: Edit +MenuQualificationNew: Create new qualification MenuLms: E‑learning -MenuLmsEdit: Edit e‑learning MenuLmsUser: User Qualifications -MenuLmsUserSchool: Institute User Qualifications +MenuLmsUserSchool: Department User Qualifications MenuLmsUserAll: All User Qualifications MenuLmsUsers: Legacy download e‑learning users MenuLmsUpload: Upload @@ -136,6 +141,7 @@ MenuFirms: Companies MenuFirmUsers: Associates MenuFirmSupervisors: Supervisors MenuFirmsComm: Messaging +MenuFirmsSupervision: Problems supervisionship MenuInterfaces: Interfaces MenuSap: SAP Interface @@ -143,12 +149,18 @@ MenuSap: SAP Interface MenuAvs: AVS Interface MenuAvsSynchError: AVS Problem Overview MenuLdap: LDAP Interface -MenuApc: Printing +MenuApc: Print MenuPrintSend: Send Letter MenuPrintDownload: Download Letter MenuPrintLog: LPR Interface MenuPrintAck: Acknowledge Printing +MenuCommCenter: Notifications +MenuMailCenter: Email +MenuMailHtml: Html +MenuMailPlain: Text +MenuMailAttachment: Attachment + MenuApiDocs: API documentation MenuSwagger: OpenAPI 2.0 (Swagger) diff --git a/backend/messages/uniworx/utils/site_layout/de-de-formal.msg b/backend/messages/uniworx/utils/site_layout/de-de-formal.msg index 34681feea..55174f07c 100644 --- a/backend/messages/uniworx/utils/site_layout/de-de-formal.msg +++ b/backend/messages/uniworx/utils/site_layout/de-de-formal.msg @@ -12,8 +12,8 @@ NewsHeading: Aktuelles InfoHeading: Informationen LegalHeading: Rechtliche Informationen VersionHeading: Versionsgeschichte -SystemMessageHeading: Uni2work Statusmeldung -SystemMessageListHeading: Uni2work Statusmeldungen +SystemMessageHeading: FRADrive Statusmeldung +SystemMessageListHeading: FRADrive Statusmeldungen HeadingHelpRequest: Supportanfrage/Verbesserungsvorschlag ProfileHeading: Benutzereinstellungen ProfileDataHeading: Gespeicherte Benutzerdaten diff --git a/backend/messages/uniworx/utils/site_layout/en-eu.msg b/backend/messages/uniworx/utils/site_layout/en-eu.msg index d263f8217..69d3ff5cd 100644 --- a/backend/messages/uniworx/utils/site_layout/en-eu.msg +++ b/backend/messages/uniworx/utils/site_layout/en-eu.msg @@ -12,8 +12,8 @@ NewsHeading: News InfoHeading: Information LegalHeading: Legal VersionHeading: Version history -SystemMessageHeading: Uni2work system message -SystemMessageListHeading: Uni2work system message +SystemMessageHeading: FRADrive system message +SystemMessageListHeading: FRADrive system messages HeadingHelpRequest: Support request/Suggestion ProfileHeading: Settings ProfileDataHeading: Personal information @@ -29,8 +29,8 @@ HeadingTermEditTid tid: Edit year #{tid} TermCourseListHeading tid: Courses #{tid} TermSchoolCourseListHeading tid school: Courses #{tid}, #{school} CourseListTitle: All courses -CourseNewHeading: Create new course type -CourseEditHeading tid ssh csh: Edit course type #{tid}-#{ssh}-#{csh} +CourseNewHeading: Create new course category +CourseEditHeading tid ssh csh: Edit course category #{tid}-#{ssh}-#{csh} SubmissionsCourse tid ssh csh: All submissions for Course #{tid}-#{ssh}-#{csh} SubmissionsSheet sheetName: Submissions for #{sheetName} SheetList tid ssh csh : #{tid}-#{ssh}-#{csh} Sheet Overview @@ -38,7 +38,7 @@ SheetNewHeading tid ssh csh : #{tid}-#{ssh}-#{csh} New Exercise Sheet SheetTitle tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{tid}-#{ssh}-#{csh} #{sheetName} SheetTitleNew tid@TermId ssh@SchoolId csh@CourseShorthand : #{tid}-#{ssh}-#{csh}: New sheet SheetEditHead tid ssh csh sheetName: #{tid}-#{ssh}-#{csh} Edit #{sheetName} -SheetDelHead tid ssh csh sheetName: Do you really want to delete sheet #{sheetName} from course type #{tid}-#{ssh}-#{csh}? Any associated submissions and corrections will be lost! +SheetDelHead tid ssh csh sheetName: Do you really want to delete sheet #{sheetName} from course category #{tid}-#{ssh}-#{csh}? Any associated submissions and corrections will be lost! SubmissionEditHead tid ssh csh sheetName: #{tid}-#{ssh}-#{csh} #{sheetName}: Edit/Create submission CorrectionHead tid ssh csh sheetName cid: #{tid}-#{ssh}-#{csh} #{sheetName}: Marking CorrectionsTitle: Assigned corrections @@ -48,8 +48,8 @@ CorrGrade: Mark submissions TableHeadingCsvImport: CSV import TableHeadingCsvExport: CSV export FavouritesEmptyTip: Your courses and recently visited courses are shown here. -FavouritesToggleTip: The display mode for the current course type can be changed between automatic, permanent and never with a click on the star symbol. -FavouritesUnavailableTip: Quick Actions for this course type are currently not available. +FavouritesToggleTip: The display mode for the current course category can be changed between automatic, permanent and never with a click on the star symbol. +FavouritesUnavailableTip: Quick Actions for this course category are currently not available. NavigationFavourites: Favourites ErrorResponseTitleInternalError internalError: An internal error occurred ErrorResponseTitleInvalidArgs invalidArgs: Request contained invalid arguments diff --git a/backend/messages/uniworx/utils/table_column/de-de-formal.msg b/backend/messages/uniworx/utils/table_column/de-de-formal.msg index 0a67481af..d8463570c 100644 --- a/backend/messages/uniworx/utils/table_column/de-de-formal.msg +++ b/backend/messages/uniworx/utils/table_column/de-de-formal.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Winnie Ros +# SPDX-FileCopyrightText: 2022-24 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Winnie Ros , Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -47,12 +47,12 @@ TablePassed: Bestanden TableNotPassed: Nicht bestanden TableTutorialTutors: Ausbilder TableTutorialName: Bezeichnung -TableTutorialType: Art -TableTutorialRoom: Regulärer Raum +TableTutorialType: Typ +TableTutorialRoom: Raum TableTutorialRoomHidden: Raum nur für Teilnehmer TableTutorialRoomIsUnset !ident-ok: — TableTutorialRoomIsHidden: Raum wird nur Teilnehmern angezeigt -TableTutorialTime: Zeit +TableTutorialOccurrence: Termin TableTutorialDeregisterUntil: Abmeldungen bis TableTutorialFirstDay: Starttag TableActionsHead: Aktionen @@ -73,15 +73,22 @@ TableDiffDaysTooltip: Zeitspanne nach ISO 8601. Beispiel: "P2Y3M4D" ist eine Zei TableExamOfficeLabel: Label-Name TableExamOfficeLabelStatus: Label-Farbe TableExamOfficeLabelPriority: Label-Priorität +TableQualification: Qualifikation TableQualifications: Qualifikationen TableCompany: Firma TableCompanyFilter: Firma oder Nummer TableCompanyShort: Firmenkürzel TableCompanies: Firmen +TablePrimeCompany: Primäre Firma +TablePrimeCompanyShort: Kürzel primäre Firma +TableBookingCompany: Buchende Firma +TableBookingCompanyShort: Kürzel buchende Firma TableCompanyNo: Firmennummer TableCompanyNos: Firmennummern TableCompanyUser: Firmenangehöriger TableCompanyNrUsers: Firmenangehörige +TableCompanyNrSecondaryUsers: Sekundäre Firmenangehörige +TableCompanyReason: Notiz TableCompanyNrSupers: Ansprechpartner TableCompanyNrEmpSupervised: Firmenangehörige mit Ansprechpartner TableCompanyNrEmpRerouted: Firmenangehörige mit Umleitung @@ -91,8 +98,13 @@ TableCompanyNrSupersDefault: Standard Ansprechpartner TableCompanyNrForeignSupers: Firmenfremde Ansprechpartner TableCompanyNrRerouteDefault: Standard Umleitungen TableCompanyNrRerouteActive: Aktive Umleitungen +TableRerouteActive: Umleitung TableCompanyPostalPreference: Benachrichtigungspräferenz neue Firmenangehörige +TableCompanyPinPassword: Pin Passwort für PDF Anhänge TableSupervisor: Ansprechpartner +TableSupervisorActive: Aktiver Ansprechpartner +TableSupervisee: Klient +TableReason: Begründung TableCreationTime: Erstellungszeit TableJob !ident-ok: Job TableJobContent !ident-ok: Parameter @@ -100,10 +112,20 @@ TableJobLockTime: Bearbeitung seit TableJobLockInstance: Bearbeiter TableJobCreationInstance: Ersteller ActJobDelete: Job entfernen +ActJobDeleteForce n@Int: Auch vor #{pluralDEnN n "Minute"} gesperrte Jobs entfernen TableJobActDeleteFeedback n@Int m@Int: #{n}/#{m} Jobs entfernt +ActJobSleep: Test Job einreihen +JobSleepNr: Anzahl Jobs +JobSleepSecs: Laufzeit in Sekunden pro Job +JobSleepNow: Prioriäts-Jobs +TableJobActSleepFeedback n@Int sec@Int prio@Bool: #{n} #{bool tempty "Prioritäts-" prio}#{pluralDEx 's' n "Job"} mit #{sec}s Laufzeit eingereiht. TableFilterComma: Es können mehrere alternative Suchkriterien mit Komma getrennt angegeben werden, wovon mindestens eines erfüllt werden muss. TableFilterCommaPlus: Mehrere alternative Suchkriterien mit Komma trennen. Mindestens ein Suchkriterium muss erfüllt werden, zusätzlich zu allen Suchkriterien mit vorangestelltem Plus-Symbol. +TableFilterCommaPlusShort: Unterstützt mehrere Kriterien mit Komma-Plus, siehe oben. TableFilterCommaName: Mehrere Namen mit Komma trennen. -TableFilterCommaNameNr: Mehrere Namen oder Nummern mit Komma trennen. Nummern werden nur exakt gesucht. +TableFilterCommaNameNr: Mehrere Namen oder exakte Nummern mit Komma trennen. TableUserEdit: Benutzer bearbeiten -TableRows: Zeilen \ No newline at end of file +TableRows: Zeilen +TableUserParkingToken day@Text: Parkmarke #{day} +TableFilterSentBefore: Gesendet bis +TableFilterSentAfter: Gesendet ab \ No newline at end of file diff --git a/backend/messages/uniworx/utils/table_column/en-eu.msg b/backend/messages/uniworx/utils/table_column/en-eu.msg index e7ae23a14..8f2f7927f 100644 --- a/backend/messages/uniworx/utils/table_column/en-eu.msg +++ b/backend/messages/uniworx/utils/table_column/en-eu.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Sarah Vaupel ,Steffen Jost ,Winnie Ros +# SPDX-FileCopyrightText: 2022-24 Sarah Vaupel ,Steffen Jost ,Winnie Ros , Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -20,7 +20,7 @@ TableMatrikelNr: AVS person no TableSex: Sex TableBirthday: Birthday TableSchool: Department -TableCourse: Course +TableCourse: Course category TableCourseMembers: Participants TableExamOccurrence: Occurrence/room TableExamName: Name @@ -48,14 +48,14 @@ TableNotPassed: Failed TableTutorialTutors: Instructors TableTutorialName: Name TableTutorialType: Type -TableTutorialRoom: Regular room +TableTutorialRoom: Room TableTutorialRoomHidden: Room only for participants TableTutorialRoomIsUnset: — TableTutorialRoomIsHidden: Room is only displayed to participants TableTutorialDeregisterUntil: Deregister until TableTutorialFirstDay: Start date TableActionsHead: Actions -TableTutorialTime: Time +TableTutorialOccurrence: Session TableNoFilter: No restriction TableUserMatriculation: AVS number TableColumnStudyFeatures: Features of study @@ -73,15 +73,22 @@ TableDiffDaysTooltip: Duration given according to ISO 8601. Example: "P2Y3M4D" i TableExamOfficeLabel: Label name TableExamOfficeLabelStatus: Label colour TableExamOfficeLabelPriority: Label priority +TableQualification: Qualification TableQualifications: Qualifications TableCompany: Company TableCompanyFilter: Company/Nr TableCompanyShort: Company shorthand TableCompanies: Companies +TablePrimeCompany: Primary company +TablePrimeCompanyShort: Primary company shorthand +TableBookingCompany: Booking company +TableBookingCompanyShort: Booking company shorthand TableCompanyNo: Company number TableCompanyNos: Company numbers TableCompanyUser: Associate TableCompanyNrUsers: Associates +TableCompanyNrSecondaryUsers: Secondary Associates +TableCompanyReason: Note TableCompanyNrSupers: Supervisors TableCompanyNrEmpSupervised: Supervised employees TableCompanyNrEmpRerouted: Employees having reroute @@ -91,8 +98,13 @@ TableCompanyNrSupersDefault: Default supervisors TableCompanyNrForeignSupers: External Supervisors TableCompanyNrRerouteDefault: Default reroutes TableCompanyNrRerouteActive: Active reroutes +TableRerouteActive: Reroute TableCompanyPostalPreference: Default notification preference +TableCompanyPinPassword: Pin password for PDF attachments TableSupervisor: Supervisor +TableSupervisorActive: Active supervisor +TableSupervisee: Supervisee +TableReason: Reason TableCreationTime: Creation TableJob !ident-ok: Job TableJobContent !ident-ok: Parameters @@ -100,10 +112,20 @@ TableJobLockTime: Lock time TableJobLockInstance: Worker TableJobCreationInstance: Creator ActJobDelete: Delete job +ActJobDeleteForce n: Also delete jobs locked #{pluralENsN n "minute"} ago TableJobActDeleteFeedback n@Int m@Int: #{n}/#{m} queued jobs deleted +ActJobSleep: Enqueue sleep job +JobSleepNr: Number of jobs +JobSleepSecs: Seconds per job +JobSleepNow: Priority jobs +TableJobActSleepFeedback n@Int sec@Int prio@Bool: #{n} #{bool tempty "priority " prio} sleep #{pluralENs n "job"} for #{sec}s enqueued. TableFilterComma: Separate multiple alternative filter criteria by comma, at least one of which must be fulfilled. TableFilterCommaPlus: Separate multiple alternative filter criteria by comma, at least one of which must be fulfilled in addition to all criteria preceded by a plus symbol. +TableFilterCommaPlusShort: Support multiple criteria with comma/plus, see above. TableFilterCommaName: Separate names by comma. -TableFilterCommaNameNr: Separate names and numbers by comma. Numbers have to match exact. +TableFilterCommaNameNr: Separate names and exact numbers by comma. TableUserEdit: Edit user -TableRows: Rows \ No newline at end of file +TableRows: Rows +TableUserParkingToken day: Parking token #{day} +TableFilterSentBefore: Sent before +TableFilterSentAfter: Sent after \ No newline at end of file diff --git a/backend/messages/uniworx/utils/utils/de-de-formal.msg b/backend/messages/uniworx/utils/utils/de-de-formal.msg index 5ff122fb1..2a20302a3 100644 --- a/backend/messages/uniworx/utils/utils/de-de-formal.msg +++ b/backend/messages/uniworx/utils/utils/de-de-formal.msg @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Steffen Jost ,Gregor Kleen ,Sarah Vaupel ,Winnie Ros +# SPDX-FileCopyrightText: 2023-25 Steffen Jost ,Gregor Kleen ,Sarah Vaupel ,Winnie Ros ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -25,6 +25,7 @@ RGTutorialParticipants tutn@TutorialName: Kursteilnehmer:innen (#{tutn}) RGExamRegistered examn@ExamName: Angemeldet zur Prüfung „#{examn}“ RGSheetSubmittor shn@SheetName: Abgebende für das Übungsblatt „#{shn}“ CommSubject: Betreff +CommContent: Inhalt CommAttachments: Anhänge CommAttachmentsTip: Im Allgemeinen ist es vorzuziehen Dateien, die Sie mit den Empfängern teilen möchten, als Material hochzuladen (und ggf. in der Nachricht zu verlinken). So ist die Datei für die Empfänger dauerhaft abrufbar und auch Personen, die sich z.B. erst später zur Kursart anmelden, haben Zugriff auf die Datei. CommSuccess n@Int: Nachricht wurde an #{n} Empfänger versandt @@ -80,8 +81,10 @@ MultiUserFieldExplanationAnyUser: Dieses Eingabefeld sucht in den Adressen aller MultiUserFieldInvitationExplanation: An Adressen, die so keinem Uni2work-Benutzer/keiner Uni2work-Benutzerin zugeordnet werden können, wird eine Einladung per E-Mail versandt. MultiUserFieldInvitationExplanationAlways: Es wird an alle Adressen, die Sie hier angeben, eine Einladung per E-Mail versandt. AmbiguousEmail: E-Mail-Adresse nicht eindeutig +UnknownEmail: E-Mail-Adresse konnte keinem bekannten Benutzer zugeordnet werden InvalidEmailAddress: E-Mail-Adresse ist ungültig InvalidEmailAddressWith e@Text: E-Mail-Adresse #{show e} ist ungültig +MailFileAttachment: Dateianhang UtilExamResultGrade: Note UtilExamResultPass: Bestanden/Nicht Bestanden UtilExamResultNoShow: Nicht erschienen @@ -89,6 +92,7 @@ UtilExamResultVoided: Entwertet CourseOption tid@TermId ssh@SchoolId csh@CourseShorthand coursen@CourseName !ident-ok: #{tid} - #{ssh} - #{csh}: #{coursen} RoomReferenceNone !ident-ok: — RoomReferenceSimple !ident-ok: Text +RoomReferenceSimpleAt r@Text: in Raum #{r} RoomReferenceLink: Link & Anweisungen RoomReferenceSimpleText: Raum RoomReferenceSimpleTextPlaceholder: Raum @@ -96,9 +100,11 @@ RoomReferenceLinkLink !ident-ok: Link RoomReferenceLinkLinkPlaceholder !ident-ok: URL RoomReferenceLinkInstructions: Anweisungen RoomReferenceLinkInstructionsPlaceholder: Anweisungen +UtilNoneSet: Keine angegeben UtilEmptyChoice: Auswahl war leer UtilEmptyNoChangeTip: Eine leere Eingabe belässt den vorherigen Wert unverändert. MultiNoSelection: Keine Auswahl +MustBePositive: muss positiv sein #invitation.hs InvitationAction: Aktion diff --git a/backend/messages/uniworx/utils/utils/en-eu.msg b/backend/messages/uniworx/utils/utils/en-eu.msg index f65004cd1..7a8206d4a 100644 --- a/backend/messages/uniworx/utils/utils/en-eu.msg +++ b/backend/messages/uniworx/utils/utils/en-eu.msg @@ -1,18 +1,18 @@ -# SPDX-FileCopyrightText: 2023 Sarah Vaupel ,Winnie Ros ,Steffen Jost +# SPDX-FileCopyrightText: 2023-25 Sarah Vaupel ,Winnie Ros ,Steffen Jost ,Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later #communication.hs RecipientCustom: Custom recipients -RGCourseParticipants: Course type participants +RGCourseParticipants: Course category participants RGCourseLecturers: Course administrators -RGCourseCorrectors: Course type correctors +RGCourseCorrectors: Course category correctors RGCourseTutors: Course instructors -RGCourseParticipantsInTutorial: Course type participants who are registered for at least one course +RGCourseParticipantsInTutorial: Course category participants who are registered for at least one course RGCourseUnacceptedApplicants: Applicants not accepted RecipientToggleAll: All/None CommCourseTestSubject customSubject: [TEST] #{customSubject} -UtilCommCourseSubject: Course type message +UtilCommCourseSubject: Course category message UtilCommFirmSubject: Company message CommRecipients: Recipients CommRecipientsTip: You always receive a copy of the message @@ -25,8 +25,9 @@ RGTutorialParticipants tutn: Course participants (#{tutn}) RGExamRegistered examn: Registered for exam “#{examn}” RGSheetSubmittor shn: Submitted for exercise sheet “#{shn}” CommSubject: Subject +CommContent: Content CommAttachments: Attachments -CommAttachmentsTip: In general it is preferable to upload files as course type material instead of sending them as attachments. You can then link to the material from the message. The file is then permanently accessable to the recipients and to persons that, for example, register for the Course type at a later date. +CommAttachmentsTip: In general it is preferable to upload files as course category material instead of sending them as attachments. You can then link to the material from the message. The file is then permanently accessable to the recipients and to persons that, for example, register for the Course category at a later date. CommSuccess n: Message was sent to #{n} #{pluralEN n "recipient" "recipients"} CommTestSuccess: Message was sent only to yourself for testing purposes @@ -80,8 +81,10 @@ MultiUserFieldExplanationAnyUser: This input searches through the addresses of a MultiUserFieldInvitationExplanation: For addresses, which are not found in this way, an invitation will be sent via email. MultiUserFieldInvitationExplanationAlways: An invitation will be sent via email to all addresses you enter here. AmbiguousEmail: Email address is ambiguous +UnknownEmail: Email adresse is not associated with any registred user InvalidEmailAddress: Email address is invalid InvalidEmailAddressWith e: Email asdress #{show e} is invalid +MailFileAttachment: Attached file UtilExamResultGrade: Grade UtilExamResultPass: Passed/Failed UtilExamResultNoShow: Not present @@ -89,6 +92,7 @@ UtilExamResultVoided: Voided CourseOption tid ssh csh coursen: #{tid} - #{ssh} - #{csh}: #{coursen} RoomReferenceNone: — RoomReferenceSimple: Text +RoomReferenceSimpleAt r: at room #{r} RoomReferenceLink: Link & Instructions RoomReferenceSimpleText: Room RoomReferenceSimpleTextPlaceholder: Room @@ -96,9 +100,11 @@ RoomReferenceLinkLink: Link RoomReferenceLinkLinkPlaceholder: URL RoomReferenceLinkInstructions: Instructions RoomReferenceLinkInstructionsPlaceholder: Instructions +UtilNoneSet: None set UtilEmptyChoice: Empty selection UtilEmptyNoChangeTip: Existing values remain unchanged if this field is left empty. MultiNoSelection: No selection +MustBePositive: must be positive #invitation.hs InvitationAction: Action diff --git a/backend/models/audit.model b/backend/models/audit.model index 3cd567a13..8a372cd3b 100644 --- a/backend/models/audit.model +++ b/backend/models/audit.model @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022-23 Gregor Kleen ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-24 Gregor Kleen ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -8,7 +8,7 @@ TransactionLog instance InstanceId initiator UserId Maybe -- User associated with performing this action remote IP Maybe -- Remote party that triggered this action via HTTP - info Value -- JSON-encoded `Transaction` + info Value -- JSON-encoded `Transaction`. Value allows full backwards compatibility deriving Eq Read Show Generic InterfaceLog @@ -26,6 +26,13 @@ InterfaceHealth interface Text subtype Text Maybe write Bool Maybe - hours Int + hours Int -- negative number: never expires, i.e. if the last entry is a success, this remains indefinitely UniqueInterfaceHealth interface subtype write !force -- Note that nullable fields must be either empty or unique deriving Eq Read Show Generic + +ProblemLog + time UTCTime default=now() + info Value -- generic JSON Value allows maximum backwards compatibility + solved UTCTime Maybe + solver UserId Maybe -- User who marked this problem as done + deriving Eq Read Show Generic \ No newline at end of file diff --git a/backend/models/avs.model b/backend/models/avs.model index 7a8a59cc0..ee4dd9a19 100644 --- a/backend/models/avs.model +++ b/backend/models/avs.model @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022 Steffen Jost +-- SPDX-FileCopyrightText: 2022-24 Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -16,27 +16,19 @@ UserAvs personId AvsPersonId -- unique identifier for user throughout avs; newtype for Int user UserId - noPerson Int default=0 -- only needed for manual communication with personnel from Ausweisverwaltungsstelle + noPerson Int default=0 -- only needed for manual communication with personnel from Ausweisverwaltungsstelle, redundant since needed for filtering lastSynch UTCTime default=now() lastSynchError Text Maybe + lastPersonInfo AvsPersonInfo Maybe -- just to discern field changes + lastFirmInfo AvsFirmInfo Maybe -- just to discern field changes + lastCardNo AvsFullCardNo Maybe -- just to discern changes UniqueUserAvsUser user UniqueUserAvsId personId deriving Generic Show --- Multiple UserAvsCards per UserAvs is possible and not too uncommon. --- Purpose of saving cards is to detect external changes in qualifications and postal addresses --- TODO: This table will be deleted if AVS CR3 SCF-165 is implemented -UserAvsCard - personId AvsPersonId - cardNo AvsFullCardNo - card AvsDataPersonCard - lastSynch UTCTime - -- UniqueAvsCard cardNo -- Note: cardNo is not unique; invalid cardNo may be reissued to different persons - deriving Generic - AvsSync user UserId -- Note: we need to lookup UserAvs Entity anyway, so no benefit from storing AvsPersonId here creationTime UTCTime - pause Day Maybe + pause Day Maybe -- Don't synch if last synch after this day, otherwise synch UniqueAvsSyncUser user - deriving Generic \ No newline at end of file + deriving Generic Show \ No newline at end of file diff --git a/backend/models/company.model b/backend/models/company.model index c022ad5f1..4d3619a8c 100644 --- a/backend/models/company.model +++ b/backend/models/company.model @@ -1,25 +1,20 @@ --- SPDX-FileCopyrightText: 2022 Sarah Vaupel ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-25 Sarah Vaupel ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later -- Description of companies associated with users Company - name CompanyName -- == (CI Text) - shorthand CompanyShorthand -- == (CI Text) and CompanyKey :: CompanyShorthand -> CompanyId FUTURE TODO: a shorthand will become available through the AVS interface in the future - avsId Int default=0 -- primary key from avs - prefersPostal Bool default=false -- new company users prefers letters by post instead of email - postAddress StoredMarkup Maybe -- default company postal address - email UserEmail Maybe -- Case-insensitive generic company eMail address - UniqueCompanyName name - UniqueCompanyShorthand shorthand - -- UniqueCompanyAvsId avsId -- should be the case, unclear if enforcing works here, since we cannot query avs by company id - Primary shorthand -- newtype Key Company = CompanyKey { unCompanyKey :: CompanyShorthand } + name CompanyName -- == (CI Text) -- NOTE: Fraport department name may carry additional information; use the Shorthand with respect to UserCompanyDepartment + shorthand CompanyShorthand -- == (CI Text) and CompanyKey :: CompanyShorthand -> CompanyId A change to AvsId as primary key is too much work and not strictly necessary due to Uniqueness + avsId Int default=0 -- primary key from avs, use negative numbers for non-AVS companies + prefersPostal Bool default=true -- new company users prefers letters by post instead of email + postAddress StoredMarkup Maybe -- default company postal address, including company name + email UserEmail Maybe -- Case-insensitive generic company eMail address + pinPassword Bool default=true -- new company users only: should sensitive PDF email attachement be protected by a password? + -- UniqueCompanyName name -- Should be Unique in AVS, but we do not yet need to enforce it + -- UniqueCompanyShorthand shorthand -- unnecessary, since it is the primary key already + UniqueCompanyAvsId avsId -- Should be the key, is not for historical reasons and for convenience in URLs and columns + Primary shorthand -- newtype Key Company = CompanyKey { unCompanyKey :: CompanyShorthand } deriving Ord Eq Show Generic Binary --- TODO: a way to populate this table (manually) -CompanySynonym - synonym CompanyName - canonical CompanyShorthand OnDeleteCascade OnUpdateCascade - UniqueCompanySynonym synonym - deriving Ord Eq Show Generic diff --git a/backend/models/courses.model b/backend/models/courses.model index ded2013dd..594bbf48e 100644 --- a/backend/models/courses.model +++ b/backend/models/courses.model @@ -28,13 +28,12 @@ Course -- Information about a single course; contained info is always visible TermSchoolCourseName term school name -- name must be unique within school and semester deriving Generic CourseEvent - type (CI Text) - course CourseId OnDeleteCascade OnUpdateCascade - room RoomReference Maybe - roomHidden Bool default=false - time Occurrences - note StoredMarkup Maybe - lastChanged UTCTime default=now() + type (CI Text) + course CourseId OnDeleteCascade OnUpdateCascade + roomHidden Bool default=false + time (JSONB Occurrences) + note StoredMarkup Maybe + lastChanged UTCTime default=now() deriving Generic CourseAppInstructionFile diff --git a/backend/models/exams.model b/backend/models/exams.model index e7dae4212..610bac4df 100644 --- a/backend/models/exams.model +++ b/backend/models/exams.model @@ -37,16 +37,17 @@ ExamPart UniqueExamPartName exam name !force deriving Read Show Eq Ord Generic ExamOccurrence - exam ExamId - name ExamOccurrenceName - room RoomReference Maybe - roomHidden Bool default=false - capacity Word64 Maybe - start UTCTime - end UTCTime Maybe - description StoredMarkup Maybe + exam ExamId + name ExamOccurrenceName + examiner UserId Maybe + room RoomReference Maybe + roomHidden Bool default=false + capacity Word64 Maybe + start UTCTime + end UTCTime Maybe + description StoredMarkup Maybe UniqueExamOccurrence exam name - deriving Generic + deriving Eq Ord Show Generic Binary ExamRegistration exam ExamId user UserId diff --git a/backend/models/jobs.model b/backend/models/jobs.model index 98aa8c3b8..bc24e931f 100644 --- a/backend/models/jobs.model +++ b/backend/models/jobs.model @@ -20,11 +20,11 @@ CronLastExec time UTCTime -- When was the job executed instance InstanceId -- Which uni2work-instance did the work UniqueCronLastExec job - deriving Generic + deriving Generic Show TokenBucket ident TokenBucketIdent lastValue Int64 lastAccess UTCTime Primary ident - deriving Generic \ No newline at end of file + deriving Generic Show \ No newline at end of file diff --git a/backend/models/lms.model b/backend/models/lms.model index 9e96df730..fdc7a33c8 100644 --- a/backend/models/lms.model +++ b/backend/models/lms.model @@ -1,28 +1,30 @@ --- SPDX-FileCopyrightText: 2022-23 Sarah Vaupel ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-25 Sarah Vaupel ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later Qualification -- INVARIANT: 2*refreshWithin < validDuration - school SchoolId --TODO: Ansprechpartner der Schule in Briefe erwähnen - shorthand (CI Text) - name (CI Text) - description StoredMarkup Maybe -- user-defined large Html, ought to contain full description - validDuration Int Maybe -- > 0, qualification is valid indefinitely or for a specified number of months, use with addMonthsDay - auditDuration Int Maybe -- > 0, number of months to keep audit log and LmsUserIdents; or indefinitely (dangerous, since LmsIdents may run out) - refreshWithin CalendarDiffDays Maybe -- notify users about renewal within this number of month/days before expiry; to be used with addGregorianDurationClip - refreshReminder CalendarDiffDays Maybe -- send a second notification about renewal within this number of month/days before expiry - elearningStart Bool -- automatically schedule e-refresher - -- elearningOnly Bool -- successful E-learing automatically increases validity. NO! - expiryNotification Bool default=true -- should expiryNotification be generated for this qualification? - avsLicence AvsLicence Maybe -- if set, valid QualificationUsers are synchronized to AVS as a driving licence - sapId Text Maybe -- if set, valid QualificationUsers with userCompanyPersonalNumber are transmitted via SAP interface under this id + school SchoolId -- 1 + shorthand (CI Text) -- 2 + name (CI Text) -- 3 + description StoredMarkup Maybe -- 4 user-defined large Html, ought to contain full description + validDuration Int Maybe -- 5 if > 0, qualification is valid indefinitely or for a specified number of months, use with addMonthsDay + auditDuration Int default=366 -- 6 number of days to keep LMS audit log and LmsUserIdents -- TODO: audit period for QualificationUser/Block as well + refreshWithin CalendarDiffDays Maybe -- 7 notify users about renewal within this number of month/days before expiry; to be used with addGregorianDurationClip + refreshReminder CalendarDiffDays Maybe -- 8 send a second notification about renewal within this number of month/days before expiry + elearningStart Bool -- 9 automatically schedule e-refresher + elearningRenews Bool default=true -- 10 successful e-learing automatically increases validity automatically by validDuration + elearningLimit Int Maybe -- 11 limit of e-learning attempts, currently only for informative purposes, as it is enforced by LMS only + lmsReuses QualificationId Maybe -- 12 if set, lms is also included within the given qualification's lms, but only for direct routes. AuditDuration is used from this Qualification instead. + expiryNotification Bool default=true -- 13 should expiryNotification be generated for this qualification? + avsLicence AvsLicence Maybe -- 14 if set, valid QualificationUsers are synchronized to AVS as a driving licence + sapId Text Maybe -- 15 if set, valid QualificationUsers with userCompanyPersonalNumber are transmitted via SAP interface under this id SchoolQualificationShort school shorthand -- must be unique per school and shorthand SchoolQualificationName school name -- must be unique per school and name - -- across all schools, only one qualification may be a driving licence: - UniqueQualificationAvsLicence avsLicence !force -- either empty or unique + -- across all schools, only one qualification may be a driving licence -- NO LONGER TRUE + -- UniqueQualificationAvsLicence avsLicence !force -- either empty or unique -- NOTE: two NULL values are not equal for the purpose of Uniqueness constraints! - deriving Eq Generic + deriving Show Eq Generic Binary -- TODOs: -- - Enstehen Kosten, wenn Teilnehmer für KnowHow eingereiht werden, aber nicht am Kurs teilnehmen? @@ -40,19 +42,20 @@ Qualification -- - PinReset==1 mit bestehendem Passwort kann problemlos erneut gesendet werden -- - Flag "interner Mitarbeiter" wird von Know-How ignoriert / nicht ausgewertet (legacy) -QualificationPrecondition -- NOTE: this can only be enforced through a background job adding or removing qualifications - qualification QualificationId OnDeleteCascade OnUpdateCascade -- AND: not unique, ie. qualification can have multiple required preconditions - required [QualificationId] -- OR : alternatives, any one will suffice - continuous Bool -- expiring precondition blocks qualification - deriving Generic +-- QualificationPrecondition -- NOTE: this can only be enforced through a background job adding or removing qualifications +-- qualification QualificationId OnDeleteCascade OnUpdateCascade -- AND: not unique, ie. qualification can have multiple required preconditions +-- required [QualificationId] -- OR : alternatives, any one will suffice -- we don't want array, since we have recursive CTEs +-- continuous Bool -- expiring precondition blocks qualification +-- deriving Generic Show -- Maybe an alternative for online qualification validity checking, transitivity through recursive CTEs? (already available in our version) --- QualificationRequirement --- qualification QualificationId OnDeleteCascade OnUpdateCascade --- requirement QualificationId OnDeleteCascade OnUpdateCascade --- group Text -- OR: several requirements within the same group are considered equivalent --- UniqueQualificationRequirement qualification requirement --- +QualificationRequirement + qualification QualificationId OnDeleteCascade OnUpdateCascade + requirement QualificationId OnDeleteCascade OnUpdateCascade + group Int -- OR: several requirements within the same group are considered equivalent; no order between groups + note Text -- for humans only, no semantical effect + UniqueQualificationRequirement qualification requirement + deriving Generic Show -- TODO: connect Qualification with Exams! @@ -60,7 +63,7 @@ QualificationEdit user UserId time UTCTime qualification QualificationId OnDeleteCascade OnUpdateCascade - deriving Generic + deriving Generic Show QualificationUser user UserId OnDeleteCascade OnUpdateCascade @@ -69,11 +72,11 @@ QualificationUser lastRefresh Day -- lastRefresh > validUntil possible, if Qualification^elearningOnly == False firstHeld Day -- first time the qualification was earned, should never change scheduleRenewal Bool default=true -- if false, no automatic renewal is scheduled and the qualification expires - lastNotified UTCTime default=now() -- last notficiation about being invalid + lastNotified UTCTime default=now() -- last notficiation about actual licence validity changes (does not entail e-learning notifications) -- Reasons and temporary revocations are implemented through QualificationUserBlock -- TODO: adjust SAP interface to transmit end dates UniqueQualificationUser qualification user - deriving Generic + deriving Generic Show QualificationUserBlock qualificationUser QualificationUserId OnDeleteCascade OnUpdateCascade @@ -130,7 +133,7 @@ LmsUser -- Primary ident -- newtype Key LmsUserId = LmsUserKey { unLmsUser :: Text } -- change LmsIdent -> Text. Do we want this? No. UniqueLmsIdent ident -- idents must be unique accross all qualifications, since idents are global within LMS! UniqueLmsQualificationUser qualification user -- each user may be enrolled at most once per course - deriving Generic + deriving Generic Show -- LmsUserStatus -- lmsUser LmsUserId OnDeleteCascade OnUpdateCascade @@ -148,7 +151,7 @@ LmsReport lock Bool -- (0|1) timestamp UTCTime default=now() UniqueLmsReport qualification ident -- required by DBTable - deriving Generic + deriving Generic Show -- LmsAudit removed by commit 71cde92a -- due to frequent transmit errors, a separate lms tranmission log is necessary again @@ -160,4 +163,16 @@ LmsReportLog lock Bool -- (0|1) timestamp UTCTime default=now() missing Bool default=false - deriving Generic \ No newline at end of file + deriving Generic Show + +-- Table to manage unknown or orphaned lms identifiers +LmsOrphan + qualification QualificationId OnDeleteCascade OnUpdateCascade + ident LmsIdent -- must be unique accross all LMS courses! + seenFirst UTCTime default=now() -- first time reported by LMS + seenLast UTCTime default=now() -- last acknowledgement by LMS, deletion uses QualificationAuditDuration + deletedLast UTCTime Maybe -- last deletion request sent to LMS + resultLast LmsState -- last received learning state + reason Text Maybe -- to mark explicit e-learning deletions, etc + UniqueLmsOrphan qualification ident -- unlike other tables, LMS Idents must only be unique within qualification, allowing orphans to be handled independently + deriving Generic Show \ No newline at end of file diff --git a/backend/models/print.model b/backend/models/print.model index ee22cf922..94d4a3dc8 100644 --- a/backend/models/print.model +++ b/backend/models/print.model @@ -10,22 +10,23 @@ PrintJob created UTCTime acknowledged UTCTime Maybe recipient UserId Maybe OnDeleteSetNull OnUpdateCascade -- optional as some letters may contain just an address + affected UserId Maybe OnDeleteSetNull OnUpdateCascade -- subject of the letter sender UserId Maybe OnDeleteSetNull OnUpdateCascade -- senders and associations are optional course CourseId Maybe OnDeleteCascade OnUpdateCascade qualification QualificationId Maybe OnDeleteCascade OnUpdateCascade lmsUser LmsIdent Maybe OnDeleteSetNull OnUpdateCascade -- allows tracking if recipient has been notified; must be unique -- UniquePrintJobLmsUser lmsUser -- Note that in fact multiple print jobs per LMS user are possible! -- UniquePrintJobApcIdent apcIdent -- TODO: not yet enforced, since LmsIdent is currently used - deriving Generic + deriving Generic Show PrintAcknowledge -- just to store acknowledging requests to be evaluated by a background job later on apcIdent Text timestamp UTCTime default=now() processed Bool - deriving Generic + deriving Generic Show PrintAckIdAlias needle Text replacement Text priority Int - deriving Generic \ No newline at end of file + deriving Generic Show \ No newline at end of file diff --git a/backend/models/tutorials.model b/backend/models/tutorials.model index be27d6a87..c1e237344 100644 --- a/backend/models/tutorials.model +++ b/backend/models/tutorials.model @@ -6,10 +6,9 @@ Tutorial json name TutorialName course CourseId OnDeleteCascade OnUpdateCascade type (CI Text) -- "Tutorium", "Zentralübung", ... - capacity Int Maybe -- limit for enrolment in this tutorial - room RoomReference Maybe + capacity Int Maybe -- limit for enrolment in this tutorial roomHidden Bool default=false - time Occurrences + time (JSONB Occurrences) regGroup (CI Text) Maybe -- each participant may register for one tutorial per regGroup registerFrom UTCTime Maybe registerTo UTCTime Maybe @@ -25,8 +24,19 @@ Tutor UniqueTutor tutorial user deriving Generic TutorialParticipant - tutorial TutorialId OnDeleteCascade OnUpdateCascade - user UserId + tutorial TutorialId OnDeleteCascade OnUpdateCascade + user UserId + company CompanyId Maybe + drivingPermit UserDrivingPermit Maybe + eyeExam UserEyeExam Maybe + note Text Maybe UniqueTutorialParticipant tutorial user - deriving Eq Ord Show - deriving Generic \ No newline at end of file + deriving Eq Ord Show Generic +TutorialParticipantDay + tutorial TutorialId OnDeleteCascade OnUpdateCascade + user UserId OnDeleteCascade OnUpdateCascade + day Day + attendance Bool default=true + note Text Maybe + UniqueTutorialParticipantDay tutorial user day + deriving Show Generic \ No newline at end of file diff --git a/backend/models/users.model b/backend/models/users.model index b23fe85b2..96761a200 100644 --- a/backend/models/users.model +++ b/backend/models/users.model @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-24 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -14,14 +14,14 @@ User json -- Each Uni2work user has a corresponding row in this table; created upon first login. surname UserSurname -- Display user names always through 'nameWidget displayName surname' displayName UserDisplayName - displayEmail UserEmail - email UserEmail -- Case-insensitive eMail address, used for sending TODO: make this nullable - ident UserIdent -- Case-insensitive user-identifier + displayEmail UserEmail -- Case-insensitive eMail address, used for sending; leave empty for using auto-update CompanyEmail via UserCompany + email UserEmail -- Case-insensitive eMail address, used for identification and fallback for sending. Defaults to "AVSNO:dddddddd" if unknown + ident UserIdent -- Case-insensitive user-identifier. Defaults to "AVSID:dddddddd" if unknown authentication AuthenticationMode -- 'AuthLDAP' or ('AuthPWHash'+password-hash) lastAuthentication UTCTime Maybe -- last login date created UTCTime default=now() lastLdapSynchronisation UTCTime Maybe - ldapPrimaryKey UserEduPersonPrincipalName Maybe + ldapPrimaryKey UserEduPersonPrincipalName Maybe -- Fraport Personnel Number or Email-Prefix for @fraport.de work here tokensIssuedAfter UTCTime Maybe -- do not accept bearer tokens issued before this time (accept all tokens if null) matrikelnummer UserMatriculation Maybe -- usually a number; AVS Personalnummer; nicht Fraport Personalnummer! firstName Text -- For export in tables, pre-split firstName from displayName @@ -44,9 +44,9 @@ User json -- Each Uni2work user has a corresponding row in this table; create mobile Text Maybe companyPersonalNumber Text Maybe -- Company will become a new table, but if company=fraport, some information is received via LDAP companyDepartment Text Maybe -- thus we store such information for ease of reference directly, if available - pinPassword Text Maybe -- used to encrypt pins within emails - postAddress StoredMarkup Maybe - postLastUpdate UTCTime Maybe -- record postal address updates + pinPassword Text Maybe -- used to encrypt pins within emails, defaults to cardno.version + postAddress StoredMarkup Maybe -- including company name, if any, but excluding username; leave empty for using auto-update CompanyPostAddress via UserCompany + postLastUpdate UTCTime Maybe -- record postal address updates prefersPostal Bool default=false -- user prefers letters by post instead of email examOfficeGetSynced Bool default=true -- whether synced status should be displayed for exam results by default examOfficeGetLabels Bool default=true -- whether labels should be displayed for exam results by default @@ -61,42 +61,52 @@ UserFunction -- Administratively assigned functions (lecturer, admin, evaluation function SchoolFunction UniqueUserFunction user school function deriving Generic -UserSystemFunction +UserSystemFunction Show user UserId function SystemFunction -- Defined in Model.Types.User manual Bool -- Inserted manually by Admin or automatic from LDAP isOptOut Bool -- User has currently deactivate the role for themselves UniqueUserSystemFunction user function - deriving Generic + deriving Generic Show UserExamOffice user UserId field StudyTermsId UniqueUserExamOffice user field - deriving Generic + deriving Generic Show UserSchool -- Managed by users themselves, encodes "schools of interest" user UserId school SchoolId isOptOut Bool -- true if this a marker, that the user manually deleted this entry; it should not be recreated automatically UniqueUserSchool user school - deriving Generic + deriving Generic Show UserGroupMember group UserGroupName user UserId primary Checkmark nullable UniquePrimaryUserGroupMember group primary !force UniqueUserGroupMember group user - deriving Generic + deriving Generic Show UserCompany user UserId company CompanyId OnDeleteCascade OnUpdateCascade supervisor Bool default=false -- should this user be made supervisor for all _new_ users associated with this company? supervisorReroute Bool default=false -- if supervisor is true, should this supervisor receive email for _new_ company users? + priority Int default=0 -- higher number, higher priority; default=1 for Haskell-Code + useCompanyAddress Bool default=true -- if true, CompanyPostalAddress and CompanyEmail are used if UserPostalAddress/UserDisplayEmail are Nothing, respects priority + reason Text Maybe -- miscellaneous note, e.g. Superior UniqueUserCompany user company -- a user may belong to multiple companies, but to each one only once - deriving Generic + deriving Generic Show UserSupervisor - supervisor UserId -- multiple supervisor per trainee possible + supervisor UserId -- multiple supervisor per trainee possible user UserId - rerouteNotifications Bool -- User can be his own supervisor to receive notifications as well - UniqueUserSupervisor supervisor user -- each supervisor/user combination is unique (same supervisor can superviser the same user only once) - deriving Generic - + rerouteNotifications Bool -- User can be his own supervisor to receive notifications as well + company CompanyId Maybe OnDeleteCascade OnUpdateCascade -- this supervisor was company default supervisor at time of entry + reason Text Maybe -- miscellaneous reason, e.g. Winterservice supervisision + UniqueUserSupervisor supervisor user -- each supervisor/user combination is unique (same supervisor can superviser the same user only once) + deriving Generic Show +UserDay + user UserId OnDeleteCascade OnUpdateCascade + day Day + parkingToken Bool default=false + UniqueUserDay user day + deriving Generic Show diff --git a/backend/package.yaml b/backend/package.yaml index 4a0878724..7e7a78efa 100644 --- a/backend/package.yaml +++ b/backend/package.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-or-later name: uniworx -version: 27.4.59 +version: 27.4.79 dependencies: - base - yesod diff --git a/backend/routes b/backend/routes index db80030ec..efde6ff6a 100644 --- a/backend/routes +++ b/backend/routes @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel , Gregor Kleen , Sarah Vaupel , Steffen Jost , Wolfgang Witt +-- SPDX-FileCopyrightText: 2022-2025 Sarah Vaupel , Gregor Kleen , Sarah Vaupel , Steffen Jost , Wolfgang Witt , Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -53,11 +53,12 @@ / NewsR GET !free /users UsersR GET POST -- no tags, i.e. admins only -/users/#CryptoUUIDUser AdminUserR GET POST -/users/#CryptoUUIDUser/delete AdminUserDeleteR POST -/users/#CryptoUUIDUser/hijack AdminHijackUserR GET POST !adminANDno-escalation +/users/#CryptoUUIDUser AdminUserR GET POST +/users/#CryptoUUIDUser/delete AdminUserDeleteR POST +/users/#CryptoUUIDUser/hijack AdminHijackUserR GET POST !adminANDno-escalation /users/#CryptoUUIDUser/notifications UserNotificationR GET POST !self /users/#CryptoUUIDUser/password UserPasswordR GET POST !selfANDis-pw-hash +/users/#CryptoUUIDUser/recipients UserRecipientsR GET !self !/users/functionary-invite/new AdminNewFunctionaryInviteR GET POST !/users/functionary-invite AdminFunctionaryInviteR GET POST !/users/add AdminUserAddR GET POST @@ -69,14 +70,21 @@ /admin/crontab AdminCrontabR GET /admin/crontab/jobs AdminJobsR GET POST /admin/avs AdminAvsR GET POST -/admin/avs/#CryptoUUIDUser AdminAvsUserR GET +/admin/avs/#CryptoUUIDUser AdminAvsUserR GET POST /admin/ldap AdminLdapR GET POST -/admin/problems AdminProblemsR GET -/admin/problems/no-contact ProblemUnreachableR GET +/admin/problems AdminProblemsR GET POST +/admin/problems/no-contact ProblemUnreachableR GET POST /admin/problems/no-avs-id ProblemWithoutAvsId GET /admin/problems/r-without-f ProblemFbutNoR GET /admin/problems/avs ProblemAvsSynchR GET POST /admin/problems/avs/errors ProblemAvsErrorR GET +/admin/config/interfaces ConfigInterfacesR GET POST + +/comm CommCenterR GET +/comm/email MailCenterR GET POST +/comm/email/html/#CryptoUUIDSentMail MailHtmlR GET +/comm/email/plain/#CryptoUUIDSentMail MailPlainR GET +/comm/email/attachment/#CryptoUUIDSentMail/#Text MailAttachmentR GET /print PrintCenterR GET POST !system-printer /print/acknowledge/#Day/#Int/#Int PrintAckR GET POST !system-printer @@ -118,6 +126,7 @@ /firms FirmAllR GET POST -- not yet !supervisor /firms/comm/+Companies FirmsCommR GET POST +/firms/supervision FirmsSupervisionR GET POST /firm/#CompanyShorthand/comm FirmCommR GET POST /firm/#CompanyShorthand FirmUsersR GET POST -- not yet !supervisor /firm/#CompanyShorthand/supers FirmSupersR GET POST -- not yet !supervisor @@ -150,8 +159,9 @@ /school SchoolListR GET !/school/new SchoolNewR GET POST /school/#SchoolId SchoolR: - / SchoolEditR GET POST - + /edit SchoolEditR GET POST + /day/#Day SchoolDayR GET POST + /day/#Day/check SchoolDayCheckR GET /participants ParticipantsListR GET !evaluation /participants/#TermId/#SchoolId ParticipantsR GET !evaluation @@ -221,6 +231,7 @@ /delete TDeleteR GET POST /participants TUsersR GET POST !tutor /participants/add TAddUserR GET POST !tutor + /participants/exam/#ExamName TExamR GET POST !tutor /register TRegisterR POST !timeANDcapacityANDcourse-registeredANDregister-group !timeANDtutorial-registered /communication TCommR GET POST !tutor /tutor-invite TInviteR GET POST !tutorANDtutor-control @@ -270,20 +281,22 @@ !/#UUID CryptoUUIDDispatchR GET !free -- just redirect -- !/*{CI FilePath} CryptoFileNameDispatchR GET !free -- Disabled until preliminary check for valid cID exists -/qualification QualificationAllR GET !free -/qualification/#SchoolId QualificationSchoolR GET !free -/qualification/#SchoolId/#QualificationShorthand QualificationR GET POST !free +/qualification QualificationAllR GET !free +/qualification/#SchoolId QualificationSchoolR GET !free +!/qualification/#SchoolId/new QualificationNewR GET POST -- not free +/qualification/#SchoolId/#QualificationShorthand QualificationR GET POST !free +/qualification/#SchoolId/#QualificationShorthand/edit QualificationEditR GET POST -- not free -- /qualification/#SchoolId/#QualificationShorthand/#CryptoUUIDUser QualificationUserR GET -- see LmsUserR -/qualifications/sap/direct QualificationSAPDirectR GET -- !token -- SAP EXPORT -- TODO reinstate token requirement +/qualifications/sap/direct QualificationSAPDirectR GET -- !token -- SAP EXPORT -- TODO reinstate token requirement -- LMS /lms LmsAllR GET POST /lms/#SchoolId LmsSchoolR GET /lms/#SchoolId/#QualificationShorthand LmsR GET POST -/lms/#SchoolId/#QualificationShorthand/edit LmsEditR GET POST -- new V2 LMS Interface /lms/#SchoolId/#QualificationShorthand/learners LmsLearnersR GET +/lms/#SchoolId/#QualificationShorthand/learners/orphans LmsOrphansR GET /lms/#SchoolId/#QualificationShorthand/learners/direct LmsLearnersDirectR GET !token -- LMS /lms/#SchoolId/#QualificationShorthand/report LmsReportR GET POST /lms/#SchoolId/#QualificationShorthand/report/upload LmsReportUploadR GET POST diff --git a/backend/src/Application.hs b/backend/src/Application.hs index 4b60ecb39..6615324f3 100644 --- a/backend/src/Application.hs +++ b/backend/src/Application.hs @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Sarah Vaupel ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-2024 Gregor Kleen ,Sarah Vaupel ,Sarah Vaupel ,Steffen Jost ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -115,16 +115,11 @@ import GHC.RTS.Flags (getRTSFlags) import qualified Prometheus -import qualified Data.IntervalMap.Strict as IntervalMap - import qualified Utils.Pool as Custom -import Utils.Postgresql -import Handler.Utils.Memcached (manageMemcachedLocalInvalidations) - import qualified System.Clock as Clock -import Utils.Avs +import Utils.Avs (mkAvsQuery) -- Import all relevant handler modules here. -- (HPack takes care to add new modules to our cabal file nowadays.) @@ -137,6 +132,7 @@ import Handler.Users.Add import Handler.Admin import Handler.Term import Handler.School +import Handler.School.DayTasks import Handler.Course import Handler.Sheet import Handler.Submission @@ -157,6 +153,8 @@ import Handler.Upload import Handler.Qualification import Handler.LMS import Handler.SAP +import Handler.CommCenter +import Handler.MailCenter import Handler.PrintCenter import Handler.ApiDocs import Handler.Swagger @@ -216,18 +214,6 @@ makeFoundation appSettings''@AppSettings{..} = do appJobState <- liftIO newEmptyTMVarIO appHealthReport <- liftIO $ newTVarIO Set.empty - appFileSourceARC <- for appFileSourceARCConf $ \ARCConf{..} -> do - ah <- initARCHandle arccMaximumGhost arccMaximumWeight - void . Prometheus.register $ arcMetrics ARCFileSource ah - return ah - appFileSourcePrewarm <- for appFileSourcePrewarmConf $ \PrewarmCacheConf{..} -> do - lh <- initLRUHandle precMaximumWeight - void . Prometheus.register $ lruMetrics LRUFileSourcePrewarm lh - return lh - appFileInjectInhibit <- liftIO $ newTVarIO IntervalMap.empty - for_ (guardOnM (isn't _JobsOffload appJobMode) appInjectFiles) $ \_ -> - void . Prometheus.register $ injectInhibitMetrics appFileInjectInhibit - appStartTime <- liftIO getCurrentTime -- We need a log function to create a connection pool. We need a connection -- pool to create our foundation. And we need our foundation to get a @@ -236,7 +222,7 @@ makeFoundation appSettings''@AppSettings{..} = do -- from there, and then create the real foundation. let mkFoundation :: _ -> (forall m. MonadIO m => Custom.Pool' m DBConnLabel DBConnUseState SqlBackend) -> _ - mkFoundation appSettings' appConnPool appSmtpPool appLdapPool appCryptoIDKey appSessionStore appSecretBoxKey appWidgetMemcached appJSONWebKeySet appClusterID appMemcached appMemcachedLocal appUploadCache appVerpSecret appAuthKey appPersonalisedSheetFilesSeedKey appVolatileClusterSettingsCache appAvsQuery = UniWorX{..} + mkFoundation appSettings' appConnPool appSmtpPool appLdapPool appCryptoIDKey appSessionStore appSecretBoxKey appWidgetMemcached appJSONWebKeySet appClusterID appMemcached appUploadCache appVerpSecret appAuthKey appPersonalisedSheetFilesSeedKey appVolatileClusterSettingsCache appAvsQuery = UniWorX{..} tempFoundation = mkFoundation (error "appSettings' forced in tempFoundation") (error "connPool forced in tempFoundation") @@ -249,7 +235,6 @@ makeFoundation appSettings''@AppSettings{..} = do (error "JSONWebKeySet forced in tempFoundation") (error "ClusterID forced in tempFoundation") (error "memcached forced in tempFoundation") - (error "memcachedLocal forced in tempFoundation") (error "MinioConn forced in tempFoundation") (error "VerpSecret forced in tempFoundation") (error "AuthKey forced in tempFoundation") @@ -334,12 +319,6 @@ makeFoundation appSettings''@AppSettings{..} = do $logWarnS "setup" "Clearing memcached" liftIO $ Memcached.flushAll memcachedConn return AppMemcached{..} - appMemcachedLocal <- for appMemcachedLocalConf $ \ARCConf{..} -> do - memcachedLocalARC <- initARCHandle arccMaximumGhost arccMaximumWeight - void . Prometheus.register $ arcMetrics ARCMemcachedLocal memcachedLocalARC - memcachedLocalInvalidationQueue <- newTVarIO mempty - memcachedLocalHandleInvalidations <- allocateLinkedAsync . managePostgresqlChannel appDatabaseConf ChannelMemcachedLocalInvalidation $ manageMemcachedLocalInvalidations memcachedLocalARC memcachedLocalInvalidationQueue - return AppMemcachedLocal{..} appSessionStore <- mkSessionStore appSettings'' sqlPool `customRunSqlPool` sqlPool @@ -352,15 +331,15 @@ makeFoundation appSettings''@AppSettings{..} = do handleIf isBucketExists (const $ return ()) $ Minio.makeBucket appUploadTmpBucket Nothing return conn - appAvsQuery <- case appAvsConf of + appAvsQuery <- case appAvsConf of Nothing -> do $logErrorS "avsPrepare" "appAvsConfig is empty, i.e. invalid AVS configuration settings." return Nothing - -- error "AvsConfig is empty, i.e. invalid AVS configuration settings." - - Just avsConf -> do + -- error "AvsConfig is empty, i.e. invalid AVS configuration settings." + + Just avsConf -> do manager <- newManagerSettings $ mkManagerSettings (def { settingDisableCertificateValidation = True }) Nothing - let avsServer = BaseUrl + let avsServer = BaseUrl { baseUrlScheme = Https , baseUrlHost = avsHost avsConf , baseUrlPort = avsPort avsConf @@ -377,7 +356,7 @@ makeFoundation appSettings''@AppSettings{..} = do $logDebugS "Runtime configuration" $ tshowCrop appSettings' - let foundation = mkFoundation appSettings' sqlPool smtpPool ldapPool appCryptoIDKey appSessionStore appSecretBoxKey appWidgetMemcached appJSONWebKeySet appClusterID appMemcached appMemcachedLocal appUploadCache appVerpSecret appAuthKey appPersonalisedSheetFilesSeedKey appVolatileClusterSettingsCache appAvsQuery + let foundation = mkFoundation appSettings' sqlPool smtpPool ldapPool appCryptoIDKey appSessionStore appSecretBoxKey appWidgetMemcached appJSONWebKeySet appClusterID appMemcached appUploadCache appVerpSecret appAuthKey appPersonalisedSheetFilesSeedKey appVolatileClusterSettingsCache appAvsQuery -- Return the foundation $logInfoS "setup" "*** DONE ***" @@ -657,7 +636,7 @@ appMain = runResourceT $ do notifyWatchdog = forever' Nothing $ \pResults -> do let delay = floor $ wInterval % 4 d <- liftIO $ newDelay delay - + $logDebugS "Notify" $ "Waiting up to " <> tshow delay <> "µs..." mResults <- atomically $ asum [ pResults <$ waitDelay d @@ -746,8 +725,8 @@ shutdownApp app = do -- | Run a handler handler, handler' :: Handler a -> IO a -handler h = runResourceT $ getAppDevSettings >>= makeFoundation >>= liftIO . flip unsafeHandler h -handler' h = runResourceT $ getAppSettings >>= makeFoundation >>= liftIO . flip unsafeHandler h +handler h = runResourceT $ getAppDevSettings >>= makeFoundation >>= liftIO . flip unsafeHandler h +handler' h = runResourceT $ getAppSettings >>= makeFoundation >>= liftIO . flip unsafeHandler h -- | Run DB queries db, db' :: DB a -> IO a diff --git a/backend/src/Audit.hs b/backend/src/Audit.hs index 40c4a4206..25bc3ccb5 100644 --- a/backend/src/Audit.hs +++ b/backend/src/Audit.hs @@ -1,7 +1,9 @@ --- SPDX-FileCopyrightText: 2023 Gregor Kleen ,Steffen Jost +-- SPDX-FileCopyrightText: 2023-2024 Gregor Kleen ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later +{-# LANGUAGE TypeApplications #-} + module Audit ( module Audit.Types , AuditException(..) @@ -9,6 +11,7 @@ module Audit , AuditRemoteException(..) , getRemote , logInterface, logInterface' + , reportAdminProblem ) where @@ -16,6 +19,8 @@ import Import.NoModel import Settings import Model import Database.Persist.Sql +import qualified Database.Esqueleto.Experimental as E -- needs TypeApplications Lang-Pragma +import qualified Database.Esqueleto.Utils as E import Audit.Types import qualified Data.Text as Text @@ -128,7 +133,7 @@ logInterface :: ( AuthId (HandlerSite m) ~ Key User -> Text -- ^ Any additional information -> ReaderT (YesodPersistBackend (HandlerSite m)) m () -- ^ Log a transaction using information available from `HandlerT`, also calls `audit` -logInterface interfaceLogInterface interfaceLogSubtype interfaceLogSuccess interfaceLogRows interfaceLogInfo = do +logInterface interfaceLogInterface interfaceLogSubtype interfaceLogSuccess interfaceLogRows interfaceLogInfo = do interfaceLogWrite <- (methodGet /=) . Wai.requestMethod . reqWaiRequest <$> getRequest logInterface' interfaceLogInterface interfaceLogSubtype interfaceLogWrite interfaceLogSuccess interfaceLogRows interfaceLogInfo @@ -152,7 +157,7 @@ logInterface' :: ( AuthId (HandlerSite m) ~ Key User -- ^ Log a transaction using information available from `HandlerT`, also calls `audit` logInterface' (Text.strip -> interfaceLogInterface) (Text.strip -> interfaceLogSubtype) interfaceLogWrite interfaceLogSuccess interfaceLogRows (Text.strip -> interfaceLogInfo) = do interfaceLogTime <- liftIO getCurrentTime - -- deleteBy $ UniqueInterfaceSubtypeWrite interfaceLogInterface interfaceLogSubtype interfaceLogWrite -- always replace: deleteBy & insert seems to be safest and fastest + -- deleteBy $ UniqueInterfaceSubtypeWrite interfaceLogInterface interfaceLogSubtype interfaceLogWrite -- deleteBy & insert would be justified here, leading to a new Row-ID, since the two rows are not truly connected. -- insert_ InterfaceLog{..} void $ upsertBy (UniqueInterfaceSubtypeWrite interfaceLogInterface interfaceLogSubtype interfaceLogWrite) ( InterfaceLog{..} ) @@ -169,3 +174,28 @@ logInterface' (Text.strip -> interfaceLogInterface) (Text.strip -> interfaceLogS , transactionInterfaceInfo = interfaceLogInfo , transactionInterfaceSuccess = Just interfaceLogSuccess } + +reportAdminProblem :: ( IsSqlBackend (YesodPersistBackend (HandlerSite m)) + , SqlBackendCanWrite (YesodPersistBackend (HandlerSite m)) + , MonadHandler m + -- , HasCallStack + ) + => AdminProblem -- ^ Problem to record + -> ReaderT (YesodPersistBackend (HandlerSite m)) m () +-- ^ Log a problem that needs interventions by admins, provided this problem has not already been reported and is still unsolved +-- +-- - `problemLogTime` is now +-- - `problemSolver` is Nothing, we do not record the person who caused it +reportAdminProblem problem = do + let problemLogSolved = Nothing + problemLogSolver = Nothing + problemLogInfo = toJSON problem + problemLogTime <- liftIO getCurrentTime + isKnown <- E.selectExists $ do + pl <- E.from $ E.table @ProblemLog + E.where_ $ E.isNothing (pl E.^. ProblemLogSolved) + E.&&. E.val problemLogInfo E.==. pl E.^. ProblemLogInfo + unless isKnown $ insert_ ProblemLog{..} + $logWarnS "Problem" $ Text.filter (/= '\n') $ tshow problem -- <> " - " <> pack (prettyCallStack callStack) + + diff --git a/backend/src/Audit/Types.hs b/backend/src/Audit/Types.hs index 976171ec4..1535b06ea 100644 --- a/backend/src/Audit/Types.hs +++ b/backend/src/Audit/Types.hs @@ -1,15 +1,18 @@ --- SPDX-FileCopyrightText: 2022-23 Gregor Kleen ,Sarah Vaupel ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-2024 Gregor Kleen ,Sarah Vaupel ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later module Audit.Types ( Transaction(..) + , AdminProblem(..) + , decodeAdminProblem ) where import ClassyPrelude.Yesod hiding (derivePersistFieldJSON) import Model.Types.TH.JSON import Model +import Data.Aeson import Data.Aeson.TH import Utils.PathPiece @@ -182,7 +185,7 @@ data Transaction } | TransactionLmsStart { transactionQualification :: QualificationId - , transactionLmsIdent :: LmsIdent + , transactionLmsIdent :: LmsIdent , transactionLmsUser :: UserId , transactionLmsUserKey :: LmsUserId } @@ -210,10 +213,16 @@ data Transaction , transactionNote :: Maybe Text , transactionReceived :: UTCTime -- when was the csv file received? } + | TransactionLmsTerminated + { transactionQualification :: QualificationId + , transactionLmsIdent :: LmsIdent + , transactionLmsUser :: UserId + , transactionNote :: Maybe Text + } | TransactionQualificationUserEdit -- Note that a renewal always entails unblocking as well! { transactionUser :: UserId -- qualification holder that is updated , transactionQualificationUser :: QualificationUserId -- not really necessary, maybe remove? - , transactionQualification :: QualificationId + , transactionQualification :: QualificationId , transactionQualificationValidUntil :: Day , transactionQualificationScheduleRenewal :: Maybe Bool -- Maybe, because some update may leave it unchanged (also avoids DB Migration) , transactionNote :: Maybe Text @@ -251,4 +260,64 @@ deriveJSON defaultOptions , sumEncoding = TaggedObject "transaction" "data" } ''Transaction -derivePersistFieldJSON ''Transaction \ No newline at end of file +derivePersistFieldJSON ''Transaction + + + +-- Datatype for raising admin awareness to certain problems +-- Database stores generic Value in table ProblemLog, such that changes do not disturb old entries +-- Note that there is no RenderMessage instance, instead see @Handler.Admin.adminProblemCell dealing with special cases instead +-- Note: Adjust MsgAdminProblemInfoTooltip as well +data AdminProblem + = AdminProblemNewCompany -- new company was noticed, presumably without supervisors + { adminProblemCompany :: CompanyId + } + | AdminProblemSupervisorNewCompany + { adminProblemUser :: UserId -- a default supervisor has changed company + , adminProblemCompany :: CompanyId -- old company where the user had default supervisor rights + , adminProblemCompanyNew :: CompanyId -- new company of the user + , adminProblemSupervisorReroute :: Bool -- reroute included? + } + | AdminProblemSupervisorLeftCompany + { adminProblemUser :: UserId -- user who had a supervisor but no longer has, due to supervisor change + , adminProblemCompany :: CompanyId -- old company + , adminProblemSupervisorReroute :: Bool -- reroute included? + } + | AdminProblemCompanySuperiorChange -- a company received a new superior user through AVS + { adminProblemUser :: UserId -- new superior user + , adminProblemCompany :: CompanyId -- affected company + , adminProblemUserOld :: Maybe UserId -- previous superior + } + | AdminProblemCompanySuperiorNotFound -- a company received a new superior user through AVS, but user could not be created from email + { adminProblemUser :: UserId -- user who had a supervisor but no longer has, due to supervisor change + , adminProblemEmail :: Maybe Text -- new superior user's email, not found in LDAP + , adminProblemCompany :: CompanyId -- affected company + , adminProblemUserOld :: Maybe UserId -- previous superior + } + | AdminProblemNewlyUnsupervised + { adminProblemUser :: UserId -- user who had a supervisor but no longer has, due to user company change + , adminProblemCompanyOld :: Maybe CompanyId -- old company + , adminProblemCompanyNew :: CompanyId -- new company of the user + } + | AdminProblemUnknown -- miscellanous problem, just displaying text + { adminProblemText :: Text + } + deriving (Eq, Ord, Read, Show, Generic) + +-- Columns shown in problem table: adminProblemCompany, adminProblemUser +-- For display: add clause to Handler.Admin.adminProblemCell + +deriveJSON defaultOptions + { constructorTagModifier = camelToPathPiece' 2 + , fieldLabelModifier = camelToPathPiece' 2 + , tagSingleConstructors = True + , sumEncoding = TaggedObject "problem" "data" + , rejectUnknownFields = False + } ''AdminProblem + +derivePersistFieldJSON ''AdminProblem + +decodeAdminProblem :: Value -> AdminProblem +decodeAdminProblem v = case fromJSON v of + Error msg -> AdminProblemUnknown $ pack msg + Success p -> p diff --git a/backend/src/Auth/Dummy.hs b/backend/src/Auth/Dummy.hs index 06bf4985e..9360d9da6 100644 --- a/backend/src/Auth/Dummy.hs +++ b/backend/src/Auth/Dummy.hs @@ -34,7 +34,7 @@ dummyForm = do mr <- getMessageRender wreq (ciField & addDatalist userList) (fslpI MsgDummyIdent (mr MsgDummyIdentPlaceholder) & addAttr "autocomplete" "username" & addName PostLoginDummy) Nothing where - userList = fmap mkOptionList . runDB $ withReaderT projectBackend (map toOption <$> selectList [] [Asc UserIdent] :: ReaderT SqlBackend _ [Option UserIdent]) + userList = fmap mkOptionList . runDB $ withReaderT projectBackend (map toOption <$> selectList [UserId <=. UserKey 12] [Asc UserIdent] :: ReaderT SqlBackend _ [Option UserIdent]) toOption (Entity _ User{..}) = Option userDisplayName userIdent (CI.original userIdent) apDummy :: Text diff --git a/backend/src/Crypto/Saltine/Instances.hs b/backend/src/Crypto/Saltine/Instances.hs index 8bbc259e0..380ec8985 100644 --- a/backend/src/Crypto/Saltine/Instances.hs +++ b/backend/src/Crypto/Saltine/Instances.hs @@ -1,5 +1,4 @@ --- {-# LANGUAGE BangPatterns #-} -{-# OPTIONS_GHC -Wwarn #-} +{-# OPTIONS_GHC -Wwarn -fno-warn-orphans #-} -- SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel -- @@ -64,8 +63,9 @@ foreign import ccall unsafe "sodium_bin2hex" bin2hex :: ByteString -> String bin2hex bs = let tlen = S.length bs * 2 + 1 in S8.unpack . S8.init . snd . buildUnsafeByteString tlen $ \t -> - constByteStrings [bs] $ \[(pbs, _)] -> - c_sodium_bin2hex t (fromIntegral tlen) pbs (fromIntegral $ S.length bs) + let aux [(pbs, _)] = c_sodium_bin2hex t (fromIntegral tlen) pbs (fromIntegral $ S.length bs) + aux _ = error "Crypto.Saltine.Instances.bin2hex reached an impossible computation path" + in constByteStrings [bs] aux instance Show Key where show k = "SecretBox.Key {hashesTo = \"" <> (bin2hex . shorthash nullShKey $ encode k) <> "}\"" diff --git a/backend/src/CryptoID.hs b/backend/src/CryptoID.hs index 9d724bbee..b47bf3e6d 100644 --- a/backend/src/CryptoID.hs +++ b/backend/src/CryptoID.hs @@ -59,6 +59,7 @@ decCryptoIDs [ ''SubmissionId , ''MaterialFileId , ''PrintJobId , ''QualificationId + , ''SentMailId ] decCryptoIDKeySize @@ -116,4 +117,20 @@ instance {-# OVERLAPS #-} FromJSON (E.CryptoID "PrintJob" (CI FilePath)) where instance {-# OVERLAPS #-} FromJSONKey (E.CryptoID "PrintJob" (CI FilePath)) where fromJSONKey = FromJSONKeyTextParser $ maybe (fail "Could not parse CryptoPrintJob") return . fromPathPiece instance {-# OVERLAPS #-} ToMarkup (E.CryptoID "PrintJob" (CI FilePath)) where - toMarkup = toMarkup . toPathPiece \ No newline at end of file + toMarkup = toMarkup . toPathPiece + + +-- instance PathPiece a => PathPiece [a] where +-- toPathPiece = textBracket '[' ']' . Text.intercalate "," . map toPathPiece +-- fromPathPiece (textUnbracket '[' ']' . Text.strip -> Just t) +-- | null t = Just [] +-- | otherwise = mapM fromPathPiece $ Text.split (==',') t +-- fromPathPiece _ = Nothing + +instance PathPiece [E.CryptoID "ExamOccurrence" UUID] where -- required for a form field sending multiple ids + fromPathPiece (textUnbracket '[' ']' . Text.strip -> Just t) + | null t = Just [] + | otherwise = fromPathMultiPiece $ Text.split (==',') t + fromPathPiece _ = Nothing + + toPathPiece = textBracket '[' ']' . Text.intercalate "," . toPathMultiPiece \ No newline at end of file diff --git a/backend/src/Data/CaseInsensitive/Instances.hs b/backend/src/Data/CaseInsensitive/Instances.hs index b7c3dfa59..d373b942a 100644 --- a/backend/src/Data/CaseInsensitive/Instances.hs +++ b/backend/src/Data/CaseInsensitive/Instances.hs @@ -128,4 +128,4 @@ instance Swagger.ToSchema s => Swagger.ToSchema (CI s) where instance (CI.FoldCase s, Binary s) => Binary (CI s) where get = CI.mk <$> Binary.get - put = Binary.put . CI.original + put = Binary.put . CI.original \ No newline at end of file diff --git a/backend/src/Database/Esqueleto/Utils.hs b/backend/src/Database/Esqueleto/Utils.hs index 127e0ed88..c4763c5ba 100644 --- a/backend/src/Database/Esqueleto/Utils.hs +++ b/backend/src/Database/Esqueleto/Utils.hs @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022-24 Gregor Kleen ,Steffen Jost ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-2025 Gregor Kleen ,Steffen Jost ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -9,12 +9,16 @@ module Database.Esqueleto.Utils ( true, false , vals, justVal, justValList, toValues , isJust, alt + , isNumerical, hasLetter , isInfixOf, hasInfix , isPrefixOf_, hasPrefix_ - , strConcat, substring + , strConcat + , substring, substringRegex + , decodeBase64, encodeEscape, mailContentContains , (=?.), (?=.) , (=~.), (~=.) , (>~.), (<~.) + , (~.), (~*.), (!~.), (!~*.) , or, and , any, all , not__, parens @@ -26,12 +30,14 @@ module Database.Esqueleto.Utils , mkContainsFilterWithSet, mkContainsFilterWithComma, mkContainsFilterWithCommaPlus , mkDayFilter, mkDayFilterFrom, mkDayFilterTo , mkExistsFilter, mkExistsFilterWithComma + -- , mkRegExFilterWith , anyFilter, allFilter , ascNullsFirst, descNullsLast , orderByList , orderByOrd, orderByEnum , strip, lower, ciEq , selectExists, selectNotExists + , filterExists , SqlHashable , sha256 , isTrue, isFalse @@ -41,16 +47,20 @@ module Database.Esqueleto.Utils , greatest, least , abs , SqlProject(..) - , (->.), (->>.), (#>>.) + , (->.), (->>.), (->>>.), (#>>.) , fromSqlKey , unKey , subSelectCountDistinct , selectCountRows, selectCountDistinct - , selectMaybe - , num2text + , str2text, str2text' + , str2citext + , num2text --, text2num , day, day', dayMaybe, interval, diffDays, diffTimes + , withinPeriod , exprLift , explicitUnsafeCoerceSqlExprValue + , psqlVersion_ + , truncateTable , module Database.Esqueleto.Utils.TH ) where @@ -61,15 +71,20 @@ import qualified Data.Set as Set import qualified Data.List as List import qualified Data.Foldable as F import Data.List.NonEmpty (NonEmpty(..)) +import qualified Database.Persist as P +import qualified Database.Persist.EntityDef.Internal as P (entityDB) import qualified Database.Esqueleto.Legacy as E import qualified Database.Esqueleto.Experimental as Ex import qualified Database.Esqueleto.PostgreSQL as E import qualified Database.Esqueleto.Internal.Internal as E import Database.Esqueleto.Utils.TH +-- import qualified Database.Persist.Postgresql as P + import qualified Data.Text as Text import qualified Data.Text.Lazy as Lazy (Text) import qualified Data.ByteString.Lazy as Lazy (ByteString) +import qualified Data.CaseInsensitive as CI import Crypto.Hash (Digest, SHA256) @@ -85,7 +100,7 @@ import Data.Monoid (Last(..)) import Utils (commaSeparatedText) -- import Utils.Set (concatMapSet) - +import Model.Types.Mail (MailContent) {-# ANN any ("HLint: ignore Use any" :: String) #-} {-# ANN all ("HLint: ignore Use all" :: String) #-} @@ -140,22 +155,51 @@ infixl 4 ?=. -- | like (=?.) but also succeeds if the right-hand side is NULL. Can often be avoided by moving from where- to join-condition! infixl 4 =~. (=~.) :: PersistField typ => E.SqlExpr (E.Value typ) -> E.SqlExpr (E.Value (Maybe typ)) -> E.SqlExpr (E.Value Bool) -(=~.) a b = E.isNothing b E.||. (E.just a E.==. b) +-- (=~.) a b = E.isNothing b E.||. (E.just a E.==. b) -- avoid expensive E.||. +(=~.) a b = a E.==. E.coalesceDefault [b] a infixl 4 ~=. (~=.) :: PersistField typ => E.SqlExpr (E.Value (Maybe typ)) -> E.SqlExpr (E.Value typ) -> E.SqlExpr (E.Value Bool) -(~=.) a b = E.isNothing a E.||. (a E.==. E.just b) +-- (~=.) a b = E.isNothing a E.||. (a E.==. E.just b) -- avoid expensive E.||. +(~=.) a b = b E.==. E.coalesceDefault [a] b --- | like (>.), but also succeeds if the right-hand side is NULL +-- | like (>=.), but also succeeds if the right-hand side is NULL infixl 4 >~. (>~.) :: PersistField typ => E.SqlExpr (E.Value typ) -> E.SqlExpr (E.Value (Maybe typ)) -> E.SqlExpr (E.Value Bool) -(>~.) a b = E.isNothing b E.||. (E.just a E.>. b) +-- (>~.) a b = E.isNothing b E.||. (E.just a E.>. b) +(>~.) a b = a E.>=. E.coalesceDefault [b] a --- | like (<.), but also succeeds if the right-hand side is NULL +-- | like (<=.), but also succeeds if the right-hand side is NULL infixl 4 <~. (<~.) :: PersistField typ => E.SqlExpr (E.Value typ) -> E.SqlExpr (E.Value (Maybe typ)) -> E.SqlExpr (E.Value Bool) -(<~.) a b = E.isNothing b E.||. (E.just a E.<. b) +-- (<~.) a b = E.isNothing b E.||. (E.just a E.<. b) +(<~.) a b = a E.<=. E.coalesceDefault [b] a +infixr 2 ~., ~*., !~., !~*. + +-- | PostgreSQL regular expression match, case sensitive. Works, but may throw SQL error for unblanced parenthesis, etc. Not suitable for dbTable filters +(~.) :: (E.SqlString s, E.SqlString t) => E.SqlExpr (E.Value s) -> E.SqlExpr (E.Value t) -> E.SqlExpr (E.Value Bool) +(~.) = E.unsafeSqlBinOp " ~ " + +-- | PostgreSQL regular expression match, case insensitive. Works, but may throw SQL errors +(~*.) :: (E.SqlString s, E.SqlString t) => E.SqlExpr (E.Value s) -> E.SqlExpr (E.Value t) -> E.SqlExpr (E.Value Bool) +(~*.) = E.unsafeSqlBinOp " ~* " + +-- | PostgreSQL regular expression does not match, case sensitive. Works, but may throw SQL error for unblanced parenthesis, etc. Not suitable for dbTable filters +(!~.) :: (E.SqlString s, E.SqlString t) => E.SqlExpr (E.Value s) -> E.SqlExpr (E.Value t) -> E.SqlExpr (E.Value Bool) +(!~.) = E.unsafeSqlBinOp " !~ " + +-- | PostgreSQL regular expression does not match, case insensitive. Works, but may throw SQL errors +(!~*.) :: (E.SqlString s, E.SqlString t) => E.SqlExpr (E.Value s) -> E.SqlExpr (E.Value t) -> E.SqlExpr (E.Value Bool) +(!~*.) = E.unsafeSqlBinOp " !~* " + +-- | PostgreSQL regex test if value contains only numbers +isNumerical :: E.SqlString s => E.SqlExpr (E.Value s) -> E.SqlExpr (E.Value Bool) +isNumerical = (~. E.val ("^[0-9]+$"::Text)) + +-- | PostgreSQL regex test if value contains at least one letter +hasLetter :: E.SqlString s => E.SqlExpr (E.Value s) -> E.SqlExpr (E.Value Bool) +hasLetter = (~*. E.val ("[a-z]"::Text)) -- | Negation of `isNothing` which is missing isJust :: PersistField typ => E.SqlExpr (E.Value (Maybe typ)) -> E.SqlExpr (E.Value Bool) @@ -217,6 +261,37 @@ substring (E.ERaw _m1 f1) (E.ERaw _m2 f2) (E.ERaw _m3 f3) , strVals <> fromiVals <> foriVals ) +substringRegex :: ( E.SqlString str, E.SqlString from) + => E.SqlExpr (E.Value str) + -> E.SqlExpr (E.Value from) + -> E.SqlExpr (E.Value str) +substringRegex (E.ERaw _m1 f1) (E.ERaw _m2 f2) + = E.ERaw E.noMeta $ \_nParens info -> + let (strTLB, strVals) = f1 E.Parens info + (fromiTLB, fromiVals) = f2 E.Parens info + in ( "SUBSTRING" <> E.parens (E.parens strTLB <> " FROM " <> E.parens fromiTLB) + , strVals <> fromiVals + ) + +-- useful for searching within MailContent in db +decodeBase64 :: E.SqlString str => E.SqlExpr (E.Value str) -> E.SqlExpr (E.Value str) +decodeBase64 = E.unsafeSqlFunction "decode" . (, E.val "base64" :: E.SqlExpr (E.Value Text)) + +encodeEscape :: E.SqlString str => E.SqlExpr (E.Value str) -> E.SqlExpr (E.Value str) +encodeEscape = E.unsafeSqlFunction "encode" . (, E.val "escape" :: E.SqlExpr (E.Value Text)) + +mailContentContains :: E.SqlString str => E.SqlExpr (E.Value MailContent) -> E.SqlExpr (E.Value str) -> E.SqlExpr (E.Value Bool) +mailContentContains hay needle = hasNeedle plainText E.||. hasNeedle encodedBase64 + where + hayText :: E.SqlExpr (E.Value Text) = E.unsafeSqlCastAs "text" hay + hasNeedle = isInfixOf needle + encodedBase64 = encodeEscape $ decodeBase64 $ + substringRegex hayText $ E.val reB64 + plainText = substringRegex hayText $ E.val rePlain + reB64 :: Text = ".*\\{\"type\": \"text/plain; charset=utf-8\", \"content\": \\{\"content\": \"(.*?)\", \"encoding\": \"base64\"\\}.*" + rePlain :: Text = ".*\\{\"type\": \"text/plain; charset=utf-8\", \"content\": \"(.*?)\", \"headers\": \\[\\], \"encoding\": \"quoted-printable-text\".*" + + explicitUnsafeCoerceSqlExprValue :: forall b a. Text -> E.SqlExpr (E.Value a) @@ -253,7 +328,8 @@ subSelectOr q = parens . E.subSelectUnsafe $ flip (E.unsafeSqlAggregateFunction parens :: E.SqlExpr (E.Value a) -> E.SqlExpr (E.Value a) parens = E.unsafeSqlFunction "" --- | Workaround for Esqueleto-Bug not placing parenthesis after NOT, see #155 +-- | Workaround for Esqueleto-Bug not placing parenthesis after NOT. +-- This leads to erroneous filters. For examples, see DevOps #1970 not__ :: E.SqlExpr (E.Value Bool) -> E.SqlExpr (E.Value Bool) not__ = E.not_ . parens @@ -322,7 +398,7 @@ mkExactFilterLastWith :: (PersistField b) -> Last a -- ^ needle -> E.SqlExpr (E.Value Bool) mkExactFilterLastWith cast lenslike row criterias - | Last (Just crit) <- criterias = lenslike row E.==. E.val (cast crit) + | Last (Just crit) <- criterias = lenslike row E.==. E.val (cast crit) | otherwise = true -- | like `mkExactFilterLast` but deals with Nothing being a filter criterion as well @@ -351,7 +427,7 @@ mkExactFilterMaybeLast' lensexists lenslike row criterias -- | generic filter creation for dbTable -- Given a lens-like function, make filter searching for needles in String-like elements -- (Keep Set here to ensure that there are no duplicates) -mkContainsFilter :: E.SqlString a +mkContainsFilter :: (E.SqlString a, Ord a) => (t -> E.SqlExpr (E.Value a)) -- ^ getter from query to searched element -> t -- ^ query row -> Set.Set a -- ^ needle collection @@ -359,7 +435,7 @@ mkContainsFilter :: E.SqlString a mkContainsFilter = mkContainsFilterWith id -- | like `mkContainsFilter` but allows for conversion; convenient in conjunction with `anyFilter` and `allFilter` -mkContainsFilterWith :: E.SqlString b +mkContainsFilterWith :: (E.SqlString b, Ord a) => (a -> b) -> (t -> E.SqlExpr (E.Value b)) -- ^ getter from query to searched element -> t -- ^ query row @@ -367,7 +443,7 @@ mkContainsFilterWith :: E.SqlString b -> E.SqlExpr (E.Value Bool) mkContainsFilterWith cast lenslike row criterias | Set.null criterias = true - | otherwise = any (hasInfix $ lenslike row) (E.val . cast <$> Set.toList criterias) + | otherwise = any (hasInfix (lenslike row) . E.val . cast) criterias -- | like `mkContainsFilterWith` but allows conversion to produce multiple needles mkContainsFilterWithSet :: (E.SqlString b, Ord b, Ord a) @@ -378,7 +454,7 @@ mkContainsFilterWithSet :: (E.SqlString b, Ord b, Ord a) -> E.SqlExpr (E.Value Bool) mkContainsFilterWithSet cast lenslike row criterias | Set.null criterias = true - | otherwise = any (hasInfix $ lenslike row) (E.val <$> Set.toList (foldMap cast criterias)) + | otherwise = any (hasInfix (lenslike row) . E.val) (foldMap cast criterias) -- | like `mkContainsFilterWithSet` but fixed to comma separated Texts mkContainsFilterWithComma :: (E.SqlString b, Ord b) @@ -389,7 +465,7 @@ mkContainsFilterWithComma :: (E.SqlString b, Ord b) -> E.SqlExpr (E.Value Bool) mkContainsFilterWithComma cast lenslike row (foldMap commaSeparatedText -> criterias) | Set.null criterias = true - | otherwise = any (hasInfix $ lenslike row) (E.val . cast <$> Set.toList criterias) + | otherwise = any (hasInfix (lenslike row) . E.val . cast) criterias -- | like `mkContainsFilterWithComma` but enforced the existence of all Texts prefixed with + mkContainsFilterWithCommaPlus :: (E.SqlString b, Ord b) @@ -403,10 +479,22 @@ mkContainsFilterWithCommaPlus cast lenslike row (foldMap commaSeparatedText -> c | Set.null compulsories = cond_optional | Set.null alternatives = cond_compulsory | otherwise = cond_compulsory E.&&. cond_optional - where + where (Set.mapMonotonic (Text.stripStart . Text.drop 1) -> compulsories, alternatives) = Set.partition (Text.isPrefixOf "+") criterias - cond_compulsory = all (hasInfix $ lenslike row) (E.val . cast <$> Set.toList compulsories) - cond_optional = any (hasInfix $ lenslike row) (E.val . cast <$> Set.toList alternatives) + cond_compulsory = all (hasInfix (lenslike row) . E.val . cast) compulsories + cond_optional = any (hasInfix (lenslike row) . E.val . cast) alternatives + +-- like `mkContainsFilterWith` but allows regular expression criterias +-- This works, but throws SQL errors for unbalanced parenthesis and similar invalid regex expressions +-- mkRegExFilterWith :: (E.SqlString b, Ord a) +-- => (a -> b) +-- -> (t -> E.SqlExpr (E.Value b)) -- ^ getter from query to searched element +-- -> t -- ^ query row +-- -> Set.Set a -- ^ needle collection +-- -> E.SqlExpr (E.Value Bool) +-- mkRegExFilterWith cast lenslike row criterias +-- | Set.null criterias = true +-- | otherwise = any ((~.) (lenslike row) . E.val . cast) criterias mkDayFilter :: (t -> E.SqlExpr (E.Value UTCTime)) -- ^ getter from query to searched element -> t -- ^ query row @@ -451,7 +539,7 @@ mkExistsFilterWithComma :: PathPiece a -> E.SqlExpr (E.Value Bool) mkExistsFilterWithComma cast query row (foldMap commaSeparatedText -> criterias) | Set.null criterias = true - | otherwise = any (E.exists . query row) (cast <$> Set.toList criterias) + | otherwise = any (E.exists . query row . cast) criterias -- | Combine several filters, using logical or @@ -470,10 +558,13 @@ allFilter fltrs needle criterias = F.foldr aux true fltrs where aux fltr acc = fltr needle criterias E.&&. acc --- | Descending order of this field or SqlExpression, but with NULLS at the end. +-- | Ascending order of this field or SqlExpression, but with NULLS at the end. +-- For bool, just use ASC, since false < true < null ascNullsFirst :: PersistField a => E.SqlExpr (E.Value a) -> E.SqlExpr E.OrderBy ascNullsFirst = E.orderByExpr " ASC NULLS FIRST" +-- | Descending order of this field or SqlExpression, but with NULLS at the end. +-- Use this if you want the order to be true, false, null descNullsLast :: PersistField a => E.SqlExpr (E.Value a) -> E.SqlExpr E.OrderBy descNullsLast = E.orderByExpr " DESC NULLS LAST" @@ -497,6 +588,7 @@ strip = E.unsafeSqlFunction "TRIM" infix 4 `ciEq` +-- Note that this function is unnecessary if the DB type is citext ciEq :: E.SqlString s => E.SqlExpr (E.Value s) -> E.SqlExpr (E.Value s) -> E.SqlExpr (E.Value Bool) ciEq a b = lower a E.==. lower b @@ -510,6 +602,13 @@ selectExists query = do _other -> error "SELECT EXISTS ... returned zero or more than one rows" selectNotExists = fmap not . selectExists +filterExists :: (MonadIO m, PersistEntity val, MonoFoldable mono, PersistField (Element mono)) + => EntityField val (Element mono) -> mono -> E.SqlReadT m [Element mono] +filterExists prj vs = fmap (fmap Ex.unValue) <$> Ex.select $ do + ent <- Ex.from Ex.table + Ex.where_ $ ent Ex.^. prj `Ex.in_` vals vs + return $ ent Ex.^. prj + class SqlHashable a instance SqlHashable Text @@ -603,7 +702,7 @@ max, min :: PersistField a max a b = bool a b $ b E.>. a min a b = bool a b $ b E.<. a --- these alternatives for max/min ought to be more efficient; note that NULL is avoided by PostgreSQL greatest/least +-- these alternatives for max/min ought to be more efficient; note that NULL is avoided by PostgreSQL greatest/least; for Bool: t > f greatest :: PersistField a => E.SqlExpr (E.Value a) -> E.SqlExpr (E.Value a) -> E.SqlExpr (E.Value a) greatest a b = E.unsafeSqlFunction "GREATEST" $ E.toArgList (a,b) @@ -642,9 +741,16 @@ infixl 8 ->. infixl 8 ->>. +-- Unsafe variant, see Database.Esqueleto.PostgreSQL.JSON for a safe version! (->>.) :: E.SqlExpr (E.Value a) -> Text -> E.SqlExpr (E.Value Text) (->>.) expr t = E.unsafeSqlBinOp "->>" expr $ E.val t +infixl 8 ->>>. + +-- Unsafe variant to obtain a DB key from a JSON field. Use with caution! +(->>>.) :: (PersistField (Key entity)) => E.SqlExpr (E.Value a) -> Text -> E.SqlExpr (E.Value (Maybe (Key entity))) +(->>>.) expr t = E.unsafeSqlCastAs "int" $ E.unsafeSqlBinOp "->>" expr $ E.val t + infixl 8 #>>. (#>>.) :: E.SqlExpr (E.Value a) -> Text -> E.SqlExpr (E.Value (Maybe Text)) @@ -663,7 +769,7 @@ unKey = E.veryUnsafeCoerceSqlExprValue -- | distinct version of `Database.Esqueleto.subSelectCount` subSelectCountDistinct :: (Num a, PersistField a) => Ex.SqlQuery (Ex.SqlExpr (Ex.Value typ)) -> Ex.SqlExpr (Ex.Value a) subSelectCountDistinct query = Ex.subSelectUnsafe (Ex.countDistinct <$> query) - + -- PersistField a => SqlQuery (SqlExpr (Value a)) -> SqlExpr (Value a) -- countDistinct :: Num a => SqlExpr (Value typ) -> SqlExpr (Value a) @@ -685,13 +791,28 @@ selectCountDistinct q = do _other -> error "E.countDistinct did not return exactly one result" -selectMaybe :: (E.SqlSelect a r, MonadIO m) => E.SqlQuery a -> E.SqlReadT m (Maybe r) -selectMaybe = fmap listToMaybe . E.select . (<* E.limit 1) +-- DEPRECATED: use Database.Esqueleto.selectOne instead +-- selectMaybe :: (E.SqlSelect a r, MonadIO m) => E.SqlQuery a -> E.SqlReadT m (Maybe r) -- aka selectFirst +-- selectMaybe = fmap listToMaybe . E.select . (<* E.limit 1) + +-- | convert something that is like a text to text +str2text :: E.SqlString a => E.SqlExpr (E.Value a) -> E.SqlExpr (E.Value Text) +str2text = E.unsafeSqlCastAs "text" + +str2text' :: E.SqlString a => E.SqlExpr (E.Value (Maybe a)) -> E.SqlExpr (E.Value (Maybe Text)) +str2text' = E.unsafeSqlCastAs "text" + +str2citext :: E.SqlString a => E.SqlExpr (E.Value a) -> E.SqlExpr (E.Value (CI.CI Text)) +str2citext = E.unsafeSqlCastAs "citext" -- | cast numeric type to text, which is safe and allows for an inefficient but safe comparison of numbers stored as text and numbers num2text :: Num n => E.SqlExpr (E.Value n) -> E.SqlExpr (E.Value Text) num2text = E.unsafeSqlCastAs "text" +-- unsafe, use with care! +-- text2num :: E.SqlExpr (E.Value Text) -> E.SqlExpr (E.Value n) +-- text2num = E.unsafeSqlCastAs "int" + day :: E.SqlExpr (E.Value UTCTime) -> E.SqlExpr (E.Value Day) day = E.unsafeSqlCastAs "date" @@ -702,10 +823,23 @@ day' = E.unsafeSqlCastAs "date" dayMaybe :: E.SqlExpr (E.Value (Maybe UTCTime)) -> E.SqlExpr (E.Value (Maybe Day)) dayMaybe = E.unsafeSqlCastAs "date" +-- | Given an occurrence with start-time and maybe an end-time, does it overlap with a given day interval? +-- If there is no end-time, then the start-time must be in between. +withinPeriod :: (Day, Day) -> E.SqlExpr (E.Value UTCTime) -> E.SqlExpr (E.Value (Maybe UTCTime)) -> E.SqlExpr (E.Value Bool) +withinPeriod (dbegin, dend) tfrom tto = day tfrom E.<=. E.val dend + E.&&. E.coalesceDefault [dayMaybe tto] + (day tfrom) E.>=. E.val dbegin +-- Alternative variant which SJ expected to be more efficient, if there is an index on the first argument available, +-- but FraportGPT thinks otherwise: "OR conditions may prevent the efficient use of an index. OR conditions can sometimes lead to a full table scan, whereas COALESCE is quite cheap" +-- withinPeriod (dstart, dend) tfrom tto = day tfrom E.<=. E.val dend +-- E.&&. ( day tfrom E.>=. E.val dstart +-- E.||. (isJust tto E.&&. dayMaybe tto E.>=. justVal dstart )) + + interval :: CalendarDiffDays -> E.SqlExpr (E.Value Day) -- E.+=. requires both types to be the same, so we use Day --- interval _ = E.unsafeSqlCastAs "interval" $ E.unsafeSqlValue "'P2Y'" -- tested working example +-- interval _ = E.unsafeSqlCastAs "interval" $ E.unsafeSqlValue "'P2Y'" -- tested working example interval = E.unsafeSqlCastAs "interval". E.unsafeSqlValue . wrapSqlString . Text.Builder.fromString . iso8601Show - where + where singleQuote = Text.Builder.singleton '\'' wrapSqlString b = singleQuote <> b <> singleQuote @@ -750,3 +884,16 @@ instance (PersistField a1, PersistField a2, PersistField b, Finite a1, Finite a2 ] (E.else_ $ E.else_ $ E.veryUnsafeCoerceSqlExprValue (E.nothing :: E.SqlExpr (E.Value (Maybe ())))) +psqlVersion_ :: E.SqlExpr (E.Value Text) +psqlVersion_ = E.unsafeSqlFunction "VERSION" () + +-- Suspected to cause trouble. Needs more testing! +-- truncateTable :: (MonadIO m, BackendCompatible SqlBackend backend, PersistEntity record) +-- => record -> ReaderT backend m () +-- truncateTable tbl = E.rawExecute ("TRUNCATE TABLE " <> P.tableName tbl <> " RESTART IDENTITY") [] + +truncateTable :: (MonadIO m, BackendCompatible SqlBackend backend, PersistEntity record) -- TODO: test this code + => proxy record -> ReaderT backend m () +truncateTable tbl = + let tblName :: Text = P.unEntityNameDB $ P.entityDB $ P.entityDef tbl + in E.rawExecute ("TRUNCATE TABLE " <> tblName <> " RESTART IDENTITY") [] diff --git a/backend/src/Database/Esqueleto/Utils/TH.hs b/backend/src/Database/Esqueleto/Utils/TH.hs index 546d85b29..7f423cc48 100644 --- a/backend/src/Database/Esqueleto/Utils/TH.hs +++ b/backend/src/Database/Esqueleto/Utils/TH.hs @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-2024 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -9,7 +9,7 @@ module Database.Esqueleto.Utils.TH , sqlInTuple, sqlInTuples , _unValue , unValueN, unValueNIs - , sqlIJproj, sqlLOJproj, sqlFOJproj + , sqlIJproj, sqlLOJproj, sqlFOJproj, sqlMIXproj, sqlMIXproj' ) where import ClassyPrelude @@ -26,6 +26,9 @@ import Data.List (foldr1, foldl) import Utils.TH import Control.Lens.Iso (Iso', iso) +{-# ANN module ("HLint: ignore Redundant bracket"::String) #-} + + class E.SqlSelect a r => SqlIn a r | a -> r, r -> a where sqlIn :: a -> [r] -> E.SqlExpr (E.Value Bool) @@ -99,7 +102,7 @@ unValueNIs arity uvIdx = do -- | Generic projections for InnerJoin-tuples -- gives I-th element of N-tuple of left-associative InnerJoin-pairs, i.e. -- --- > $(projN n m) :: (t1 `E.InnerJoin` .. `E.InnerJoin` tn) -> tm@ (for m<=n) +-- > $(sqlIJproj n m) :: (t1 `E.InnerJoin` .. `E.InnerJoin` tn) -> tm@ (for m<=n) sqlIJproj :: Int -> Int -> ExpQ sqlIJproj = leftAssociativePairProjection 'E.InnerJoin @@ -108,3 +111,23 @@ sqlLOJproj = leftAssociativePairProjection 'E.LeftOuterJoin sqlFOJproj :: Int -> Int -> ExpQ sqlFOJproj = leftAssociativePairProjection 'E.FullOuterJoin + +-- | Generic projections for Join-tuple +-- gives i-th element of n-tuple of left-associative join pairs, i.e. +-- +-- > $(sqlMIXproj "IR" 3) :: ((t1 `E.InnerJoin` t2) `E.RightOuterJoin` t3) -> t3 +sqlMIXproj :: String -> Int -> ExpQ +sqlMIXproj = leftAssociativeProjection . map decodeJoin + where + decodeJoin 'I' = 'E.InnerJoin + decodeJoin 'L' = 'E.LeftOuterJoin + decodeJoin 'R' = 'E.RightOuterJoin + decodeJoin 'F' = 'E.FullOuterJoin + decodeJoin 'O' = 'E.FullOuterJoin + decodeJoin 'X' = 'E.CrossJoin + decodeJoin 'C' = 'E.CrossJoin + decodeJoin c = error $ "Database.Esqueleto.Utils.TH.sqlMIXproj: received unknown SQL join kind \"" ++ c:"\"" -- always raised at compile time, so this is ok + +-- Alternative using `reify`; works, but may require `$(return [])` between type definition and call to workaround ghc staging problems +sqlMIXproj' :: Name -> Int -> ExpQ +sqlMIXproj' t i = extractConstructorNames t >>= flip leftAssociativeProjection i diff --git a/backend/src/Database/Persist/Types/Instances.hs b/backend/src/Database/Persist/Types/Instances.hs index e32ed5951..1cdf4a70a 100644 --- a/backend/src/Database/Persist/Types/Instances.hs +++ b/backend/src/Database/Persist/Types/Instances.hs @@ -27,7 +27,7 @@ instance Hashable LiteralType instance Binary LiteralType instance NFData LiteralType - + deriving instance Generic PersistValue instance Hashable PersistValue diff --git a/backend/src/Foundation/Authorization.hs b/backend/src/Foundation/Authorization.hs index 0243b0609..93b15fd70 100644 --- a/backend/src/Foundation/Authorization.hs +++ b/backend/src/Foundation/Authorization.hs @@ -38,7 +38,7 @@ import Handler.Utils.I18n import Handler.Utils.Routes import Utils.Course (courseIsVisible) import Utils.Metrics (observeAuthTagEvaluation, AuthTagEvalOutcome(..)) - + import qualified Data.Set as Set import qualified Data.Aeson as JSON import qualified Data.HashSet as HashSet @@ -95,7 +95,7 @@ instance Exception InvalidAuthTag type AuthTagsEval m = AuthDNF -> Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> WriterT (Set AuthTag) m AuthResult - + data AccessPredicate = APPure (Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> Reader MsgRenderer AuthResult) | APHandler (Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> HandlerFor UniWorX AuthResult) @@ -174,7 +174,7 @@ cacheAPDB mExp k mkV cont = APBindDB $ \mAuthId route isWrite -> do v <- mkV memcachedBySet mExp k v either (return . Left) (fmap Right . lift) $ cont mAuthId route isWrite v - + -- cacheAP' :: ( Binary k -- , Typeable v, Binary v -- ) @@ -185,7 +185,7 @@ cacheAPDB mExp k mkV cont = APBindDB $ \mAuthId route isWrite -> do -- cacheAP' mExp mkKV cont = APBind $ \mAuthId route isWrite -> case mkKV mAuthId route isWrite of -- Just (k, mkV) -> either (return . Left) (fmap Right) . cont mAuthId route isWrite . Just =<< memcachedBy mExp k mkV -- Nothing -> either (return . Left) (fmap Right) $ cont mAuthId route isWrite Nothing - + cacheAPDB' :: ( Binary k , Typeable v, Binary v, NFData v ) @@ -313,7 +313,8 @@ isDryRunDB = fmap unIsDryRun . cached . fmap MkIsDryRun $ orM dnf <- throwLeft $ routeAuthTags currentRoute let eval :: forall m''. MonadAP m'' => AuthTagsEval m'' - eval dnf' mAuthId' route' isWrite' = evalAuthTags 'isDryRun (AuthTagActive $ const True) eval (noTokenAuth dnf') mAuthId' route' isWrite' + -- eval dnf' mAuthId' route' isWrite' = evalAuthTags 'isDryRun (AuthTagActive $ const True) eval (noTokenAuth dnf') mAuthId' route' isWrite' + eval dnf' = evalAuthTags 'isDryRun (AuthTagActive $ const True) eval (noTokenAuth dnf') in guardAuthResult <=< evalWriterT $ eval dnf mAuthId currentRoute isWrite return False @@ -368,7 +369,8 @@ validateBearer mAuthId' route' isWrite' token' = $runCachedMemoT $ for4 memo val noTokenAuth = over _dnfTerms . Set.filter . noneOf (re _nullable . folded) $ (== AuthToken) . plVar eval :: forall m'. MonadAP m' => AuthTagsEval m' - eval dnf' mAuthId'' route'' isWrite'' = evalAuthTags 'validateBearer (AuthTagActive $ const True) eval (noTokenAuth dnf') mAuthId'' route'' isWrite'' + -- eval dnf' mAuthId'' route'' isWrite'' = evalAuthTags 'validateBearer (AuthTagActive $ const True) eval (noTokenAuth dnf') mAuthId'' route'' isWrite'' + eval dnf' = evalAuthTags 'validateBearer (AuthTagActive $ const True) eval (noTokenAuth dnf') bearerAuthority' <- hoist apRunDB $ do bearerAuthority' <- flip foldMapM bearerAuthority $ \case @@ -538,14 +540,14 @@ tagAccessPredicate AuthAdmin = cacheAPSchoolFunction SchoolAdmin (Just $ Right d guardMExceptT (isJust adrights) (unauthorizedI MsgUnauthorizedSiteAdmin) return Authorized -tagAccessPredicate AuthSupervisor = APDB $ \_ _ mAuthId route _ -> case route of +tagAccessPredicate AuthSupervisor = APDB $ \_ _ mAuthId route _ -> case route of ForProfileR cID -> checkSupervisor (mAuthId, cID) ForProfileDataR cID -> checkSupervisor (mAuthId, cID) FirmAllR -> checkAnySupervisor mAuthId FirmUsersR fsh -> checkCompanySupervisor (mAuthId, fsh) FirmSupersR fsh -> checkCompanySupervisor (mAuthId, fsh) - r -> $unsupportedAuthPredicate AuthSupervisor r - where + r -> $unsupportedAuthPredicate AuthSupervisor r + where checkSupervisor sup@(mAuthId, cID) = $cachedHereBinary sup . exceptT return return $ do authId <- maybeExceptT AuthenticationRequired $ return mAuthId uid <- decrypt cID @@ -553,13 +555,13 @@ tagAccessPredicate AuthSupervisor = APDB $ \_ _ mAuthId route _ -> case route of guardMExceptT isSupervisor (unauthorizedI MsgUnauthorizedSupervisor) return Authorized checkCompanySupervisor sup@(mAuthId, fsh) = $cachedHereBinary sup . exceptT return return $ do - authId <- maybeExceptT AuthenticationRequired $ return mAuthId + authId <- maybeExceptT AuthenticationRequired $ return mAuthId -- isSupervisor <- lift . existsBy $ UniqueUserCompany authId $ CompanyKey fsh isSupervisor <- lift $ exists [UserCompanyUser ==. authId, UserCompanyCompany ==. CompanyKey fsh, UserCompanySupervisor ==. True] guardMExceptT isSupervisor (unauthorizedI $ MsgUnauthorizedCompanySupervisor fsh) return Authorized checkAnySupervisor mAuthId = $cachedHereBinary mAuthId . exceptT return return $ do - authId <- maybeExceptT AuthenticationRequired $ return mAuthId + authId <- maybeExceptT AuthenticationRequired $ return mAuthId isSupervisor <- lift $ exists [UserSupervisorSupervisor ==. authId] guardMExceptT isSupervisor (unauthorizedI MsgUnauthorizedAnySupervisor) return Authorized @@ -692,7 +694,7 @@ tagAccessPredicate AuthLecturer = cacheAPDB' (Just $ Right diffMinute) mkLecture _ | is _Nothing mAuthId' -> return AuthenticationRequired CourseR{} -> unauthorizedI MsgUnauthorizedLecturer EExamR{} -> unauthorizedI MsgUnauthorizedExternalExamLecturer - _other -> unauthorizedI MsgUnauthorizedSchoolLecturer + _other -> unauthorizedI MsgUnauthorizedSchoolLecturer | otherwise -> Left $ APDB $ \_ _ mAuthId route _ -> case route of CourseR tid ssh csh _ -> $cachedHereBinary (mAuthId, tid, ssh, csh) . exceptT return return $ do authId <- maybeExceptT AuthenticationRequired $ return mAuthId @@ -722,7 +724,7 @@ tagAccessPredicate AuthLecturer = cacheAPDB' (Just $ Right diffMinute) mkLecture return Authorized where mkLecturerList _ route _ = case route of - CourseR{} -> cacheLecturerList + CourseR{} -> cacheLecturerList EExamR{} -> Just ( AuthCacheExternalExamStaffList , fmap (setOf $ folded . _Value) . E.select . E.from $ return . (E.^. ExternalExamStaffUser) @@ -1199,7 +1201,7 @@ tagAccessPredicate AuthExamRegistered = APDB $ \_ _ mAuthId route _ -> case rout guardMExceptT hasRegistration $ unauthorizedI MsgUnauthorizedRegisteredExam return Authorized CSheetR tid ssh csh shn _ -> exceptT return return $ do - requiredExam' <- $cachedHereBinary (tid, ssh, csh, shn) . lift . E.selectMaybe . E.from $ \(course `E.InnerJoin` sheet) -> do + requiredExam' <- $cachedHereBinary (tid, ssh, csh, shn) . lift . E.selectOne . E.from $ \(course `E.InnerJoin` sheet) -> do E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId E.where_ $ course E.^. CourseTerm E.==. E.val tid E.&&. course E.^. CourseSchool E.==. E.val ssh @@ -1700,7 +1702,7 @@ evalAccessWith :: (HasCallStack, MonadThrow m, MonadAP m) => [(AuthTag, Bool)] - evalAccessWith assumptions route isWrite = do mAuthId <- liftHandler maybeAuthId evalAccessWithFor assumptions mAuthId route isWrite - + evalAccessWithDB :: (HasCallStack, MonadThrow m, MonadAP m, BackendCompatible SqlReadBackend backend) => [(AuthTag, Bool)] -> Route UniWorX -> Bool -> ReaderT backend m AuthResult evalAccessWithDB = evalAccessWith diff --git a/backend/src/Foundation/I18n.hs b/backend/src/Foundation/I18n.hs index fd2bb9479..e02273f68 100644 --- a/backend/src/Foundation/I18n.hs +++ b/backend/src/Foundation/I18n.hs @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022-23 Gregor Kleen ,Sarah Vaupel ,Sarah Vaupel ,Steffen Jost ,Steffen Jost ,Winnie Ros +-- SPDX-FileCopyrightText: 2022-2025 Gregor Kleen ,Sarah Vaupel ,Sarah Vaupel ,Steffen Jost ,Steffen Jost ,Winnie Ros -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -8,7 +8,7 @@ -- 3. add constructor to list of module exports {-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -fno-warn-orphans -fno-warn-unused-top-binds #-} module Foundation.I18n ( appLanguages, appLanguagesOpts @@ -39,11 +39,10 @@ module Foundation.I18n , StudyDegreeTerm(..) , ShortStudyFieldType(..) , StudyDegreeTermType(..) - , ErrorResponseTitle(..) - , UniWorXMessages(..) - , uniworxMessages + , ErrorResponseTitle(..) + -- , UniWorXMessages(..), uniworxMessages , unRenderMessage, unRenderMessage', unRenderMessageLenient - , SomeMessages(..) + , SomeMessages(..), pattern SomeMsgs, pattern SpaceMsgs, pattern JoinMsgs , someMessages , module Foundation.I18n.TH ) where @@ -62,7 +61,7 @@ import qualified Data.Text as Text import Utils.Form -import qualified GHC.Exts (IsList(..)) +-- import qualified GHC.Exts (IsList(..)) -- for UniWorXMessages import Yesod.Form.I18n.German import Yesod.Form.I18n.English @@ -87,21 +86,30 @@ pluralDE num singularForm pluralForm | num == 1 = singularForm | otherwise = pluralForm --- pluralDEx :: (Eq a, Num a) => Char -> a -> Text -> Text --- -- ^ @pluralENs n "Monat" = pluralEN n "Monat" "Monate"@ --- pluralDEx c n t = pluralDE n t $ t `snoc` c +pluralDEx :: (Eq a, Num a) => Char -> a -> Text -> Text +pluralDEx c n t = pluralDE n t $ t `snoc` c --- -- | like `pluralDEe` but also prefixes with the number --- pluralDExN :: (Eq a, Num a, Show a) => Char -> a -> Text -> Text --- pluralDExN c n t = tshow n <> cons ' ' (pluralDEx c n t) +-- | like `pluralDEx` but also prefixes with the number +pluralDExN :: (Eq a, Num a, Show a) => Char -> a -> Text -> Text +pluralDExN c n t = tshow n <> cons ' ' (pluralDEx c n t) pluralDEe :: (Eq a, Num a) => a -> Text -> Text --- ^ @pluralENs n "Monat" = pluralEN n "Monat" "Monate"@ -pluralDEe n t = pluralDE n t $ t `snoc` 'e' +-- ^ @pluralDEe n "Monat" = pluralDEe n "Monat" "Monate"@ +pluralDEe = pluralDEx 'e' -- | like `pluralDEe` but also prefixes with the number pluralDEeN :: (Eq a, Num a, Show a) => a -> Text -> Text -pluralDEeN n t = tshow n <> cons ' ' (pluralDEe n t) +pluralDEeN = pluralDExN 'e' + +-- | postfix plural with an 'n' +pluralDEn :: (Eq a, Num a) => a -> Text -> Text +-- ^ @pluralENs n "Monat" = pluralEN n "Monat" "Monate"@ +pluralDEn = pluralDEx 'n' + +-- | like `pluralDEn` but also prefixes with the number +pluralDEnN :: (Eq a, Num a, Show a) => a -> Text -> Text +pluralDEnN = pluralDExN 'n' + noneOneMoreDE :: (Eq a, Num a) => a -- ^ Count @@ -114,14 +122,14 @@ noneOneMoreDE num noneText singularForm pluralForm | num == 1 = singularForm | otherwise = pluralForm --- noneMoreDE :: (Eq a, Num a) --- => a -- ^ Count --- -> Text -- ^ None --- -> Text -- ^ Some --- -> Text --- noneMoreDE num noneText someText --- | num == 0 = noneText --- | otherwise = someText +noneMoreDE :: (Eq a, Num a) + => a -- ^ Count + -> Text -- ^ None + -> Text -- ^ Some + -> Text +noneMoreDE num noneText someText + | num == 0 = noneText + | otherwise = someText pluralEN :: (Eq a, Num a) => a -- ^ Count @@ -136,7 +144,7 @@ pluralENs :: (Eq a, Num a) => a -- ^ Count -> Text -- ^ Singular -> Text --- ^ @pluralENs n "foo" = pluralEN n "foo" "foos"@ +-- ^ @pluralENs n "foo" = pluralEN n "foo" "foos"@ pluralENs n t = pluralEN n t $ t `snoc` 's' -- | like `pluralENs` but also prefixes with the number @@ -154,14 +162,14 @@ noneOneMoreEN num noneText singularForm pluralForm | num == 1 = singularForm | otherwise = pluralForm --- noneMoreEN :: (Eq a, Num a) --- => a -- ^ Count --- -> Text -- ^ None --- -> Text -- ^ Some --- -> Text --- noneMoreEN num noneText someText --- | num == 0 = noneText --- | otherwise = someText +noneMoreEN :: (Eq a, Num a) + => a -- ^ Count + -> Text -- ^ None + -> Text -- ^ Some + -> Text +noneMoreEN num noneText someText + | num == 0 = noneText + | otherwise = someText _ordinalEN :: ToMessage a => a @@ -181,20 +189,20 @@ notEN :: Bool -> Text notEN = bool "not" "" {- -- TODO: use this is message eventually --- Commonly used plurals +-- Commonly used plurals data Thing = Person | Examinee deriving (Eq) -thingDE :: Int -> Thing -> Text +thingDE :: Int -> Thing -> Text thingDE num = (tshow num <>) . Text.cons ' ' . thing - where + where thing :: Thing -> Text thing Person = pluralDE num "Person" "Personen" thing Examinee = pluralDE num "Prüfling" "Prüflinge" - -thingEN :: Int -> Thing -> Text + +thingEN :: Int -> Thing -> Text thingEN num t = tshow num <> Text.cons ' ' (thing t) - where + where thing :: Thing -> Text thing Person = pluralENs num "person" thing Examinee = pluralENs num "examinee" @@ -210,6 +218,9 @@ maybeBoolMessage Nothing n _ _ = n maybeBoolMessage (Just True) _ t _ = t maybeBoolMessage (Just False) _ _ f = f +-- | Convenience function avoiding type signatures +boolText :: Text -> Text -> Bool -> Text +boolText = bool newtype ShortTermIdentifier = ShortTermIdentifier TermIdentifier deriving stock (Eq, Ord, Read, Show) @@ -268,16 +279,31 @@ mkMessageAddition ''UniWorX "Avs" "messages/uniworx/categories/avs" "de-de-forma embedRenderMessage ''UniWorX ''LmsStatus (uncurry ((<>) . (<> "Status")) . Text.splitAt 3) +-- | Flexible variant of `UniWorXMessages` allowing custom separation +data SomeMessages master = SomeMessages Text [SomeMessage master] -newtype SomeMessages master = SomeMessages [SomeMessage master] - deriving newtype (Semigroup, Monoid) +pattern SomeMsgs :: [SomeMessage master] -> SomeMessages master +pattern SomeMsgs msgs = SomeMessages "\n " msgs + +pattern SpaceMsgs :: [SomeMessage master] -> SomeMessages master +pattern SpaceMsgs msgs = SomeMessages " " msgs + +pattern JoinMsgs :: [SomeMessage master] -> SomeMessages master +pattern JoinMsgs msgs = SomeMessages "" msgs + +-- Not yet needed: +-- instance Semigroup (SomeMessage master) where +-- (SomeMessages s1 t1) <> (SomeMessages _s2 t2) = SomeMessages s1 $ t1 ++ t2 + +-- instance Monoid (SomeMessage master) where +-- mempty = SomeMessages mempty mempty instance master ~ master' => RenderMessage master (SomeMessages master') where - renderMessage a b (SomeMessages msgs) = Text.intercalate "\n " $ renderMessage a b <$> msgs + renderMessage a b (SomeMessages sep msgs) = Text.intercalate sep $ renderMessage a b <$> msgs -- | convenienience function if all messages happen to belong to the exact same type someMessages :: RenderMessage master msg => [msg] -> SomeMessages master -someMessages msgs = SomeMessages $ SomeMessage <$> msgs +someMessages msgs = SomeMessages "\n " $ SomeMessage <$> msgs instance RenderMessage UniWorX (Maybe LmsStatus) where -- useful for Filter with optionsFinite @@ -525,22 +551,24 @@ instance HasResolution a => ToMessage (Fixed a) where newtype ErrorResponseTitle = ErrorResponseTitle ErrorResponse embedRenderMessageVariant ''UniWorX ''ErrorResponseTitle ("ErrorResponseTitle" <>) +-- -- A list of messages is a message by itself. Uses blank for separation. +-- -- Deprecated for now; replaced by the more flexibles SomeMessages. Easy to reinstate. +-- -- +-- newtype UniWorXMessages = UniWorXMessages [SomeMessage UniWorX] +-- deriving stock (Generic) +-- deriving newtype (Semigroup, Monoid) -newtype UniWorXMessages = UniWorXMessages [SomeMessage UniWorX] - deriving stock (Generic) - deriving newtype (Semigroup, Monoid) +-- instance IsList UniWorXMessages where +-- type Item UniWorXMessages = SomeMessage UniWorX +-- fromList = UniWorXMessages +-- toList (UniWorXMessages msgs) = msgs -instance IsList UniWorXMessages where - type Item UniWorXMessages = SomeMessage UniWorX - fromList = UniWorXMessages - toList (UniWorXMessages msgs) = msgs +-- instance RenderMessage UniWorX UniWorXMessages where +-- renderMessage foundation ls (UniWorXMessages msgs) = +-- Text.unwords $ map (renderMessage foundation ls) msgs -- Text.unwords uses blank for separation -instance RenderMessage UniWorX UniWorXMessages where - renderMessage foundation ls (UniWorXMessages msgs) = - Text.unwords $ map (renderMessage foundation ls) msgs - -uniworxMessages :: [UniWorXMessage] -> UniWorXMessages -uniworxMessages = UniWorXMessages . map SomeMessage +-- uniworxMessages :: [UniWorXMessage] -> UniWorXMessages +-- uniworxMessages = UniWorXMessages . map SomeMessage -- This instance is required to use forms. You can modify renderMessage to @@ -602,12 +630,12 @@ unRenderMessage = unRenderMessage' (==) unRenderMessageLenient :: forall a master. (Ord a, Finite a, RenderMessage master a) => master -> Text -> [a] unRenderMessageLenient = unRenderMessage' cmp - where cmp = (==) `on` mk . under packed (filter Char.isAlphaNum . concatMap unidecode) + where cmp = (==) `on` mk . under packed (concatMap $ filter Char.isAlphaNum . unidecode) instance Default DateTimeFormatter where def = mkDateTimeFormatter (getTimeLocale' []) def appTZ -instance RenderMessage UniWorX Address where +instance RenderMessage UniWorX Address where renderMessage s l a@Address{addressName = Just aname} = aname <> cons ' ' (renderMessage s l a{addressName=Nothing}) renderMessage _ _ Address{addressEmail = mail} = "<" <> mail <> ">" diff --git a/backend/src/Foundation/Navigation.hs b/backend/src/Foundation/Navigation.hs index 008e68e08..c7d1b36db 100644 --- a/backend/src/Foundation/Navigation.hs +++ b/backend/src/Foundation/Navigation.hs @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Sarah Vaupel ,Steffen Jost ,Steffen Jost ,Winnie Ros +-- SPDX-FileCopyrightText: 2022-2025 Gregor Kleen ,Sarah Vaupel ,Sarah Vaupel ,Steffen Jost ,Steffen Jost ,Winnie Ros ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -29,10 +29,12 @@ import Foundation.Routes import Foundation.I18n import Foundation.Authorization +import Utils.Company (areThereInsaneCompanySupervisions) +import Utils.Sheet + import Handler.Utils.DateTime import Handler.Utils.Memcached import Handler.Utils.ExamOffice.Course -import Utils.Sheet import qualified Data.Set as Set import qualified Data.Map as Map @@ -87,9 +89,9 @@ breadcrumb (AdminUserR cID) = useRunDB . maybeT (i18nCrumb MsgBreadcrumbUser $ J uid <- decrypt cID User{..} <- MaybeT $ get uid return (userDisplayName, Just UsersR) -breadcrumb (AdminUserDeleteR cID) = i18nCrumb MsgBreadcrumbUserDelete . Just $ AdminUserR cID -breadcrumb (AdminHijackUserR cID) = i18nCrumb MsgBreadcrumbUserHijack . Just $ AdminUserR cID -breadcrumb (UserNotificationR cID) = useRunDB $ do +breadcrumb (AdminUserDeleteR cID) = i18nCrumb MsgBreadcrumbUserDelete . Just $ AdminUserR cID +breadcrumb (AdminHijackUserR cID) = i18nCrumb MsgBreadcrumbUserHijack . Just $ AdminUserR cID +breadcrumb (UserNotificationR cID) = useRunDB $ do mayList <- hasReadAccessTo UsersR if | mayList @@ -103,6 +105,7 @@ breadcrumb (UserPasswordR cID) = useRunDB $ do -> i18nCrumb MsgMenuUserPassword . Just $ AdminUserR cID | otherwise -> i18nCrumb MsgMenuUserPassword $ Just ProfileR +breadcrumb (UserRecipientsR cID) = i18nCrumb MsgBreadcrumbUserRecipients . Just $ AdminUserR cID breadcrumb AdminNewFunctionaryInviteR = i18nCrumb MsgMenuLecturerInvite $ Just UsersR breadcrumb AdminFunctionaryInviteR = i18nCrumb MsgBreadcrumbFunctionaryInvite Nothing @@ -122,27 +125,41 @@ breadcrumb ProblemWithoutAvsId = i18nCrumb MsgProblemsNoAvsIdHeading $ Just breadcrumb ProblemFbutNoR = i18nCrumb MsgProblemsRWithoutFHeading $ Just AdminProblemsR breadcrumb ProblemAvsSynchR = i18nCrumb MsgProblemsAvsSynchHeading $ Just AdminProblemsR breadcrumb ProblemAvsErrorR = i18nCrumb MsgProblemsAvsErrorHeading $ Just AdminProblemsR +breadcrumb ConfigInterfacesR = i18nCrumb MsgConfigInterfacesHeading $ Just AdminProblemsR breadcrumb FirmAllR = i18nCrumb MsgMenuFirms Nothing breadcrumb FirmsCommR{} = i18nCrumb MsgMenuFirmsComm $ Just FirmAllR +breadcrumb FirmsSupervisionR= i18nCrumb MsgMenuFirmsSupervision $ Just FirmAllR breadcrumb FirmUsersR{} = i18nCrumb MsgMenuFirmUsers $ Just FirmAllR breadcrumb (FirmSupersR fsh)= i18nCrumb MsgMenuFirmSupervisors $ Just $ FirmUsersR fsh breadcrumb (FirmCommR fsh)= i18nCrumb MsgMenuFirmsComm $ Just $ FirmUsersR fsh -breadcrumb PrintCenterR = i18nCrumb MsgMenuApc Nothing +breadcrumb CommCenterR = i18nCrumb MsgMenuCommCenter Nothing +breadcrumb MailCenterR = i18nCrumb MsgMenuMailCenter $ Just CommCenterR +breadcrumb MailHtmlR{} = i18nCrumb MsgMenuMailHtml $ Just MailCenterR +breadcrumb MailPlainR{} = i18nCrumb MsgMenuMailPlain $ Just MailCenterR +breadcrumb (MailAttachmentR mid _) = i18nCrumb MsgMenuMailAttachment $ Just $ MailHtmlR mid + +breadcrumb PrintCenterR = i18nCrumb MsgMenuApc $ Just CommCenterR breadcrumb PrintSendR = i18nCrumb MsgMenuPrintSend $ Just PrintCenterR breadcrumb PrintDownloadR{} = i18nCrumb MsgMenuPrintDownload $ Just PrintCenterR breadcrumb PrintAckR{} = i18nCrumb MsgMenuPrintSend $ Just PrintCenterR -- never displayed breadcrumb PrintAckDirectR{}= i18nCrumb MsgMenuPrintAck $ Just PrintCenterR breadcrumb PrintLogR = i18nCrumb MsgMenuPrintLog $ Just PrintCenterR -breadcrumb SchoolListR = i18nCrumb MsgMenuSchoolList $ Just AdminR -breadcrumb (SchoolR ssh sRoute) = case sRoute of - SchoolEditR -> useRunDB . maybeT (i18nCrumb MsgBreadcrumbSchool $ Just SchoolListR) $ do +breadcrumb SchoolListR = i18nCrumb MsgMenuSchoolList $ Just AdminR +breadcrumb (SchoolR ssh SchoolEditR) = + useRunDB . maybeT (i18nCrumb MsgBreadcrumbSchool $ Just SchoolListR) $ do School{..} <- MaybeT $ get ssh isAdmin <- lift $ hasReadAccessTo SchoolListR return (CI.original schoolName, bool Nothing (Just SchoolListR) isAdmin) -breadcrumb SchoolNewR = i18nCrumb MsgMenuSchoolNew $ Just SchoolListR +breadcrumb (SchoolR ssh (SchoolDayR d)) = do + dt <- formatTime SelFormatDate d + mr <- getMessageRender + return (mr $ MsgMenuSchoolDay ssh dt, Just SchoolListR) +breadcrumb (SchoolR ssh (SchoolDayCheckR d)) + = i18nCrumb MsgMenuSchoolDayCheck $ Just (SchoolR ssh (SchoolDayR d)) +breadcrumb SchoolNewR = i18nCrumb MsgMenuSchoolNew $ Just SchoolListR breadcrumb (ExamOfficeR EOExamsR) = i18nCrumb MsgMenuExamOfficeExams Nothing breadcrumb (ExamOfficeR EOFieldsR) = i18nCrumb MsgMenuExamOfficeFields . Just $ ExamOfficeR EOExamsR @@ -171,12 +188,14 @@ breadcrumb InstanceR = i18nCrumb MsgMenuInstance Nothing breadcrumb StatusR = i18nCrumb MsgMenuHealth Nothing -- never displayed breadcrumb QualificationAllR = i18nCrumb MsgMenuQualifications Nothing -breadcrumb (QualificationSchoolR ssh ) = useRunDB . maybeT (i18nCrumb MsgBreadcrumbSchool . Just $ SchoolListR) $ do -- redirect only, used in other breadcrumbs +breadcrumb (QualificationSchoolR ssh ) = useRunDB . maybeT (i18nCrumb MsgBreadcrumbSchool . Just $ SchoolListR) $ do guardM . lift . existsBy . UniqueSchoolShorthand $ unSchoolKey ssh return (CI.original $ unSchoolKey ssh, Just QualificationAllR) +breadcrumb (QualificationNewR ssh ) = i18nCrumb MsgMenuQualificationNew $ Just $ QualificationSchoolR ssh breadcrumb (QualificationR ssh qsh) =useRunDB . maybeT (i18nCrumb MsgBreadcrumbCourse . Just $ QualificationSchoolR ssh) $ do guardM . lift . existsBy $ SchoolQualificationShort ssh qsh return (CI.original qsh, Just $ QualificationSchoolR ssh) +breadcrumb (QualificationEditR ssh qsh) = i18nCrumb MsgMenuQualificationEdit $ Just $ QualificationR ssh qsh breadcrumb QualificationSAPDirectR = i18nCrumb MsgMenuSap $ Just QualificationAllR -- never displayed breadcrumb LmsAllR = i18nCrumb MsgMenuLms Nothing @@ -186,10 +205,10 @@ breadcrumb (LmsSchoolR ssh ) = useRunDB . maybeT (i18nCrumb MsgBrea breadcrumb (LmsR ssh qsh) = useRunDB . maybeT (i18nCrumb MsgBreadcrumbCourse . Just $ LmsSchoolR ssh) $ do guardM . lift . existsBy $ SchoolQualificationShort ssh qsh return (CI.original qsh, Just $ LmsSchoolR ssh) -breadcrumb (LmsEditR ssh qsh) = i18nCrumb MsgMenuLmsEdit $ Just $ LmsR ssh qsh -- v2 breadcrumb (LmsLearnersR ssh qsh) = i18nCrumb MsgMenuLmsLearners $ Just $ LmsR ssh qsh breadcrumb (LmsLearnersDirectR ssh qsh) = i18nCrumb MsgMenuLmsLearners $ Just $ LmsLearnersR ssh qsh -- never displayed, TypedContent +breadcrumb (LmsOrphansR ssh qsh) = i18nCrumb MsgLmsOrphans $ Just $ LmsLearnersR ssh qsh breadcrumb (LmsReportR ssh qsh) = i18nCrumb MsgMenuLmsReport $ Just $ LmsR ssh qsh breadcrumb (LmsReportUploadR ssh qsh) = i18nCrumb MsgMenuLmsUpload $ Just $ LmsReportR ssh qsh breadcrumb (LmsReportDirectR ssh qsh) = i18nCrumb MsgMenuLmsUpload $ Just $ LmsReportR ssh qsh -- never displayed @@ -295,6 +314,7 @@ breadcrumb (CourseR tid ssh csh (TutorialR tutn sRoute)) = case sRoute of guardM . lift . hasReadAccessTo $ CTutorialR tid ssh csh tutn TUsersR return (CI.original tutn, Just $ CourseR tid ssh csh CTutorialListR) TAddUserR -> i18nCrumb MsgMenuTutorialAddMembers . Just $ CTutorialR tid ssh csh tutn TUsersR + TExamR exn -> i18nCrumb (MsgMenuTutorialExam exn) . Just $ CTutorialR tid ssh csh tutn TUsersR TEditR -> i18nCrumb MsgMenuTutorialEdit . Just $ CTutorialR tid ssh csh tutn TUsersR TDeleteR -> i18nCrumb MsgMenuTutorialDelete . Just $ CTutorialR tid ssh csh tutn TUsersR TCommR -> i18nCrumb MsgMenuTutorialComm . Just $ CTutorialR tid ssh csh tutn TUsersR @@ -930,19 +950,37 @@ pageActions :: ( MonadHandler m , MonadUnliftIO m ) => Route UniWorX -> m [Nav] -pageActions NewsR = return - [ NavPageActionPrimary - { navLink = NavLink - { navLabel = MsgMenuOpenCourses - , navRoute = (CourseListR, [("courses-openregistration", toPathPiece True)]) - , navAccess' = NavAccessTrue - , navType = NavTypeLink { navModal = False } - , navQuick' = mempty - , navForceActive = False +pageActions NewsR = do + now <- liftIO getCurrentTime + let nowaday = utctDay now + nd <- formatTime SelFormatDate now + schools <- useRunDB $ selectList [] [Asc SchoolShorthand] + return $ + ( NavPageActionPrimary + { navLink = NavLink + { navLabel = MsgMenuOpenCourses + , navRoute = (CourseListR, [("courses-openregistration", toPathPiece True)]) + , navAccess' = NavAccessTrue + , navType = NavTypeLink { navModal = False } + , navQuick' = mempty + , navForceActive = False + } + , navChildren = [] } - , navChildren = [] - } - ] + ) : + [ NavPageActionPrimary + { navLink = NavLink + { navLabel = MsgMenuSchoolDay ssh nd + , navRoute = SchoolR ssh $ SchoolDayR nowaday + , navAccess' = NavAccessTrue + , navType = NavTypeLink { navModal = False } + , navQuick' = mempty + , navForceActive = False + } + , navChildren = [] + } + | sch <- schools, let ssh = sch ^. _entityKey + ] pageActions (CourseR tid ssh csh CShowR) = do materialListSecondary <- pageQuickActions NavQuickViewPageActionSecondary $ CourseR tid ssh csh MaterialListR tutorialListSecondary <- pageQuickActions NavQuickViewPageActionSecondary $ CourseR tid ssh csh CTutorialListR @@ -1172,6 +1210,18 @@ pageActions SchoolListR = return , navChildren = [] } ] +pageActions (SchoolR ssh (SchoolDayR nd)) = return $ + ( NavPageActionPrimary + { navLink = defNavLinkModal MsgMenuSchoolDayCheck $ SchoolR ssh $ SchoolDayCheckR nd + , navChildren = [] + } + ) : + [ NavPageActionPrimary + { navLink = defNavLink msg $ SchoolR ssh (SchoolDayR $ addDays n nd) + , navChildren = [] + } + | (msg, n) <- [(MsgWeekPrev, -7), (MsgDayPrev, -1), (MsgDayNext, 1), (MsgWeekNext, 7)] + ] pageActions UsersR = return [ NavPageActionPrimary { navLink = NavLink @@ -1457,6 +1507,12 @@ pageActions (ForProfileR cID) = return , navChildren = [] } ] +pageActions (ForProfileDataR cID) = return + [ NavPageActionPrimary + { navLink = defNavLink MsgAdminUserHeading $ AdminUserR cID + , navChildren = [] + } + ] pageActions TermShowR = do participantsSecondary <- pageQuickActions NavQuickViewPageActionSecondary ParticipantsListR return @@ -1752,6 +1808,12 @@ pageActions (CTutorialR tid ssh csh tutn TUsersR) = do } } ] +pageActions (CTutorialR tid ssh csh _tutn (TExamR ename)) = return + [ NavPageActionPrimary + { navLink = defNavLink MsgMenuExamEditComplete $ CourseR tid ssh csh $ ExamR ename EEditR + , navChildren = [] + } + ] pageActions (CourseR tid ssh csh CExamListR) = return [ NavPageActionPrimary { navLink = NavLink @@ -1946,7 +2008,7 @@ pageActions (CSheetR tid ssh csh shn SShowR) = do { navLabel = MsgMenuSheetPersonalisedFiles , navRoute = CSheetR tid ssh csh shn SPersonalFilesR , navAccess' = NavAccessDB $ - let onlyPersonalised = fmap (maybe False $ not . E.unValue) . E.selectMaybe . E.from $ \(sheet `E.InnerJoin` course) -> do + let onlyPersonalised = fmap (maybe False $ not . E.unValue) . E.selectOne . E.from $ \(sheet `E.InnerJoin` course) -> do E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId E.where_$ sheet E.^. SheetName E.==. E.val shn E.&&. course E.^. CourseTerm E.==. E.val tid @@ -2367,6 +2429,20 @@ pageActions ParticipantsListR = return , navChildren = [] } ] +pageActions QualificationAllR = do + schools <- useRunDB $ selectList [] [Asc SchoolShorthand] -- selectKeysList here mysteriously leads to runtime error: InternalError "selectKeysImpl:" School: keyFromValues failed + return [ NavPageActionSecondary { navLink = defNavLink (SomeMessage $ unSchoolKey sid) (QualificationSchoolR sid) } | Entity{entityKey=sid} <- schools ] +pageActions (QualificationSchoolR sid) = return + [ NavPageActionSecondary { + navLink = defNavLink MsgMenuQualificationNew $ QualificationNewR sid + } + ] +pageActions (QualificationR sid qsh) = return + [ NavPageActionSecondary { + navLink = defNavLink MsgMenuQualificationEdit $ QualificationEditR sid qsh + } + ] + pageActions (LmsR sid qsh) = return [ NavPageActionPrimary { navLink = defNavLink MsgMenuLmsLearners $ LmsLearnersR sid qsh @@ -2382,12 +2458,18 @@ pageActions (LmsR sid qsh) = return ] } , NavPageActionSecondary { - navLink = defNavLink MsgMenuLmsEdit $ LmsEditR sid qsh + navLink = defNavLink MsgMenuQualificationEdit $ QualificationEditR sid qsh } -- , NavPageActionSecondary { -- navLink = defNavLink MsgMenuLmsFake $ LmsFakeR sid qsh -- } ] +pageActions (LmsLearnersR sid qsh) = return + [ NavPageActionPrimary + { navLink = defNavLink MsgLmsOrphans $ LmsOrphansR sid qsh + , navChildren = [] + } + ] pageActions ApiDocsR = return [ NavPageActionPrimary { navLink = NavLink @@ -2401,6 +2483,12 @@ pageActions ApiDocsR = return , navChildren = [] } ] +pageActions FirmAllR = do + let navLink = defNavLink MsgMenuFirmsSupervision FirmsSupervisionR + navChildren = [] + (thereAre,_) <- liftHandler areThereInsaneCompanySupervisions + return [ NavPageActionPrimary{..} | thereAre ] + pageActions (FirmUsersR fsh) = return [ NavPageActionPrimary { navLink = defNavLink MsgTableCompanyNrSupers $ FirmSupersR fsh @@ -2471,6 +2559,50 @@ pageActions PrintCenterR = do dayLinks <- mapM toDayAck $ Map.toAscList dayMap return $ manualSend : printLog : printAck : take 9 dayLinks +pageActions CommCenterR = return + [ NavPageActionPrimary + { navLink = defNavLink MsgMenuMailCenter MailCenterR + , navChildren = [] + } + , NavPageActionPrimary + { navLink = defNavLink MsgMenuApc PrintCenterR + , navChildren = [] + } + ] + +pageActions (MailHtmlR smid) = do + sid <- decrypt smid + usrNotiSettings <- useRunDB $ runMaybeT $ do + sm <- MaybeT $ get sid + uid <- hoistMaybe $ sentMailRecipient sm + User{userDisplayName} <- MaybeT $ get uid + uuid <- liftHandler $ encrypt uid + return NavPageActionPrimary + { navLink = defNavLink (MsgNotificationSettingsHeading userDisplayName) $ UserNotificationR uuid + , navChildren = [] + } + let linkPlain = NavPageActionPrimary + { navLink = defNavLink MsgMenuMailPlain $ MailPlainR smid + , navChildren = [] + } + return $ msnoc [linkPlain] usrNotiSettings +pageActions (MailPlainR smid) = do + sid <- decrypt smid + usrNotiSettings <- useRunDB $ runMaybeT $ do + sm <- MaybeT $ get sid + uid <- hoistMaybe $ sentMailRecipient sm + User{userDisplayName} <- MaybeT $ get uid + uuid <- liftHandler $ encrypt uid + return NavPageActionPrimary + { navLink = defNavLink (MsgNotificationSettingsHeading userDisplayName) $ UserNotificationR uuid + , navChildren = [] + } + let linkHtml = NavPageActionPrimary + { navLink = defNavLink MsgMenuMailHtml $ MailHtmlR smid + , navChildren = [] + } + return $ msnoc [linkHtml] usrNotiSettings + pageActions AdminCrontabR = return [ NavPageActionPrimary { navLink = defNavLink MsgMenuAdminJobs AdminJobsR @@ -2478,6 +2610,20 @@ pageActions AdminCrontabR = return } ] +pageActions AdminProblemsR = return + [ NavPageActionPrimary + { navLink = defNavLink MsgConfigInterfacesHeading ConfigInterfacesR + , navChildren = [] + } + , NavPageActionPrimary + { navLink = defNavLink MsgProblemsAvsSynchHeading ProblemAvsSynchR + , navChildren = [] + } + , NavPageActionSecondary + { navLink = defNavLink MsgProblemsAvsErrorHeading ProblemAvsErrorR + } + ] + pageActions _ = return [] submissionList :: ( MonadIO m @@ -2490,7 +2636,7 @@ submissionList tid csh shn uid = withReaderT (projectBackend @SqlReadBackend) . E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId E.where_ $ submissionUser E.^. SubmissionUserUser E.==. E.val uid - E.&&. sheet E.^. SheetName E.==. E.val shn + E.&&. sheet E.^. SheetName E.==. E.val shn E.&&. course E.^. CourseShorthand E.==. E.val csh E.&&. course E.^. CourseTerm E.==. E.val tid diff --git a/backend/src/Foundation/SiteLayout.hs b/backend/src/Foundation/SiteLayout.hs index de88d07f7..6ddc6a6d6 100644 --- a/backend/src/Foundation/SiteLayout.hs +++ b/backend/src/Foundation/SiteLayout.hs @@ -156,7 +156,7 @@ siteLayout' overrideHeading widget = do -- isParent r = r == (fst parents) isAuth <- isJust <$> maybeAuthId - + now <- liftIO getCurrentTime muid <- maybeAuthPair @@ -254,7 +254,7 @@ siteLayout' overrideHeading widget = do forM_ authTagPivots $ \authTag -> addMessageWidget Info $ msgModal [whamlet|_{MsgUnauthorizedDisabledTag authTag}|] (Left $ SomeRoute (AuthPredsR, catMaybes [(toPathPiece GetReferer, ) . toPathPiece <$> mcurrentRoute])) getMessages - + storedReasonAndToggleRoute <- case mcurrentRoute of (Just (CourseR tid ssh csh _)) -> (, Just . SomeRoute $ CourseR tid ssh csh CFavouriteR) <$> storedFavouriteReason tid ssh csh muid _otherwise -> pure (Nothing, Nothing) @@ -266,8 +266,8 @@ siteLayout' overrideHeading widget = do , nav' , contentHeadline , mmsgs - , maybe userDefaultMaxFavouriteTerms userMaxFavouriteTerms $ view _2 <$> muid - , maybe userDefaultTheme userTheme $ view _2 <$> muid + , maybe userDefaultMaxFavouriteTerms (userMaxFavouriteTerms . view _2) muid + , maybe userDefaultTheme (userTheme . view _2) muid , storedReasonAndToggleRoute ) @@ -299,7 +299,7 @@ siteLayout' overrideHeading widget = do | otherwise = Set.drop (Set.size ts - n) ts currentTerms = toTermKeySet $ filter (views (_2 . _Value) . maybe True $ is _FavouriteCurrent) favourites' toTermKeySet = setOf $ folded . _1 . _2 . to unTermKey - + favourites <- fmap catMaybes . forM favourites' $ \(c@(_, tid, ssh, csh), E.Value mFavourite, courseVisible, mayView, mayEdit) -> let courseRoute = CourseR tid ssh csh CShowR favouriteReason = fromMaybe FavouriteCurrent mFavourite @@ -508,7 +508,7 @@ siteLayout' overrideHeading widget = do $(widgetFile "default-layout") withUrlRenderer $(hamletFile "templates/default-layout-wrapper.hamlet") - + getSystemMessageState :: (MonadHandler m, HandlerSite m ~ UniWorX, BearerAuthSite UniWorX) => SystemMessageId -> m UserSystemMessageState getSystemMessageState smId = liftHandler $ do muid <- maybeAuthId @@ -594,7 +594,7 @@ applySystemMessages = maybeT_ . catchMPlus (Proxy @CryptoIDError) $ do -- FIXME: Move headings into their respective handlers - + -- | Method for specifying page heading for handlers that call defaultLayout -- -- All handlers whose code is under our control should use diff --git a/backend/src/Foundation/Type.hs b/backend/src/Foundation/Type.hs index 5c77e9863..f2f84e7ce 100644 --- a/backend/src/Foundation/Type.hs +++ b/backend/src/Foundation/Type.hs @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-26 Gregor Kleen ,Sarah Vaupel ,Steffen Jost ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -11,11 +11,11 @@ module Foundation.Type , _SessionStorageMemcachedSql, _SessionStorageAcid , AppMemcached(..) , _memcachedKey, _memcachedConn - , AppMemcachedLocal(..) - , _memcachedLocalARC , SMTPPool , _appSettings', _appStatic, _appConnPool, _appSmtpPool, _appLdapPool, _appWidgetMemcached, _appHttpManager, _appLogger, _appLogSettings, _appCryptoIDKey, _appClusterID, _appInstanceID, _appJobState, _appSessionStore, _appSecretBoxKey, _appJSONWebKeySet, _appHealthReport, _appMemcached, _appUploadCache, _appVerpSecret, _appAuthKey, _appPersonalisedSheetFilesSeedKey, _appVolatileClusterSettingsCache, _appAvsQuery - , DB, Form, MsgRenderer, MailM, DBFile + , DB + , DBRead, DBRead', DBReadUq, DBReadUq' + , Form, MsgRenderer, MailM, DBFile ) where import Import.NoFoundation @@ -32,18 +32,13 @@ import qualified Jose.Jwk as Jose import qualified Database.Memcached.Binary.IO as Memcached import Network.Minio (MinioConn) -import Data.IntervalMap.Strict (IntervalMap) - import qualified Utils.Pool as Custom import Utils.Metrics (DBConnUseState) -import qualified Data.ByteString.Lazy as Lazy -import Data.Time.Clock.POSIX (POSIXTime) -import GHC.Fingerprint (Fingerprint) import Handler.Sheet.PersonalisedFiles.Types (PersonalisedSheetFilesSeedKey) -import Utils.Avs (AvsQuery) +import Utils.Avs (AvsQuery()) type SMTPPool = Pool SMTPConnection @@ -62,13 +57,6 @@ data AppMemcached = AppMemcached makeLenses_ ''AppMemcached -data AppMemcachedLocal = AppMemcachedLocal - { memcachedLocalARC :: ARCHandle (Fingerprint, Lazy.ByteString) Int (NFDynamic, Maybe POSIXTime) - , memcachedLocalHandleInvalidations :: Async () - , memcachedLocalInvalidationQueue :: TVar (Seq (Fingerprint, Lazy.ByteString)) - } deriving (Generic) - -makeLenses_ ''AppMemcachedLocal -- | The foundation datatype for your application. This can be a good place to -- keep settings and values requiring initialization before your application @@ -93,13 +81,9 @@ data UniWorX = UniWorX , appJSONWebKeySet :: Jose.JwkSet , appHealthReport :: TVar (Set (UTCTime, HealthReport)) , appMemcached :: Maybe AppMemcached - , appMemcachedLocal :: Maybe AppMemcachedLocal , appUploadCache :: Maybe MinioConn , appVerpSecret :: VerpSecret , appAuthKey :: Auth.Key - , appFileSourceARC :: Maybe (ARCHandle (FileContentChunkReference, (Int, Int)) Int ByteString) - , appFileSourcePrewarm :: Maybe (LRUHandle (FileContentChunkReference, (Int, Int)) UTCTime Int ByteString) - , appFileInjectInhibit :: TVar (IntervalMap UTCTime (Set FileContentReference)) , appPersonalisedSheetFilesSeedKey :: PersonalisedSheetFilesSeedKey , appVolatileClusterSettingsCache :: TVar VolatileClusterSettingsCache , appStartTime :: UTCTime -- for Status Page @@ -123,8 +107,17 @@ instance HasCookieSettings RegisteredCookie UniWorX where instance (MonadHandler m, HandlerSite m ~ UniWorX) => ReadLogSettings m where readLogSettings = liftIO . readTVarIO =<< getsYesod (view _appLogSettings) - type DB = YesodDB UniWorX + -- ~ ReaderT SqlBackend (HandlerFor UniWorX) +-- type DBRead = ReaderT SqlReadBackend (HandlerFor UniWorX) -- old, was too unflexible. Try DBRead first, then add suffixes ' or Uq until it types ;) +type DBRead a = forall backend . (PersistQueryRead backend, BackendCompatible SqlBackend backend) + => ReaderT backend (HandlerFor UniWorX) a +type DBRead' a = forall backend . (PersistQueryRead backend, BackendCompatible SqlBackend backend, BaseBackend backend ~ SqlBackend) -- ought to be redundant, but somehow isn´t. Using this everywhere give redundant constraint warnings, also undesirable + => ReaderT backend (HandlerFor UniWorX) a +type DBReadUq a = forall backend . (PersistQueryRead backend, BackendCompatible SqlBackend backend, PersistUniqueRead backend) -- adding this to DBRead would yield some unnecessary constraint warnings + => ReaderT backend (HandlerFor UniWorX) a +type DBReadUq' a = forall backend . (PersistQueryRead backend, BackendCompatible SqlBackend backend, BaseBackend backend ~ SqlBackend, PersistUniqueRead backend) + => ReaderT backend (HandlerFor UniWorX) a type Form x = Html -> MForm (HandlerFor UniWorX) (FormResult x, WidgetFor UniWorX ()) type MsgRenderer = MsgRendererS UniWorX -- see Utils type MailM a = MailT (HandlerFor UniWorX) a diff --git a/backend/src/Foundation/Yesod/Auth.hs b/backend/src/Foundation/Yesod/Auth.hs index efabadc80..cd6b4c42b 100644 --- a/backend/src/Foundation/Yesod/Auth.hs +++ b/backend/src/Foundation/Yesod/Auth.hs @@ -107,7 +107,7 @@ authenticate creds@Creds{..} = liftHandler . runDB . withReaderT projectBackend | not isDummy -> res <$ update uid [ UserLastAuthentication =. Just now ] _other -> return res - $logDebugS "auth" $ tshow Creds{..} + $logDebugS "auth" $ tshow Creds{..} ldapPool' <- getsYesod $ view _appLdapPool flip catches excHandlers $ case ldapPool' of @@ -153,9 +153,9 @@ _upsertCampusUserMode mMode cs@Creds{..} defaultOther = apHash -ldapLookupAndUpsert :: forall m. (MonadHandler m, HandlerSite m ~ UniWorX, MonadMask m, MonadUnliftIO m) => Text -> SqlPersistT m (Entity User) -ldapLookupAndUpsert ident = - getsYesod (view _appLdapPool) >>= \case +ldapLookupAndUpsert :: forall m. (MonadHandler m, HandlerSite m ~ UniWorX, MonadMask m, MonadUnliftIO m) => Text -> SqlPersistT m (Entity User) +ldapLookupAndUpsert ident = + getsYesod (view _appLdapPool) >>= \case Nothing -> throwM $ CampusUserLdapError $ LdapHostNotResolved "No LDAP configuration in Foundation." Just ldapPool -> campusUser'' ldapPool campusUserFailoverMode ident >>= \case @@ -182,22 +182,21 @@ upsertCampusUser upsertMode ldapData = do userDefaultConf <- getsYesod $ view _appUserDefaults (newUser,userUpdate) <- decodeUser now userDefaultConf upsertMode ldapData - --TODO: newUser should be associated with a company and company supervisor through Handler.Utils.Company.upsertUserCompany, but this is called by upsertAvsUser already - conflict? oldUsers <- for (userLdapPrimaryKey newUser) $ \pKey -> selectKeysList [ UserLdapPrimaryKey ==. Just pKey ] [] user@(Entity userId userRec) <- case oldUsers of Just [oldUserId] -> updateGetEntity oldUserId userUpdate _other -> upsertBy (UniqueAuthentication (newUser ^. _userIdent)) newUser userUpdate - unless (validDisplayName (newUser ^. _userTitle) + unless (validDisplayName (newUser ^. _userTitle) (newUser ^. _userFirstName) - (newUser ^. _userSurname) + (newUser ^. _userSurname) (userRec ^. _userDisplayName)) $ - update userId [ UserDisplayName =. (newUser ^. _userDisplayName) ] - when (validEmail' (userRec ^. _userEmail)) $ do + update userId [ UserDisplayName =. (newUser ^. _userDisplayName) ] -- update invalid display names only + when (validEmail' (userRec ^. _userEmail)) $ do -- RECALL: userRec already contains basic updates let emUps = [ UserDisplayEmail =. (newUser ^. _userEmail) | not (validEmail' (userRec ^. _userDisplayEmail)) ] ++ [ UserAuthentication =. AuthLDAP | is _AuthNoLogin (userRec ^. _userAuthentication) ] - unless (null emUps) $ update userId emUps + update userId emUps -- update already checks whether list is empty -- Attempt to update ident, too: unless (validEmail' (userRec ^. _userIdent)) $ void $ maybeCatchAll (update userId [ UserIdent =. (newUser ^. _userEmail) ] >> return (Just ())) @@ -228,10 +227,10 @@ decodeUserTest mbIdent ldapData = do decodeUser :: (MonadThrow m) => UTCTime -> UserDefaultConf -> UpsertCampusUserMode -> Ldap.AttrList [] -> m (User,_) -decodeUser now UserDefaultConf{..} upsertMode ldapData = do +decodeUser now UserDefaultConf{..} upsertMode ldapData = do let - userTelephone = decodeLdap ldapUserTelephone - userMobile = decodeLdap ldapUserMobile + userTelephone = decodeLdap ldapUserTelephone <&> canonicalPhone + userMobile = decodeLdap ldapUserMobile <&> canonicalPhone userCompanyPersonalNumber = decodeLdap ldapUserFraportPersonalnummer userCompanyDepartment = decodeLdap ldapUserFraportAbteilung @@ -267,7 +266,7 @@ decodeUser now UserDefaultConf{..} upsertMode ldapData = do -- -> return $ CI.mk userEmail | otherwise -> throwM CampusUserInvalidEmail - + userLdapPrimaryKey <- if | [bs] <- ldapMap !!! ldapPrimaryKey , Right userLdapPrimaryKey'' <- Text.decodeUtf8' bs @@ -306,13 +305,13 @@ decodeUser now UserDefaultConf{..} upsertMode ldapData = do , userPrefersPostal = userDefaultPrefersPostal , .. } - userUpdate = + userUpdate = [ UserLastAuthentication =. Just now | isLogin ] ++ [ UserEmail =. userEmail | validEmail' userEmail ] ++ [ - -- UserDisplayName =. userDisplayName -- not updated here, since users are allowed to change their DisplayName; see line 272 + -- UserDisplayName =. userDisplayName -- not updated here, since users are allowed to change their DisplayName; see line 191 UserFirstName =. userFirstName - , UserSurname =. userSurname + , UserSurname =. userSurname , UserLastLdapSynchronisation =. Just now , UserLdapPrimaryKey =. userLdapPrimaryKey , UserMobile =. userMobile diff --git a/backend/src/Handler/Admin.hs b/backend/src/Handler/Admin.hs index fd001c768..fa00065aa 100644 --- a/backend/src/Handler/Admin.hs +++ b/backend/src/Handler/Admin.hs @@ -1,4 +1,4 @@ --- SPDX-FileCopyrightText: 2022 Gregor Kleen ,Steffen Jost +-- SPDX-FileCopyrightText: 2022-2025 Gregor Kleen ,Steffen Jost ,Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later @@ -8,23 +8,30 @@ module Handler.Admin import Import -import Jobs -- import Data.Either -import qualified Data.Set as Set +import qualified Data.Set as Set +import qualified Data.Map as Map +import qualified Data.Text as Text -- import qualified Data.Text.Lazy.Encoding as LBS -- import qualified Control.Monad.Catch as Catch -- import Servant.Client (ClientError(..), ResponseF(..)) -- import Text.Blaze.Html (preEscapedToHtml) +import Database.Persist.Sql (updateWhereCount) import Database.Esqueleto.Experimental ((:&)(..)) import qualified Database.Esqueleto.Experimental as E +import qualified Database.Esqueleto.Legacy as EL (on) -- needed for dbTable import qualified Database.Esqueleto.Utils as E +import Jobs +import Utils.Company (areThereInsaneCompanySupervisions) import Handler.Utils import Handler.Utils.Avs import Handler.Utils.Users +-- import Handler.Utils.Company import Handler.Health.Interface +import Handler.Users (AllUsersAction(..)) import Handler.Admin.Test as Handler.Admin import Handler.Admin.ErrorMessage as Handler.Admin @@ -34,11 +41,29 @@ import Handler.Admin.Avs as Handler.Admin import Handler.Admin.Ldap as Handler.Admin +-- Types and Template Haskell +data ProblemTableAction = ProblemTableMarkSolved + | ProblemTableMarkUnsolved + deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic) + deriving anyclass (Universe, Finite) + +nullaryPathPiece ''ProblemTableAction $ camelToPathPiece' 2 +embedRenderMessage ''UniWorX ''ProblemTableAction id + +data ProblemTableActionData = ProblemTableMarkSolvedData + | ProblemTableMarkUnsolvedData -- Placeholder, remove later + deriving (Eq, Ord, Read, Show, Generic) + + +-- Handlers getAdminR :: Handler Html getAdminR = redirect AdminProblemsR -getAdminProblemsR :: Handler Html -getAdminProblemsR = do +getAdminProblemsR, postAdminProblemsR :: Handler Html +getAdminProblemsR = handleAdminProblems Nothing + +handleAdminProblems :: Maybe Widget -> Handler Html +handleAdminProblems mbProblemTable = do now <- liftIO getCurrentTime let nowaday = utctDay now cutOffOldDays = 1 @@ -50,26 +75,32 @@ getAdminProblemsR = do msgErrorTooltip <- messageI Error MsgMessageError let flagError = messageTooltip . bool msgErrorTooltip msgSuccessTooltip - flagWarning = messageTooltip . bool msgWarningTooltip msgSuccessTooltip + flagWarning = messageTooltip . bool msgWarningTooltip msgSuccessTooltip flagNonZero :: Int -> Widget flagNonZero n | n <= 0 = flagError True - | otherwise = messageTooltip =<< handlerToWidget (messageI Error (MsgProblemsDriverSynch n)) + | otherwise = messageTooltip =<< handlerToWidget (messageI Error (MsgProblemsDriverSynch n)) - (usersAreReachable, driversHaveAvsIds, rDriversHaveFs, noStalePrintJobs, noBadAPCids, (interfaceOks, interfaceTable)) <- runDB $ (,,,,,) - <$> areAllUsersReachable - <*> allDriversHaveAvsId now + showDiffTime t = + let d = diffUTCTime now t + in guardMonoid (d > secondsToNominalDiffTime 30) [whamlet|_{MsgProblemLastCheckTime (formatDiffDays d)}|] + + (usersAreReachable, aurTime) <- areAllUsersReachable -- cached + (not -> thereAreInsaneFirmSupervisions, ifsTime) <- areThereInsaneCompanySupervisions -- cached + (driversHaveAvsIds, rDriversHaveFs, not -> noStalePrintJobs, not -> noBadAPCids) <- runDBRead $ (,,,) + <$> allDriversHaveAvsId now <*> allRDriversHaveFs now - <*> (not <$> exists [PrintJobAcknowledged ==. Nothing, PrintJobCreated <. cutOffOldTime]) - <*> (not <$> exists [PrintAcknowledgeProcessed ==. False]) - <*> mkInterfaceLogTable flagError mempty + <*> exists [PrintJobAcknowledged ==. Nothing, PrintJobCreated <. cutOffOldTime] + <*> exists [PrintAcknowledgeProcessed ==. False] + (interfaceOks, interfaceTable) <- runDB $ mkInterfaceLogTable mempty let interfacesBadNr = length $ filter (not . snd) interfaceOks - -- interfacesOk = all snd interfaceOks + -- interfacesOk = all snd interfaceOks + diffLics <- try retrieveDifferingLicences >>= \case -- (Left (UnsupportedContentType "text/html" resp)) -> Left $ text2widget "Html received" (Left e) -> return $ Left $ text2widget $ tshow (e :: SomeException) - (Right AvsLicenceDifferences{..}) -> do + (Right (AvsLicenceDifferences{..},_)) -> do let problemIds = avsLicenceDiffRevokeAll <> avsLicenceDiffGrantVorfeld <> avsLicenceDiffRevokeRollfeld <> avsLicenceDiffGrantRollfeld - forM_ (take 42 $ Set.toList problemIds) $ queueJob' . flip JobSynchroniseAvsId (Just nowaday) + void $ runDB $ queueAvsUpdateByAID problemIds $ Just nowaday return $ Right ( Set.size avsLicenceDiffRevokeAll , Set.size avsLicenceDiffGrantVorfeld @@ -78,7 +109,7 @@ getAdminProblemsR = do ) -- 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` + -- diffLics <- (procDiffLics . fst <$> retrieveDifferingLicences) `catches` -- [ Catch.Handler (\case (UnsupportedContentType "text/html;charset=utf-8" Response{responseBody}) -- -> return $ Left $ toWidget $ preEscapedToHtml $ fromRight "Response UTF8-decoding error" $ LBS.decodeUtf8' responseBody -- ex -> return $ Left $ text2widget $ tshow ex) @@ -86,20 +117,63 @@ getAdminProblemsR = do -- ] rerouteMail <- getsYesod $ view _appMailRerouteTo + problemLogTable <- maybeM (snd <$> runDB mkProblemLogTable) return $ return mbProblemTable -- formResult only processed in POST-Handler siteLayoutMsg MsgProblemsHeading $ do setTitleI MsgProblemsHeading $(widgetFile "admin-problems") +postAdminProblemsR = do + (problemLogRes, problemLogTable) <- runDB mkProblemLogTable + formResult problemLogRes procProblems + handleAdminProblems $ Just problemLogTable + where + procProblems :: (ProblemTableActionData, Set ProblemLogId) -> Handler () + procProblems (ProblemTableMarkSolvedData , pids) = actUpdate True pids + procProblems (ProblemTableMarkUnsolvedData, pids) = actUpdate False pids + + actUpdate markdone pids = do + mauid <- maybeAuthId + now <- liftIO getCurrentTime + let (pls_fltr,newv,msg) | markdone = (ProblemLogSolved ==. Nothing, Just now, MsgAdminProblemsSolved) + | otherwise = (ProblemLogSolved !=. Nothing, Nothing , MsgAdminProblemsReopened) + (fromIntegral -> oks) <- runDB $ updateWhereCount [pls_fltr, ProblemLogId <-. toList pids] + [ProblemLogSolved =. newv, ProblemLogSolver =. mauid] + let no_req = Set.size pids + mkind = if oks < no_req || no_req <= 0 then Warning else Success + addMessageI mkind $ msg oks + when (oks > 0) $ reloadKeepGetParams AdminProblemsR -- reload to update all tables + +getProblemUnreachableR, postProblemUnreachableR :: Handler Html +getProblemUnreachableR = postProblemUnreachableR +postProblemUnreachableR = do + unreachables <- runDBRead retrieveUnreachableUsers + + -- the following form is a nearly identicaly copy from Handler.Users: + ((noreachUsersRes, noreachUsersWgt'), noreachUsersEnctype) <- runFormPost . identifyForm FIDUnreachableUsersAction $ buttonForm + let noreachUsersWgt = wrapForm noreachUsersWgt' def + { formSubmit = FormNoSubmit + , formAction = Just $ SomeRoute ProblemUnreachableR + , formEncoding = noreachUsersEnctype + } + formResult noreachUsersRes $ \case + AllUsersLdapSync -> do + forM_ unreachables $ \Entity{entityKey=uid} -> void . queueJob $ JobSynchroniseLdapUser uid + addMessageI Success . MsgSynchroniseLdapUserQueued $ length unreachables + redirect ProblemUnreachableR + AllUsersAvsSync -> do + n <- runDB $ queueAvsUpdateByUID (entityKey <$> unreachables) Nothing + addMessageI Success . MsgSynchroniseAvsUserQueued $ fromIntegral n + redirect ProblemUnreachableR -getProblemUnreachableR :: Handler Html -getProblemUnreachableR = do - unreachables <- runDB retrieveUnreachableUsers siteLayoutMsg MsgProblemsUnreachableHeading $ do setTitleI MsgProblemsUnreachableHeading [whamlet|
- #{length unreachables} _{MsgProblemsUnreachableBody} +

_{MsgProblemsUnreachableButtons} + ^{noreachUsersWgt} +
+ #{length unreachables} _{MsgProblemsUnreachableBody}