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

* Timesheet: allow to add timesheets starting yesterday and end today (no warning end-time before start-time)

Browse Source
This commit is contained in:
Ralf Becker 2013-05-24 07:07:04 +00:00
parent 9ecefc6b79
commit 59f57d69b6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -126,6 +126,16 @@ class timesheet_ui extends timesheet_bo
if ($end && $start) // start- & end-time --> calculate the duration if ($end && $start) // start- & end-time --> calculate the duration
{ {
$content['ts_duration'] = ($end->format('ts') - $start->format('ts')) / 60; $content['ts_duration'] = ($end->format('ts') - $start->format('ts')) / 60;
// check if negative duration is caused by wrap over midnight
if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24*60)
{
$yesterday = new egw_time();
$yesterday->modify('-1day');
if ($start->format('Y-m-d') == $yesterday->format('Y-m-d'))
{
$content['ts_duration'] += 24*60;
}
}
//echo "<p>end_time=$content[end_time], start_time=$content[start_time] --> duration=$content[ts_duration]</p>\n"; //echo "<p>end_time=$content[end_time], start_time=$content[start_time] --> duration=$content[ts_duration]</p>\n";
} }
elseif ($content['ts_duration'] && $end) // no start, calculate from end and duration elseif ($content['ts_duration'] && $end) // no start, calculate from end and duration