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

fixed restart timesheet with tags with active record (#1622)

Browse Source
This commit is contained in:
Kevin Papst
2020-04-07 17:30:39 +02:00
committed by GitHub
parent 9e1e1a7a96
commit 5e7b0c7826
5 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Repository/TimesheetRepository.php
View File

@@ -91,6 +91,25 @@ class TimesheetRepository extends EntityRepository
}
}
public function add(Timesheet $timesheet, int $maxRunningEntries)
{
$em = $this->getEntityManager();
$em->beginTransaction();
try {
if (null === $timesheet->getEnd()) {
$this->stopActiveEntries($timesheet->getUser(), $maxRunningEntries, false);
}
$em->persist($timesheet);
$em->flush();
$em->commit();
} catch (\Exception $ex) {
$em->rollback();
throw $ex;
}
}
/**
* @param Timesheet $timesheet
* @throws \Doctrine\ORM\ORMException
@@ -126,12 +145,13 @@ class TimesheetRepository extends EntityRepository
/**
* @param Timesheet $entry
* @param bool $flush
* @return bool
* @throws RepositoryException
* @throws \Doctrine\ORM\ORMException
* @throws \Doctrine\ORM\OptimisticLockException
*/
public function stopRecording(Timesheet $entry)
public function stopRecording(Timesheet $entry, bool $flush = true)
{
if (null !== $entry->getEnd()) {
throw new RepositoryException('Timesheet entry already stopped');
@@ -146,7 +166,9 @@ class TimesheetRepository extends EntityRepository
$entityManager = $this->getEntityManager();
$entityManager->persist($entry);
$entityManager->flush();
if ($flush) {
$entityManager->flush();
}
return true;
}
@@ -486,12 +508,13 @@ class TimesheetRepository extends EntityRepository
/**
* @param User $user
* @param int $hardLimit
* @param bool $flush
* @return int
* @throws RepositoryException
* @throws \Doctrine\ORM\ORMException
* @throws \Doctrine\ORM\OptimisticLockException
*/
public function stopActiveEntries(User $user, int $hardLimit)
public function stopActiveEntries(User $user, int $hardLimit, bool $flush = true)
{
$counter = 0;
$activeEntries = $this->getActiveEntries($user);
@@ -509,7 +532,7 @@ class TimesheetRepository extends EntityRepository
throw new \Exception('timesheet.start.exceeded_limit');
}
$this->stopRecording($activeEntry);
$this->stopRecording($activeEntry, $flush);
$counter++;
}
$i++;