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

WIP: Improve assignment information display

Browse Source
This commit is contained in:
Björn Fromme
2023-10-19 15:20:44 +02:00
parent 21968b833c
commit 585f86e45f
15 changed files with 84 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/admin/application/index.html.twig
+36 -19
View File
@@ -12,10 +12,7 @@
<thead>
<tr>
<th>
{{ knp_pagination_sortable(pagination, 'Einsatzbeginn', 'destination.dateFrom') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Einsatzende', 'destination.dateTo') }}
{{ knp_pagination_sortable(pagination, 'Einsatz&shy;zeitraum', 'destination.dateFrom') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
@@ -24,7 +21,7 @@
{{ knp_pagination_sortable(pagination, 'Destination', 'destination.product') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Busbegleitung ab', 'destination.pickup') }}
{{ knp_pagination_sortable(pagination, 'Bus', 'destination.pickup') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Bewerber*in', 'teamer.lastName') }}
@@ -37,34 +34,54 @@
{% set assignment = application.assignment %}
<tr>
<td>
{{ assignment.destination.dateFrom|date('d.m.Y') }}
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid }) }}">
{{ assignment.effectivePeriod.start|date('d.m.Y') }} -
{{ assignment.effectivePeriod.end|date('d.m.Y') }}
</a>
</td>
<td>
{{ assignment.destination.dateTo|date('d.m.Y') }}
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid }) }}">
{{ assignment.jobProfile.name }}
</a>
</td>
<td>
{{ assignment.jobProfile.name }}
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid }) }}">
{{ assignment.destination.product }}
<br>
{{ assignment.destination.hotel }}
</a>
</td>
<td>
{{ assignment.destination.product }}
<br>
{{ assignment.destination.hotel }}
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid }) }}">
{{ assignment.pickup ? assignment.pickup|bpn_pickup_label : '-' }}
<br>
{{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }}
</a>
</td>
<td>
{{ assignment.pickup ? assignment.pickup|bpn_pickup_label : '-' }}
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid }) }}">
{{ application.teamer }}
</a>
</td>
<td>
{{ application.teamer }}
</td>
<td>
<button type="button" class="btn">
Welche Funktion?
</button>
<div class="flex items-center justify-end space-x-1">
{% if assignment.pickup %}
{% if application.matchesPickup %}
{{ icon('bus', 'w-5 h-5 text-green-500 shrink-0') }}
{% else %}
{{ icon('bus', 'w-5 h-5 text-red-500 shrink-0') }}
{% endif %}
{% endif %}
{% set requiredTrainingsCount = assignment.jobProfile.requiredTrainings|length %}
{% if requiredTrainingsCount > 0 %}
<span>{{ application.completedTrainingsCount }}/{{ requiredTrainingsCount }}</span>
{% endif %}
</div>
</td>
</tr>
{% else %}
<tr>
<td colspan="7">
<td colspan="6">
Keine Daten...
</td>
</tr>
templates/admin/assignment/detail.html.twig
+1 -1
View File
@@ -65,7 +65,7 @@
'title': 'Bewerbungsstatus bearbeiten',
'url': path('app_admin_application_status', { 'uuid': application.uuid })
}) }}>
Status ändern
Status
</button>
{% endif %}
{% if is_granted('DELETE', application) %}
templates/admin/assignment/index.html.twig
+4 -12
View File
@@ -12,10 +12,7 @@
<thead>
<tr>
<th>
{{ knp_pagination_sortable(pagination, 'Einsatz&shy;beginn', 'assignment.dateFrom') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Einsatz&shy;ende', 'assignment.dateTo') }}
{{ knp_pagination_sortable(pagination, 'Einsatz&shy;zeitraum', 'assignment.dateFrom') }}
</th>
<th>
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'assignment.jobProfile') }}
@@ -36,15 +33,10 @@
{% for assignment in pagination %}
<tr>
<td>
{% set dateFrom = assignment.dateFrom ? assignment.dateFrom : assignment.destination.dateFrom %}
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
{{ dateFrom|date('d.m.Y') }}
</a>
</td>
<td>
{% set dateTo = assignment.dateTo ? assignment.dateTo : assignment.destination.dateTo %}
<a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
{{ dateTo|date('d.m.Y') }}
{{ assignment.effectivePeriod.start|date('d.m.Y') }} -
<br>
{{ assignment.effectivePeriod.end|date('d.m.Y') }}
</a>
</td>
<td>
templates/admin/document/index.html.twig
-1
View File
@@ -72,7 +72,6 @@
</button>
{% endif %}
<a href="{{ path('app_common_download', { 'uuid': upload.uuid }) }}"
target="_blank"
title="Download">
{{ icon('download') }}
</a>