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

WIP: Adjust model, remove manager branch in navigation

Browse Source
This commit is contained in:
Björn Fromme
2023-10-07 17:34:40 +02:00
parent 25a90b04aa
commit 8740041e7a
30 changed files with 302 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/admin/assignment/_form.html.twig
+11 -7
View File
@@ -1,17 +1,19 @@
{{ form_start(form) }}
<div class="flex flex-col space-y-4 pb-8">
<div class="grid lg:grid-cols-2 gap-x-8 gap-y-4">
<div class="grid lg:grid-cols-4 gap-x-8 gap-y-4">
<div class="lg:col-span-3">
{{ form_row(form.destination) }}
</div>
{{ form_row(form.available) }}
{{ form_row(form.jobProfile) }}
</div>
<div class="grid lg:grid-cols-2 gap-x-8 gap-y-4">
{{ form_row(form.destination) }}
{{ form_row(form.contact) }}
</div>
<div class="grid lg:grid-cols-2 gap-x-8 gap-y-4">
{{ form_row(form.dateFrom) }}
{{ form_row(form.dateTo) }}
</div>
<div class="grid lg:grid-cols-2 gap-x-8 gap-y-4">
{{ form_row(form.jobProfile) }}
{{ form_row(form.contact) }}
</div>
<div class="grid lg:grid-cols-2 gap-x-8 gap-y-4">
{{ form_row(form.pickupDate) }}
{{ form_row(form.pickup) }}
@@ -20,7 +22,9 @@
{{ form_row(form.benefits) }}
{{ form_row(form.fees) }}
</div>
{{ form_row(form.remarks) }}
<div class="grid lg:grid-cols-2 gap-x-8 gap-y-4">
{{ form_row(form.remarks) }}
</div>
</div>
<div class="flex items-center space-x-2">
<button type="submit" class="btn">
templates/admin/assignment/index.html.twig
+15 -9
View File
@@ -21,14 +21,14 @@
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'assignment.jobProfile') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Destination', 'assignment.destinationBusProId') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Busabfahrt', 'assignment.pickupDate') }}
{{ knp_pagination_sortable(pagination, 'Destination', 'destination.dateFrom') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Busbegleitung ab', 'assignment.pickup') }}
</th>
<th>
Bewerbungen
</th>
<th></th>
</tr>
</thead>
@@ -36,22 +36,28 @@
{% for assignment in pagination %}
<tr>
<td>
{{ assignment.dateFrom|date('d.m.Y') }}
{% set dateFrom = assignment.dateFrom ? assignment.dateFrom : assignment.destination.dateFrom %}
{{ dateFrom|date('d.m.Y') }}
</td>
<td>
{{ assignment.dateTo|date('d.m.Y') }}
{% set dateTo = assignment.dateTo ? assignment.dateTo : assignment.destination.dateTo %}
{{ dateTo|date('d.m.Y') }}
</td>
<td>
{{ assignment.jobProfile.name }}
</td>
<td>
{{ assignment.destinationBusProId|bpn_destination_label }}
{{ assignment.destination.product }}
<br>
{{ assignment.destination.hotel }}
</td>
<td>
{{ assignment.pickupDate|date('d.m.Y') }}
{{ assignment.pickup ? assignment.pickup|bpn_pickup_label|default('-') : '-' }}
<br>
{{ assignment.pickupDate ? assignment.pickupDate|date('d.m.Y') : '' }}
</td>
<td>
{{ assignment.pickup|bpn_pickup_label|default('-') }}
{{ assignment.applications|length }}
</td>
<td>
<div class="flex items-center space-x-1 justify-end">