Weekly reporting view (#1892)

src/Reporting/DateByUser.php

@@ -0,0 +1,48 @@
+<?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\Reporting;
+
+use App\Entity\User;
+
+abstract class DateByUser
+{
+    /**
+     * @var User
+     */
+    private $user;
+    /**
+     * @var \DateTime
+     */
+    private $date;
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(User $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    public function getDate(): ?\DateTime
+    {
+        return $this->date;
+    }
+
+    public function setDate(\DateTime $date): self
+    {
+        $this->date = $date;
+
+        return $this;
+    }
+}

src/Reporting/MonthByUser.php

@@ -9,40 +9,6 @@
 
 namespace App\Reporting;
 
-use App\Entity\User;
-
-final class MonthByUser
+final class MonthByUser extends DateByUser
 {
-    /**
-     * @var User
-     */
-    private $user;
-    /**
-     * @var \DateTime
-     */
-    private $date;
-
-    public function getUser(): ?User
-    {
-        return $this->user;
-    }
-
-    public function setUser(User $user): MonthByUser
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-
-    public function getDate(): ?\DateTime
-    {
-        return $this->date;
-    }
-
-    public function setDate(\DateTime $date): MonthByUser
-    {
-        $this->date = $date;
-
-        return $this;
-    }
 }

src/Reporting/MonthByUserForm.php

@@ -12,6 +12,7 @@ namespace App\Reporting;
 use App\Form\Type\MonthPickerType;
 use App\Form\Type\UserType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -32,7 +33,12 @@ class MonthByUserForm extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('date', MonthPickerType::class);
+        $builder->add('date', MonthPickerType::class, [
+            'model_timezone' => $options['timezone'],
+            'view_timezone' => $options['timezone'],
+            'start_date' => $options['start_date'],
+            'format' => $options['format'],
+        ]);
 
         if ($options['include_user']) {
             $builder->add('user', UserType::class, ['width' => false]);
@@ -46,6 +52,9 @@ class MonthByUserForm extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => MonthByUser::class,
+            'timezone' => date_default_timezone_get(),
+            'start_date' => new \DateTime(),
+            'format' => DateType::HTML5_FORMAT,
             'include_user' => false,
             'csrf_protection' => false,
             'method' => 'GET',

src/Reporting/MonthlyUserListForm.php

@@ -11,6 +11,7 @@ namespace App\Reporting;
 
 use App\Form\Type\MonthPickerType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -31,7 +32,12 @@ class MonthlyUserListForm extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('date', MonthPickerType::class);
+        $builder->add('date', MonthPickerType::class, [
+            'model_timezone' => $options['timezone'],
+            'view_timezone' => $options['timezone'],
+            'start_date' => $options['start_date'],
+            'format' => $options['format'],
+        ]);
     }
 
     /**
@@ -41,6 +47,9 @@ class MonthlyUserListForm extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => MonthlyUserList::class,
+            'timezone' => date_default_timezone_get(),
+            'start_date' => new \DateTime(),
+            'format' => DateType::HTML5_FORMAT,
             'csrf_protection' => false,
             'method' => 'GET',
         ]);

src/Reporting/WeekByUser.php

@@ -0,0 +1,14 @@
+<?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\Reporting;
+
+final class WeekByUser extends DateByUser
+{
+}

src/Reporting/WeekByUserForm.php

@@ -0,0 +1,63 @@
+<?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\Reporting;
+
+use App\Form\Type\UserType;
+use App\Form\Type\WeekPickerType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class WeekByUserForm extends AbstractType
+{
+    /**
+     * Simplify cross linking between pages by removing the block prefix.
+     *
+     * @return null|string
+     */
+    public function getBlockPrefix()
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('date', WeekPickerType::class, [
+            'model_timezone' => $options['timezone'],
+            'view_timezone' => $options['timezone'],
+            'start_date' => $options['start_date'],
+            'format' => $options['format'],
+        ]);
+
+        if ($options['include_user']) {
+            $builder->add('user', UserType::class, ['width' => false]);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => WeekByUser::class,
+            'timezone' => date_default_timezone_get(),
+            'start_date' => new \DateTime(),
+            'format' => DateType::HTML5_FORMAT,
+            'include_user' => false,
+            'csrf_protection' => false,
+            'method' => 'GET',
+        ]);
+    }
+}