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

fix timezone for timesheets created by other users (#1509)

Browse Source
This commit is contained in:
Kevin Papst
2020-11-13 17:46:32 +01:00
committed by GitHub
parent 7503899a9b
commit 288fc5dd08
3 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Timesheet/TimesheetService.php
View File

@@ -148,6 +148,7 @@ final class TimesheetService
$this->repository->begin();
try {
$this->validateTimesheet($timesheet);
$this->fixTimezone($timesheet);
$this->dispatcher->dispatch(new TimesheetCreatePreEvent($timesheet));
$this->repository->save($timesheet);
@@ -187,6 +188,8 @@ final class TimesheetService
}
*/
$this->fixTimezone($timesheet);
$this->dispatcher->dispatch(new TimesheetUpdatePreEvent($timesheet));
$this->repository->save($timesheet);
$this->dispatcher->dispatch(new TimesheetUpdatePostEvent($timesheet));
@@ -263,6 +266,21 @@ final class TimesheetService
}
}
/**
* Makes sure, that the timesheet record has the timezone of the user.
*
* This fixes #1442 and prevents a wrong time if a teamlead edits the
* timesheet for an employee living in another timezone.
*
* @param Timesheet $timesheet
*/
private function fixTimezone(Timesheet $timesheet)
{
if (null !== ($timezone = $timesheet->getTimezone()) && $timezone !== $timesheet->getUser()->getTimezone()) {
$timesheet->setTimezone($timesheet->getUser()->getTimezone());
}
}
/**
* Stops active records if more than allowed are running for the timesheet user.
*