diff --git a/app/V1Module/security/Policies/AssignmentPermissionPolicy.php b/app/V1Module/security/Policies/AssignmentPermissionPolicy.php index bb5603eb4..266b5c101 100644 --- a/app/V1Module/security/Policies/AssignmentPermissionPolicy.php +++ b/app/V1Module/security/Policies/AssignmentPermissionPolicy.php @@ -123,13 +123,14 @@ public function userIsNotLockedElsewhereStrictly(Identity $identity, Assignment } /** - * The assignment is not in an exam group, or it is already after the exam. + * The assignment is not in an exam group, or it is still before/already after the exam. */ public function isExamNotInProgress(Identity $identity, Assignment $assignment): bool { $group = $assignment->getGroup(); $now = new DateTime(); - return $group && (!$group->hasExamPeriodSet($now) || $group->getExamEnd() < $now); + return $group && (!$group->hasExamPeriodSet($now) || + $now < $group->getExamBegin() || $group->getExamEnd() < $now); } /** diff --git a/app/V1Module/security/Policies/GroupPermissionPolicy.php b/app/V1Module/security/Policies/GroupPermissionPolicy.php index 768d18dc6..9b12188f8 100644 --- a/app/V1Module/security/Policies/GroupPermissionPolicy.php +++ b/app/V1Module/security/Policies/GroupPermissionPolicy.php @@ -4,7 +4,6 @@ use App\Model\Entity\Group; use App\Model\Entity\Instance; -use App\Model\Repository\Groups; use App\Security\Identity; use DateTIme;