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

Last bugfixes

Browse Source
This commit is contained in:
Thomas Günther
2026-05-01 13:52:53 +02:00
parent adffa6d6b2
commit b291c05da7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Installer/Providers/BdpLvSachsenDataSeeder.php
+1 -1
View File
@@ -240,7 +240,7 @@ class BdpLvSachsenDataSeeder {
['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'marlene.koehler@pfadfinden.de', 'local_group' => 'lv', 'firstname' => 'Marlene', 'lastname' => 'Köhler', 'email' => 'marlene.koehler@pfadfinden.de', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true], ['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'marlene.koehler@pfadfinden.de', 'local_group' => 'lv', 'firstname' => 'Marlene', 'lastname' => 'Köhler', 'email' => 'marlene.koehler@pfadfinden.de', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true],
['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'marslisdneu@aol.de', 'local_group' => 'feu', 'firstname' => 'Steffi', 'lastname' => 'Deckenbach', 'email' => 'marslisdneu@aol.de', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true], ['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'marslisdneu@aol.de', 'local_group' => 'feu', 'firstname' => 'Steffi', 'lastname' => 'Deckenbach', 'email' => 'marslisdneu@aol.de', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true],
['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'mascha.meyenschein@pfadfinden.de', 'local_group' => 'lv', 'firstname' => 'Mascha', 'lastname' => 'Meyenschein', 'email' => 'mascha.meyenschein@pfadfinden.de', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true], ['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'mascha.meyenschein@pfadfinden.de', 'local_group' => 'lv', 'firstname' => 'Mascha', 'lastname' => 'Meyenschein', 'email' => 'mascha.meyenschein@pfadfinden.de', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true],
['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'yannik@suck-taucha.de', 'local_group' => 'lv', 'firstname' => 'Nathalie', 'lastname' => 'Hammermüller', 'email' => 'Nataliehammer22@web.de', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true], ['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'nataliehammer22@web.de', 'local_group' => 'lv', 'firstname' => 'Nathalie', 'lastname' => 'Hammermüller', 'email' => 'nataliehammer22@web.de', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true],
['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'pdeakova@centrum.cz', 'local_group' => 'fen', 'firstname' => 'Mikulas', 'lastname' => 'Loub', 'email' => 'pdeakova@centrum.cz', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true], ['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'pdeakova@centrum.cz', 'local_group' => 'fen', 'firstname' => 'Mikulas', 'lastname' => 'Loub', 'email' => 'pdeakova@centrum.cz', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true],
['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'pfadfinden@christian-schlag.org', 'local_group' => 'wm', 'firstname' => 'Christian', 'lastname' => 'Schlag', 'email' => 'pfadfinden@christian-schlag.org', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true], ['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'pfadfinden@christian-schlag.org', 'local_group' => 'wm', 'firstname' => 'Christian', 'lastname' => 'Schlag', 'email' => 'pfadfinden@christian-schlag.org', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true],
['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'rebekka.thielen@googlemail.com', 'local_group' => 'lv', 'firstname' => 'Almuna Elisa', 'lastname' => 'Hines', 'email' => 'rebekka.thielen@googlemail.com', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true], ['user_role_main' => 'ROLE_USER', 'user_role_local_group' => 'ROLE_USER', 'username' => 'rebekka.thielen@googlemail.com', 'local_group' => 'lv', 'firstname' => 'Almuna Elisa', 'lastname' => 'Hines', 'email' => 'rebekka.thielen@googlemail.com', 'activation_token_expires_at' => '2026-02-20 21:53:58', 'active' => true],
app/Resources/EventParticipantResource.php
+4 -4
View File
@@ -48,7 +48,7 @@ class EventParticipantResource extends JsonResource
'unregisteredAt' => $this->resource->unregistered_at?->format('d.m.Y'), 'unregisteredAt' => $this->resource->unregistered_at?->format('d.m.Y'),
'fullname' => $this->resource->getFullName(), 'fullname' => $this->resource->getFullName(),
'age' => new Age($this->resource->birthday)->getAge(), 'age' => new Age($this->resource->birthday)->getAge(),
'localgroup' => $this->resource->localGroup()->first()->name, 'localgroup' => $this->resource->localGroup()?->first()?->name ?? 'Nicht im LV',
'swimmingPermission' => $this->resource->swimmingPermission()->first()->short, 'swimmingPermission' => $this->resource->swimmingPermission()->first()->short,
'extendedFirstAid' => $this->resource->firstAidPermission()->first()->name, 'extendedFirstAid' => $this->resource->firstAidPermission()->first()->name,
'tetanusVaccination' => $this->resource->tetanus_vaccination?->format('d.m.Y') ?? 'Unbekannt', 'tetanusVaccination' => $this->resource->tetanus_vaccination?->format('d.m.Y') ?? 'Unbekannt',
@@ -64,10 +64,10 @@ class EventParticipantResource extends JsonResource
'amountPaid' => ['value' => $this->resource->amount_paid, 'readable' => $this->resource->amount_paid?->toString() ?? '0,00 Euro', 'short' => $this->resource->amount_paid?->getFormattedAmount() ?? '0,00'], 'amountPaid' => ['value' => $this->resource->amount_paid, 'readable' => $this->resource->amount_paid?->toString() ?? '0,00 Euro', 'short' => $this->resource->amount_paid?->getFormattedAmount() ?? '0,00'],
'amountExpected' => ['value' => $this->resource->amount, 'readable' => $this->resource->amount?->toString() ?? '0,00 Euro', 'short' => $this->resource->amount?->getFormattedAmount() ?? '0,00'], 'amountExpected' => ['value' => $this->resource->amount, 'readable' => $this->resource->amount?->toString() ?? '0,00 Euro', 'short' => $this->resource->amount?->getFormattedAmount() ?? '0,00'],
'alcoholicsAllowed' => new Age($this->resource->birthday)->getAge() >= $event->alcoholics_age, 'alcoholicsAllowed' => new Age($this->resource->birthday)->getAge() >= $event->alcoholics_age,
'localGroupPostcode' => $this->resource->localGroup()->first()->postcode, 'localGroupPostcode' => $this->resource->localGroup()->first()?->postcode ?? '00000',
'localGroupCity' => $this->resource->localGroup()->first()->city, 'localGroupCity' => $this->resource->localGroup()->first()?->city ?? '00000',
'state' => config('postCode.map.' . $this->resource->postcode), 'state' => config('postCode.map.' . $this->resource->postcode),
'localGroupState' => config('postCode.map.' . $this->resource->localGroup()->first()->postcode), 'localGroupState' => null !== $this->resource->localGroup()->first()?->postcode ? config('postCode.map.' . $this->resource->postcode) : '--',
'birthday' => $this->resource->birthday->format('d.m.Y'), 'birthday' => $this->resource->birthday->format('d.m.Y'),
'eatingHabit' => EatingHabit::where('slug', $this->resource->eating_habit)->first()->name, 'eatingHabit' => EatingHabit::where('slug', $this->resource->eating_habit)->first()->name,
'cocColor' => match ($this->resource->efz_status) { 'cocColor' => match ($this->resource->efz_status) {