holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reset working-time title, when times are changed

Browse Source
This commit is contained in:
ralf 2022-11-08 08:19:45 +01:00
parent 104680c477
commit 1d86f1712a
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
timesheet/src/Events.php
View File

@ -183,12 +183,34 @@ class Events extends Api\Storage\Base
{ {
$bo->data['ts_duration'] += $diff; $bo->data['ts_duration'] += $diff;
$bo->data['ts_quantity'] += $diff / 60; $bo->data['ts_quantity'] += $diff / 60;
// set title, in case date(s) changed
$events = self::get(['ts_id' => $event['ts_id']]);
$bo->data['ts_title'] = self::workingTimeTitle($events);
$bo->save(); $bo->save();
} }
} }
} }
} }
/**
* Generate working time title
*
* @param array $events
* @param Api\DateTime|null &$start on return start-time
* @return string
*/
protected static function workingTimeTitle(array $events, Api\DateTime &$start=null)
{
$start = array_shift($events)['tse_time'];
$timespan = Api\DateTime::to($start, true);
$last = array_pop($events);
if ($timespan !== ($end = Api\DateTime::to($last['tse_time'], true)))
{
$timespan .= ' - '.$end;
}
return lang('Working time from %1', $timespan);
}
/** /**
* Store pending overall timer events as a working time timesheet * Store pending overall timer events as a working time timesheet
* *
@ -208,14 +230,7 @@ class Events extends Api\Storage\Base
$events = array_merge(self::get(['ts_id' => $period_ts['ts_id']], $period_total), $events); $events = array_merge(self::get(['ts_id' => $period_ts['ts_id']], $period_total), $events);
$time += $period_total; $time += $period_total;
} }
$start = array_shift($events)['tse_time']; $title = self::workingTimeTitle($events, $start);
$timespan = Api\DateTime::to($start, true);
$last = array_pop($events);
if ($timespan !== ($end = Api\DateTime::to($last['tse_time'], true)))
{
$timespan .= ' - '.$end;
}
$title = lang('Working time from %1', $timespan);
$bo->init($period_ts); $bo->init($period_ts);
$bo->save([ $bo->save([
'ts_title' => $title, 'ts_title' => $title,