th.guenther/mareike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CoC Checks now optional

Browse Source
This commit is contained in:
th.guenther
2026-09-29 14:58:21 +02:00
parent a5e4e55df5
commit a43fd9cedf
12 changed files with 103 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Domains/Event/Actions/CertificateOfConductionCheck/CertificateOfConductionCheckCommand.php
+6
View File
@@ -12,6 +12,12 @@ class CertificateOfConductionCheckCommand {
public function execute() : CertificateOfConductionCheckResponse {
$response = new CertificateOfConductionCheckResponse();
// Verlangt die Veranstaltung kein eFZ, entfällt die Prüfung -- ohne Aufruf der Prüf-API.
if (!$this->request->participant->event()->first()?->coc_check_required) {
$response->status = EfzStatus::EFZ_STATUS_NOT_REQUIRED;
return $response;
}
// Der Stamm ist optional (die Kurzanmeldung erhebt ihn nicht, in der Verwaltung kann er entfernt werden).
$localGroup = str_replace('Stamm ', '', $this->request->participant->localGroup()->first()?->name ?? '');
app/Domains/Event/Actions/SignUp/SignUpCommand.php
+3 -1
View File
@@ -95,7 +95,9 @@ class SignUpCommand {
'payment_purpose' => $this->request->event->name . ' - Beitrag ' . $this->request->firstname . ' ' . $this->request->lastname,
'payment_method' => $this->request->paymentMethod,
'payment_options' => $paymentOptions,
'efz_status' => $participantAge->isfullAged() ? EfzStatus::EFZ_STATUS_NOT_CHECKED : EfzStatus::EFZ_STATUS_NOT_REQUIRED,
'efz_status' => $participantAge->isfullAged() && $this->request->event->coc_check_required
? EfzStatus::EFZ_STATUS_NOT_CHECKED
: EfzStatus::EFZ_STATUS_NOT_REQUIRED,
]
);
app/Domains/Event/Actions/UpdateEvent/UpdateEventCommand.php
+1
View File
@@ -28,6 +28,7 @@ class UpdateEventCommand {
$this->request->event->registration_allowed = $this->request->registrationAllowed;
$this->request->event->short_registration = $this->request->shortRegistration;
$this->request->event->swimming_permission_required = $this->request->swimmingPermissionRequired;
$this->request->event->coc_check_required = $this->request->cocCheckRequired;
// Umstellen zwischen Local und Parent Group nur ohne Anmeldungen -- sonst stünden in einer Veranstaltung
// beide Arten von Antworten nebeneinander.
app/Domains/Event/Actions/UpdateEvent/UpdateEventRequest.php
+3 -1
View File
@@ -22,6 +22,7 @@ class UpdateEventRequest {
public bool $registrationAllowed;
public bool $shortRegistration;
public bool $swimmingPermissionRequired;
public bool $cocCheckRequired;
public Amount $flatSupport;
public Amount $supportPerPerson;
public array $contributingLocalGroups;
@@ -29,9 +30,10 @@ class UpdateEventRequest {
/** Wonach bei der Anmeldung gefragt wird; null = unverändert. Greift nur, solange es keine Anmeldungen gibt. */
public ?ParticipantGroupType $participantGroupType;
public function __construct(Event $event, string $eventName, string $eventLocation, string $postalCode, string $email, DateTime $earlyBirdEnd, DateTime $registrationFinalEnd, int $alcoholicsAge, bool $sendWeeklyReports, bool $registrationAllowed, Amount $flatSupport, Amount $supportPerPerson, array $contributingLocalGroups, array $eatingHabits, bool $shortRegistration = false, bool $swimmingPermissionRequired = true, ?string $street = null, ?string $houseNumber = null, ?ParticipantGroupType $participantGroupType = null)
public function __construct(Event $event, string $eventName, string $eventLocation, string $postalCode, string $email, DateTime $earlyBirdEnd, DateTime $registrationFinalEnd, int $alcoholicsAge, bool $sendWeeklyReports, bool $registrationAllowed, Amount $flatSupport, Amount $supportPerPerson, array $contributingLocalGroups, array $eatingHabits, bool $shortRegistration = false, bool $swimmingPermissionRequired = true, ?string $street = null, ?string $houseNumber = null, ?ParticipantGroupType $participantGroupType = null, bool $cocCheckRequired = true)
{
$this->participantGroupType = $participantGroupType;
$this->cocCheckRequired = $cocCheckRequired;
$this->event = $event;
$this->eventName = $eventName;
$this->eventLocation = $eventLocation;
app/Domains/Event/Controllers/DetailsController.php
+1
View File
@@ -70,6 +70,7 @@ class DetailsController extends CommonController {
$request->input('street'),
$request->input('houseNumber'),
ParticipantGroupType::tryFrom((string) $request->input('participantGroupType')),
(bool)$request->input('cocCheckRequired', true),
);
$eventUpdateCommand = new UpdateEventCommand($eventUpdateRequest);
app/Domains/Event/Views/Partials/CommonSettings.vue
+12
View File
@@ -44,6 +44,7 @@ const emit = defineEmits(['close'])
registrationAllowed: props.event.registrationAllowed,
shortRegistration: props.event.shortRegistration,
swimmingPermissionRequired: props.event.swimmingPermissionRequired,
cocCheckRequired: props.event.cocCheckRequired,
flatSupport: props.event.flatSupportEdit,
supportPerson: props.event.supportPersonIndex,
participantGroupType: props.event.participantGroupType ?? 'local_group',
@@ -78,6 +79,7 @@ const emit = defineEmits(['close'])
registrationAllowed: formData.registrationAllowed,
shortRegistration: formData.shortRegistration,
swimmingPermissionRequired: formData.swimmingPermissionRequired,
cocCheckRequired: formData.cocCheckRequired,
flatSupport: formData.flatSupport,
supportPerson: formData.supportPerson,
contributingLocalGroups: contributingLocalGroups.value,
@@ -234,6 +236,16 @@ const emit = defineEmits(['close'])
</span>
</td>
</tr>
<tr>
<td colspan="2">
<input type="checkbox" v-model="formData.cocCheckRequired" id="cocCheckRequired" />
<label for="cocCheckRequired">Erweitertes Führungszeugnis (eFZ) prüfen</label><br />
<span style="font-size: 0.8rem; color: #6b7280;">
Ist die Prüfung deaktiviert, wird das eFZ bei neuen Anmeldungen als „Nicht erforderlich" hinterlegt.
</span>
</td>
</tr>
</table>