Index: openacs-4/packages/calendar/www/view-one-day-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/view-one-day-display.adp 17 Aug 2003 18:08:16 -0000 1.4
+++ openacs-4/packages/calendar/www/view-one-day-display.adp 18 Aug 2003 16:17:05 -0000 1.5
@@ -38,9 +38,9 @@
-
- @day_items_with_time.current_hour@ |
+
+ @day_items_with_time.localized_current_hour;noquote@ |
Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/calendar/www/view-one-day-display.tcl 17 Aug 2003 18:08:16 -0000 1.9
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl 18 Aug 2003 16:17:05 -0000 1.10
@@ -36,12 +36,13 @@
multirow append day_items_without_time $name $status_summary $item_id $calendar_name
}
-multirow create day_items_with_time current_hour name item_id calendar_name status_summary start_hour end_hour start_time end_time colspan rowspan
+multirow create day_items_with_time current_hour localized_current_hour name item_id calendar_name status_summary start_hour end_hour start_time end_time colspan rowspan
for {set i $start_display_hour } { $i < $end_display_hour } { incr i } {
set items_per_hour($i) 0
}
+
set day_items_per_hour {}
db_foreach select_day_items_with_time {} {
# Convert to user's timezone
@@ -50,12 +51,12 @@
set start_hour [lc_time_fmt $ansi_start_date "%H"]
set end_hour [lc_time_fmt $ansi_end_date "%H"]
+ set start_time [lc_time_fmt $ansi_start_date "%X"]
+ set end_time [lc_time_fmt $ansi_end_date "%X"]
- set start_time [lc_time_fmt $ansi_start_date "%H:%M"]
- set end_time [lc_time_fmt $ansi_end_date "%H:%M"]
-
for { set item_current_hour $start_hour } { $item_current_hour < $end_hour } { incr item_current_hour } {
set item_current_hour [expr int($item_current_hour)]
+
if {$start_hour == $item_current_hour && $start_hour >= $start_display_hour } {
lappend day_items_per_hour [list $item_current_hour $name $item_id $calendar_name $status_summary $start_hour $end_hour $start_time $end_time]
} elseif { $end_hour <= $end_display_hour } {
@@ -84,18 +85,21 @@
if {$item_start_hour > $day_current_hour} {
# need to add dummy entries to show all hours
for { } { $day_current_hour < $item_start_hour } { incr day_current_hour } {
- multirow append day_items_with_time $day_current_hour "" "" "" "" "" "" "" "" 0 0
+ set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%r"]
+ multirow append day_items_with_time $day_current_hour $localized_day_current_hour "" "" "" "" "" "" "" "" 0 0
}
}
- multirow append day_items_with_time [lindex $item 0] [lindex $item 1] [lindex $item 2] [lindex $item 3] [lindex $item 4] [lindex $item 5] [lindex $item 6] [lindex $item 7] [lindex $item 8] 0 $rowspan
+ set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%r"]
+ multirow append day_items_with_time [lindex $item 0] $localized_day_current_hour [lindex $item 1] [lindex $item 2] [lindex $item 3] [lindex $item 4] [lindex $item 5] [lindex $item 6] [lindex $item 7] [lindex $item 8] 0 $rowspan
set day_current_hour [expr [lindex $item 0] +1 ]
}
if {$day_current_hour < $end_display_hour } {
# need to add dummy entries to show all hours
for { } { $day_current_hour <= $end_display_hour } { incr day_current_hour } {
- multirow append day_items_with_time $day_current_hour "" "" "" "" "" 0 0
+ set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%r"]
+ multirow append day_items_with_time $day_current_hour $localized_day_current_hour "" "" "" "" "" 0 0
}
}
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 -r1.4 -r1.5
--- openacs-4/packages/calendar/www/view-week-display.tcl 14 Aug 2003 15:44:08 -0000 1.4
+++ openacs-4/packages/calendar/www/view-week-display.tcl 18 Aug 2003 16:17:05 -0000 1.5
@@ -60,7 +60,7 @@
if {$day_of_week > $current_weekday} {
# need to add dummy entries to show all days
for { } { $current_weekday < $day_of_week } { incr current_weekday } {
- multirow append week_items "" "" [dt_julian_to_ansi [expr $sunday_julian + $current_weekday -1]] "" "" $current_weekday [lindex $weekday_english_names [expr $current_weekday -1]] "" "" ""
+ multirow append week_items "" "" [lc_time_fmt [dt_julian_to_ansi [expr $sunday_julian + $current_weekday -1]] "%x"] "" "" $current_weekday [lindex $weekday_english_names [expr $current_weekday -1]] "" "" ""
}
}
if {[string equal $start_time "00:00"]} {
@@ -76,7 +76,7 @@
if {$current_weekday < 8} {
# need to add dummy entries to show all hours
for { } { $current_weekday < 8 } { incr current_weekday } {
- multirow append week_items "" "" [dt_julian_to_ansi [expr $sunday_julian + $current_weekday -1]] "" "" $current_weekday [lindex $weekday_english_names [expr $current_weekday -1]] "" "" ""
+ multirow append week_items "" "" [lc_time_fmt [dt_julian_to_ansi [expr $sunday_julian + $current_weekday -1]] "%x"] "" "" $current_weekday [lindex $weekday_english_names [expr $current_weekday -1]] "" "" ""
}
}