Form and theme improvements (#513)

src/Form/Toolbar/AbstractToolbarForm.php

@@ -78,10 +78,15 @@ abstract class AbstractToolbarForm extends AbstractType
 
     /**
      * @param FormBuilderInterface $builder
+     * @param null|string $label
      */
-    protected function addVisibilityChoice(FormBuilderInterface $builder)
+    protected function addVisibilityChoice(FormBuilderInterface $builder, ?string $label = null)
     {
-        $builder->add('visibility', VisibilityType::class, []);
+        $builder->add('visibility', VisibilityType::class, [
+            'required' => false,
+            'placeholder' => null,
+            'label' => $label
+        ]);
     }
 
     /**

src/Form/Toolbar/InvoiceToolbarForm.php

@@ -36,7 +36,8 @@ class InvoiceToolbarForm extends AbstractToolbarForm
     protected function addTemplateChoice(FormBuilderInterface $builder)
     {
         $builder->add('template', InvoiceTemplateType::class, [
-            'required' => true
+            'required' => false,
+            'placeholder' => null,
         ]);
     }
 

src/Form/Toolbar/TimesheetToolbarForm.php

@@ -40,6 +40,8 @@ class TimesheetToolbarForm extends AbstractToolbarForm
     {
         $builder->add('state', ChoiceType::class, [
             'label' => 'label.entryState',
+            'required' => false,
+            'placeholder' => null,
             'choices' => [
                 'entryState.all' => TimesheetQuery::STATE_ALL,
                 'entryState.running' => TimesheetQuery::STATE_RUNNING,

src/Form/Toolbar/UserToolbarForm.php

@@ -24,7 +24,7 @@ class UserToolbarForm extends AbstractToolbarForm
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $this->addPageSizeChoice($builder);
-        $this->addVisibilityChoice($builder);
+        $this->addVisibilityChoice($builder, 'label.active');
         $this->addUserRoleChoice($builder);
     }