From 60e31d1be86a845b6271fefb1fbb1367ef736928 Mon Sep 17 00:00:00 2001 From: drei Date: Fri, 27 Sep 2002 23:19:15 +0000 Subject: =?UTF-8?q?day.php:=20modified=20logic=20to=20draw=20overlapping?= =?UTF-8?q?=20events=20changed=20logic=20to=20allow=20for=20dynamic=20grid?= =?UTF-8?q?=20height=20(set=20by=20=C3=A4gridLength)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ical_parser.php: include draw_functions.inc.php fill day-_array dynamically --- day.php | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) (limited to 'day.php') diff --git a/day.php b/day.php index 83a48f3..8f0539b 100644 --- a/day.php +++ b/day.php @@ -11,12 +11,23 @@ include("./ical_parser.php"); $starttime = "0700"; $weekstart = 1; -$gridLength = 30; +// dpr 20020926: moved variable gridLength to config.inc.php +//$gridLength = 30; $unix_time = strtotime($getdate); $today_today = date ("Ymd"); $tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); $yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); $display_date = strftime($dateFormat_day, $unix_time); +$nbrGridCols = 1; +if ($master_array[($getdate)]) { + foreach($master_array[($getdate)] as $ovlKey => $ovlValue) { + if ($ovlKey != "-1") { + foreach($ovlValue as $ovl2Value) { + $nbrGridCols = kgv($nbrGridCols, ($ovl2Value["event_overlap"] + 1)); + } + } + } +} ?> - - - + \"\""; + } ?> 0) { foreach ($master_array[($getdate)]["$cal_time"] as $eventKey => $loopevent) { + $drawEvent = drawEventTimes ($loopevent["event_start"], $loopevent["event_end"]); $j = 0; while ($event_length[$j]) { if ($event_length[$j]["state"] == "ended") { - $event_length[$j] = array ("length" => (round($loopevent["event_length"] / $gridLength)), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin"); + $event_length[$j] = array ("length" => ($drawEvent["draw_length"] / $gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin"); break; } $j++; } if ($j == sizeof($event_length)) { - array_push ($event_length, array ("length" => (round($loopevent["event_length"] / $gridLength)), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin")); + array_push ($event_length, array ("length" => ($drawEvent["draw_length"] / $gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin")); } } } if (ereg("([0-9]{1,2}):00", $key)) { - echo "\n"; - echo "$key\n"; - echo "\n"; + echo "\n"; + echo "$key\n"; + echo "\n"; } else { - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; } if (sizeof($event_length) == 0) { - echo " \n"; + echo " \n"; } else { - $emptyWidth = 12; + $emptyWidth = $nbrGridCols; for ($i=0;$i"; - $drawWidth = eventWidth($i,$event_length[$i]["overlap"]); + $drawWidth = $nbrGridCols / ($event_length[$i]["overlap"] + 1); $emptyWidth = $emptyWidth - $drawWidth; switch ($event_length[$i]["state"]) { case "begin": -- cgit v1.2.3