fix: draw only active placements on the timeline and keep trips overlapping its dates

This commit is contained in:
fromme committed 2026-11-12 11:13:55 +01:00
1 parent 5ca9b812c3
commit 4e50f23558
6 files changed
+216 -32

No files matched your search

@@ -4,10 +4,9 @@
{% macro cell(item, colspan) %}
<td class="{{ html_classes('border border-gray-700', {
'bg-gray-100': item.type == 'assignment' and item.status in ['unstaffed'],
'bg-blue-500 text-gray-50': 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-green-500 text-gray-50': item.type == 'disposition' and item.status in ['confirmed', 'ended', 'checking_invoice', 'completed'],
'bg-gray-100': item.state == 'open',
'bg-blue-500 text-gray-50': item.state == 'pending',
'bg-green-500 text-gray-50': item.state == 'staffed',
}) }}" colspan="{{ colspan }}">
{% if item.type == 'disposition' %}
<div class="flex items-center space-x-2">
@@ -26,7 +25,7 @@
hx-get="{{ path('app_administrative_teamer_info', { 'uuid': item.teamerUuid, 'r': return_url() }) }}"
hx-target="body"
hx-swap="beforeend">
<span class="text-xs font-semibold">{{ item.teamerName | raw }}</span>
<span class="text-xs font-semibold">{{ item.teamerName }}</span>
</button>
</div>
{% else %}