week.php hands $nbrGridCols better. It should get the correct number of

cols for the day it's working it. week.php still doesn't draw overlapping
events correctly

2 files changed, 45 insertions, 38 deletions

diff --git a/calendars/Jared's32Classes.ics b/calendars/Jared's32Classes.ics
index d1dd7d6..db46dbb 100644
--- a/calendars/Jared's32Classes.ics
+++ b/calendars/Jared's32Classes.ics
@@ -3,45 +3,45 @@ CALSCALE:GREGORIAN
 X-WR-TIMEZONE;VALUE=TEXT:US/Central
 PRODID:-//Apple Computer\, Inc//iCal 1.0//EN
 X-WR-CALNAME;VALUE=TEXT:Jared's Classes
-X-WR-RELCALID;VALUE=TEXT:78B20BBC-D3EB-11D6-A1D9-0050E4E60429
+X-WR-RELCALID;VALUE=TEXT:48F19492-D3EE-11D6-8EAC-0050E4E60429
 VERSION:2.0
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020904T080000
+UID:48F1448F-D3EE-11D6-8EAC-0050E4E60429
 DTSTAMP:20020919T031210Z
 SUMMARY:Computer Organization
-UID:78B1AA94-D3EB-11D6-A1D9-0050E4E60429
+DTSTART;TZID=US/Central:20020904T080000
 DTEND;TZID=US/Central:20020904T090000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020904T090000
+UID:48F15361-D3EE-11D6-8EAC-0050E4E60429
 DTSTAMP:20020919T031631Z
 SUMMARY:Linguistics
-UID:78B1B9C0-D3EB-11D6-A1D9-0050E4E60429
+DTSTART;TZID=US/Central:20020904T090000
 DTEND;TZID=US/Central:20020904T100000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,WE,FR
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020904T103000
+UID:48F1588D-D3EE-11D6-8EAC-0050E4E60429
 DTSTAMP:20020919T031607Z
 SUMMARY:First Aid & CPR
-UID:78B1BEF3-D3EB-11D6-A1D9-0050E4E60429
+DTSTART;TZID=US/Central:20020904T103000
 DTEND;TZID=US/Central:20020904T113000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,WE,FR
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020904T133000
+UID:48F15D1C-D3EE-11D6-8EAC-0050E4E60429
 DTSTAMP:20020924T125113Z
 SUMMARY:Japanese
-UID:78B1C686-D3EB-11D6-A1D9-0050E4E60429
+DTSTART;TZID=US/Central:20020904T133000
 DTEND;TZID=US/Central:20020904T143000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,TU,WE,FR
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020905T143000
+UID:48F161E6-D3EE-11D6-8EAC-0050E4E60429
 DTSTAMP:20020919T031625Z
 SUMMARY:The Bible
-UID:78B1CF3C-D3EB-11D6-A1D9-0050E4E60429
+DTSTART;TZID=US/Central:20020905T143000
 DTEND;TZID=US/Central:20020905T163000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=TU,TH
 END:VEVENT
@@ -50,12 +50,12 @@ DTEND;TZID=US/Central:20020910T163000
 RECURRENCE-ID;TZID=US/Central:20020910T143000
 DTSTAMP:20020911T125000Z
 DTSTART;TZID=US/Central:20020910T143000
-UID:78B1CF3C-D3EB-11D6-A1D9-0050E4E60429
+UID:48F161E6-D3EE-11D6-8EAC-0050E4E60429
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020917T154615Z
 SUMMARY:test event
-UID:78B1DA1B-D3EB-11D6-A1D9-0050E4E60429
+UID:48F16B7E-D3EE-11D6-8EAC-0050E4E60429
 DTSTART;TZID=US/Central:20020916T130000
 DURATION:PT45M
 END:VEVENT
@@ -64,21 +64,21 @@ DTEND;TZID=US/Central:20020916T090000
 RECURRENCE-ID;TZID=US/Central:20020916T080000
 DTSTAMP:20020926T035105Z
 DTSTART;TZID=US/Central:20020916T080000
-UID:78B1AA94-D3EB-11D6-A1D9-0050E4E60429
+UID:48F1448F-D3EE-11D6-8EAC-0050E4E60429
 DURATION:PT1H
 END:VEVENT
 BEGIN:VEVENT
-UID:78B1DF53-D3EB-11D6-A1D9-0050E4E60429
+UID:48F17037-D3EE-11D6-8EAC-0050E4E60429
 DTSTAMP:20020919T031814Z
 SUMMARY:Reading Day
 DTSTART;VALUE=DATE:20021214
 DTEND;VALUE=DATE:20021215
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20021219T153000
+UID:48F17541-D3EE-11D6-8EAC-0050E4E60429
 DTSTAMP:20020919T042240Z
 SUMMARY:Japanese Final
-UID:78B1E4AE-D3EB-11D6-A1D9-0050E4E60429
+DTSTART;TZID=US/Central:20021219T153000
 ORGANIZER;CN=Jared Wangen:mailto:jwangen@gac.edu
 DTEND;TZID=US/Central:20021219T173000
 DESCRIPTION:VH 301
@@ -86,33 +86,33 @@ END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020919T041543Z
 SUMMARY:The Bible Final
-DTSTART;TZID=US/Central:20021217T103000
+UID:48F179E2-D3EE-11D6-8EAC-0050E4E60429
 ORGANIZER;CN=Jared Wangen:mailto:jwangen@gac.edu
-DESCRIPTION:NHS Auditorium
-UID:78B1E99E-D3EB-11D6-A1D9-0050E4E60429
+DTSTART;TZID=US/Central:20021217T103000
 DURATION:PT2H
+DESCRIPTION:NHS Auditorium
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020919T033447Z
 SUMMARY:Computer Organization Final
+UID:48F17E68-D3EE-11D6-8EAC-0050E4E60429
 DTSTART;TZID=US/Central:20021218T080000
-UID:78B1F086-D3EB-11D6-A1D9-0050E4E60429
 DURATION:PT2H
 DESCRIPTION:Olin 321 (Classroom)
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020919T033454Z
 SUMMARY:Linguistics Final
+UID:48F182FB-D3EE-11D6-8EAC-0050E4E60429
 DTSTART;TZID=US/Central:20021217T130000
-UID:78B1F8CE-D3EB-11D6-A1D9-0050E4E60429
 DURATION:PT2H
 DESCRIPTION:VH 202 (Classroom)
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020919T033438Z
 SUMMARY:CPR & First Aid Final
+UID:48F187AC-D3EE-11D6-8EAC-0050E4E60429
 DTSTART;TZID=US/Central:20021217T080000
-UID:78B1FE15-D3EB-11D6-A1D9-0050E4E60429
 DURATION:PT2H
 DESCRIPTION:Lund 109 (Classroom)
 END:VEVENT
diff --git a/week.php b/week.php
index d10b8d7..bba0221 100644
--- a/week.php
+++ b/week.php
@@ -51,15 +51,20 @@ $thisday2 = strftime($dateFormat_week_list, $date);
 
 $dayborder = 0;
 
-$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));
+$thisdate = $start_week_time;
+for ($i=0;$i<7;$i++) {
+	$thisday = date("Ymd", $thisdate);
+	$nbrGridCols[$thisday] = 1;
+	if ($master_array[($thisday)]) {
+		foreach($master_array[($thisday)] as $ovlKey => $ovlValue) {
+			if ($ovlKey != "-1") {
+				foreach($ovlValue as $ovl2Value) {
+					$nbrGridCols[$thisday] = kgv($nbrGridCols[$thisday], ($ovl2Value["event_overlap"] + 1));
+				}
 			}
-		}
-	} 
+		} 
+	}
+	$thisdate = ($thisdate + (25 * 60 * 60));
 }
 ?>
 
@@ -111,7 +116,7 @@ if ($master_array[($getdate)]) {
 							do {
 								$thisday = date("Ymd", $thisdate);
 								$thisday2 = strftime($dateFormat_week_list, $thisdate);
-								echo "<td width=\"70\" colspan=\"" . $nbrGridCols . "\" valign=\"top\" align=\"center\" bgcolor=\"#eeeeee\" class=\"V9\">\n";
+								echo "<td width=\"70\" colspan=\"" . $nbrGridCols[$thisday] . "\" valign=\"top\" align=\"center\" bgcolor=\"#eeeeee\" class=\"V9\">\n";
 								echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$thisday\">$thisday2</a>\n";
 								echo "</td>\n";
 								$thisdate = ($thisdate + (25 * 60 * 60));
@@ -127,6 +132,7 @@ if ($master_array[($getdate)]) {
 					//		echo "<td  height=\"11\" width=\"60\" nowrap bgcolor=\"#f5f5f5\">&nbsp;</td>";
 							do {
 								$thisday = date("Ymd", $thisdate);
+
 								if ($master_array[($thisday)]["-1"]) {
 									echo "<td  height=\"24\">\n";
 									echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"4\">\n";
@@ -134,7 +140,7 @@ if ($master_array[($getdate)]) {
 										$all_day_text = $allday["event_text"];
 										$description = $allday["description"];
 										echo "<tr>\n";
-										echo "<td colspan=\"" . $nbrGridCols . "\" valign=\"top\" align=\"center\" bgcolor=\"#6699CC\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description')\"><font color=\"#ffffff\"><i>$all_day_text</i></font></a></td>\n";
+										echo "<td colspan=\"" . $nbrGridCols[$thisday] . "\" valign=\"top\" align=\"center\" bgcolor=\"#6699CC\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description')\"><font color=\"#ffffff\"><i>$all_day_text</i></font></a></td>\n";
 										echo "</tr>\n";
 									}
 									echo "</table>\n";
@@ -169,9 +175,10 @@ if ($master_array[($getdate)]) {
 									
 									// loop this part 7 times, one for each day
 									for ($week_loop=0; $week_loop<7; $week_loop++) {
-										$dayborder = 0;
+									$thisday = date("Ymd", $thisdate);
+									$dayborder = 0;
 										$event_length=array();
-										$thisday = date("Ymd", $thisdate);
+										
 										// check for eventstart 
 										if (sizeof($master_array[($thisday)]["$cal_time"]) > 0) {
 											foreach ($master_array[($thisday)]["$cal_time"] as $eventKey => $loopevent) {
@@ -197,14 +204,14 @@ if ($master_array[($getdate)]) {
 												$class = "";
 												$dayborder = 0;
 											}
-											echo "<td bgcolor=\"#ffffff\" colspan=\"" . $nbrGridCols . "\" $class>&nbsp;</td>\n";
+											echo "<td bgcolor=\"#ffffff\" colspan=\"" . $nbrGridCols[$thisday] . "\" $class>&nbsp;</td>\n";
 											
 										} else {
-											$emptyWidth = $nbrGridCols;
+											$emptyWidth = $nbrGridCols[$thisday];
 											for ($i=0;$i<sizeof($event_length);$i++) {
 											
 											//echo $master_array[($thisday)]["$cal_time"][($event_length[$i]["key"])]["event_text"] . " ind: " . $i . " / anz: " . $event_length[$i]["overlap"] . " = " . eventWidth($i,$event_length[$i]["overlap"]) . "<br />";
-												$drawWidth = $nbrGridCols / ($event_length[$i]["overlap"] + 1);
+												$drawWidth = $nbrGridCols[$thisday] / ($event_length[$i]["overlap"] + 1);
 												$emptyWidth = $emptyWidth - $drawWidth;
 												switch ($event_length[$i]["state"]) {
 													case "begin":