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 -N -r1.11 -r1.12
--- openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql	26 May 2003 09:59:54 -0000	1.11
+++ openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql	29 Jun 2003 23:32:24 -0000	1.12
@@ -3,6 +3,38 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
+<fullquery name="calendar::one_month_display.select_monthly_items">      
+      <querytext>
+      
+	select   to_char(start_date, 'J') as start_date,
+                 to_char(start_date, 'HH:MIpm') as start_time,
+                 to_char(end_date, 'HH:MIpm') as 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,
+	         e.event_id as item_id,
+		 (select on_which_calendar from cal_items where cal_item_id = e.event_id) as calendar_id,
+		 (select calendar_name from calendars 
+		 where calendar_id = (select on_which_calendar from cal_items where cal_item_id= e.event_id))
+		 as calendar_name
+	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      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	
+      </querytext>
+</fullquery>
+
+
 <fullquery name="calendar::one_week_display.select_week_items">
 <querytext>
 select   to_char(start_date, 'J') as start_date_julian,
@@ -39,32 +71,88 @@
 </querytext>
 </fullquery>
 
-<fullquery name="calendar::list_display.select_day_items">
+<fullquery name="calendar::one_week_display.select_weekday_info">
 <querytext>
+        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
+</querytext>
+</fullquery>
+
+<fullquery name="calendar::one_day_display.select_day_items">
+<querytext>
 	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,
+         to_char(start_date, 'HH24:MI') as start_date,
+         to_char(end_date, 'HH24:MI') as 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
+         e.event_id as item_id,
+         (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type,
+	 on_which_calendar as calendar_id,
+	 (select calendar_name from calendars 
+	 where calendar_id = on_which_calendar)
+	 as calendar_name
 from     acs_activities a,
          acs_events e,
          timespans s,
-         time_intervals t
+         time_intervals t,
+         cal_items
 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      cal_items.cal_item_id= e.event_id
 and      e.event_id
 in       (
          select  cal_item_id
          from    cal_items
+         where   on_which_calendar in ([join $calendar_id_list ","])
+         )
+	
+</querytext>
+</fullquery>
+
+<fullquery name="calendar::list_display.select_list_items">
+<querytext>
+	select   to_char(start_date, 'HH24') as start_hour,
+         to_char(start_date, 'MM/DD/YYYY') as pretty_date,
+         to_char(start_date, 'Day') as pretty_weekday,
+         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,
+         recurrence_id,
+         (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type
+from     acs_activities a,
+         acs_events e,
+         timespans s,
+         time_intervals t,
+         cal_items
+where    e.timespan_id = s.timespan_id
+and      s.interval_id = t.interval_id
+and      e.activity_id = a.activity_id
+and      cal_items.cal_item_id= e.event_id
+and      (start_date > to_date(:start_date,:date_format) or :start_date is null) and
+         (start_date < to_date(:end_date,:date_format) or :end_date is null)
+and      e.event_id
+in       (
+         select  cal_item_id
+         from    cal_items
          where   on_which_calendar = :calendar_id
          )
+order by $sort_by
 	
 </querytext>
 </fullquery>
+
  
 </queryset>