kalugin66/kimai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 2.0.28 (#4172)

Browse Source 
See https://github.com/kimai/kimai/pull/4172
This commit is contained in:
Kevin Papst
2023-07-09 15:27:27 +02:00
committed by GitHub
parent 651f812da8
commit 385753fbc3
27 changed files with 182 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/WorkingTime/WorkingTimeService.php
View File

@@ -46,7 +46,7 @@ final class WorkingTimeService
return $this->workingTimeRepository->getLatestApproval($user);
}
public function getYear(User $user, \DateTimeInterface $yearDate): Year
public function getYear(User $user, \DateTimeInterface $yearDate, \DateTimeInterface $until): Year
{
$yearTimes = $this->workingTimeRepository->findForYear($user, $yearDate);
$existing = [];
@@ -57,6 +57,7 @@ final class WorkingTimeService
$year = new Year(\DateTimeImmutable::createFromInterface($yearDate), $user);
$stats = null;
$firstDay = $user->getWorkStartingDay();
foreach ($year->getMonths() as $month) {
foreach ($month->getDays() as $day) {
@@ -70,8 +71,12 @@ final class WorkingTimeService
$stats = $this->getYearStatistics($yearDate, $user);
}
$result = new WorkingTime($user, $day->getDay());
$result->setExpectedTime($user->getWorkHoursForDay($day->getDay()));
$dayDate = $day->getDay();
$result = new WorkingTime($user, $dayDate);
if ($firstDay === null || $firstDay <= $dayDate) {
$result->setExpectedTime($user->getWorkHoursForDay($dayDate));
}
if (\array_key_exists($key, $stats)) {
$result->setActualTime($stats[$key]);
@@ -81,16 +86,16 @@ final class WorkingTimeService
}
}
$event = new WorkingTimeYearEvent($year);
$event = new WorkingTimeYearEvent($year, $until);
$this->eventDispatcher->dispatch($event);
return $year;
}
public function getMonth(User $user, \DateTimeInterface $monthDate): Month
public function getMonth(User $user, \DateTimeInterface $monthDate, \DateTimeInterface $until): Month
{
// uses the year, because that triggers the required events to collect all different working times
$year = $this->getYear($user, $monthDate);
$year = $this->getYear($user, $monthDate, $until);
return $year->getMonth($monthDate);
}