extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 19:19:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed prob. with included events not shown, if no cal-event on that day

Browse Source
This commit is contained in:
Ralf Becker 2003-09-07 18:33:52 +00:00
parent 65d4d6b484
commit a8a8adf55c
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
calendar/inc/class.uicalendar.inc.php
View File

@ -46,7 +46,7 @@
var $planner_end_month; var $planner_end_month;
var $planner_end_year; var $planner_end_year;
var $planner_days_in_end_month; var $planner_days_in_end_month;
var $planner_intervals = array( // conversation hour and interval depending on intervals_per_day var $planner_intervals = array( // conversation hour and interval depending on intervals_per_day
// 1 1 1 1 1 1 1 1 1 1 2 2 2 2 // 1 1 1 1 1 1 1 1 1 1 2 2 2 2
@ -91,7 +91,7 @@
{ {
$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs'); $GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
$GLOBALS['phpgw']->browser = CreateObject('phpgwapi.browser'); $GLOBALS['phpgw']->browser = CreateObject('phpgwapi.browser');
$this->theme = $GLOBALS['phpgw_info']['theme']; $this->theme = $GLOBALS['phpgw_info']['theme'];
$this->bo = CreateObject('calendar.bocalendar',1); $this->bo = CreateObject('calendar.bocalendar',1);
@ -1234,7 +1234,7 @@
function day() function day()
{ {
$this->bo->read_holidays(); $this->bo->read_holidays();
if (!$this->bo->printer_friendly || ($this->bo->printer_friendly && @$this->bo->prefs['calendar']['display_minicals'])) if (!$this->bo->printer_friendly || ($this->bo->printer_friendly && @$this->bo->prefs['calendar']['display_minicals']))
{ {
$minical = $this->mini_calendar( $minical = $this->mini_calendar(
@ -3287,12 +3287,12 @@
$day_end = mktime(intval($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']); $day_end = mktime(intval($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']);
$daily = $this->set_week_array($GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True); $daily = $this->set_week_array($GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True);
print_debug('Date to Eval',$date_to_eval); print_debug('Date to Eval',$date_to_eval);
$events_to_show = array();
if($daily[$date_to_eval]['appts']) if($daily[$date_to_eval]['appts'])
{ {
$events = $this->bo->cached_events[$date_to_eval]; $events = $this->bo->cached_events[$date_to_eval];
print_debug('Date',$date_to_eval); print_debug('Date',$date_to_eval);
print_debug('Count',count($events)); print_debug('Count',count($events));
$events_to_show = array();
foreach($events as $event) foreach($events as $event)
{ {
if ($this->bo->rejected_no_show($event)) if ($this->bo->rejected_no_show($event))
@ -3309,28 +3309,31 @@
'content' => $this->link_to_entry($event,$params['month'],$params['day'],$params['year']) 'content' => $this->link_to_entry($event,$params['month'],$params['day'],$params['year'])
); );
} }
//echo "events_to_show=<pre>"; print_r($events_to_show); echo "</pre>\n"; }
$other = $GLOBALS['phpgw']->hooks->process(array( //echo "events_to_show=<pre>"; print_r($events_to_show); echo "</pre>\n";
'location' => 'calendar_include_events', $other = $GLOBALS['phpgw']->hooks->process(array(
'year' => $params['year'], 'location' => 'calendar_include_events',
'month' => $params['month'], 'year' => $params['year'],
'day' => $params['day'], 'month' => $params['month'],
'owner' => $this->bo->owner // num. id of the user, not necessary current user 'day' => $params['day'],
)); 'owner' => $this->bo->owner // num. id of the user, not necessary current user
));
if (is_array($other)) if (is_array($other))
{
foreach($other as $evts)
{ {
foreach($other as $evts) if (is_array($evts))
{ {
if (is_array($evts)) $events_to_show = array_merge($events_to_show,$evts);
{
$events_to_show = array_merge($events_to_show,$evts);
}
} }
usort($events_to_show,create_function('$a,$b','return $a[\'starttime\']-$b[\'starttime\'];'));
//echo "events_to_show=<pre>"; print_r($events_to_show); echo "</pre>\n";
} }
usort($events_to_show,create_function('$a,$b','return $a[\'starttime\']-$b[\'starttime\'];'));
//echo "events_to_show=<pre>"; print_r($events_to_show); echo "</pre>\n";
}
if (count($events_to_show))
{
$last_slot_end = -1; $last_slot_end = -1;
foreach($events_to_show as $event) foreach($events_to_show as $event)
{ {