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

display wholeDay-nonblocking events on Top in month-view too. Additionally added some fixes which makes the extraRows value only as big as needed.

Browse Source
This commit is contained in:
Christian Binder 2006-11-15 19:46:20 +00:00
parent 4a19aaa1ff
commit 19127495f3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/inc/class.uiviews.inc.php
View File

@ -268,7 +268,7 @@ class uiviews extends uical
/** /**
* Displays the monthview or a multiple week-view * Displays the monthview or a multiple week-view
* *
* @param int $weeks=0 number of weeks to show, if 0 (default) all weeks of one month are shows * @param int $weeks=0 number of weeks to show, if 0 (default) all weeks of one month are shown
* @param boolean $home=false if true return content suitable for home-page * @param boolean $home=false if true return content suitable for home-page
*/ */
function &month($weeks=0,$home=false) function &month($weeks=0,$home=false)
@ -312,7 +312,7 @@ class uiviews extends uical
$title = lang('Wk').' '.adodb_date('W',$week_start); $title = lang('Wk').' '.adodb_date('W',$week_start);
$title = $this->html->a_href($title,$week_view,'',' title="'.lang('Weekview').'"'); $title = $this->html->a_href($title,$week_view,'',' title="'.lang('Weekview').'"');
$content .= $this->timeGridWidget($week,60,200,'',$title,0,$week_start+WEEK_s >= $this->last); $content .= $this->timeGridWidget($this->tagWholeDayOnTop($week),60,200,'',$title,0,$week_start+WEEK_s >= $this->last);
} }
if (!$home) if (!$home)
{ {
@ -472,7 +472,6 @@ class uiviews extends uical
if (count($users) == 1 || count($users) > 5) if (count($users) == 1 || count($users) > 5)
{ {
$dayEvents =& $this->bo->search($this->search_params); $dayEvents =& $this->bo->search($this->search_params);
$dayEvents = $this->tagWholeDayOnTop($dayEvents);
$owner = 0; $owner = 0;
} }
else else
@ -485,10 +484,9 @@ class uiviews extends uical
list(,$dayEvents['<b>'.$label.'</b>']) = each($this->bo->search($search_params)); list(,$dayEvents['<b>'.$label.'</b>']) = each($this->bo->search($search_params));
$owner[] = $uid; $owner[] = $uid;
} }
$dayEvents = $this->tagWholeDayOnTop($dayEvents);
} }
$cols = array(); $cols = array();
$cols[0] =& $this->timeGridWidget($dayEvents,$this->cal_prefs['interval'],450,'','',$owner); $cols[0] =& $this->timeGridWidget($this->tagWholeDayOnTop($dayEvents),$this->cal_prefs['interval'],450,'','',$owner);
// only show todo's for a single user // only show todo's for a single user
if (count($users) == 1 && ($todos = $this->get_todos($todo_label)) !== false) if (count($users) == 1 && ($todos = $this->get_todos($todo_label)) !== false)
@ -1002,7 +1000,7 @@ class uiviews extends uical
{ {
if ($this->debug > 1 || $this->debug==='eventWidget') $this->bo->debug_message('uiviews::eventWidget(%1,width=%2)',False,$event,$width); if ($this->debug > 1 || $this->debug==='eventWidget') $this->bo->debug_message('uiviews::eventWidget(%1,width=%2)',False,$event,$width);
if($event['whole_day_on_top']) { $block='event_widget_wholeday_on_top'; } if($this->use_time_grid && $event['whole_day_on_top']) { $block='event_widget_wholeday_on_top'; }
static $tpl = False; static $tpl = False;
if (!$tpl) if (!$tpl)
@ -1768,6 +1766,7 @@ class uiviews extends uical
*/ */
function tagWholeDayOnTop($dayEvents) function tagWholeDayOnTop($dayEvents)
{ {
$this->extraRows = $this->extraRowsOriginal;
foreach ($dayEvents as $day=>$oneDayEvents) foreach ($dayEvents as $day=>$oneDayEvents)
{ {
$extraRowsToAdd = 0; $extraRowsToAdd = 0;