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

Remove 1 week limit if end date is not provided

Browse Source
This commit is contained in:
Nathan Gray 2016-04-27 15:43:38 +00:00
parent a5080a29d5
commit 66386c1a42
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/src/DateTime.php
View File

@ -228,11 +228,6 @@ class DateTime extends \DateTime
$end->setTime(0, 0, 0); $end->setTime(0, 0, 0);
$end->add('+1day'); $end->add('+1day');
} }
else
{
$end = new DateTime($start);
$end->add('+1week');
}
} }
else else
{ {
@ -280,13 +275,19 @@ class DateTime extends \DateTime
} }
} }
// convert start + end from user to servertime for the filter // convert start + end from user to servertime for the filter
$sql = '('.DateTime::user2server($start, 'ts').' <= '.$column.' AND '.$column.' < '.DateTime::user2server($end, 'ts').')'; $sql = '('.DateTime::user2server($start, 'ts').' <= '.$column;
if($end)
{
$sql .=' AND '.$column.' < '.DateTime::user2server($end, 'ts');
// returned timestamps: $end is an inclusive date, eg. for today it's equal to start!
$end->add('-1day');
$end = $end->format('ts');
}
$sql .= ')';
//error_log(__METHOD__."('$name', ...) syear=$syear, smonth=$smonth, sday=$sday, sweek=$sweek, eyear=$eyear, emonth=$emonth, eday=$eday, eweek=$eweek --> start=".$start->format().', end='.$end->format().", sql='$sql'"); //error_log(__METHOD__."('$name', ...) syear=$syear, smonth=$smonth, sday=$sday, sweek=$sweek, eyear=$eyear, emonth=$emonth, eday=$eday, eweek=$eweek --> start=".$start->format().', end='.$end->format().", sql='$sql'");
// returned timestamps: $end is an inclusive date, eg. for today it's equal to start!
$start = $start->format('ts'); $start = $start->format('ts');
$end->add('-1day');
$end = $end->format('ts');
return $sql; return $sql;
} }