added user-specific rates (#1455)

src/Entity/Activity.php

@@ -74,7 +74,6 @@ class Activity implements EntityWithMetaFields
     private $visible = true;
 
     // keep the trait include exactly here, for placing the column at the correct position
-    use RatesTrait;
     use ColorTrait;
     use BudgetTrait;
 
@@ -138,6 +137,11 @@ class Activity implements EntityWithMetaFields
         return $this;
     }
 
+    public function isGlobal(): bool
+    {
+        return $this->project === null;
+    }
+
     public function isVisible(): bool
     {
         return $this->visible;

src/Entity/ActivityRate.php

@@ -0,0 +1,54 @@
+<?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\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
+
+/**
+ * @ORM\Table(name="kimai2_activities_rates",
+ *     uniqueConstraints={
+ *          @ORM\UniqueConstraint(columns={"user_id", "activity_id"}),
+ *     }
+ * )
+ * @ORM\Entity(repositoryClass="App\Repository\ActivityRateRepository")
+ * @UniqueEntity({"user", "activity"}, ignoreNull=false)
+ */
+class ActivityRate implements RateInterface
+{
+    use Rate;
+
+    /**
+     * @var Activity
+     *
+     * @ORM\ManyToOne(targetEntity="App\Entity\Activity")
+     * @ORM\JoinColumn(onDelete="CASCADE", nullable=false)
+     * @Assert\NotNull()
+     */
+    private $activity;
+
+    public function setActivity(?Activity $activity): ActivityRate
+    {
+        $this->activity = $activity;
+
+        return $this;
+    }
+
+    public function getActivity(): ?Activity
+    {
+        return $this->activity;
+    }
+
+    public function getScore(): int
+    {
+        return 5;
+    }
+}

src/Entity/Customer.php

@@ -174,7 +174,6 @@ class Customer implements EntityWithMetaFields
     private $timezone;
 
     // keep the trait include exactly here, for placing the column at the correct position
-    use RatesTrait;
     use ColorTrait;
     use BudgetTrait;
 

src/Entity/CustomerRate.php

@@ -0,0 +1,54 @@
+<?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\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
+
+/**
+ * @ORM\Table(name="kimai2_customers_rates",
+ *     uniqueConstraints={
+ *          @ORM\UniqueConstraint(columns={"user_id", "customer_id"}),
+ *     }
+ * )
+ * @ORM\Entity(repositoryClass="App\Repository\CustomerRateRepository")
+ * @UniqueEntity({"user", "customer"}, ignoreNull=false)
+ */
+class CustomerRate implements RateInterface
+{
+    use Rate;
+
+    /**
+     * @var Customer
+     *
+     * @ORM\ManyToOne(targetEntity="App\Entity\Customer")
+     * @ORM\JoinColumn(onDelete="CASCADE", nullable=false)
+     * @Assert\NotNull()
+     */
+    private $customer;
+
+    public function setCustomer(?Customer $customer): CustomerRate
+    {
+        $this->customer = $customer;
+
+        return $this;
+    }
+
+    public function getCustomer(): ?Customer
+    {
+        return $this->customer;
+    }
+
+    public function getScore(): int
+    {
+        return 1;
+    }
+}

src/Entity/Project.php

@@ -105,7 +105,6 @@ class Project implements EntityWithMetaFields
     private $visible = true;
 
     // keep the trait include exactly here, for placing the column at the correct position
-    use RatesTrait;
     use ColorTrait;
     use BudgetTrait;
 

src/Entity/ProjectRate.php

@@ -0,0 +1,54 @@
+<?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\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
+
+/**
+ * @ORM\Table(name="kimai2_projects_rates",
+ *     uniqueConstraints={
+ *          @ORM\UniqueConstraint(columns={"user_id", "project_id"}),
+ *     }
+ * )
+ * @ORM\Entity(repositoryClass="App\Repository\ProjectRateRepository")
+ * @UniqueEntity({"user", "project"}, ignoreNull=false)
+ */
+class ProjectRate implements RateInterface
+{
+    use Rate;
+
+    /**
+     * @var Project
+     *
+     * @ORM\ManyToOne(targetEntity="App\Entity\Project")
+     * @ORM\JoinColumn(onDelete="CASCADE", nullable=false)
+     * @Assert\NotNull
+     */
+    private $project;
+
+    public function setProject(?Project $project): ProjectRate
+    {
+        $this->project = $project;
+
+        return $this;
+    }
+
+    public function getProject(): ?Project
+    {
+        return $this->project;
+    }
+
+    public function getScore(): int
+    {
+        return 3;
+    }
+}

src/Entity/Rate.php

@@ -0,0 +1,92 @@
+<?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\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
+
+trait Rate
+{
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="IDENTITY")
+     */
+    private $id;
+    /**
+     * @var User
+     *
+     * @ORM\ManyToOne(targetEntity="App\Entity\User")
+     * @ORM\JoinColumn(onDelete="CASCADE", nullable=true)
+     */
+    private $user;
+    /**
+     * @var float
+     *
+     * @ORM\Column(name="rate", type="float", nullable=false)
+     * @Assert\GreaterThanOrEqual(0)
+     */
+    private $rate = 0.00;
+    /**
+     * @var bool
+     *
+     * @ORM\Column(name="fixed", type="boolean", nullable=false)
+     * @Assert\NotNull()
+     */
+    private $isFixed = false;
+
+    /**
+     * Get entry id, returns null for new entities which were not persisted.
+     *
+     * @return int|null
+     */
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function setUser(?User $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setRate(float $rate): self
+    {
+        $this->rate = $rate;
+
+        return $this;
+    }
+
+    public function getRate(): float
+    {
+        return $this->rate;
+    }
+
+    public function isFixed(): bool
+    {
+        return $this->isFixed;
+    }
+
+    public function setIsFixed(bool $isFixed): self
+    {
+        $this->isFixed = $isFixed;
+
+        return $this;
+    }
+}

src/Entity/RateInterface.php

@@ -0,0 +1,21 @@
+<?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\Entity;
+
+interface RateInterface
+{
+    public function getUser(): ?User;
+
+    public function getRate(): float;
+
+    public function isFixed(): bool;
+
+    public function getScore(): int;
+}

src/Entity/RatesTrait.php

@@ -1,70 +0,0 @@
-<?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\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
-
-trait RatesTrait
-{
-    /**
-     * @var float
-     *
-     * @ORM\Column(name="fixed_rate", type="float", nullable=true)
-     * @Assert\GreaterThanOrEqual(0)
-     */
-    private $fixedRate = null;
-
-    /**
-     * @var float
-     *
-     * @ORM\Column(name="hourly_rate", type="float", nullable=true)
-     * @Assert\GreaterThanOrEqual(0)
-     */
-    private $hourlyRate = null;
-
-    /**
-     * @return float
-     */
-    public function getFixedRate(): ?float
-    {
-        return $this->fixedRate;
-    }
-
-    /**
-     * @param float $fixedRate
-     * @return self
-     */
-    public function setFixedRate(?float $fixedRate)
-    {
-        $this->fixedRate = $fixedRate;
-
-        return $this;
-    }
-
-    /**
-     * @return float
-     */
-    public function getHourlyRate(): ?float
-    {
-        return $this->hourlyRate;
-    }
-
-    /**
-     * @param float $hourlyRate
-     * @return self
-     */
-    public function setHourlyRate(?float $hourlyRate)
-    {
-        $this->hourlyRate = $hourlyRate;
-
-        return $this;
-    }
-}

src/Entity/Timesheet.php

@@ -130,8 +130,21 @@ class Timesheet implements EntityWithMetaFields, ExportItemInterface
      */
     private $rate = 0.00;
 
-    // keep the trait include exactly here, for placing the column at the correct position
-    use RatesTrait;
+    /**
+     * @var float
+     *
+     * @ORM\Column(name="fixed_rate", type="float", nullable=true)
+     * @Assert\GreaterThanOrEqual(0)
+     */
+    private $fixedRate = null;
+
+    /**
+     * @var float
+     *
+     * @ORM\Column(name="hourly_rate", type="float", nullable=true)
+     * @Assert\GreaterThanOrEqual(0)
+     */
+    private $hourlyRate = null;
 
     /**
      * @var bool
@@ -452,6 +465,30 @@ class Timesheet implements EntityWithMetaFields, ExportItemInterface
         return self::CATEGORY_WORK;
     }
 
+    public function getFixedRate(): ?float
+    {
+        return $this->fixedRate;
+    }
+
+    public function setFixedRate(?float $fixedRate): Timesheet
+    {
+        $this->fixedRate = $fixedRate;
+
+        return $this;
+    }
+
+    public function getHourlyRate(): ?float
+    {
+        return $this->hourlyRate;
+    }
+
+    public function setHourlyRate(?float $hourlyRate): Timesheet
+    {
+        $this->hourlyRate = $hourlyRate;
+
+        return $this;
+    }
+
     /**
      * @internal only here for symfony forms
      * @return Collection|MetaTableTypeInterface[]