extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow to set endtime before starttime, and calculate it as next day time.

Browse Source 
- Fix setting endtime after middnight gives an validation error
- Move starttime validation under starttime field
This commit is contained in:
Hadi Nategh 2014-08-27 12:04:05 +00:00
parent e3e42b3dc8
commit a2c60633c6
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,14 +128,9 @@ class timesheet_ui extends timesheet_bo
$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 // check if negative duration is caused by wrap over midnight
if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24*60) 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; $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
@ -186,9 +181,9 @@ class timesheet_ui extends timesheet_bo
{ {
$etpl->set_validation_error('ts_quantity',lang('Field must not be empty !!!')); $etpl->set_validation_error('ts_quantity',lang('Field must not be empty !!!'));
} }
if ($this->data['ts_duration'] < 0) // for layout purpose we show the error behind the quantity field if ($this->data['ts_duration'] < 0)
{ {
$etpl->set_validation_error('ts_quantity',lang('Starttime has to be before endtime !!!')); $etpl->set_validation_error('start_time',lang('Starttime has to be before endtime !!!'));
} }
// only store project-blur, if a project is selected // only store project-blur, if a project is selected
if (!$this->data['ts_project'] && $this->data['pm_id']) $this->data['ts_project'] = $this->data['ts_project_blur']; if (!$this->data['ts_project'] && $this->data['pm_id']) $this->data['ts_project'] = $this->data['ts_project_blur'];