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

Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

Browse Source
This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,8 @@ use App\Controller\AbstractController;
use App\Export\Spreadsheet\Writer\BinaryFileResponseWriter;
use App\Export\Spreadsheet\Writer\XlsxWriter;
use App\Model\DailyStatistic;
use App\Reporting\WeeklyUserList;
use App\Reporting\WeeklyUserListForm;
use App\Reporting\WeeklyUserList\WeeklyUserList;
use App\Reporting\WeeklyUserList\WeeklyUserListForm;
use App\Repository\Query\UserQuery;
use App\Repository\UserRepository;
use App\Timesheet\TimesheetStatisticService;
@@ -24,15 +24,11 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
/**
* @Route(path="/reporting/users")
* @Security("is_granted('view_reporting') and is_granted('view_other_reporting') and is_granted('view_other_timesheet')")
*/
#[Route(path: '/reporting/users')]
#[Security("is_granted('report:other')")]
final class ReportUsersWeekController extends AbstractController
{
/**
* @Route(path="/week", name="report_weekly_users", methods={"GET","POST"})
*/
#[Route(path: '/week', name: 'report_weekly_users', methods: ['GET', 'POST'])]
public function report(Request $request, TimesheetStatisticService $statisticService, UserRepository $userRepository): Response
{
return $this->render(
@@ -41,9 +37,7 @@ final class ReportUsersWeekController extends AbstractController
);
}
/**
* @Route(path="/week_export", name="report_weekly_users_export", methods={"GET","POST"})
*/
#[Route(path: '/week_export', name: 'report_weekly_users_export', methods: ['GET', 'POST'])]
public function export(Request $request, TimesheetStatisticService $statisticService, UserRepository $userRepository): Response
{
$data = $this->getData($request, $statisticService, $userRepository);
@@ -66,7 +60,7 @@ final class ReportUsersWeekController extends AbstractController
$values = new WeeklyUserList();
$values->setDate($dateTimeFactory->getStartOfWeek());
$form = $this->createForm(WeeklyUserListForm::class, $values, [
$form = $this->createFormForGetRequest(WeeklyUserListForm::class, $values, [
'timezone' => $dateTimeFactory->getTimezone()->getName(),
'start_date' => $values->getDate(),
]);
@@ -74,6 +68,7 @@ final class ReportUsersWeekController extends AbstractController
$form->submit($request->query->all(), false);
$query = new UserQuery();
$query->setSystemAccount(false);
$query->setCurrentUser($currentUser);
if ($form->isSubmitted()) {