users weekly stats as bar-chart in dashboard (#847)

src/Model/Statistic/Day.php

@@ -0,0 +1,64 @@
+<?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\Model\Statistic;
+
+use DateTime;
+
+class Day
+{
+    /**
+     * @var int
+     */
+    protected $totalDuration = 0;
+    /**
+     * @var float
+     */
+    protected $totalRate = 0.00;
+    /**
+     * @var DateTime
+     */
+    protected $day;
+
+    public function __construct(DateTime $day, int $duration, float $rate)
+    {
+        $this->day = $day;
+        $this->totalDuration = $duration;
+        $this->totalRate = $rate;
+    }
+
+    public function getDay(): DateTime
+    {
+        return $this->day;
+    }
+
+    public function getTotalDuration(): int
+    {
+        return $this->totalDuration;
+    }
+
+    public function setTotalDuration(int $seconds): Day
+    {
+        $this->totalDuration = $seconds;
+
+        return $this;
+    }
+
+    public function getTotalRate(): float
+    {
+        return $this->totalRate;
+    }
+
+    public function setTotalRate(float $totalRate): Day
+    {
+        $this->totalRate = $totalRate;
+
+        return $this;
+    }
+}

src/Model/Statistic/Month.php

@@ -9,6 +9,8 @@
 
 namespace App\Model\Statistic;
 
+use InvalidArgumentException;
+
 /**
  * Monthly statistics
  */
@@ -23,9 +25,9 @@ class Month
      */
     protected $totalDuration = 0;
     /**
-     * @var int
+     * @var float
      */
-    protected $totalRate = 0;
+    protected $totalRate = 0.00;
 
     /**
      * @param string $month
@@ -34,7 +36,9 @@ class Month
     {
         $monthNumber = (int) $month;
         if ($monthNumber < 1 || $monthNumber > 12) {
-            throw new \InvalidArgumentException('Invalid month given, expected 01-12 but given: ' . $monthNumber);
+            throw new InvalidArgumentException(
+                sprintf('Invalid month given. Expected 1-12, received "%s".', $monthNumber)
+            );
         }
         $this->month = $month;
     }
@@ -47,38 +51,24 @@ class Month
         return $this->month;
     }
 
-    /**
-     * @return int
-     */
-    public function getTotalDuration()
+    public function getTotalDuration(): int
     {
         return $this->totalDuration;
     }
 
-    /**
-     * @param int $totalDuration
-     * @return $this
-     */
-    public function setTotalDuration($totalDuration)
+    public function setTotalDuration(int $seconds): Month
     {
-        $this->totalDuration = $totalDuration;
+        $this->totalDuration = $seconds;
 
         return $this;
     }
 
-    /**
-     * @return int
-     */
-    public function getTotalRate()
+    public function getTotalRate(): float
     {
         return $this->totalRate;
     }
 
-    /**
-     * @param int $totalRate
-     * @return $this
-     */
-    public function setTotalRate($totalRate)
+    public function setTotalRate(float $totalRate): Month
     {
         $this->totalRate = $totalRate;
 

src/Model/Statistic/Year.php

@@ -24,7 +24,6 @@ class Year
     protected $months = [];
 
     /**
-     * Year constructor.
      * @param string $year
      */
     public function __construct($year)
@@ -40,22 +39,14 @@ class Year
         return $this->year;
     }
 
-    /**
-     * @param Month $month
-     * @return $this
-     */
-    public function setMonth(Month $month)
+    public function setMonth(Month $month): Year
     {
         $this->months[(int) $month->getMonth()] = $month;
 
         return $this;
     }
 
-    /**
-     * @param int $month
-     * @return null|Month
-     */
-    public function getMonth(int $month)
+    public function getMonth(int $month): ?Month
     {
         if (isset($this->months[$month])) {
             return $this->months[$month];
@@ -67,7 +58,7 @@ class Year
     /**
      * @return Month[]
      */
-    public function getMonths()
+    public function getMonths(): array
     {
         return array_values($this->months);
     }