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

Feat: Improve layout at several places

Browse Source
This commit is contained in:
Björn Fromme
2023-10-21 09:05:35 +02:00
parent 7309826114
commit c7a9296062
3 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/admin/application/index.html.twig
+14 -10
View File
@@ -15,10 +15,10 @@
{{ knp_pagination_sortable(pagination, 'Einsatz­zeitraum', 'destination.dateFrom') }} {{ knp_pagination_sortable(pagination, 'Einsatz­zeitraum', 'destination.dateFrom') }}
</th> </th>
<th> <th>
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }} {{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }}
</th> </th>
<th> <th>
{{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }} {{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
</th> </th>
<th> <th>
{{ knp_pagination_sortable(pagination, 'Bus', 'destination.pickup') }} {{ knp_pagination_sortable(pagination, 'Bus', 'destination.pickup') }}
@@ -39,6 +39,17 @@
{{ assignment.effectivePeriod.end|date('d.m.Y') }} {{ assignment.effectivePeriod.end|date('d.m.Y') }}
</a> </a>
</td> </td>
<td>
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}"
class="flex items-start space-x-2">
{{ icon('flag-' ~ assignment.destination.country, 'w-5 h-5 shrink-0') }}
<div class="flex-1">
{{ assignment.destination.product }}
<br>
{{ assignment.destination.hotel }}
</div>
</a>
</td>
<td> <td>
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}"> <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
{{ assignment.jobProfile.name }} {{ assignment.jobProfile.name }}
@@ -46,14 +57,7 @@
</td> </td>
<td> <td>
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}"> <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
{{ assignment.destination.product }} <span class="whitespace-nowrap">{{ assignment.pickup ? assignment.pickup|bpn_pickup_label : '-' }}</span>
<br>
{{ assignment.destination.hotel }}
</a>
</td>
<td>
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
{{ assignment.pickup ? assignment.pickup|bpn_pickup_label : '-' }}
<br> <br>
{{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }} {{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }}
</a> </a>
templates/admin/assignment/index.html.twig
+14 -10
View File
@@ -15,10 +15,10 @@
{{ knp_pagination_sortable(pagination, 'Einsatz&shy;zeitraum', 'destination.dateFrom') }} {{ knp_pagination_sortable(pagination, 'Einsatz&shy;zeitraum', 'destination.dateFrom') }}
</th> </th>
<th> <th>
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }} {{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }}
</th> </th>
<th> <th>
{{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }} {{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
</th> </th>
<th> <th>
{{ knp_pagination_sortable(pagination, 'Bus', 'assignment.pickup') }} {{ knp_pagination_sortable(pagination, 'Bus', 'assignment.pickup') }}
@@ -39,6 +39,17 @@
{{ assignment.effectivePeriod.end|date('d.m.Y') }} {{ assignment.effectivePeriod.end|date('d.m.Y') }}
</a> </a>
</td> </td>
<td>
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}"
class="flex items-start space-x-2">
{{ icon('flag-' ~ assignment.destination.country, 'w-5 h-5 shrink-0') }}
<div class="flex-1">
{{ assignment.destination.product }}
<br>
{{ assignment.destination.hotel }}
</div>
</a>
</td>
<td> <td>
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}"> <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
{{ assignment.jobProfile.name }} {{ assignment.jobProfile.name }}
@@ -46,14 +57,7 @@
</td> </td>
<td> <td>
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}"> <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
{{ assignment.destination.product }} <span class="whitespace-nowrap">{{ assignment.pickup ? assignment.pickup|bpn_pickup_label : '-' }}</span>
<br>
{{ assignment.destination.hotel }}
</a>
</td>
<td>
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
{{ assignment.pickup ? assignment.pickup|bpn_pickup_label|default('-') : '-' }}
<br> <br>
{{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }} {{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }}
</a> </a>
templates/admin/document/index.html.twig
+12 -7
View File
@@ -12,14 +12,14 @@
<thead> <thead>
<tr> <tr>
<th> <th>
{{ knp_pagination_sortable(pagination, 'Einsatzzeitraum', 'destination.dateFrom') }} {{ knp_pagination_sortable(pagination, 'Einsatz&shy;zeitraum', 'destination.dateFrom') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
</th> </th>
<th> <th>
{{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }} {{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }}
</th> </th>
<th>
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
</th>
<th> <th>
{{ knp_pagination_sortable(pagination, 'Dokument', 'upload.type') }} {{ knp_pagination_sortable(pagination, 'Dokument', 'upload.type') }}
</th> </th>
@@ -43,12 +43,17 @@
{{ assignment.destination.dateTo|date('d.m.Y') }} {{ assignment.destination.dateTo|date('d.m.Y') }}
</td> </td>
<td> <td>
{{ assignment.jobProfile.name }} <div class="flex items-start space-x-2">
</td> {{ icon('flag-' ~ assignment.destination.country, 'w-5 h-5 shrink-0') }}
<td> <div class="flex-1">
{{ assignment.destination.product }} {{ assignment.destination.product }}
<br> <br>
{{ assignment.destination.hotel }} {{ assignment.destination.hotel }}
</div>
</div>
</td>
<td>
{{ assignment.jobProfile.name }}
</td> </td>
<td> <td>
{{ ('label.document.type.' ~ upload.type)|trans }} {{ ('label.document.type.' ~ upload.type)|trans }}