forked from extern/egroupware
get planner working
This commit is contained in:
parent
d0e66ba776
commit
5a73146b91
@ -1311,10 +1311,8 @@
|
||||
{
|
||||
echo \'<!-- For Date : \'.$v.\' : Count of items : \'.count($daily).\' -->\'."\n";
|
||||
}
|
||||
for($g=0;$g<count($daily);$g++)
|
||||
while (list($nul,$event) = @each($daily))
|
||||
{
|
||||
$event = $daily[$g];
|
||||
|
||||
$view = $html->link(\'/index.php\',
|
||||
array(
|
||||
\'menuaction\' => \'calendar.uicalendar.view\',
|
||||
@ -1322,31 +1320,46 @@
|
||||
)
|
||||
);
|
||||
|
||||
$start_cell = $intervals_per_day * ($event[\'start\'][\'mday\'] - 1);
|
||||
$start_cell += $interval[$event[\'start\'][\'hour\']];
|
||||
|
||||
$end_cell = $intervals_per_day * ($event[\'end\'][\'mday\'] - 1);
|
||||
$end_cell += $interval[$event[\'end\'][\'hour\']];
|
||||
if ($event[\'start\'][\'month\'] == $this->bo->month &&
|
||||
$event[\'start\'][\'year\'] == $this->bo->year) // event starts in actual month ?
|
||||
{
|
||||
$start_cell = $intervals_per_day * ($event[\'start\'][\'mday\'] - 1);
|
||||
$start_cell += $interval[$event[\'start\'][\'hour\']];
|
||||
}
|
||||
else
|
||||
{
|
||||
$start_cell = 0;
|
||||
}
|
||||
if ($event[\'end\'][\'month\'] == $this->bo->month &&
|
||||
$event[\'end\'][\'year\'] == $this->bo->year) // event ends in actual month ?
|
||||
{
|
||||
$end_cell = $intervals_per_day * ($event[\'end\'][\'mday\'] - 1);
|
||||
$end_cell += $interval[$event[\'end\'][\'hour\']];
|
||||
}
|
||||
else
|
||||
{
|
||||
$end_cell = $last_cell;
|
||||
}
|
||||
if ($c = $event[\'category\'])
|
||||
{
|
||||
list($cat) = $this->planner_category($event[\'category\']);
|
||||
if ($cat[\'parent\'])
|
||||
{
|
||||
list($pcat) = $this->planner_category($c = $cat[\'parent\']);
|
||||
}
|
||||
else
|
||||
{
|
||||
$pcat = $cat;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$cat = $pcat = array( \'name\' => lang(\'none\'));
|
||||
}
|
||||
|
||||
$i = 0; // search for row of parent category
|
||||
do {
|
||||
++$i;
|
||||
if ($c = $event[\'category\'])
|
||||
{
|
||||
$cat = $this->planner_category($event[\'category\']);
|
||||
if ($cat[\'parent\'])
|
||||
{
|
||||
$pcat = $this->planner_category($c = $cat[\'parent\']);
|
||||
}
|
||||
else
|
||||
{
|
||||
$pcat = $cat;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$cat = $pcat = array( \'name\' => lang(\'none\'));
|
||||
}
|
||||
$k = $c.\'_\'.$i;
|
||||
$ka = \'.nr_\'.$k;
|
||||
if (!isset($rows[$k]))
|
||||
@ -1378,7 +1391,6 @@
|
||||
{
|
||||
$opt .= "colspan=".(1 + $end_cell - $start_cell);
|
||||
}
|
||||
|
||||
if ($bgcolor=$cat[\'color\'])
|
||||
{
|
||||
$opt .= \' bgcolor="\'.$bgcolor.\'"\';
|
||||
|
Loading…
Reference in New Issue
Block a user