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

feat: allow examFinished before examEnd

Browse Source
This commit is contained in:
Gregor Kleen 2021-05-19 14:50:07 +02:00
parent 79d4b72780
commit 21bbb92d4c
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
messages/uniworx/categories/authorization/de-de-formal.msg
View File

@ -88,7 +88,7 @@ UnauthorizedWorkflowWorkflowsNotEmpty: Es gibt laufende Workflows, die Sie einse
UnauthorizedWorkflowFiles: Sie dürfen die angegebenen Workflow-Dateien nicht im angegebenen historischen Zustand herunterladen UnauthorizedWorkflowFiles: Sie dürfen die angegebenen Workflow-Dateien nicht im angegebenen historischen Zustand herunterladen
UnauthorizedStudent: Sie sind nicht Student:in UnauthorizedStudent: Sie sind nicht Student:in
UnauthorizedCorrectionExamTime: Visibility restrictions of the relevant exam are restricting access. UnauthorizedCorrectionExamTime: Sichtbarkeitseinstellungen der relevanten Prüfung verhindern momentan die Freigabe.
WorkflowRoleUserMismatch: Sie sind nicht einer der vom Workflow geforderten Benutzer WorkflowRoleUserMismatch: Sie sind nicht einer der vom Workflow geforderten Benutzer
WorkflowRoleAlreadyInitiated: Dieser Workflow wurde bereits initiiert WorkflowRoleAlreadyInitiated: Dieser Workflow wurde bereits initiiert

2
messages/uniworx/categories/authorization/en-eu.msg
View File

@ -88,7 +88,7 @@ UnauthorizedWorkflowWorkflowsNotEmpty: There are running workflows, which you ma
UnauthorizedWorkflowFiles: You are not allowed to download the given workflow files in the given historical state UnauthorizedWorkflowFiles: You are not allowed to download the given workflow files in the given historical state
UnauthorizedStudent: You are not a student. UnauthorizedStudent: You are not a student.
UnauthorizedCorrectionExamTime: Sichtbarkeitseinstellungen der relevanten Prüfung verhindern momentan die Freigabe. UnauthorizedCorrectionExamTime: Visibility restrictions of the relevant exam are restricting access.
WorkflowRoleUserMismatch: You aren't any of the users authorized by the workflow WorkflowRoleUserMismatch: You aren't any of the users authorized by the workflow
WorkflowRoleAlreadyInitiated: This workflow was already initiated WorkflowRoleAlreadyInitiated: This workflow was already initiated

2
src/Handler/Exam/Form.hs
View File

@ -430,7 +430,7 @@ validateExam cId oldExam = do
guardValidation MsgExamDeregisterUntilMustBeAfterRegisterFrom $ NTop efDeregisterUntil >= NTop efRegisterFrom guardValidation MsgExamDeregisterUntilMustBeAfterRegisterFrom $ NTop efDeregisterUntil >= NTop efRegisterFrom
guardValidation MsgExamStartMustBeAfterPublishOccurrenceAssignments $ Just False /= ((>=) <$> efStart <*> efPublishOccurrenceAssignments) guardValidation MsgExamStartMustBeAfterPublishOccurrenceAssignments $ Just False /= ((>=) <$> efStart <*> efPublishOccurrenceAssignments)
guardValidation MsgExamEndMustBeAfterStart $ NTop efEnd >= NTop efStart guardValidation MsgExamEndMustBeAfterStart $ NTop efEnd >= NTop efStart
guardValidation MsgExamFinishedMustBeAfterEnd $ Just False /= ((>=) <$> efFinished <*> efEnd) warnValidation MsgExamFinishedMustBeAfterEnd $ Just False /= ((>=) <$> efFinished <*> efEnd)
guardValidation MsgExamFinishedMustBeAfterStart $ Just False /= ((>=) <$> efFinished <*> efStart) guardValidation MsgExamFinishedMustBeAfterStart $ Just False /= ((>=) <$> efFinished <*> efStart)
guardValidation MsgExamPartsFromMustBeBeforeFinished $ NTop efFinished >= NTop efPartsFrom guardValidation MsgExamPartsFromMustBeBeforeFinished $ NTop efFinished >= NTop efPartsFrom
|| is _Nothing efPartsFrom || is _Nothing efPartsFrom

2
templates/i18n/changelog/exam-finished-before-end.de-de-formal.hamlet Normal file
View File

@ -0,0 +1,2 @@
$newline never
Für die Einzelfälle in denen es sinnvoll ist, kann bei Prüfungen nun „_{MsgExamFinished}“ auch vor „_{MsgExamEnd}“ eingestellt werden.

2
templates/i18n/changelog/exam-finished-before-end.en-eu.hamlet Normal file
View File

@ -0,0 +1,2 @@
$newline never
For the rare cases in which it is sensible to do so, “_{MsgExamFinished}” can now be set to be before “_{MsgExamEnd}” for exams.