Index: openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-oracle.xql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql 18 Nov 2002 18:01:10 -0000 1.12 +++ openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql 4 Dec 2002 09:44:35 -0000 1.13 @@ -74,10 +74,7 @@ - select to_char(start_date, 'HH24') as start_hour, - to_char(start_date, 'HH24:MI') as start_date, - to_char(end_date, 'HH24:MI') as end_date, - to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, + select to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date, nvl(e.name, a.name) as name, nvl(e.status_summary, a.status_summary) as status_summary, @@ -86,7 +83,9 @@ on_which_calendar as calendar_id, (select calendar_name from calendars where calendar_id = on_which_calendar) - as calendar_name + as calendar_name, + to_char(timezone.local_to_utc(timezone.get_id(:timezone),to_date(:current_date,:date_format)),'YYYY-MM-DD HH24:MI:SS') as start_interval, + to_char(timezone.local_to_utc(timezone.get_id(:timezone),to_date(:current_date,:date_format) + (24 - 1/3600)/24),'YYYY-MM-DD HH24:MI:SS') as end_interval from acs_activities a, acs_events e, timespans s, @@ -96,8 +95,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and start_date between - to_date(:current_date,:date_format) and - to_date(:current_date,:date_format) + (24 - 1/3600)/24 + timezone.local_to_utc(timezone.get_id(:timezone),to_date(:current_date,:date_format)) and + timezone.local_to_utc(timezone.get_id(:timezone),to_date(:current_date,:date_format) + (24 - 1/3600)/24) and cal_items.cal_item_id= e.event_id and e.event_id in (