bump version 1.19.1 (#3229)

This commit is contained in:
Kevin Papst
2022-03-30 22:23:12 +02:00
committed by GitHub
parent eb2664ac79
commit 3a7e3b2168
4 changed files with 87 additions and 106 deletions

View File

@@ -17,11 +17,11 @@ class Constants
/**
* The current release version
*/
public const VERSION = '1.19';
public const VERSION = '1.19.1';
/**
* The current release: major * 10000 + minor * 100 + patch
*/
public const VERSION_ID = 11900;
public const VERSION_ID = 11901;
/**
* The current release status, either "stable" or "dev"
*/

View File

@@ -1196,6 +1196,11 @@ class TimesheetRepository extends EntityRepository
{
$qb = $this->getEntityManager()->createQueryBuilder();
$qb
->select($qb->expr()->count('t.id'))
->from(Timesheet::class, 't')
;
$or = $qb->expr()->orX(
$qb->expr()->between(':begin', 't.begin', 't.end')
);
@@ -1216,8 +1221,7 @@ class TimesheetRepository extends EntityRepository
$begin = clone $timesheet->getBegin();
$begin->add(new DateInterval('PT1S'));
$qb->select($qb->expr()->count('t.id'))
->from(Timesheet::class, 't')
$qb
->andWhere($qb->expr()->eq('t.user', ':user'))
->andWhere($qb->expr()->isNotNull('t.end'))
->andWhere($or)