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

Add different day / time for multi-day events, based on which day is being merged

Browse Source
This commit is contained in:
Nathan Gray 2011-03-28 16:55:24 +00:00
parent 267241e149
commit 4d5105806d
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
calendar/inc/class.calendar_merge.inc.php
View File

@ -219,18 +219,26 @@ class calendar_merge extends bo_merge
)); ));
$days = array(); $days = array();
$replacements = array(); $replacements = array();
$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
foreach($events as $day => $list) foreach($events as $day => $list)
{ {
foreach($list as $key => $event) foreach($list as $key => $event)
{ {
$start = egw_time::to($event['start'], 'array'); $start = egw_time::to($event['start'], 'array');
$end = egw_time::to($event['end'], 'array'); $end = egw_time::to($event['end'], 'array');
$replacements = $this->calendar_replacements($event);
if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) { if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
$dow = date('l',$event['start']); $dow = date('l',$event['start']);
} else { } else {
$dow = date('l', strtotime($day)); $dow = date('l', strtotime($day));
// Fancy date+time formatting for multi-day events
$start_time = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
$end_time = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
$replacements['$$calendar_starttime$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)) . ' ' .$start_time;
$replacements['$$calendar_endtime$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)) . ' ' . $end_time;
} }
$days[date('Ymd',$_date)][$dow][] = $this->calendar_replacements($event);
$days[date('Ymd',$_date)][$dow][] = $replacements;
} }
if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) { if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
$date_marker = array( $date_marker = array(
@ -302,7 +310,19 @@ class calendar_merge extends bo_merge
{ {
foreach($list as $key => $event) foreach($list as $key => $event)
{ {
$days[date('Ymd',$_date)][$plugin][] = $this->calendar_replacements($event); $start = egw_time::to($event['start'], 'array');
$end = egw_time::to($event['end'], 'array');
$replacements = $this->calendar_replacements($event);
if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
$dow = date('l',$event['start']);
} else {
// Fancy date+time formatting for multi-day events
$start_time = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
$end_time = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
$replacements['$$calendar_starttime$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)) . ' ' .$start_time;
$replacements['$$calendar_endtime$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)) . ' ' . $end_time;
}
$days[date('Ymd',$_date)][$plugin][] = $replacements;
} }
if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) { if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
$date_marker = array( $date_marker = array(