jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added global activities (#259)

Browse Source
This commit is contained in:
Kevin Papst
2018-11-06 23:10:34 +01:00
committed by GitHub
parent c66dfbc653
commit db7de3aac1
70 changed files with 1168 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/Repository/ActivityRepository.php
View File

@@ -10,6 +10,7 @@
namespace App\Repository;
use App\Entity\Activity;
use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Model\ActivityStatistic;
@@ -35,7 +36,7 @@ class ActivityRepository extends AbstractRepository
/**
* @param User|null $user
* @param \DateTime|null $startFrom
* @return mixed
* @return Timesheet[]
*/
public function getRecentActivities(User $user = null, \DateTime $startFrom = null)
{
@@ -45,7 +46,7 @@ class ActivityRepository extends AbstractRepository
->distinct()
->from(Timesheet::class, 't')
->join('t.activity', 'a')
->join('a.project', 'p')
->join('t.project', 'p')
->join('p.customer', 'c')
->andWhere($qb->expr()->isNotNull('t.end'))
->andWhere('a.visible = 1')
@@ -66,15 +67,7 @@ class ActivityRepository extends AbstractRepository
->setParameter('begin', $startFrom);
}
$results = $qb->getQuery()->getResult();
$activities = [];
/* @var Timesheet $entry */
foreach ($results as $entry) {
$activities[] = $entry->getActivity();
}
return $activities;
return $qb->getQuery()->getResult();
}
/**
@@ -118,14 +111,21 @@ class ActivityRepository extends AbstractRepository
/**
* Returns a query builder that is used for ActivityType and your own 'query_builder' option.
*
* @param Activity|null $entity
* @param Activity|string|null $activity
* @param Project|string|null $project
* @return \Doctrine\ORM\QueryBuilder
*/
public function builderForEntityType(Activity $entity = null)
public function builderForEntityType($activity = null, $project = null)
{
$query = new ActivityQuery();
$query->setHiddenEntity($entity);
$query->setHiddenEntity($activity);
$query->setResultType(ActivityQuery::RESULT_TYPE_QUERYBUILDER);
$query->setProject($project);
$query->setOrderGlobalsFirst(true);
if (null === $activity && $project === null) {
$query->setGlobalsOnly(true);
}
return $this->findByQuery($query);
}
@@ -140,34 +140,68 @@ class ActivityRepository extends AbstractRepository
$qb->select('a', 'p', 'c')
->from(Activity::class, 'a')
->join('a.project', 'p')
->join('p.customer', 'c')
->leftJoin('a.project', 'p')
->leftJoin('p.customer', 'c')
->orderBy('a.' . $query->getOrderBy(), $query->getOrder());
$where = $qb->expr()->andX();
if (ActivityQuery::SHOW_VISIBLE == $query->getVisibility()) {
$where->add('a.visible = :visible');
if (!$query->isExclusiveVisibility()) {
$qb->andWhere('c.visible = 1');
$qb->andWhere('p.visible = 1');
}
$qb->andWhere('a.visible = 1');
/** @var Activity $entity */
$entity = $query->getHiddenEntity();
if (null !== $entity) {
$qb->orWhere('a.id = :activity')->setParameter('activity', $entity);
$where->add(
$qb->expr()->orX(
$qb->expr()->eq('c.visible', ':visible'),
$qb->expr()->isNull('c.visible')
)
);
$where->add(
$qb->expr()->orX(
$qb->expr()->eq('p.visible', ':visible'),
$qb->expr()->isNull('p.visible')
)
);
}
$qb->setParameter('visible', 1);
} elseif (ActivityQuery::SHOW_HIDDEN == $query->getVisibility()) {
$qb->andWhere('a.visible = 0');
$where->add('a.visible = :visible');
$qb->setParameter('visible', 0);
}
if (null !== $query->getProject()) {
$qb->andWhere('a.project = :project')
->setParameter('project', $query->getProject());
if ($query->isGlobalsOnly()) {
$where->add($qb->expr()->isNull('a.project'));
} elseif (null !== $query->getProject()) {
$where->add(
$qb->expr()->orX(
$qb->expr()->eq('a.project', ':project'),
$qb->expr()->isNull('a.project')
)
);
$qb->setParameter('project', $query->getProject());
} elseif (null !== $query->getCustomer()) {
$qb->andWhere('p.customer = :customer')
->setParameter('customer', $query->getCustomer());
$where->add('p.customer = :customer');
$qb->setParameter('customer', $query->getCustomer());
}
$or = $qb->expr()->orX();
// this must always be the last part before the or
$or->add($where);
// this must always be the last part of the query
/** @var Activity $entity */
$entity = $query->getHiddenEntity();
if (null !== $entity) {
$or->add($qb->expr()->eq('a.id', ':activity'));
$qb->setParameter('activity', $entity);
}
if ($query->isOrderGlobalsFirst()) {
$qb->orderBy('a.project', 'ASC');
}
$qb->andWhere($or);
return $this->getBaseQueryResult($qb, $query);
}
}

2
src/Repository/CustomerRepository.php
View File

@@ -60,7 +60,7 @@ class CustomerRepository extends AbstractRepository
->join(Project::class, 'p')
->join(Customer::class, 'c')
->andWhere('t.activity = a.id')
->andWhere('a.project = p.id')
->andWhere('t.project = p.id')
->andWhere('p.customer = c.id')
->andWhere('c.id = :customer')
;

11
src/Repository/ProjectRepository.php
View File

@@ -10,6 +10,7 @@
namespace App\Repository;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Timesheet;
use App\Model\ProjectStatistic;
@@ -41,7 +42,7 @@ class ProjectRepository extends AbstractRepository
}
/**
* Retrieves statistics for one activity.
* Retrieves statistics for one project.
*
* @param Project $project
* @return ProjectStatistic
@@ -55,7 +56,7 @@ class ProjectRepository extends AbstractRepository
->addSelect('COUNT(DISTINCT(a.id)) as activityAmount')
->from(Activity::class, 'a')
->join(Timesheet::class, 't')
->where('a.project = :project')
->where('t.project = :project')
->andWhere('t.activity = a.id')
;
@@ -79,12 +80,14 @@ class ProjectRepository extends AbstractRepository
* Returns a query builder that is used for ProjectType and your own 'query_builder' option.
*
* @param Project|null $entity
* @return \Doctrine\ORM\QueryBuilder
* @param Customer|null $customer
* @return array|QueryBuilder|Pagerfanta
*/
public function builderForEntityType(Project $entity = null)
public function builderForEntityType(Project $entity = null, Customer $customer = null)
{
$query = new ProjectQuery();
$query->setHiddenEntity($entity);
$query->setCustomer($customer);
$query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER);
return $this->findByQuery($query);

54
src/Repository/Query/ActivityQuery.php
View File

@@ -17,12 +17,58 @@ use App\Entity\Project;
class ActivityQuery extends ProjectQuery
{
/**
* @var Project
* @var Project|int
*/
protected $project;
/**
* @var bool
*/
protected $orderGlobalsFirst = false;
/**
* @var bool
*/
protected $globalsOnly = false;
/**
* @return Project
* @return bool
*/
public function isOrderGlobalsFirst(): bool
{
return $this->orderGlobalsFirst;
}
/**
* @param bool $orderGlobalsFirst
* @return ActivityQuery
*/
public function setOrderGlobalsFirst(bool $orderGlobalsFirst)
{
$this->orderGlobalsFirst = $orderGlobalsFirst;
return $this;
}
/**
* @return bool
*/
public function isGlobalsOnly(): bool
{
return $this->globalsOnly;
}
/**
* @param bool $globalsOnly
* @return ActivityQuery
*/
public function setGlobalsOnly(bool $globalsOnly)
{
$this->globalsOnly = $globalsOnly;
return $this;
}
/**
* @return Project|int
*/
public function getProject()
{
@@ -30,10 +76,10 @@ class ActivityQuery extends ProjectQuery
}
/**
* @param Project $project
* @param Project|int $project
* @return $this
*/
public function setProject(Project $project = null)
public function setProject($project = null)
{
$this->project = $project;

4
src/Repository/Query/BaseQuery.php
View File

@@ -140,7 +140,7 @@ class BaseQuery
}
/**
* @param string $resultType
* @param $resultType
* @return $this
* @throws \InvalidArgumentException
*/
@@ -166,7 +166,7 @@ class BaseQuery
}
/**
* @param object $hiddenEntity
* @param object|string $hiddenEntity
* @return BaseQuery
*/
public function setHiddenEntity($hiddenEntity)

8
src/Repository/Query/ProjectQuery.php
View File

@@ -17,12 +17,12 @@ use App\Entity\Customer;
class ProjectQuery extends VisibilityQuery
{
/**
* @var Customer
* @var Customer|int
*/
protected $customer;
/**
* @return Customer
* @return Customer|int
*/
public function getCustomer()
{
@@ -30,10 +30,10 @@ class ProjectQuery extends VisibilityQuery
}
/**
* @param Customer $customer
* @param Customer|int $customer
* @return $this
*/
public function setCustomer(Customer $customer = null)
public function setCustomer($customer = null)
{
$this->customer = $customer;

45
src/Repository/TimesheetRepository.php
View File

@@ -9,7 +9,6 @@
namespace App\Repository;
use App\Entity\Activity;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Model\Statistic\Month;
@@ -54,28 +53,6 @@ class TimesheetRepository extends AbstractRepository
return true;
}
/**
* @param User $user
* @param Activity $activity
* @return Timesheet
* @throws \Doctrine\ORM\ORMException
* @throws \Doctrine\ORM\OptimisticLockException
*/
public function startRecording(User $user, Activity $activity)
{
$entry = new Timesheet();
$entry
->setBegin(new DateTime())
->setUser($user)
->setActivity($activity);
$entityManager = $this->getEntityManager();
$entityManager->persist($entry);
$entityManager->flush();
return $entry;
}
/**
* @param string $type
* @param DateTime|null $begin
@@ -223,17 +200,17 @@ class TimesheetRepository extends AbstractRepository
$qb->andWhere($qb->expr()->isNotNull('t.end'));
}
if (null !== $user) {
$qb->andWhere('t.user = :user')
->setParameter('user', $user);
}
$qb
->orderBy('year', 'DESC')
->addOrderBy('month', 'ASC')
->groupBy('year')
->addGroupBy('month');
if (null !== $user) {
$qb->andWhere('t.user = :user')
->setParameter('user', $user);
}
$years = [];
foreach ($qb->getQuery()->execute() as $statRow) {
$curYear = $statRow['year'];
@@ -267,7 +244,7 @@ class TimesheetRepository extends AbstractRepository
$qb->select('t', 'a', 'p', 'c')
->from(Timesheet::class, 't')
->join('t.activity', 'a')
->join('a.project', 'p')
->join('t.project', 'p')
->join('p.customer', 'c')
->where($qb->expr()->gt('t.begin', '0'))
->andWhere($qb->expr()->isNull('t.end'))
@@ -293,10 +270,10 @@ class TimesheetRepository extends AbstractRepository
$qb->select('t', 'a', 'p', 'c', 'u')
->from(Timesheet::class, 't')
->join('t.activity', 'a')
->join('t.user', 'u')
->join('a.project', 'p')
->join('p.customer', 'c')
->leftJoin('t.activity', 'a')
->leftJoin('t.user', 'u')
->leftJoin('t.project', 'p')
->leftJoin('p.customer', 'c')
->orderBy('t.' . $query->getOrderBy(), $query->getOrder());
if (null !== $query->getUser()) {
@@ -323,7 +300,7 @@ class TimesheetRepository extends AbstractRepository
$qb->andWhere('t.activity = :activity')
->setParameter('activity', $query->getActivity());
} elseif (null !== $query->getProject()) {
$qb->andWhere('a.project = :project')
$qb->andWhere('t.project = :project')
->setParameter('project', $query->getProject());
} elseif (null !== $query->getCustomer()) {
$qb->andWhere('p.customer = :customer')