Index: openacs-4/packages/calendar/www/view-month-display-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-month-display-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/calendar/www/view-month-display-postgresql.xql 26 May 2003 10:00:10 -0000 1.1 +++ openacs-4/packages/calendar/www/view-month-display-postgresql.xql 21 Jul 2003 19:21:36 -0000 1.2 @@ -5,9 +5,10 @@ - select to_char(start_date, 'J') as start_date, + select to_char(start_date, 'J') as julian_start_date, 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, + to_char(start_date, 'HH24:MI') as ansi_start_time, + to_char(end_date, 'HH24:MI') as ansi_end_time, coalesce(e.name, a.name) as name, coalesce(e.description, a.description) as description, coalesce(e.status_summary, a.status_summary) as status_summary, @@ -23,13 +24,16 @@ where e.timespan_id = s.timespan_id and s.interval_id = t.interval_id and e.activity_id = a.activity_id + and start_date between + to_date(:first_julian_date_of_month,'J') and + to_date(:last_julian_date_in_month,'J') and e.event_id in ( select cal_item_id from cal_items where on_which_calendar in ([join $calendar_id_list ","]) ) - order by start_date,end_date + order by ansi_start_date