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

prepare break time field (#5366)

Browse Source
This commit is contained in:
Kevin Papst
2025-02-20 14:46:20 +01:00
committed by GitHub
parent b341358d0a
commit 8a8d0503f7
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Form/TimesheetEditForm.php
View File

@@ -310,6 +310,10 @@ class TimesheetEditForm extends AbstractType
$builder->add('duration', DurationType::class, $durationOptions); $builder->add('duration', DurationType::class, $durationOptions);
if ($this->systemConfiguration->isBreakTimeEnabled()) {
$builder->add('break', DurationType::class, ['label' => 'break', 'required' => false]);
}
$builder->addEventListener( $builder->addEventListener(
FormEvents::POST_SET_DATA, FormEvents::POST_SET_DATA,
function (FormEvent $event) { function (FormEvent $event) {
@@ -338,7 +342,7 @@ class TimesheetEditForm extends AbstractType
$duration = $timesheet->getDuration() ?? 0; $duration = $timesheet->getDuration() ?? 0;
// only apply the duration, if the end is not yet set // only apply the duration, if the end is not yet set.
// without that check, the end would be overwritten and the real end time would be lost // without that check, the end would be overwritten and the real end time would be lost
if (($forceApply && $duration > 0) || ($duration > 0 && $timesheet->isRunning())) { if (($forceApply && $duration > 0) || ($duration > 0 && $timesheet->isRunning())) {
$end = clone $timesheet->getBegin(); $end = clone $timesheet->getBegin();

3
templates/timesheet/edit-default.html.twig
View File

@@ -46,6 +46,9 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if form.break is defined %}
{{ form_row(form.break, {'row_attr': {'class': 'mb-3 ' ~ form.vars.name ~ '_row_' ~ form.break.vars.name}}) }}
{% endif %}
{% if form.customer is defined %} {% if form.customer is defined %}
{{ form_row(form.customer, {'row_attr': {'class': 'mb-3 ' ~ form.vars.name ~ '_row_' ~ form.customer.vars.name}}) }} {{ form_row(form.customer, {'row_attr': {'class': 'mb-3 ' ~ form.vars.name ~ '_row_' ~ form.customer.vars.name}}) }}
{% endif %} {% endif %}