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

highlight invisible items (#2493)

Browse Source
This commit is contained in:
Kevin Papst
2021-04-07 19:14:33 +02:00
committed by GitHub
parent 68bb01d064
commit cdad5913ca
27 changed files with 218 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Controller/ActivityController.php
View File

@@ -87,7 +87,8 @@ final class ActivityController extends AbstractController
'query' => $query,
'toolbarForm' => $form->createView(),
'metaColumns' => $this->findMetaColumns($query),
'defaultCurrency' => $this->configuration->getCustomerDefaultCurrency()
'defaultCurrency' => $this->configuration->getCustomerDefaultCurrency(),
'now' => $this->getDateTimeFactory()->createDateTime(),
]);
}
@@ -138,6 +139,7 @@ final class ActivityController extends AbstractController
'rates' => $rates,
'team' => $defaultTeam,
'teams' => $teams,
'now' => $this->getDateTimeFactory()->createDateTime(),
]);
}

10
src/Controller/CustomerController.php
View File

@@ -87,6 +87,7 @@ final class CustomerController extends AbstractController
'query' => $query,
'toolbarForm' => $form->createView(),
'metaColumns' => $this->findMetaColumns($query),
'now' => $this->getDateTimeFactory()->createDateTime(),
]);
}
@@ -248,6 +249,9 @@ final class CustomerController extends AbstractController
$query->setPage($page);
$query->setPageSize(5);
$query->addCustomer($customer);
$query->setShowBoth();
$query->addOrderGroup('visible', ProjectQuery::ORDER_DESC);
$query->addOrderGroup('name', ProjectQuery::ORDER_ASC);
/* @var $entries Pagerfanta */
$entries = $projectRepository->getPagerfantaForQuery($query);
@@ -256,6 +260,7 @@ final class CustomerController extends AbstractController
'customer' => $customer,
'projects' => $entries,
'page' => $page,
'now' => $this->getDateTimeFactory()->createDateTime(),
]);
}
@@ -313,8 +318,9 @@ final class CustomerController extends AbstractController
'stats' => $stats,
'team' => $defaultTeam,
'teams' => $teams,
'now' => new \DateTime('now', $timezone),
'rates' => $rates
'customer_now' => new \DateTime('now', $timezone),
'rates' => $rates,
'now' => $this->getDateTimeFactory()->createDateTime(),
]);
}

8
src/Controller/ProjectController.php
View File

@@ -99,6 +99,7 @@ final class ProjectController extends AbstractController
'query' => $query,
'toolbarForm' => $form->createView(),
'metaColumns' => $this->findMetaColumns($query),
'now' => $this->getDateTimeFactory()->createDateTime(),
]);
}
@@ -271,6 +272,9 @@ final class ProjectController extends AbstractController
$query->setPageSize(5);
$query->addProject($project);
$query->setExcludeGlobals(true);
$query->setShowBoth();
$query->addOrderGroup('visible', ActivityQuery::ORDER_DESC);
$query->addOrderGroup('name', ActivityQuery::ORDER_ASC);
/* @var $entries Pagerfanta */
$entries = $activityRepository->getPagerfantaForQuery($query);
@@ -279,6 +283,7 @@ final class ProjectController extends AbstractController
'project' => $project,
'activities' => $entries,
'page' => $page,
'now' => $this->getDateTimeFactory()->createDateTime(),
]);
}
@@ -330,7 +335,8 @@ final class ProjectController extends AbstractController
'stats' => $stats,
'team' => $defaultTeam,
'teams' => $teams,
'rates' => $rates
'rates' => $rates,
'now' => $this->getDateTimeFactory()->createDateTime(),
]);
}