extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 12:21:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix range filter, adds range selected in mini-calendar to date filter

Browse Source 
- Use selected date range for merge, if no events are checked
This commit is contained in:
Nathan Gray 2011-02-10 19:19:52 +00:00
parent 974ef4b74a
commit 21c1f08322
1 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
calendar/inc/class.calendar_uilist.inc.php
View File

@ -121,6 +121,10 @@ class calendar_uilist extends calendar_ui
// Handle actions // Handle actions
if ($content['action'] != '') if ($content['action'] != '')
{ {
// Allow merge using the date range filter
if(strpos($content['action'],'document') !== false && !count($content['nm']['rows']['checked']) && !$content['use_all']) {
$content['nm']['rows']['checked'][] = $this->get_merge_range($content['nm']);
}
if (!count($content['nm']['rows']['checked']) && !$content['use_all']) { if (!count($content['nm']['rows']['checked']) && !$content['use_all']) {
$msg = lang('You need to select some events first'); $msg = lang('You need to select some events first');
} }
@ -324,8 +328,8 @@ class calendar_uilist extends calendar_ui
unset($this->last['raw']); unset($this->last['raw']);
$this->last = $this->bo->date2ts($this->last); $this->last = $this->bo->date2ts($this->last);
$this->date_filters['fixed'] = $label = lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last); $this->date_filters['fixed'] = $label = lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last);
$search_params['start'] = $this->first; $params['startdate'] = $search_params['start'] = $this->first;
$search_params['end'] = $this->last; $params['enddate'] = $search_params['end'] = $this->last;
break; break;
} }
elseif ((string)$this->listview_days === '0') // monthview elseif ((string)$this->listview_days === '0') // monthview
@ -339,8 +343,8 @@ class calendar_uilist extends calendar_ui
$this->last = $this->bo->date2ts($this->last); $this->last = $this->bo->date2ts($this->last);
$this->last--; $this->last--;
$this->date_filters['fixed'] = $label = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year; $this->date_filters['fixed'] = $label = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
$search_params['start'] = $this->first; $params['startdate'] = $search_params['start'] = $this->first;
$search_params['end'] = $this->last; $params['enddate'] = $search_params['end'] = $this->last;
break; break;
} }
// fall through to after given date // fall through to after given date
@ -353,6 +357,7 @@ class calendar_uilist extends calendar_ui
if ($label) if ($label)
{ {
$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$label; $GLOBALS['egw_info']['flags']['app_header'] .= ': '.$label;
$params['options-filter'][$params['filter']] = $label; // Add it in, or it will be cleared
} }
if ((int) $params['col_filter']['participant']) if ((int) $params['col_filter']['participant'])
{ {
@ -496,11 +501,15 @@ class calendar_uilist extends calendar_ui
// Pull the date for recurring events // Pull the date for recurring events
$split = array(); $split = array();
foreach($checked as $key) { foreach($checked as $key) {
list($id, $recur_date) = explode(':', $key); if(!is_array($key) && strpos($key,':') !== false) {
$split[] = array( list($id, $recur_date) = explode(':', $key);
'id' => $id, $split[] = array(
'recur_date' => $recur_date 'id' => $id,
); 'recur_date' => $recur_date
);
} else {
$split[] = $key;
}
} }
$checked = $split; $checked = $split;
} }
@ -674,6 +683,39 @@ class calendar_uilist extends calendar_ui
</script>'; </script>';
} }
/**
* Get date ranges to select for merging instead of individual events
*
* @param $nm nextmatch array from submit
*
* @return array of ranges
*/
protected function get_merge_range($nm)
{
$checked = array();
if($nm['filter'] == 'fixed')
{
$checked['start'] = $nm['startdate'];
$last = $this->bo->date2array($nm['enddate']);
$last['hour'] = '23'; $last['minute'] = $last['sec'] = '59';
$checked['end'] = $this->bo->date2ts($last);
} else {
switch($nm['filter']) {
case 'after':
$checked['start'] = $nm['startdate'] ? $nm['startdate'] : strtotime('today');
break;
case 'before':
$checked['end'] = $nm['enddate'] ? $nm['enddate'] : strtotime('tomorrow');
break;
case 'custom':
$checked['start'] = $nm['startdate'];
$checked['end'] = $nm['enddate'];
break;
}
}
return $checked;
}
/** /**
* Download a document with inserted entries * Download a document with inserted entries
* *