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

Feat: Streamline layout for teamer

Browse Source
This commit is contained in:
Björn Fromme
2023-10-20 13:54:52 +02:00
parent b0bf854b97
commit 004b189be9
6 changed files with 99 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Controller/Teamer/Application/IndexController.php
+1
View File
@@ -43,6 +43,7 @@ class IndexController extends AbstractController
); );
return $this->render('teamer/application/index.html.twig', [ return $this->render('teamer/application/index.html.twig', [
'teamer' => $teamer,
'pagination' => $pagination, 'pagination' => $pagination,
]); ]);
} }
src/Controller/Teamer/Disposition/RecentController.php
+1
View File
@@ -43,6 +43,7 @@ class RecentController extends AbstractController
); );
return $this->render('teamer/disposition/recent.html.twig', [ return $this->render('teamer/disposition/recent.html.twig', [
'teamer' => $teamer,
'pagination' => $pagination, 'pagination' => $pagination,
]); ]);
} }
src/Controller/Teamer/Disposition/UpcomingController.php
+1
View File
@@ -43,6 +43,7 @@ class UpcomingController extends AbstractController
); );
return $this->render('teamer/disposition/upcoming.html.twig', [ return $this->render('teamer/disposition/upcoming.html.twig', [
'teamer' => $teamer,
'pagination' => $pagination, 'pagination' => $pagination,
]); ]);
} }
templates/teamer/application/index.html.twig
+55 -87
View File
@@ -6,92 +6,60 @@
<h1 class="text-2xl font-bold pb-8"> <h1 class="text-2xl font-bold pb-8">
Meine offenen Bewerbungen Meine offenen Bewerbungen
</h1> </h1>
<div class="data-table-wrapper"> <div class="grid sm:grid-cols-2 md:grid-cols-3 gap-4 pb-4">
<div class="data-table-wrapper__inner"> {% for application in pagination %}
<table class="data-table"> {% set assignment = application.assignment %}
<thead> <div class="relative flex flex-col justify-between rounded-md border border-gray-200 bg-gray-100 p-4">
<tr> <div class="flex flex-col space-y-2 pb-2">
<th> <div class="flex items-start space-x-2">
{{ knp_pagination_sortable(pagination, 'Einsatz&shy;beginn', 'assignment.dateFrom') }} {{ icon('flag-' ~ assignment.destination.country, 'w-5 h-5 shrink-0') }}
</th> <span class="flex-1 font-bold">{{ assignment.destination.product }}</span>
<th> </div>
{{ knp_pagination_sortable(pagination, 'Einsatz&shy;ende', 'assignment.dateTo') }} <div class="flex items-start space-x-2">
</th> {{ icon('calendar', 'w-5 h-5 shrink-0') }}
<th> <span class="flex-1">{{ assignment.effectivePeriod.start|date('d.m.Y') }} - {{ assignment.effectivePeriod.end|date('d.m.Y') }}</span>
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'assignment.jobProfile') }} </div>
</th> <div class="flex items-start space-x-2">
<th> {{ icon('profile', 'w-5 h-5 shrink-0') }}
{{ knp_pagination_sortable(pagination, 'Destination', 'destination.dateFrom') }} <span class="flex-1">{{ assignment.jobProfile.name }}</span>
</th> </div>
<th> <div class="flex items-start space-x-2">
{{ knp_pagination_sortable(pagination, 'Busbegleitung', 'assignment.pickup') }} {{ icon('house', 'w-5 h-5 shrink-0') }}
</th> <span class="flex-1">{{ assignment.destination.hotel }}</span>
<th> </div>
{{ knp_pagination_sortable(pagination, 'Status', 'application.status') }} {% if assignment.pickup %}
</th> <div class="flex items-start space-x-2">
<th></th> {{ icon('bus', 'w-5 h-5 shrink-0') }}
</tr> <span>{{ assignment.pickup|bpn_pickup_label|default('-') }} {{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }}</span>
</thead> </div>
<tbody> {% endif %}
{% for application in pagination %} </div>
{% set assignment = application.assignment %} <div class="flex flex-col space-y-2">
<tr> <a href="{{ path('app_teamer_assignment', { 'uuid': assignment.uuid, 'r': return_url() }) }}"
<td> class="btn btn--small flex items-center space-x-2">
{% set dateFrom = assignment.dateFrom ? assignment.dateFrom : assignment.destination.dateFrom %} {{ icon('info', 'w-4 h-4 shrink-0') }}
{{ dateFrom|date('d.m.Y') }} <span>Details</span>
</td> </a>
<td> {% if is_granted('DELETE', application) %}
{% set dateTo = assignment.dateTo ? assignment.dateTo : assignment.destination.dateTo %} <button type="button"
{{ dateTo|date('d.m.Y') }} title="Bewerbung löschen"
</td> class="btn btn--small bg-red-100 text-red-800 hover:bg-red-50"
<td> {{ stimulus_controller('modal-button', [], [], {'confirmation-modal': '#confirmation-modal'}) }}
{{ assignment.jobProfile.name }} {{ stimulus_action('modal-button', 'confirmation', null, {
</td> 'title': 'Bist du sicher?',
<td> 'content': 'Möchtest du die Bewerbing wirklich zurückziehen/löschen?',
{{ assignment.destination.product }} 'target-url': path('app_teamer_application_delete', { 'uuid': application.uuid })
<br> }) }}>
{{ assignment.destination.hotel }} {{ icon('delete', 'w-4 h-4 shrink-0') }}
</td> <span>Löschen</span>
<td> </button>
{{ assignment.pickup ? assignment.pickup|bpn_pickup_label|default('-') : '-' }} {% endif %}
<br> </div>
{{ assignment.pickupDate ? assignment.pickupDate|date('d.m.Y') : '' }} {% if teamer.bookmarks.contains(assignment) %}
</td> {{ icon('star', 'w-5 h-5 text-yellow-500 absolute top-0 right-0 mt-2 mr-2') }}
<td> {% endif %}
{{ ('label.application.status.' ~ application.status)|trans }} </div>
</td> {% endfor %}
<td>
<div class="flex items-center space-x-1 justify-end">
{% if is_granted('VIEW', application) %}
<a href="{{ path('app_teamer_assignment', { 'uuid': assignment.uuid, 'r': return_url() }) }}">
{{ icon('info', 'w-5 h-5') }}
</a>
{% endif %}
{% if is_granted('DELETE', application) %}
<button type="button"
title="Bewerbung löschen"
{{ stimulus_controller('modal-button', [], [], {'confirmation-modal': '#confirmation-modal'}) }}
{{ stimulus_action('modal-button', 'confirmation', null, {
'title': 'Bist du sicher?',
'content': 'Möchtest du die Bewerbing wirklich zurückziehen/löschen?',
'target-url': path('app_teamer_application_delete', { 'uuid': application.uuid })
}) }}>
{{ icon('delete', 'w-5 h-5 text-red-500') }}
</button>
{% endif %}
</div>
</td>
</tr>
{% else %}
<tr>
<td colspan="6">
Keine Daten...
</td>
</tr>
{% endfor %}
</tbody>
</table>
{{ knp_pagination_render(pagination) }}
</div>
</div> </div>
{{ knp_pagination_render(pagination, 'paginator/sliding_boxes.html.twig') }}
{% endblock %} {% endblock %}
templates/teamer/disposition/_table.html.twig
+39 -67
View File
@@ -1,68 +1,40 @@
<div class="data-table-wrapper"> <div class="grid sm:grid-cols-2 md:grid-cols-3 gap-4 pb-4">
<div class="data-table-wrapper__inner"> {% for disposition in pagination %}
<table class="data-table"> {% set assignment = disposition.assignment %}
<thead> <div class="relative flex flex-col justify-between rounded-md border border-gray-200 bg-gray-100 p-4">
<tr> <div class="flex flex-col space-y-2 pb-2">
<th> <div class="flex items-start space-x-2">
{{ knp_pagination_sortable(pagination, 'Einsatz&shy;beginn', 'assignment.dateFrom') }} {{ icon('flag-' ~ assignment.destination.country, 'w-5 h-5 shrink-0') }}
</th> <span class="flex-1 font-bold">{{ assignment.destination.product }}</span>
<th> </div>
{{ knp_pagination_sortable(pagination, 'Einsatz&shy;ende', 'assignment.dateTo') }} <div class="flex items-start space-x-2">
</th> {{ icon('calendar', 'w-5 h-5 shrink-0') }}
<th> <span class="flex-1">{{ assignment.effectivePeriod.start|date('d.m.Y') }} - {{ assignment.effectivePeriod.end|date('d.m.Y') }}</span>
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'assignment.jobProfile') }} </div>
</th> <div class="flex items-start space-x-2">
<th> {{ icon('profile', 'w-5 h-5 shrink-0') }}
{{ knp_pagination_sortable(pagination, 'Destination', 'destination.dateFrom') }} <span class="flex-1">{{ assignment.jobProfile.name }}</span>
</th> </div>
<th> <div class="flex items-start space-x-2">
{{ knp_pagination_sortable(pagination, 'Busbegleitung ab', 'assignment.pickup') }} {{ icon('house', 'w-5 h-5 shrink-0') }}
</th> <span class="flex-1">{{ assignment.destination.hotel }}</span>
<th></th> </div>
</tr> {% if assignment.pickup %}
</thead> <div class="flex items-start space-x-2">
<tbody> {{ icon('bus', 'w-5 h-5 shrink-0') }}
{% for disposition in pagination %} <span>{{ assignment.pickup|bpn_pickup_label|default('-') }} {{ assignment.effectivePickupDate ? assignment.effectivePickupDate|date('d.m.Y') : '' }}</span>
{% set assignment = disposition.assignment %} </div>
<tr> {% endif %}
<td> </div>
{% set dateFrom = assignment.dateFrom ? assignment.dateFrom : assignment.destination.dateFrom %} <a href="{{ path('app_teamer_disposition_detail', { 'uuid': disposition.uuid, 'r': return_url() }) }}"
{{ dateFrom|date('d.m.Y') }} class="btn btn--small flex items-center space-x-2">
</td> {{ icon('info', 'w-4 h-4 shrink-0') }}
<td> <span>Details</span>
{% set dateTo = assignment.dateTo ? assignment.dateTo : assignment.destination.dateTo %} </a>
{{ dateTo|date('d.m.Y') }} {% if teamer.bookmarks.contains(assignment) %}
</td> {{ icon('star', 'w-5 h-5 text-yellow-500 absolute top-0 right-0 mt-2 mr-2') }}
<td> {% endif %}
{{ assignment.jobProfile.name }} </div>
</td> {% endfor %}
<td>
{{ assignment.destination.product }}
<br>
{{ assignment.destination.hotel }}
</td>
<td>
{{ assignment.pickup ? assignment.pickup|bpn_pickup_label|default('-') : '-' }}
<br>
{{ assignment.pickupDate ? assignment.pickupDate|date('d.m.Y') : '' }}
</td>
<td>
<div class="flex items-center space-x-1 justify-end">
<a href="{{ path('app_teamer_disposition_detail', { 'uuid': disposition.uuid, 'r': return_url() }) }}">
{{ icon('info', 'w-5 h-5') }}
</a>
</div>
</td>
</tr>
{% else %}
<tr>
<td colspan="6">
Keine Daten...
</td>
</tr>
{% endfor %}
</tbody>
</table>
{{ knp_pagination_render(pagination) }}
</div>
</div> </div>
{{ knp_pagination_render(pagination, 'paginator/sliding_boxes.html.twig') }}
templates/teamer/index.html.twig
+2 -2
View File
@@ -58,13 +58,13 @@
{% set label = 'eingeteilt' %} {% set label = 'eingeteilt' %}
{% else %} {% else %}
{% set icon = 'info' %} {% set icon = 'info' %}
{% set class = 'btn--info' %} {% set class = '' %}
{% set url = path('app_teamer_assignment', { 'uuid': assignment.uuid, 'r': return_url() }) %} {% set url = path('app_teamer_assignment', { 'uuid': assignment.uuid, 'r': return_url() }) %}
{% set label = 'bewerben' %} {% set label = 'bewerben' %}
{% endif %} {% endif %}
<a href="{{ url }}" <a href="{{ url }}"
class="btn btn--small flex items-center space-x-2 {{ class }}"> class="btn btn--small flex items-center space-x-2 {{ class }}">
{{ icon(icon, 'w-4 h-4') }} {{ icon(icon, 'w-4 h-4 shrink-0') }}
<span>{{ label }}</span> <span>{{ label }}</span>
</a> </a>
</div> </div>