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

Fix calendar report not taking Day Light Saving into account

Browse Source
This commit is contained in:
Hadi Nategh 2019-04-10 09:07:06 +02:00
parent 557353e7df
commit bf309755ef
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_category_report.inc.php
View File

@ -265,14 +265,20 @@ class calendar_category_report extends calendar_ui{
} }
} }
$end_obj = new Api\DateTime($content['end']);
// Add 1 day minus a second to only query untill the end of the
// end range day.
$end_range = $end_obj->modify('+1 day -1 sec');
// query calendar for events // query calendar for events
$events = $this->bo->search(array( $events = $this->bo->search(array(
'start' => $content['start'], 'start' => $content['start'],
'end' => $content['end']+86399, // range till midnight of the sele3cted end date 'end' => $end_range->getTimestamp(), // range till midnight of the sele3cted end date
'users' => $users, 'users' => $users,
'cat_id' => $categories, 'cat_id' => $categories,
'daywise' => true 'daywise' => true
)); ));
$days_sum = $weeks_sum = $events_log = array (); $days_sum = $weeks_sum = $events_log = array ();
// iterate over found events // iterate over found events
foreach($events as $day_index => $day_events) foreach($events as $day_index => $day_events)
@ -293,7 +299,7 @@ class calendar_category_report extends calendar_ui{
$content['grid'][$row_id]['min_days'], $content['grid'][$row_id]['min_days'],
$content['grid'][$row_id]['unit'], $content['grid'][$row_id]['unit'],
$content['start'], $content['start'],
$content['end']+86399 // range till midnight of the selected end date $end_range->getTimestamp() // range till midnight of the selected end date
); );
} }
} }