Index: openacs-4/packages/calendar/www/view-one-day-display-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-one-day-display-postgresql.xql,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/calendar/www/view-one-day-display-postgresql.xql 14 Aug 2003 15:44:08 -0000 1.7 +++ openacs-4/packages/calendar/www/view-one-day-display-postgresql.xql 17 Aug 2003 18:08:16 -0000 1.8 @@ -8,7 +8,7 @@ select coalesce(e.name, a.name) as name, coalesce(e.status_summary, a.status_summary) as status_summary, e.event_id as item_id, - (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type, + (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, cals.calendar_id, cals.calendar_name from acs_activities a, @@ -23,7 +23,7 @@ and start_date between to_date(:current_date_system,:ansi_date_format) and to_date(:current_date_system,:ansi_date_format) + cast('23 hours 59 minutes 59 seconds' as interval) -and cal_items.cal_item_id= e.event_id +and ci.cal_item_id= e.event_id and to_char(start_date, 'HH24:MI') = '00:00' and to_char(end_date, 'HH24:MI') = '00:00' and cals.package_id= :package_id @@ -40,7 +40,7 @@ coalesce(e.name, a.name) as name, coalesce(e.status_summary, a.status_summary) as status_summary, e.event_id as item_id, - (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type, + (select type from cal_item_types where item_type_id= ci.item_type_id) as item_type, cals.calendar_id, cals.calendar_name from acs_activities a, @@ -55,7 +55,7 @@ and start_date between to_date(:current_date_system,:ansi_date_format) and to_date(:current_date_system,:ansi_date_format) + cast('23 hours 59 minutes 59 seconds' as interval) -and cal_items.cal_item_id= e.event_id +and ci.cal_item_id= e.event_id and (to_char(start_date, 'HH24:MI') <> '00:00' or to_char(end_date, 'HH24:MI') <> '00:00') and cals.package_id= :package_id 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 -N -r1.3 -r1.4 --- openacs-4/packages/calendar/www/view-one-day-display.adp 22 Jul 2003 15:32:06 -0000 1.3 +++ openacs-4/packages/calendar/www/view-one-day-display.adp 17 Aug 2003 18:08:16 -0000 1.4 @@ -38,7 +38,9 @@ - @day_items_with_time.current_hour@ + + @day_items_with_time.current_hour@ 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 -N -r1.8 -r1.9 --- openacs-4/packages/calendar/www/view-one-day-display.tcl 17 Aug 2003 01:46:10 -0000 1.8 +++ openacs-4/packages/calendar/www/view-one-day-display.tcl 17 Aug 2003 18:08:16 -0000 1.9 @@ -55,7 +55,8 @@ 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 } { - if {$start_hour == $item_current_hour $$ start_hour >= $start_display_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 } { lappend day_items_per_hour [list $item_current_hour "" $item_id $calendar_name $status_summary $start_hour $end_hour $start_time $end_time]