Index: openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-postgresql.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql 18 Nov 2002 18:01:10 -0000 1.8
+++ openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql 17 May 2003 10:20:50 -0000 1.9
@@ -35,6 +35,19 @@
+
+
+ select to_char(to_date(:current_date, 'yyyy-mm-dd'), 'D')
+ as day_of_the_week,
+ to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')- '1 week'::interval, 'Sunday'), 'YYYY-MM-DD')
+ as sunday_of_the_week,
+ to_char(next_day(to_date(:current_date, 'yyyy-mm-dd'), 'Saturday'), 'YYYY-MM-DD')
+ as saturday_of_the_week
+ from dual
+
+
+
+
select to_char(start_date, 'J') as start_date_julian,
@@ -96,8 +109,8 @@
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
-and cal_items.cal_item_id= e.event_id
+ to_date(:current_date,:date_format) + cast('23 hours 59 minutes 59 seconds' as interval)
+and cal_items.cal_item_id= e.event_id
and e.event_id
in (
select cal_item_id
@@ -139,5 +152,34 @@
+
+
+
+
+ select to_char(start_date, 'HH24') as start_hour,
+ to_char(start_date, 'HH:MIpm') as pretty_start_date,
+ to_char(end_date, 'HH:MIpm') as pretty_end_date,
+ coalesce(e.name, a.name) as name,
+ coalesce(e.status_summary, a.status_summary) as status_summary,
+ e.event_id as item_id
+from acs_activities a,
+ acs_events e,
+ timespans s,
+ time_intervals t
+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(:current_date,:date_format) and
+ to_date(:current_date,:date_format) + cast('23 hours 59 minutes 59 seconds' as interval)
+and e.event_id
+in (
+ select cal_item_id
+ from cal_items
+ where on_which_calendar = :calendar_id
+ )
+
+
+