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

toolbar dropdown and visibility improvements (#933)

Browse Source
This commit is contained in:
Kevin Papst
2019-07-09 16:34:11 +02:00
committed by GitHub
parent b833e1ce27
commit c33a87a07c
74 changed files with 1317 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Controller/TimesheetAbstractController.php
View File

@@ -87,10 +87,10 @@ abstract class TimesheetAbstractController extends AbstractController
$query->setPage($page);
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var TimesheetQuery $query */
$query = $form->getData();
$form->setData($query);
$form->submit($request->query->all(), false);
if ($form->isValid()) {
if (null !== $query->getBegin()) {
$query->getBegin()->setTime(0, 0, 0);
}
@@ -99,10 +99,6 @@ abstract class TimesheetAbstractController extends AbstractController
}
}
if (!$this->includeUserInForms()) {
$query->setUser($this->getUser());
}
$tags = $query->getTags(true);
if (!empty($tags)) {
/** @var TagRepository $tagRepo */
@@ -114,13 +110,19 @@ abstract class TimesheetAbstractController extends AbstractController
);
}
$dirtyQuery = $query->isDirty();
if (!$this->includeUserInForms()) {
$query->setUser($this->getUser());
}
$pager = $this->getRepository()->getPagerfantaForQuery($query);
return $this->render($renderTemplate, [
'entries' => $pager,
'page' => $query->getPage(),
'query' => $query,
'showFilter' => $form->isSubmitted(),
'showFilter' => $dirtyQuery,
'toolbarForm' => $form->createView(),
'showSummary' => $this->includeSummary(),
'showStartEndTime' => $this->canSeeStartEndTime()
@@ -235,11 +237,8 @@ abstract class TimesheetAbstractController extends AbstractController
$query = new TimesheetQuery();
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var TimesheetQuery $query */
$query = $form->getData();
}
$form->setData($query);
$form->submit($request->query->all(), false);
// by default the current month is exported, but it can be overwritten
// this should not be removed, otherwise we would export EVERY available record in the admin section