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

Release 2.15 (#4749)

Browse Source
This commit is contained in:
Kevin Papst
2024-04-12 19:03:09 +02:00
committed by GitHub
parent b76a5d5c35
commit 7219b3f421
56 changed files with 441 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Invoice/Hydrator/InvoiceItemDefaultHydrator.php
View File

@@ -15,6 +15,8 @@ use App\Invoice\InvoiceModel;
final class InvoiceItemDefaultHydrator implements InvoiceItemHydrator
{
private const DATE_PROCESS_FORMAT = 'Y-m-d h:i:s';
private InvoiceModel $model;
public function setInvoiceModel(InvoiceModel $model): void
@@ -75,17 +77,24 @@ final class InvoiceItemDefaultHydrator implements InvoiceItemHydrator
'entry.duration_format' => $formatter->getFormattedDuration($item->getDuration()),
'entry.duration_decimal' => $formatter->getFormattedDecimalDuration($item->getDuration()),
'entry.duration_minutes' => (int) ($item->getDuration() / 60),
'entry.begin' => $formatter->getFormattedDateTime($begin),
'entry.begin_time' => $formatter->getFormattedTime($begin),
'entry.begin_timestamp' => $begin->getTimestamp(),
'entry.end' => $formatter->getFormattedDateTime($end),
'entry.end_time' => $formatter->getFormattedTime($end),
'entry.end_timestamp' => $end->getTimestamp(),
'entry.date' => $formatter->getFormattedDateTime($begin),
'entry.week' => \intval($begin->format('W')),
'entry.weekyear' => $begin->format('o'),
];
if ($begin !== null) {
$values['entry.begin'] = $formatter->getFormattedDateTime($begin);
$values['entry.begin_time'] = $formatter->getFormattedTime($begin);
$values['entry.begin_timestamp'] = $begin->getTimestamp();
$values['entry.date'] = $formatter->getFormattedDateTime($begin);
$values['entry.date_process'] = $begin->format(self::DATE_PROCESS_FORMAT); // since 2.14
$values['entry.week'] = \intval($begin->format('W'));
$values['entry.weekyear'] = $begin->format('o');
}
if ($end !== null) {
$values['entry.end'] = $formatter->getFormattedDateTime($end);
$values['entry.end_time'] = $formatter->getFormattedTime($end);
$values['entry.end_timestamp'] = $end->getTimestamp();
}
if (null !== $user) {
$values = array_merge($values, [
'entry.user_id' => $user->getId(),