added basic invoice rendering #97 #93 (#99)

src/Form/Toolbar/TimesheetToolbarForm.php

@@ -14,7 +14,6 @@ namespace App\Form\Toolbar;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Form\Type\ActivityType;
 use App\Repository\Query\TimesheetQuery;
 
 /**
@@ -22,7 +21,7 @@ use App\Repository\Query\TimesheetQuery;
  *
  * @author Kevin Papst <kevin@kevinpapst.de>
  */
-class TimesheetToolbarForm extends ActivityToolbarForm
+class TimesheetToolbarForm extends AbstractToolbarForm
 {
 
     /**
@@ -30,42 +29,26 @@ class TimesheetToolbarForm extends ActivityToolbarForm
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder
-            ->add('state', ChoiceType::class, [
-                'label' => 'label.entryState',
-                'choices' => [
-                    'entryState.all' => TimesheetQuery::STATE_ALL,
-                    'entryState.running' => TimesheetQuery::STATE_RUNNING,
-                    'entryState.stopped' => TimesheetQuery::STATE_STOPPED
-                ],
-            ])
-        ;
-        parent::buildForm($builder, $options);
-        $this->addActivityChoice($builder, $options['data']);
-
-        $builder->remove('visibility');
+        $this->addTimesheetStateChoice($builder);
+        $this->addPageSizeChoice($builder);
+        $this->addCustomerChoice($builder);
+        $this->addProjectChoice($builder);
+        $this->addActivityChoice($builder);
     }
 
     /**
      * @param FormBuilderInterface $builder
-     * @param TimesheetQuery $query
      */
-    protected function addActivityChoice(FormBuilderInterface $builder, TimesheetQuery $query)
+    protected function addTimesheetStateChoice(FormBuilderInterface $builder)
     {
-        if ($query->getProject() === null) {
-            return;
-        }
-
-        $choices = [];
-        foreach ($query->getProject()->getActivities() as $activity) {
-            $choices[] = $activity;
-        }
-
-        $builder
-            ->add('activity', ActivityType::class, [
-                'required' => false,
-                'choices' => $choices,
-            ]);
+        $builder->add('state', ChoiceType::class, [
+            'label' => 'label.entryState',
+            'choices' => [
+                'entryState.all' => TimesheetQuery::STATE_ALL,
+                'entryState.running' => TimesheetQuery::STATE_RUNNING,
+                'entryState.stopped' => TimesheetQuery::STATE_STOPPED
+            ],
+        ]);
     }
 
     /**