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

change isWeekend() handling to use work-hour configuration (#4261)

Browse Source
This commit is contained in:
Bruno Paré-Simard
2023-08-31 07:38:58 -04:00
committed by GitHub
parent 18d953e79b
commit 452de88e18
5 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Twig/LocaleFormatExtensions.php
View File

@@ -26,7 +26,6 @@ use Twig\TwigTest;
final class LocaleFormatExtensions extends AbstractExtension implements LocaleAwareInterface
{
private ?bool $fdowSunday = null;
private ?LocaleFormatter $formatter = null;
private ?string $locale = null;
@@ -116,29 +115,21 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
return $this->locale;
}
public function isWeekend(\DateTimeInterface|string|null $dateTime): bool
public function isWeekend(\DateTimeInterface|string|null $dateTime, ?User $user = null): bool
{
if (!$dateTime instanceof \DateTimeInterface) {
return false;
}
$day = (int) $dateTime->format('w');
$day = (int) $dateTime->format('N');
if ($this->fdowSunday === null) {
/** @var User|null $user */
$user = $this->security->getUser();
if ($user !== null) {
$this->fdowSunday = $user->isFirstDayOfWeekSunday();
} else {
$this->fdowSunday = false;
}
/** @var User|null $tmp */
$tmp = $user ?? $this->security->getUser();
if ($tmp !== null && $tmp->hasWorkHourConfiguration()) {
return !$tmp->isWorkDay($dateTime);
}
if ($this->fdowSunday) {
return ($day === 5 || $day === 6);
}
return ($day === 0 || $day === 6);
return ($day === 6 || $day === 7);
}
public function dateShort(\DateTimeInterface|string|null $date): string