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

Release 2.33.0 (#5438)

Browse Source
This commit is contained in:
Kevin Papst
2025-04-22 20:43:22 +02:00
committed by GitHub
parent a70c803158
commit e663cc2b02
58 changed files with 1404 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Activity/ActivityService.php
View File

@@ -120,12 +120,23 @@ class ActivityService
// we cannot use max(number) because a varchar column returns unexpected results
$start = $this->repository->countActivity();
$i = 0;
$createDate = new \DateTimeImmutable();
do {
$start++;
$numberGenerator = new NumberGenerator($format, function (string $originalFormat, string $format, int $increaseBy) use ($start): string|int {
$numberGenerator = new NumberGenerator($format, function (string $originalFormat, string $format, int $increaseBy) use ($start, $createDate): string|int {
return match ($format) {
'Y' => $createDate->format('Y'),
'y' => $createDate->format('y'),
'M' => $createDate->format('m'),
'm' => $createDate->format('n'),
'D' => $createDate->format('d'),
'd' => $createDate->format('j'),
'YY' => (int) $createDate->format('Y') + $increaseBy,
'yy' => (int) $createDate->format('y') + $increaseBy,
'MM' => (int) $createDate->format('m') + $increaseBy,
'DD' => (int) $createDate->format('d') + $increaseBy,
'ac' => $start + $increaseBy,
default => $originalFormat,
};