Weekly reporting view (#1892)

src/Form/Type/ColorPickerType.php

@@ -9,6 +9,7 @@
 
 namespace App\Form\Type;
 
+use App\Constants;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Extension\Core\Type\ColorType;
@@ -17,7 +18,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ColorPickerType extends AbstractType implements DataTransformerInterface
 {
-    public const DEFAULT_COLOR = '#d2d6de';
+    public const DEFAULT_COLOR = Constants::DEFAULT_COLOR;
 
     /**
      * {@inheritdoc}

src/Form/Type/MonthPickerType.php

@@ -9,8 +9,6 @@
 
 namespace App\Form\Type;
 
-use App\Timesheet\UserDateTimeFactory;
-use App\Utils\LocaleSettings;
 use App\Utils\MomentFormatConverter;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
@@ -25,38 +23,16 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
  */
 final class MonthPickerType extends AbstractType
 {
-    /**
-     * @var LocaleSettings
-     */
-    private $localeSettings;
-
-    /**
-     * @var UserDateTimeFactory
-     */
-    private $dateTime;
-
-    public function __construct(LocaleSettings $localeSettings, UserDateTimeFactory $dateTime)
-    {
-        $this->localeSettings = $localeSettings;
-        $this->dateTime = $dateTime;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $pickerFormat = $this->localeSettings->getDatePickerFormat();
-        $dateFormat = $this->localeSettings->getDateTypeFormat();
-        $timezone = $this->dateTime->getTimezone()->getName();
-
         $resolver->setDefaults([
             'widget' => 'single_text',
             'html5' => false,
-            'format' => $dateFormat,
-            'format_picker' => $pickerFormat,
-            'model_timezone' => $timezone,
-            'view_timezone' => $timezone,
+            'format' => DateType::HTML5_FORMAT,
+            'start_date' => new \DateTime(),
         ]);
     }
 
@@ -66,13 +42,13 @@ final class MonthPickerType extends AbstractType
         $date = $form->getData();
 
         if (null === $date) {
-            $date = $this->dateTime->getStartOfMonth();
+            $date = $options['start_date'];
         }
 
         $view->vars['month'] = $date;
         $view->vars['previousMonth'] = (clone $date)->modify('-1 month');
         $view->vars['nextMonth'] = (clone $date)->modify('+1 month');
-        $view->vars['momentFormat'] = (new MomentFormatConverter())->convert($this->localeSettings->getDateTypeFormat());
+        $view->vars['momentFormat'] = (new MomentFormatConverter())->convert($options['format']);
     }
 
     /**

src/Form/Type/WeekPickerType.php

@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\Type;
+
+use App\Utils\MomentFormatConverter;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Custom form field type to select a week via picker and select previous and next week.
+ *
+ * Always falls back to the current week if none or an invalid date is given.
+ */
+final class WeekPickerType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'widget' => 'single_text',
+            'html5' => false,
+            'format' => DateType::HTML5_FORMAT,
+            'start_date' => new \DateTime(),
+        ]);
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        /** @var \DateTime|null $date */
+        $date = $form->getData();
+
+        if (null === $date) {
+            $date = $options['start_date'];
+        }
+
+        $view->vars['week'] = $date;
+        $view->vars['previousWeek'] = (clone $date)->modify('-1 week');
+        $view->vars['nextWeek'] = (clone $date)->modify('+1 week');
+        $view->vars['momentFormat'] = (new MomentFormatConverter())->convert($options['format']);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return DateType::class;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBlockPrefix()
+    {
+        return 'weekpicker';
+    }
+}