EP/myep
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: selectable bus exits

Browse Source
This commit is contained in:
Björn Fromme
2025-03-12 18:05:21 +01:00
parent 778d79fd23
commit 851c7086ba
14 changed files with 162 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+12 -12
View File
@@ -1358,16 +1358,16 @@
}, },
{ {
"name": "knplabs/knp-menu", "name": "knplabs/knp-menu",
"version": "v3.6.0", "version": "v3.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/KnpLabs/KnpMenu.git", "url": "https://github.com/KnpLabs/KnpMenu.git",
"reference": "ac96b711cf7b4178747b0ecde79d7e5e05dbcd28" "reference": "328bb430a0afad0b6eae2bd4bfea8e15db616fd6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/ac96b711cf7b4178747b0ecde79d7e5e05dbcd28", "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/328bb430a0afad0b6eae2bd4bfea8e15db616fd6",
"reference": "ac96b711cf7b4178747b0ecde79d7e5e05dbcd28", "reference": "328bb430a0afad0b6eae2bd4bfea8e15db616fd6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1425,9 +1425,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/KnpLabs/KnpMenu/issues", "issues": "https://github.com/KnpLabs/KnpMenu/issues",
"source": "https://github.com/KnpLabs/KnpMenu/tree/v3.6.0" "source": "https://github.com/KnpLabs/KnpMenu/tree/v3.7.0"
}, },
"time": "2024-12-20T10:10:51+00:00" "time": "2025-02-28T08:21:46+00:00"
}, },
{ {
"name": "knplabs/knp-menu-bundle", "name": "knplabs/knp-menu-bundle",
@@ -3830,16 +3830,16 @@
}, },
{ {
"name": "symfony/flex", "name": "symfony/flex",
"version": "v2.4.7", "version": "v2.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/flex.git", "url": "https://github.com/symfony/flex.git",
"reference": "92f4fba342161ff36072bd3b8e0b3c6c23160402" "reference": "8ce1acd9842abe0e9b4c4a0bd3f259859516c018"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/flex/zipball/92f4fba342161ff36072bd3b8e0b3c6c23160402", "url": "https://api.github.com/repos/symfony/flex/zipball/8ce1acd9842abe0e9b4c4a0bd3f259859516c018",
"reference": "92f4fba342161ff36072bd3b8e0b3c6c23160402", "reference": "8ce1acd9842abe0e9b4c4a0bd3f259859516c018",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3878,7 +3878,7 @@
"description": "Composer plugin for Symfony", "description": "Composer plugin for Symfony",
"support": { "support": {
"issues": "https://github.com/symfony/flex/issues", "issues": "https://github.com/symfony/flex/issues",
"source": "https://github.com/symfony/flex/tree/v2.4.7" "source": "https://github.com/symfony/flex/tree/v2.5.0"
}, },
"funding": [ "funding": [
{ {
@@ -3894,7 +3894,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-10-07T08:51:54+00:00" "time": "2025-03-03T07:50:46+00:00"
}, },
{ {
"name": "symfony/form", "name": "symfony/form",
src/BusProNet/DataProcessor/BookingDataProcessor.php
+31 -9
View File
@@ -12,7 +12,7 @@ class BookingDataProcessor
$travelData = $formData->travel; $travelData = $formData->travel;
// Reset mappings // Reset mappings
foreach ([...$bookingData->additionalServices, ...$bookingData->transportationServices, ...$bookingData->pickups] as $service) { foreach ([...$bookingData->additionalServices, ...$bookingData->transportationServices, ...$bookingData->pickupsTo, ...$bookingData->pickupsFro] as $service) {
$service->mapping = []; $service->mapping = [];
} }
// Update mappings, add services and pickups // Update mappings, add services and pickups
@@ -40,11 +40,17 @@ class BookingDataProcessor
} }
$bookingData->transportationServices[$service->id]->mapping[] = $participant->index; $bookingData->transportationServices[$service->id]->mapping[] = $participant->index;
} }
if ('BUS' === $participant->transportationServiceTo->subType && null !== $selectedPickup = $participant->pickup) { if ('BUS' === $participant->transportationServiceTo->subType && null !== $selectedPickup = $participant->pickupTo) {
if (false === isset($bookingData->pickups[$selectedPickup->id])) { if (false === isset($bookingData->pickupsTo[$selectedPickup->id])) {
$bookingData->pickups[$selectedPickup->id] = $selectedPickup; $bookingData->pickupsTo[$selectedPickup->id] = $selectedPickup;
} }
$bookingData->pickups[$selectedPickup->id]->mapping[] = $participant->index; $bookingData->pickupsTo[$selectedPickup->id]->mapping[] = $participant->index;
}
if ('BUS' === $participant->transportationServiceFro->subType && null !== $selectedPickup = $participant->pickupFro) {
if (false === isset($bookingData->pickupsFro[$selectedPickup->id])) {
$bookingData->pickupsFro[$selectedPickup->id] = $selectedPickup;
}
$bookingData->pickupsFro[$selectedPickup->id]->mapping[] = $participant->index;
} }
} }
// Remove services/pickups with empty mappings // Remove services/pickups with empty mappings
@@ -58,9 +64,14 @@ class BookingDataProcessor
unset($bookingData->transportationServices[$service->id]); unset($bookingData->transportationServices[$service->id]);
} }
} }
foreach ($bookingData->pickups as $pickup) { foreach ($bookingData->pickupsTo as $pickup) {
if (0 === count($pickup->mapping)) { if (0 === count($pickup->mapping)) {
unset($bookingData->pickups[$pickup->id]); unset($bookingData->pickupsTo[$pickup->id]);
}
}
foreach ($bookingData->pickupsFro as $pickup) {
if (0 === count($pickup->mapping)) {
unset($bookingData->pickupsFro[$pickup->id]);
} }
} }
@@ -147,9 +158,9 @@ class BookingDataProcessor
]; ];
} }
if (0 < count($bookingData->pickups)) { if (0 < count($bookingData->pickupsTo)) {
$payload['zustiege']['zustieg'] = []; $payload['zustiege']['zustieg'] = [];
foreach ($bookingData->pickups as $pickup) { foreach ($bookingData->pickupsTo as $pickup) {
$payload['zustiege']['zustieg'][] = [ $payload['zustiege']['zustieg'][] = [
'@idzustieg' => $pickup->id, '@idzustieg' => $pickup->id,
'@anzahl' => count($pickup->mapping), '@anzahl' => count($pickup->mapping),
@@ -158,6 +169,17 @@ class BookingDataProcessor
} }
} }
if (0 < count($bookingData->pickupsFro)) {
$payload['zustiege_rueck']['zustieg_rueck'] = [];
foreach ($bookingData->pickupsFro as $pickup) {
$payload['zustiege_rueck']['zustieg_rueck'][] = [
'@idzustieg' => $pickup->id,
'@anzahl' => count($pickup->mapping),
'@zuordnung' => implode(',', $pickup->mapping),
];
}
}
return $payload; return $payload;
} }
} }
src/BusProNet/Model/Booking.php
+16 -4
View File
@@ -29,7 +29,8 @@ class Booking
public array $transportationServices = []; public array $transportationServices = [];
public array $additionalServices = []; public array $additionalServices = [];
public array $rooms = []; public array $rooms = [];
public array $pickups = []; public array $pickupsTo = [];
public array $pickupsFro = [];
public array $surcharges = []; public array $surcharges = [];
public ?int $invoiceNumber = null; public ?int $invoiceNumber = null;
public ?float $totalPrice = null; public ?float $totalPrice = null;
@@ -75,9 +76,20 @@ class Booking
return null; return null;
} }
public function getPickupForParticipant(int $participantIndex): ?Pickup public function getPickupToForParticipant(int $participantIndex): ?Pickup
{ {
foreach ($this->pickups as $pickup) { foreach ($this->pickupsTo as $pickup) {
if (in_array($participantIndex, $pickup->mapping)) {
return $pickup;
}
}
return null;
}
public function getPickupFroForParticipant(int $participantIndex): ?Pickup
{
foreach ($this->pickupsFro as $pickup) {
if (in_array($participantIndex, $pickup->mapping)) { if (in_array($participantIndex, $pickup->mapping)) {
return $pickup; return $pickup;
} }
@@ -132,4 +144,4 @@ class Booking
{ {
return $this->travelDate > new \DateTimeImmutable() && false === in_array($this->status, ['S', 'U']); return $this->travelDate > new \DateTimeImmutable() && false === in_array($this->status, ['S', 'U']);
} }
} }
src/BusProNet/Model/Travel.php
+5 -2
View File
@@ -53,7 +53,10 @@ class Travel
public bool $transportationServicesMutable = true; public bool $transportationServicesMutable = true;
#[Groups(['api:single'])] #[Groups(['api:single'])]
public array $pickups = []; public array $pickupsTo = [];
#[Groups(['api:single'])]
public array $pickupsFro = [];
#[Groups(['api:single'])] #[Groups(['api:single'])]
public bool $pickupsMutable = true; public bool $pickupsMutable = true;
@@ -112,4 +115,4 @@ class Travel
return $services; return $services;
} }
} }
src/BusProNet/XmlLoader/PickupLoader.php
+10 -2
View File
@@ -54,7 +54,15 @@ class PickupLoader extends AbstractLoader
public function patchPickupsDetails(Travel $travel): void public function patchPickupsDetails(Travel $travel): void
{ {
foreach ($travel->pickups as $pickupId => $pickup) { foreach ($travel->pickupsTo as $pickupId => $pickup) {
$pickupData = $this->loadById($pickupId);
$pickup->code = $pickupData->code;
$pickup->postalCode = $pickupData->postalCode;
$pickup->city = $pickupData->city;
$pickup->street = $pickupData->street;
}
foreach ($travel->pickupsFro as $pickupId => $pickup) {
$pickupData = $this->loadById($pickupId); $pickupData = $this->loadById($pickupId);
$pickup->code = $pickupData->code; $pickup->code = $pickupData->code;
@@ -63,4 +71,4 @@ class PickupLoader extends AbstractLoader
$pickup->street = $pickupData->street; $pickup->street = $pickupData->street;
} }
} }
} }
src/BusProNet/XmlLoader/TravelLoader.php
+3 -2
View File
@@ -140,7 +140,8 @@ class TravelLoader extends AbstractLoader
$travel->transportationServices = $this $travel->transportationServices = $this
->getTransportationServices($node->filterXPath('//lei_befoerderung/leistung')); ->getTransportationServices($node->filterXPath('//lei_befoerderung/leistung'));
$travel->rooms = $this->getRooms($hotelNode); $travel->rooms = $this->getRooms($hotelNode);
$travel->pickups = $this->getPickups($node->filterXPath('//zustiege/zustieg')); $travel->pickupsTo = $this->getPickups($node->filterXPath('//zustiege/zustieg'));
$travel->pickupsFro = $this->getPickups($node->filterXPath('//zustiege_rueck/zustieg_rueck'));
return $travel; return $travel;
} }
@@ -347,4 +348,4 @@ class TravelLoader extends AbstractLoader
$booking->travelData = $this->loadById($travelId); $booking->travelData = $this->loadById($travelId);
} }
} }
} }
src/BusProNet/XmlParser/BookingParser.php
+6 -2
View File
@@ -78,7 +78,11 @@ class BookingParser extends AbstractParser
$pickupsData = $node->filterXPath('//zustiege/zustieg'); $pickupsData = $node->filterXPath('//zustiege/zustieg');
if (0 < $pickupsData->count()) { if (0 < $pickupsData->count()) {
$booking->pickups = $this->pickupsParser->parse($pickupsData); $booking->pickupsTo = $this->pickupsParser->parse($pickupsData);
}
$pickupsData = $node->filterXPath('//zustiege_rueck/zustieg_rueck');
if (0 < $pickupsData->count()) {
$booking->pickupsFro = $this->pickupsParser->parse($pickupsData);
} }
$surchargesData = $node->filterXPath('//zuschlaege/zuschlag'); $surchargesData = $node->filterXPath('//zuschlaege/zuschlag');
@@ -151,4 +155,4 @@ class BookingParser extends AbstractParser
return $personalData; return $personalData;
} }
} }
src/Form/BookingType.php
+3 -2
View File
@@ -33,7 +33,8 @@ final class BookingType extends AbstractType
->getTransportationServicesByDirection('HIN'), ->getTransportationServicesByDirection('HIN'),
'selectable_transportation_services_fro' => $travelData 'selectable_transportation_services_fro' => $travelData
->getTransportationServicesByDirection('RUECK'), ->getTransportationServicesByDirection('RUECK'),
'selectable_pickups' => $travelData->pickups, 'selectable_pickups_to' => $travelData->pickupsTo,
'selectable_pickups_fro' => $travelData->pickupsFro,
'personal_data_mutable' => $travelData->participantDataMutable, 'personal_data_mutable' => $travelData->participantDataMutable,
'additional_services_mutable' => $travelData->additionalServicesMutable, 'additional_services_mutable' => $travelData->additionalServicesMutable,
'transportation_services_mutable' => $travelData->transportationServicesMutable, 'transportation_services_mutable' => $travelData->transportationServicesMutable,
@@ -72,4 +73,4 @@ final class BookingType extends AbstractType
'anti_xss' => true, 'anti_xss' => true,
]); ]);
} }
} }
src/Form/Model/BookingData.php
+3 -2
View File
@@ -42,11 +42,12 @@ class BookingData
->getTransportationServiceForParticipantAndDirection($index, 'H'); ->getTransportationServiceForParticipantAndDirection($index, 'H');
$participantData->transportationServiceFro = $booking $participantData->transportationServiceFro = $booking
->getTransportationServiceForParticipantAndDirection($index, 'R'); ->getTransportationServiceForParticipantAndDirection($index, 'R');
$participantData->pickup = $booking->getPickupForParticipant($index); $participantData->pickupTo = $booking->getPickupToForParticipant($index);
$participantData->pickupFro = $booking->getPickupFroForParticipant($index);
$instance->participants[$index] = $participantData; $instance->participants[$index] = $participantData;
} }
return $instance; return $instance;
} }
} }
src/Form/Model/ParticipantData.php
+9 -2
View File
@@ -43,7 +43,8 @@ class ParticipantData
public array $rentals = []; public array $rentals = [];
public ?Service $transportationServiceTo = null; public ?Service $transportationServiceTo = null;
public ?Service $transportationServiceFro = null; public ?Service $transportationServiceFro = null;
public ?Pickup $pickup = null; public ?Pickup $pickupTo = null;
public ?Pickup $pickupFro = null;
#[Assert\Callback] #[Assert\Callback]
public function assertBodyMeasurementsValid(ExecutionContextInterface $context): void public function assertBodyMeasurementsValid(ExecutionContextInterface $context): void
@@ -77,12 +78,18 @@ class ParticipantData
#[Assert\Callback] #[Assert\Callback]
public function assertPickupSelected(ExecutionContextInterface $context): void public function assertPickupSelected(ExecutionContextInterface $context): void
{ {
if (null !== $this->transportationServiceTo && null === $this->pickup) { if (null !== $this->transportationServiceTo && null === $this->pickupTo) {
$context->buildViolation('Bitte auswählen') $context->buildViolation('Bitte auswählen')
->atPath('pickupTo') ->atPath('pickupTo')
->addViolation() ->addViolation()
; ;
} }
if (null !== $this->transportationServiceFro && null === $this->pickupFro) {
$context->buildViolation('Bitte auswählen')
->atPath('pickupFro')
->addViolation()
;
}
} }
public static function fromPersonalData(PersonalData $personalData): static public static function fromPersonalData(PersonalData $personalData): static
src/Form/ParticipantType.php
+44 -25
View File
@@ -133,9 +133,6 @@ class ParticipantType extends AbstractType
'expanded' => true, 'expanded' => true,
'choice_value' => 'id', 'choice_value' => 'id',
'choice_label' => function (?Service $service) use ($participantIndex) { 'choice_label' => function (?Service $service) use ($participantIndex) {
if (null === $service) {
return null;
}
$price = $service->individualPrice[$participantIndex] ?? $service->price; $price = $service->individualPrice[$participantIndex] ?? $service->price;
if (null === $price || 0.0 === $price) { if (null === $price || 0.0 === $price) {
return $service->label; return $service->label;
@@ -175,7 +172,10 @@ class ParticipantType extends AbstractType
return $attributes; return $attributes;
}, },
'choice_filter' => function (Service $service) use ($participantData) { 'choice_filter' => function (?Service $service) use ($participantData) {
if (null === $service) {
return false;
}
// remove choices only available in booking data and // remove choices only available in booking data and
// which are not mapped to the current participant // which are not mapped to the current participant
if ( if (
@@ -248,35 +248,53 @@ class ParticipantType extends AbstractType
'required' => true, 'required' => true,
'multiple' => false, 'multiple' => false,
'choices' => $options['selectable_transportation_services_fro'], 'choices' => $options['selectable_transportation_services_fro'],
'choice_attr' => function (?Service $service) {
return [
'data-booking-target' => 'field',
'data-action' => 'select-toggle#toggle booking#toggle',
'data-select-toggle-value' => $service->subType,
];
},
]) ])
; ;
// Pickup // Pickup
$form $form->add('pickupTo', ChoiceType::class, [
->add('pickup', ChoiceType::class, [ 'label' => 'Zustieg',
'label' => 'Zustieg', 'multiple' => false,
'expanded' => false,
'choices' => $options['selectable_pickups_to'],
'choice_value' => 'id',
'choice_label' => function (?Pickup $pickup) {
if (null === $pickup) {
return null;
}
$price = $pickup->price;
if (null === $price || 0.0 === $price) {
return $pickup->city;
}
return sprintf('%s (%s €)',
$pickup->city,
number_format($price, 2, ',', '.')
);
},
]);
if (0 < count($options['selectable_pickups_fro'])) {
$form->add('pickupFro', ChoiceType::class, [
'label' => 'Ausstieg',
'multiple' => false, 'multiple' => false,
'expanded' => false, 'expanded' => false,
'choices' => $options['selectable_pickups'], 'choices' => $options['selectable_pickups_fro'],
'choice_value' => 'id', 'choice_value' => 'id',
'choice_label' => function (?Pickup $pickup) { 'choice_label' => function (?Pickup $pickup) {
if (null === $pickup) { return $pickup?->city;
return null;
}
$price = $pickup->price;
if (null === $price || 0.0 === $price) {
return $pickup->city;
}
return sprintf('%s (%s €)',
$pickup->city,
number_format($price, 2, ',', '.')
);
}, },
]) ]);
; }
}) })
->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($options) { ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($options) {
$data = $event->getData(); $data = $event->getData();
@@ -324,7 +342,8 @@ class ParticipantType extends AbstractType
'selectable_rentals' => [], 'selectable_rentals' => [],
'selectable_transportation_services_to' => [], 'selectable_transportation_services_to' => [],
'selectable_transportation_services_fro' => [], 'selectable_transportation_services_fro' => [],
'selectable_pickups' => [], 'selectable_pickups_to' => [],
'selectable_pickups_fro' => [],
'personal_data_mutable' => true, 'personal_data_mutable' => true,
'additional_services_mutable' => true, 'additional_services_mutable' => true,
'transportation_services_mutable' => true, 'transportation_services_mutable' => true,
templates/_partials/_modal.html.twig
+1 -1
View File
@@ -12,7 +12,7 @@
{{ icon('close', 'w-6 h-6')}} {{ icon('close', 'w-6 h-6')}}
</button> </button>
</div> </div>
<div class="max-h-96 overflow-y-scroll"> <div class="max-h-96 overflow-y-auto">
<div class="{{ html_classes('px-8', { 'text-red-700': level == 'error', 'text-green-700': level == 'success', 'text-blue-700': level == 'info' }) }}"> <div class="{{ html_classes('px-8', { 'text-red-700': level == 'error', 'text-green-700': level == 'success', 'text-blue-700': level == 'info' }) }}">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
templates/booking/edit.html.twig
+17 -8
View File
@@ -188,14 +188,23 @@
<h3 class="text-xl font-semibold"> <h3 class="text-xl font-semibold">
Hin-/Rückreise Hin-/Rückreise
</h3> </h3>
<fieldset class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-8 gap-y-4" {{ stimulus_controller('select-toggle', { 'show': ['BUS'], 'visible': participant.transportationServiceTo.subType == 'BUS' }, { 'hidden': 'hidden' }) }}> <fieldset class="grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-4">
{{ form_row(child.transportationServiceTo) }} <div class="space-y-2" {{ stimulus_controller('select-toggle', { 'show': ['BUS'], 'visible': participant.transportationServiceTo.subType == 'BUS' }, { 'hidden': 'hidden' }) }}>
{{ form_row(child.transportationServiceFro) }} {{ form_row(child.transportationServiceTo) }}
{% if child.pickup is defined %} {% if child.pickupTo is defined %}
<div {{ stimulus_target('select-toggle', 'container') }}> <div {{ stimulus_target('select-toggle', 'container') }}>
{{ form_row(child.pickup) }} {{ form_row(child.pickupTo) }}
</div> </div>
{% endif %} {% endif %}
</div>
<div class="space-y-2" {{ stimulus_controller('select-toggle', { 'show': ['BUS'], 'visible': participant.transportationServiceFro.subType == 'BUS' }, { 'hidden': 'hidden' }) }}>
{{ form_row(child.transportationServiceFro) }}
{% if child.pickupFro is defined %}
<div {{ stimulus_target('select-toggle', 'container') }}>
{{ form_row(child.pickupFro) }}
</div>
{% endif %}
</div>
</fieldset> </fieldset>
{% if not travelData.transportationServicesMutable %} {% if not travelData.transportationServicesMutable %}
<div class="absolute inset-0 cursor-not-allowed"></div> <div class="absolute inset-0 cursor-not-allowed"></div>
tests/BusProNet/DataLoader/TravelDataLoaderTest.php
+2 -2
View File
@@ -30,7 +30,7 @@ class TravelDataLoaderTest extends TestCase
$this->assertCount(8, $travel->selectionGroups); $this->assertCount(8, $travel->selectionGroups);
$this->assertCount(27, $travel->additionalServices); $this->assertCount(27, $travel->additionalServices);
$this->assertCount(5, $travel->transportationServices); $this->assertCount(5, $travel->transportationServices);
$this->assertCount(7, $travel->pickups); $this->assertCount(7, $travel->pickupsTo);
$this->assertCount(12, $travel->rooms); $this->assertCount(12, $travel->rooms);
} }
} }