upgraded to symfony 4 #74 (#81)

src/Form/Toolbar/AbstractToolbarForm.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\Toolbar;
+
+use Symfony\Component\Form\AbstractType;
+
+/**
+ * Defines the base form used for all toolbars.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+abstract class AbstractToolbarForm extends AbstractType
+{
+    /**
+     * Dirty hack to enable easy handling of GET form in controller and javascript.
+     *Cleans up the name of all form elents (and unfortunately of the form itself).
+     *
+     * @return null|string
+     */
+    public function getBlockPrefix()
+    {
+        return '';
+    }
+}

src/Form/Toolbar/ActivityToolbarForm.php

@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\Toolbar;
+
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use App\Form\Type\ProjectType;
+use App\Repository\Query\ActivityQuery;
+
+/**
+ * Defines the form used for filtering the activities.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class ActivityToolbarForm extends ProjectToolbarForm
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        parent::buildForm($builder, $options);
+
+        /** @var ActivityQuery $query */
+        $query = $options['data'];
+
+        if ($query->getCustomer() === null) {
+            return;
+        }
+
+        $choices = [];
+        foreach ($query->getCustomer()->getProjects() as $project) {
+            $choices[] = $project;
+        }
+
+        $builder
+            ->add('project', ProjectType::class, [
+                'required' => false,
+                'choices' => $choices,
+            ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => ActivityQuery::class,
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/Form/Toolbar/CustomerToolbarForm.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\Toolbar;
+
+use App\Form\Toolbar\VisibilityToolbarForm;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use App\Repository\Query\CustomerQuery;
+
+/**
+ * Defines the form used for filtering the customer.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class CustomerToolbarForm extends VisibilityToolbarForm
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => CustomerQuery::class,
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/Form/Toolbar/PagedToolbarForm.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\Toolbar;
+
+use App\Form\Type\PageSizeType;
+use Symfony\Component\Form\FormBuilderInterface;
+use App\Repository\Query\CustomerQuery;
+
+/**
+ * Defines the base form used for all toolbars with pageSizes.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class PagedToolbarForm extends AbstractToolbarForm
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        /** @var CustomerQuery $query */
+        $query = $options['data'];
+
+        $builder
+            ->add('pageSize', PageSizeType::class, [
+                'required' => false,
+            ])
+        ;
+    }
+}

src/Form/Toolbar/ProjectToolbarForm.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\Toolbar;
+
+use App\Form\Toolbar\VisibilityToolbarForm;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use App\Form\Type\CustomerType;
+use App\Repository\CustomerRepository;
+use App\Repository\Query\CustomerQuery;
+use App\Repository\Query\ProjectQuery;
+
+/**
+ * Defines the form used for filtering the projects.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class ProjectToolbarForm extends VisibilityToolbarForm
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        parent::buildForm($builder, $options);
+
+        $builder
+            ->add('customer', CustomerType::class, [
+                'required' => false,
+                'query_builder' => function (CustomerRepository $repo) {
+                    $query = new CustomerQuery();
+                    $query->setVisibility(CustomerQuery::SHOW_BOTH); // this field is the reason for the query here
+                    $query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER);
+                    return $repo->findByQuery($query);
+                },
+            ])
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => ProjectQuery::class,
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/Form/Toolbar/TimesheetToolbarForm.php

@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+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;
+
+/**
+ * Defines the form used for filtering the timesheet.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class TimesheetToolbarForm extends ActivityToolbarForm
+{
+
+    /**
+     * @inheritdoc
+     */
+    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');
+    }
+
+    /**
+     * @param FormBuilderInterface $builder
+     * @param TimesheetQuery $query
+     */
+    protected function addActivityChoice(FormBuilderInterface $builder, TimesheetQuery $query)
+    {
+        if ($query->getProject() === null) {
+            return;
+        }
+
+        $choices = [];
+        foreach ($query->getProject()->getActivities() as $activity) {
+            $choices[] = $activity;
+        }
+
+        $builder
+            ->add('activity', ActivityType::class, [
+                'required' => false,
+                'choices' => $choices,
+            ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => TimesheetQuery::class,
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/Form/Toolbar/UserToolbarForm.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\Toolbar;
+
+use App\Form\Type\UserRoleType;
+use App\Repository\Query\UserQuery;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Defines the form used for filtering the user.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class UserToolbarForm extends VisibilityToolbarForm
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        parent::buildForm($builder, $options);
+
+        $builder
+            ->add('role', UserRoleType::class, [
+                'required' => false,
+            ])
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => UserQuery::class,
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/Form/Toolbar/VisibilityToolbarForm.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\Toolbar;
+
+use App\Form\Type\VisibilityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Defines the form used for filtering entities with a "visibility" field.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class VisibilityToolbarForm extends PagedToolbarForm
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        parent::buildForm($builder, $options);
+
+        $builder
+            ->add('visibility', VisibilityType::class, [
+                'required' => false,
+            ])
+        ;
+    }
+}