new report: week for users (#2494)

src/Reporting/AbstractUserList.php

@@ -0,0 +1,28 @@
+<?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;
+
+abstract class AbstractUserList
+{
+    /**
+     * @var \DateTime
+     */
+    private $date;
+
+    public function getDate(): ?\DateTime
+    {
+        return $this->date;
+    }
+
+    public function setDate(\DateTime $date): void
+    {
+        $this->date = $date;
+    }
+}

src/Reporting/MonthlyUserList.php

@@ -9,22 +9,6 @@
 
 namespace App\Reporting;
 
-final class MonthlyUserList
+final class MonthlyUserList extends AbstractUserList
 {
-    /**
-     * @var \DateTime
-     */
-    private $date;
-
-    public function getDate(): ?\DateTime
-    {
-        return $this->date;
-    }
-
-    public function setDate(\DateTime $date): MonthlyUserList
-    {
-        $this->date = $date;
-
-        return $this;
-    }
 }

src/Reporting/Report.php

@@ -14,12 +14,16 @@ final class Report implements ReportInterface
     private $id;
     private $label;
     private $route;
+    private $reportIcon = 'reporting';
 
-    public function __construct(string $id, string $route, string $label)
+    public function __construct(string $id, string $route, string $label, ?string $reportIcon = null)
     {
         $this->id = $id;
         $this->route = $route;
         $this->label = $label;
+        if (null !== $reportIcon) {
+            $this->reportIcon = $reportIcon;
+        }
     }
 
     public function getRoute(): string
@@ -36,4 +40,9 @@ final class Report implements ReportInterface
     {
         return $this->label;
     }
+
+    public function getReportIcon(): string
+    {
+        return $this->reportIcon;
+    }
 }

src/Reporting/ReportingService.php

@@ -42,13 +42,14 @@ final class ReportingService
         $event = new ReportingEvent($user);
 
         if ($this->security->isGranted('view_reporting')) {
-            $event->addReport(new Report(self::DEFAULT_VIEW, 'report_user_week', 'report_user_week'));
-            $event->addReport(new Report('month_by_user', 'report_user_month', 'report_user_month'));
-            if ($this->security->isGranted('budget_project')) {
-                $event->addReport(new Report('project_view', 'report_project_view', 'report_project_view'));
-            }
+            $event->addReport(new Report('week_by_user', 'report_user_week', 'report_user_week', 'user'));
+            $event->addReport(new Report('month_by_user', 'report_user_month', 'report_user_month', 'user'));
             if ($this->security->isGranted('view_other_timesheet')) {
-                $event->addReport(new Report('monthly_users_list', 'report_monthly_users', 'report_monthly_users'));
+                $event->addReport(new Report('weekly_users_list', 'report_weekly_users', 'report_weekly_users', 'user'));
+                $event->addReport(new Report('monthly_users_list', 'report_monthly_users', 'report_monthly_users', 'user'));
+            }
+            if ($this->security->isGranted('budget_project')) {
+                $event->addReport(new Report('project_view', 'report_project_view', 'report_project_view', 'project'));
             }
 
             $this->dispatcher->dispatch($event);

src/Reporting/WeeklyUserList.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 WeeklyUserList extends AbstractUserList
+{
+}

src/Reporting/WeeklyUserListForm.php

@@ -0,0 +1,57 @@
+<?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\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 WeeklyUserListForm 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'],
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => WeeklyUserList::class,
+            'timezone' => date_default_timezone_get(),
+            'start_date' => new \DateTime(),
+            'format' => DateType::HTML5_FORMAT,
+            'csrf_protection' => false,
+            'method' => 'GET',
+        ]);
+    }
+}