From c155e8c19e049e17e2bc55b6ca4d3bd9718fe6f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Mon, 23 Oct 2023 16:10:56 +0200
Subject: [PATCH] Fix: Use form labels in favour of placeholders to avois
 issues on mob.

---
 src/Form/AssignmentFilterType.php          | 22 ++++++++--------------
 templates/admin/assignment/index.html.twig | 10 +++++-----
 templates/admin/index.html.twig            |  4 ++--
 templates/teamer/index.html.twig           | 10 +++++-----
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/Form/AssignmentFilterType.php b/src/Form/AssignmentFilterType.php
index 140bb02..04ab7c9 100644
--- a/src/Form/AssignmentFilterType.php
+++ b/src/Form/AssignmentFilterType.php
@@ -18,24 +18,18 @@ class AssignmentFilterType extends AbstractType
     {
         $builder
             ->add('dateFrom', DatepickerType::class, [
-                'label' => false,
+                'label' => 'Zeitraum von',
                 'min_date' => $options['min_date'],
                 'max_date' => $options['max_date'],
-                'attr' => [
-                    'placeholder' => 'von',
-                ],
             ])
             ->add('dateTo', DatepickerType::class, [
-                'label' => false,
+                'label' => 'Zeitraum bis',
                 'min_date' => $options['min_date'],
                 'max_date' => $options['max_date'],
-                'attr' => [
-                    'placeholder' => 'bis',
-                ],
             ])
             ->add('duration', ChoiceType::class, [
-                'label' => false,
-                'placeholder' => 'Einsatzdauer',
+                'label' => 'Einsatzdauer',
+                'required' => false,
                 'choices' => [
                     'Wochenende (2-4 Tage)' => AssignmentFilterDto::DURATION_WEEKEND,
                     'Midweek (5-6 Tage)' => AssignmentFilterDto::DURATION_MID_WEEK,
@@ -54,9 +48,9 @@ class AssignmentFilterType extends AbstractType
         if (0 < count($options['job_profiles'])) {
             $builder
                 ->add('jobProfile', EntityType::class, [
-                    'label' => false,
-                    'placeholder' => 'Job-Profil',
+                    'label' => 'Job-Profil',
                     'class' => JobProfile::class,
+                    'required' => false,
                     'choice_label' => 'name',
                     'choices' => $options['job_profiles'],
                 ])
@@ -65,9 +59,9 @@ class AssignmentFilterType extends AbstractType
         if (0 < count($options['destinations'])) {
             $builder
                 ->add('destination', EntityType::class, [
-                    'label' => false,
-                    'placeholder' => 'Destination',
+                    'label' => 'Destination',
                     'class' => Destination::class,
+                    'required' => false,
                     'choice_label' => function (Destination $destination) {
                         return $destination->getProduct();
                     },
diff --git a/templates/admin/assignment/index.html.twig b/templates/admin/assignment/index.html.twig
index 9779082..315ea4a 100644
--- a/templates/admin/assignment/index.html.twig
+++ b/templates/admin/assignment/index.html.twig
@@ -9,11 +9,11 @@
     {{ form_start(filterForm) }}
     <div class="border border-gray-200 rounded-md p-2 mb-4">
         <div class="grid grid-cols-2 md:grid-cols-5 gap-1 pb-2">
-            {{ form_widget(filterForm.dateFrom) }}
-            {{ form_widget(filterForm.dateTo) }}
-            {{ form_widget(filterForm.jobProfile) }}
-            {{ form_widget(filterForm.destination) }}
-            {{ form_widget(filterForm.duration) }}
+            {{ form_row(filterForm.dateFrom) }}
+            {{ form_row(filterForm.dateTo) }}
+            {{ form_row(filterForm.jobProfile) }}
+            {{ form_row(filterForm.destination) }}
+            {{ form_row(filterForm.duration) }}
         </div>
         <div class="flex items-center space-x-2">
             {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn btn--small' } }) }}
diff --git a/templates/admin/index.html.twig b/templates/admin/index.html.twig
index 023bf9c..9c7a408 100644
--- a/templates/admin/index.html.twig
+++ b/templates/admin/index.html.twig
@@ -19,7 +19,7 @@
                 {% for application in applications %}
                     {% set assignment = application.assignment %}
                     <li class="py-2 first:pt-0 last:pb-0">
-                        <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}" class="flex items-center space-x-1 text-clip">
+                        <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}" class="flex items-center space-x-1 truncate">
                             {{ icon('hand', 'w-4 h-4 shrink-0') }}
                             <span class="whitespace-nowrap">{{ application.teamer.fullName(true) }}</span>
                             {{ _self.dot() }}
@@ -71,7 +71,7 @@
             <ul class="divide-y divide-gray-200">
                 {% for assignment in assignments %}
                     <li class="py-2 first:pt-0 last:pb-0">
-                        <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}" class="flex items-center space-x-1 truncate truncate">
+                        <a href="{{ path('app_admin_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) }}" class="flex items-center space-x-1 truncate">
                             {{ icon('calendar', 'w-4 h-4 shrink-0') }}
                             <span class="whitespace-nowrap">{{ assignment.effectivePeriod.start|date('d.m.y') }} - {{ assignment.effectivePeriod.end|date('d.m.y') }}</span>
                             {{ _self.dot() }}
diff --git a/templates/teamer/index.html.twig b/templates/teamer/index.html.twig
index acb6bd5..510f211 100644
--- a/templates/teamer/index.html.twig
+++ b/templates/teamer/index.html.twig
@@ -21,11 +21,11 @@
     {{ form_start(filterForm) }}
     <div class="border border-gray-200 rounded-md p-2 mb-4">
         <div class="grid grid-cols-2 md:grid-cols-5 gap-x-1 gap-y-2 pb-2">
-            {{ form_widget(filterForm.dateFrom) }}
-            {{ form_widget(filterForm.dateTo) }}
-            {{ form_widget(filterForm.jobProfile) }}
-            {{ form_widget(filterForm.destination) }}
-            {{ form_widget(filterForm.duration) }}
+            {{ form_row(filterForm.dateFrom) }}
+            {{ form_row(filterForm.dateTo) }}
+            {{ form_row(filterForm.jobProfile) }}
+            {{ form_row(filterForm.destination) }}
+            {{ form_row(filterForm.duration) }}
         </div>
         <div class="flex items-center space-x-2">
             {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn btn--small' } }) }}