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

fix: hide called off assignments from timeline, adjust status colors

Browse Source
This commit is contained in:
Björn Fromme
2025-03-27 09:08:29 +01:00
parent 28b757fb15
commit 80e57d148f
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Model/TimelineItem.php
+1 -1
View File
@@ -35,7 +35,7 @@ class TimelineItem
->setDateTo($dateTo) ->setDateTo($dateTo)
->setJobProfile($assignment->getJobProfile()->getName()) ->setJobProfile($assignment->getJobProfile()->getName())
->setDateRange(sprintf('%s - %s', $dateFrom->format('d.m.Y'), $dateTo->format('d.m.Y'))) ->setDateRange(sprintf('%s - %s', $dateFrom->format('d.m.Y'), $dateTo->format('d.m.Y')))
->setStatus($assignment->getStatus()) ->setStatus($assignment->getStaffingStatus())
; ;
} }
src/Service/Assignment/TimelineService.php
+5
View File
@@ -18,6 +18,11 @@ class TimelineService
$rows = []; $rows = [];
foreach ($assignments as $assignment) { foreach ($assignments as $assignment) {
// exclude called off assignments
// TODO: refactor filtering to do this on database level
if (Assignment::STATUS_CALLED_OFF === $assignment->getStatus()) {
continue;
}
$destination = $assignment->getDestination(); $destination = $assignment->getDestination();
$hotelCode = $destination->getHotelCodeNormalized(); $hotelCode = $destination->getHotelCodeNormalized();
templates/administrative/assignment/timeline.html.twig
+6 -1
View File
@@ -4,7 +4,8 @@
{% macro cell(item, colspan) %} {% macro cell(item, colspan) %}
<td class="{{ html_classes('border border-gray-700', { <td class="{{ html_classes('border border-gray-700', {
'bg-gray-100': item.type == 'assignment', 'bg-gray-100': item.type == 'assignment' and item.status in ['unstaffed'],
'bg-blue-300': item.type == 'assignment' and item.status in ['staffing', 'partly_staffed'],
'bg-blue-500 text-gray-50': item.type == 'disposition' and item.status in ['new', 'checking_contract'], 'bg-blue-500 text-gray-50': item.type == 'disposition' and item.status in ['new', 'checking_contract'],
'bg-green-500 text-gray-50': item.type == 'disposition' and item.status in ['confirmed', 'ended', 'checking_invoice', 'completed'], 'bg-green-500 text-gray-50': item.type == 'disposition' and item.status in ['confirmed', 'ended', 'checking_invoice', 'completed'],
}) }}" colspan="{{ colspan }}"> }) }}" colspan="{{ colspan }}">
@@ -14,6 +15,7 @@
class="inline-block text-xs font-semibold"> class="inline-block text-xs font-semibold">
{{ item.jobProfile }} {{ item.jobProfile }}
</a> </a>
<span>|</span>
<button type="button" <button type="button"
class="flex items-center space-x-2" class="flex items-center space-x-2"
title="Teamer:inneninfo {{ item.teamerName }}" title="Teamer:inneninfo {{ item.teamerName }}"
@@ -111,6 +113,9 @@
<div class="flex items-center space-x-2 bg-gray-100 px-4 py-1"> <div class="flex items-center space-x-2 bg-gray-100 px-4 py-1">
<span>Bedarf</span> <span>Bedarf</span>
</div> </div>
<div class="flex items-center space-x-2 bg-blue-300 px-4 py-1">
<span>in Bewerbung</span>
</div>
<div class="flex items-center space-x-2 bg-blue-500 text-gray-50 px-4 py-1"> <div class="flex items-center space-x-2 bg-blue-500 text-gray-50 px-4 py-1">
<span>in Bearbeitung</span> <span>in Bearbeitung</span>
</div> </div>