Überfällige Honorarverträge
diff --git a/templates/administrative/assignment/detail.html.twig b/templates/administrative/assignment/detail.html.twig
index 2a59438..b95deb4 100644
--- a/templates/administrative/assignment/detail.html.twig
+++ b/templates/administrative/assignment/detail.html.twig
@@ -164,13 +164,18 @@
{{ disposition.remarks|default('-')|nl2br }}
-
+
+
+ {{ disposition.specialAgreements|default('-')|nl2br }}
+
+
+ |
diff --git a/templates/administrative/assignment/index.html.twig b/templates/administrative/assignment/index.html.twig
index f204ccf..5b93dc1 100644
--- a/templates/administrative/assignment/index.html.twig
+++ b/templates/administrative/assignment/index.html.twig
@@ -50,7 +50,7 @@
{{ knp_pagination_sortable(pagination, 'Jobprofil', 'job_profile.name') }}
- {{ knp_pagination_sortable(pagination, 'Bus', 'assignment.pickup') }}
+ {{ knp_pagination_sortable(pagination, 'Busbegleitung', 'assignment.pickup') }}
|
{% if is_granted('ROLE_ADMIN') %}
diff --git a/templates/common/modal_assignment_filter.html.twig b/templates/common/modal_assignment_filter.html.twig
index f1afe0c..a155a01 100644
--- a/templates/common/modal_assignment_filter.html.twig
+++ b/templates/common/modal_assignment_filter.html.twig
@@ -5,11 +5,16 @@
{% block content %}
{{ form_start(filterForm, { 'attr': { 'hx-post': app.request.uri, 'hx-target': '#htmx-modal', 'hx-swap': 'outerHTML' } }) }}
+ {% if filterForm.id is defined %}
+ {{ form_row(filterForm.id) }}
+ {% endif %}
{% if filterForm.status is defined %}
{{ form_row(filterForm.status) }}
{% endif %}
- {{ form_row(filterForm.dateFrom) }}
- {{ form_row(filterForm.dateTo) }}
+
+ {{ form_row(filterForm.dateFrom) }}
+ {{ form_row(filterForm.dateTo) }}
+
{{ form_row(filterForm.jobProfiles) }}
{{ form_row(filterForm.hotels) }}
{{ form_row(filterForm.duration) }}
diff --git a/templates/house_manager/index.html.twig b/templates/house_manager/index.html.twig
index 98c1f3a..8fb5f98 100644
--- a/templates/house_manager/index.html.twig
+++ b/templates/house_manager/index.html.twig
@@ -3,6 +3,14 @@
{% macro dispositionData(disposition) %}
{% set assignment = disposition.assignment %}
{{ disposition.teamer.fullName(true) }}
+
{% include '_partials/_dot.html.twig' %}
{{ assignment.effectivePeriod.start|date('d.m.y') }} - {{ assignment.effectivePeriod.end|date('d.m.y') }}
{% include '_partials/_dot.html.twig' %}
diff --git a/templates/teamer/assignment/detail.html.twig b/templates/teamer/assignment/detail.html.twig
index 60dc181..ad07250 100644
--- a/templates/teamer/assignment/detail.html.twig
+++ b/templates/teamer/assignment/detail.html.twig
@@ -22,12 +22,14 @@
{% if application.comment and application.commentVisible %}
Begründung: {{ application.comment|nl2br}}
{% endif %}
- {% elseif application.status == constant('App\\Entity\\Application::STATUS_PENDING') %}
+ {% endif %}
+ {% if application.status == constant('App\\Entity\\Application::STATUS_PENDING') %}
{% if application.comment and application.commentVisible %}
Begründung: {{ application.comment|nl2br}}
{% endif %}
- {% else %}
+ {% endif %}
+ {% if is_granted('WITHDRAW', application) %}
| |