added team permissions (#996)

src/Repository/Query/BaseQuery.php

@@ -9,6 +9,9 @@
 
 namespace App\Repository\Query;
 
+use App\Entity\Team;
+use App\Entity\User;
+
 /**
  * Base class for advanced Repository queries.
  */
@@ -44,6 +47,45 @@ class BaseQuery
      * @var string
      */
     private $resultType = self::RESULT_TYPE_PAGER;
+    /**
+     * @var User
+     */
+    private $user;
+    /**
+     * @var Team[]
+     */
+    private $teams = [];
+
+    public function addTeam(Team $team): self
+    {
+        $this->teams[$team->getId()] = $team;
+
+        return $this;
+    }
+
+    /**
+     * @return Team[]
+     */
+    public function getTeams(): array
+    {
+        return array_values($this->teams);
+    }
+
+    public function getCurrentUser(): ?User
+    {
+        return $this->user;
+    }
+
+    /**
+     * @param User $user
+     * @return $this
+     */
+    public function setCurrentUser(User $user)
+    {
+        $this->user = $user;
+
+        return $this;
+    }
 
     /**
      * @return int

src/Repository/Query/CustomerFormTypeQuery.php

@@ -10,6 +10,8 @@
 namespace App\Repository\Query;
 
 use App\Entity\Customer;
+use App\Entity\Team;
+use App\Entity\User;
 
 /**
  * Can be used for advanced queries with the: CustomerRepository
@@ -24,6 +26,14 @@ final class CustomerFormTypeQuery
      * @var Customer|null
      */
     private $customerToIgnore;
+    /**
+     * @var User
+     */
+    private $user;
+    /**
+     * @var array<Team>
+     */
+    private $teams = [];
 
     /**
      * @param Customer|int|null $customer
@@ -33,6 +43,33 @@ final class CustomerFormTypeQuery
         $this->customer = $customer;
     }
 
+    public function addTeam(Team $team): CustomerFormTypeQuery
+    {
+        $this->teams[$team->getId()] = $team;
+
+        return $this;
+    }
+
+    /**
+     * @return Team[]
+     */
+    public function getTeams(): array
+    {
+        return array_values($this->teams);
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(User $user): CustomerFormTypeQuery
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
     /**
      * @return Customer|int|null
      */

src/Repository/Query/ProjectFormTypeQuery.php

@@ -11,6 +11,8 @@ namespace App\Repository\Query;
 
 use App\Entity\Customer;
 use App\Entity\Project;
+use App\Entity\Team;
+use App\Entity\User;
 
 final class ProjectFormTypeQuery
 {
@@ -26,6 +28,14 @@ final class ProjectFormTypeQuery
      * @var Project|null
      */
     private $projectToIgnore;
+    /**
+     * @var User
+     */
+    private $user;
+    /**
+     * @var array<Team>
+     */
+    private $teams = [];
 
     /**
      * @param Project|int|null $project
@@ -37,6 +47,33 @@ final class ProjectFormTypeQuery
         $this->customer = $customer;
     }
 
+    public function addTeam(Team $team): ProjectFormTypeQuery
+    {
+        $this->teams[$team->getId()] = $team;
+
+        return $this;
+    }
+
+    /**
+     * @return Team[]
+     */
+    public function getTeams(): array
+    {
+        return array_values($this->teams);
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(User $user): ProjectFormTypeQuery
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
     /**
      * @return Customer|int|null
      */

src/Repository/Query/TagQuery.php

@@ -11,4 +11,8 @@ namespace App\Repository\Query;
 
 class TagQuery extends BaseQuery
 {
+    public function __construct()
+    {
+        $this->setOrderBy('name');
+    }
 }

src/Repository/Query/TeamQuery.php

@@ -0,0 +1,18 @@
+<?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\Repository\Query;
+
+class TeamQuery extends BaseQuery
+{
+    public function __construct()
+    {
+        $this->setOrderBy('name');
+    }
+}

src/Repository/Query/TimesheetQuery.php

@@ -28,7 +28,7 @@ class TimesheetQuery extends ActivityQuery
     /**
      * @var User|null
      */
-    protected $user;
+    protected $timesheetUser;
     /**
      * @var Activity|null
      */
@@ -63,7 +63,7 @@ class TimesheetQuery extends ActivityQuery
      */
     public function getUser()
     {
-        return $this->user;
+        return $this->timesheetUser;
     }
 
     /**
@@ -72,7 +72,7 @@ class TimesheetQuery extends ActivityQuery
      */
     public function setUser($user = null)
     {
-        $this->user = $user;
+        $this->timesheetUser = $user;
 
         return $this;
     }
@@ -256,7 +256,7 @@ class TimesheetQuery extends ActivityQuery
             return true;
         }
 
-        if ($this->user !== null) {
+        if ($this->timesheetUser !== null) {
             return true;
         }
 

src/Repository/Query/UserFormTypeQuery.php

@@ -0,0 +1,55 @@
+<?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\Repository\Query;
+
+use App\Entity\Team;
+use App\Entity\User;
+
+/**
+ * Can be used for pre-filling form types with the: UserRepository
+ */
+final class UserFormTypeQuery
+{
+    /**
+     * @var User
+     */
+    private $user;
+    /**
+     * @var array<Team>
+     */
+    private $teams = [];
+
+    public function addTeam(Team $team): UserFormTypeQuery
+    {
+        $this->teams[$team->getId()] = $team;
+
+        return $this;
+    }
+
+    /**
+     * @return Team[]
+     */
+    public function getTeams(): array
+    {
+        return array_values($this->teams);
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(User $user): UserFormTypeQuery
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+}