Index: openacs-4/packages/calendar/www/view-week-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/calendar/www/view-week-display.tcl	26 Aug 2008 22:35:12 -0000	1.21
+++ openacs-4/packages/calendar/www/view-week-display.tcl	30 Aug 2008 19:51:23 -0000	1.22
@@ -133,8 +133,12 @@
     set start_time [lc_time_fmt $ansi_start_date "%X"]
     set end_time [lc_time_fmt $ansi_end_date "%X"]
 
+    set start_hour [format %.0f [lc_time_fmt $ansi_start_date "%H"]]
+    set end_hour [format %.0f [lc_time_fmt $ansi_end_date "%H"]]
+
     set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]]
-    if {[string equal $start_time "12:00 AM"] && [string equal $end_time "12:00 AM"]} {
+
+    if { $start_time eq $end_time } {
         set no_time_p t
     } else {
         set no_time_p f
@@ -162,7 +166,7 @@
         set previous_intervals [list]
     }
     
-    if {[string equal $no_time_p t]} {
+    if { $no_time_p } {
         #All day event
         set top_hour 0
         set top_minutes 0
@@ -189,29 +193,6 @@
             set adjusted_end_display_hour $end_hour
         }
 
-
-#         if { $start_hour < 9 } {
-#             set top_hour 9
-#             set top_minutes 0
-#         } elseif { $start_hour > 21 } {
-#             set top_hour 22
-#             set top_minutes 0
-#         } else {
-#             set top_hour $start_hour
-#             set top_minutes $start_minutes
-#         }
-
-#         if { $end_hour < 9 } {
-#             set bottom_hour 9
-#             set bottom_minutes 0
-#         } elseif { $end_hour > 21 } {
-#             set bottom_hour 22
-#             set bottom_minutes 0
-#         } else {
-#             set bottom_hour $end_hour
-#             set bottom_minutes $end_minutes
-#         }
-
     }
 
     set top [expr ($top_hour * ($hour_height_inside+$hour_height_sep)) \
@@ -228,12 +209,13 @@
     #Assumption: for any given day we will loop through all-day events
     #before looping through regular events.
     set bumps 0
-    if {$start_hour == 0 && $start_minutes == 0 && $end_hour == 0 && $end_minutes == 0} {
+    if { $no_time_p } {
         #All-day event.
         incr event_left_base $event_bump_delta
         incr all_day_events
     } else {
         #Regular event.
+        set name "$name ($start_time - $end_time)"
         foreach {previous_start previous_end} $previous_intervals {
             if { ($start_seconds >= $previous_start && $start_seconds < $previous_end) || ($previous_start >= $start_seconds && $previous_start < $end_seconds) } {
                 incr bumps
@@ -325,7 +307,7 @@
 set next_week [clock format [expr $first_weekday_date_secs + (7*86400)] -format "%Y-%m-%d"]
 set last_week [clock format [expr $first_weekday_date_secs - (7*86400)] -format "%Y-%m-%d"]
 
-multirow create days_of_week width day_short monthday weekday_date weekday_url
+multirow create days_of_week width day_short monthday weekday_date weekday_url day_num
 
 set nav_url_base [ad_conn url]?[export_vars -url -entire_form -exclude {date view}]
 
@@ -339,7 +321,8 @@
     set weekday_url [export_vars -base [ad_conn url] -url -entire_form {{view day} {date $weekday_date}}]
     #TODO: localize_me
     set weekday_monthday "$trimmed_month/$trimmed_day"
-    multirow append days_of_week [set day_width_$i] [lindex $week_days [expr [expr $i + $first_day_of_week] % 7]] $weekday_monthday $weekday_date $weekday_url
+    set i_day [expr { [expr { $i + $first_day_of_week }] % 7 }]
+    multirow append days_of_week [set day_width_$i] [lindex $week_days $i_day] $weekday_monthday $weekday_date $weekday_url $i
 }
 
 set week_width $time_of_day_width