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

always query timesheets by begin date (#740)

Browse Source
This commit is contained in:
Kevin Papst
2019-04-30 14:31:10 +02:00
committed by GitHub
parent cdb112df05
commit 62b091c77b
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controller/ExportController.php
View File

@@ -93,6 +93,7 @@ class ExportController extends AbstractController
$entries = $this->getEntries($query); $entries = $this->getEntries($query);
return $this->render('export/index.html.twig', [ return $this->render('export/index.html.twig', [
'query' => $query,
'entries' => $entries, 'entries' => $entries,
'form' => $form->createView(), 'form' => $form->createView(),
'renderer' => $this->export->getRenderer(), 'renderer' => $this->export->getRenderer(),

9
src/Repository/TimesheetRepository.php
View File

@@ -352,16 +352,11 @@ class TimesheetRepository extends AbstractRepository
if (TimesheetQuery::STATE_RUNNING == $query->getState()) { if (TimesheetQuery::STATE_RUNNING == $query->getState()) {
$qb->andWhere($qb->expr()->isNull('t.end')); $qb->andWhere($qb->expr()->isNull('t.end'));
} } elseif (TimesheetQuery::STATE_STOPPED == $query->getState()) {
if (TimesheetQuery::STATE_STOPPED == $query->getState()) {
$qb->andWhere($qb->expr()->isNotNull('t.end')); $qb->andWhere($qb->expr()->isNotNull('t.end'));
}
if (null !== $query->getEnd()) { if (null !== $query->getEnd()) {
$qb->andWhere('t.end <= :end')
->setParameter('end', $query->getEnd());
}
} elseif (null !== $query->getEnd()) {
$qb->andWhere('t.begin <= :end') $qb->andWhere('t.begin <= :end')
->setParameter('end', $query->getEnd()); ->setParameter('end', $query->getEnd());
} }