From 05efa9c638f38edd70fa74044a970f6adb18e700 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 27 Aug 2014 12:04:57 +0000 Subject: [PATCH] Allow to set endtime before starttime, and calculate it as next day time. - Fix setting endtime after middnight gives an validation error - Move starttime validation under starttime field --- timesheet/inc/class.timesheet_ui.inc.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php index fdfb72a9a8..224a663551 100644 --- a/timesheet/inc/class.timesheet_ui.inc.php +++ b/timesheet/inc/class.timesheet_ui.inc.php @@ -129,12 +129,7 @@ class timesheet_ui extends timesheet_bo // 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; - } + $content['ts_duration'] += 24*60; } //echo "

end_time=$content[end_time], start_time=$content[start_time] --> duration=$content[ts_duration]

\n"; } @@ -186,9 +181,9 @@ class timesheet_ui extends timesheet_bo { $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 if (!$this->data['ts_project'] && $this->data['pm_id']) $this->data['ts_project'] = $this->data['ts_project_blur'];