extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 11:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust custom date selection to include the full end date (export)

Browse Source
This commit is contained in:
Nathan Gray 2012-10-09 17:39:02 +00:00
parent 7cbc4949d3
commit c23fee1092
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_export_csv.inc.php
View File

@ -36,7 +36,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
if($options['selection']['select'] == 'criteria') { if($options['selection']['select'] == 'criteria') {
$query = array( $query = array(
'start' => $options['selection']['start'], 'start' => $options['selection']['start'],
'end' => $options['selection']['end'], 'end' => strtotime('+1 day',$options['selection']['end'])-1,
'categories' => $options['categories'] ? $options['categories'] : $options['selection']['categories'], 'categories' => $options['categories'] ? $options['categories'] : $options['selection']['categories'],
//'enum_recuring' => false, // we want the recurring events enumerated for csv export //'enum_recuring' => false, // we want the recurring events enumerated for csv export
'daywise' => false, 'daywise' => false,

3
calendar/inc/class.calendar_export_ical.inc.php
View File

@ -38,9 +38,8 @@ class calendar_export_ical extends calendar_export_csv {
if($options['selection']['select'] == 'criteria') { if($options['selection']['select'] == 'criteria') {
$query = array( $query = array(
'start' => $options['selection']['start'], 'start' => $options['selection']['start'],
'end' => $options['selection']['end'], 'end' => strtotime('+1 day',$options['selection']['end'])-1,
'categories' => $options['categories'] ? $options['categories'] : $options['selection']['categories'], 'categories' => $options['categories'] ? $options['categories'] : $options['selection']['categories'],
'enum_recuring' => false,
'daywise' => false, 'daywise' => false,
'users' => $options['selection']['owner'], 'users' => $options['selection']['owner'],
'cfs' => $cfs // Otherwise we shouldn't get any custom fields 'cfs' => $cfs // Otherwise we shouldn't get any custom fields

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

@ -291,7 +291,7 @@ class calendar_uilist extends calendar_ui
case 'custom': case 'custom':
$GLOBALS['egw']->js->set_onload("set_style_by_class('table','custom_hide','visibility','visible');"); $GLOBALS['egw']->js->set_onload("set_style_by_class('table','custom_hide','visibility','visible');");
$this->first = $search_params['start'] = $params['startdate']; $this->first = $search_params['start'] = $params['startdate'];
$this->last = $search_params['end'] = $params['enddate']; $this->last = $search_params['end'] = strtotime('+1 day', $params['enddate'])-1;
$label = $this->bo->long_date($this->first,$this->last); $label = $this->bo->long_date($this->first,$this->last);
break; break;
case 'fixed': case 'fixed':