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

fix: only use destination's pickup values

Browse Source
This commit is contained in:
Björn Fromme
2024-01-28 17:49:46 +01:00
parent 85200e2960
commit 75bd055474
18 changed files with 286 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/_partials/_assignment_info.html.twig
+13 -14
View File
@@ -24,29 +24,28 @@
</dd>
</div>
{% if assignment.pickup %}
{% set pickup = assignment.destination.pickup(assignment.pickup) %}
<div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-bold leading-6 text-gray-900">
Busbegleitung
</dt>
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
{{ assignment.pickup|bpn_pickup_label }}
ab {{ pickup.city }}, {{ pickup.street }}
</dd>
</div>
{% if assignment.pickupDate %}
<div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-bold leading-6 text-gray-900">
Busabfahrt
</dt>
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
{{ assignment.pickupDate|date('d.m.Y') }}
</dd>
</div>
{% endif %}
{% endif %}
{% if application is defined and application.pickup is not null %}
<div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-bold leading-6 text-gray-900">
Gwählter Zustieg
Busabfahrt
</dt>
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
{{ pickup.time }} Uhr
</dd>
</div>
{% endif %}
{% if application is defined and application is not null and application.pickup is not null %}
<div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-bold leading-6 text-gray-900">
Gewählter Zustieg
</dt>
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
{{ application.pickup|bpn_pickup_label }}
templates/_partials/_assignment_info_compact.html.twig
+10 -11
View File
@@ -27,24 +27,23 @@
</dl>
<dl class="divide-y divide-gray-100">
{% if assignment.pickup %}
{% set pickup = assignment.destination.pickup(assignment.pickup) %}
<div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-bold leading-6 text-gray-900">
Busbegleitung
</dt>
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
{{ assignment.pickup|bpn_pickup_label }}
{{ pickup.city }}
</dd>
</div>
<div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-bold leading-6 text-gray-900">
Busabfahrt
</dt>
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
{{ pickup.time }} Uhr
</dd>
</div>
{% if assignment.pickupDate %}
<div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-bold leading-6 text-gray-900">
Busabfahrt
</dt>
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
{{ assignment.pickupDate|date('d.m.Y') }}
</dd>
</div>
{% endif %}
{% endif %}
<div class="py-6 first:pt-0 last:pb-0 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-bold leading-6 text-gray-900">
templates/_partials/_assignment_requirements_info.html.twig
+1 -1
View File
@@ -2,7 +2,7 @@
{% if assignment.pickup %}
<li class="py-2">
<div class="flex items-center justify-between">
<span class="flex-1">Busbegleitung {{ assignment.pickup|bpn_pickup_label }} am {{ assignment.effectivePickupDate|date('d.m.Y') }}</span>
<span class="flex-1">Busbegleitung ab {{ assignment.destination.pickup(assignment.pickup).city }}</span>
{% if teamer.hasPickup(assignment.pickup) %}
{{ icon('check', 'w-5 h-5 text-green-500 shrink-0') }}
{% else %}