Add 'Today' as calendar list date range option

This commit is contained in:
Nathan Gray 2016-03-09 22:38:45 +00:00
parent fd2bf095aa
commit a8f158e72b

View File

@ -41,6 +41,7 @@ class calendar_uilist extends calendar_ui
var $date_filters = array( var $date_filters = array(
'after' => 'After current date', 'after' => 'After current date',
'before' => 'Before current date', 'before' => 'Before current date',
'today' => 'Today',
'week' => 'Week', 'week' => 'Week',
'month' => 'Month', 'month' => 'Month',
'all' => 'All events', 'all' => 'All events',
@ -322,6 +323,13 @@ class calendar_uilist extends calendar_ui
$this->last = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate']))-1; $this->last = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate']))-1;
$label = $this->bo->long_date($this->first,$this->last); $label = $this->bo->long_date($this->first,$this->last);
break; break;
case 'today':
$today = new egw_time();
$today->setTime(0, 0, 0);
$this->first = $search_params['start'] = $today->format('ts');
$today->setTime(23,59,59);
$this->last = $search_params['end'] = $today->format('ts');
break;
case 'week': case 'week':
$start = $this->bo->date2array($params['date'] ? $params['date'] : $this->date); $start = $this->bo->date2array($params['date'] ? $params['date'] : $this->date);
$this->first = $this->datetime->get_weekday_start($start['year'],$start['month'],$start['day']); $this->first = $this->datetime->get_weekday_start($start['year'],$start['month'],$start['day']);