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

added team filter in timesheet search forms (#3590)

Browse Source 
* added team filter in export and invoice search form
* added teams select to timesheet filter
* added team select to report filter
* hide user and team filter if count < 2
This commit is contained in:
Kevin Papst
2022-10-21 16:14:39 +02:00
committed by GitHub
parent 2022fa54d3
commit 14f4530de0
17 changed files with 235 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Controller/Reporting/ReportUsersWeekController.php
View File

@@ -63,10 +63,6 @@ final class ReportUsersWeekController extends AbstractController
$currentUser = $this->getUser();
$dateTimeFactory = $this->getDateTimeFactory();
$query = new UserQuery();
$query->setCurrentUser($currentUser);
$allUsers = $userRepository->getUsersForQuery($query);
$values = new WeeklyUserList();
$values->setDate($dateTimeFactory->getStartOfWeek());
@@ -77,10 +73,21 @@ final class ReportUsersWeekController extends AbstractController
$form->submit($request->query->all(), false);
if ($form->isSubmitted() && !$form->isValid()) {
$values->setDate($dateTimeFactory->getStartOfWeek());
$query = new UserQuery();
$query->setCurrentUser($currentUser);
if ($form->isSubmitted()) {
if (!$form->isValid()) {
$values->setDate($dateTimeFactory->getStartOfWeek());
} else {
if ($values->getTeam() !== null) {
$query->setSearchTeams([$values->getTeam()]);
}
}
}
$allUsers = $userRepository->getUsersForQuery($query);
if ($values->getDate() === null) {
$values->setDate($dateTimeFactory->getStartOfWeek());
}