Index: openacs-4/packages/calendar/www/view-week-display-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/view-week-display-oracle.xql	26 Jul 2003 21:58:28 -0000	1.1
+++ openacs-4/packages/calendar/www/view-week-display-oracle.xql	14 Aug 2003 15:44:08 -0000	1.2
@@ -5,105 +5,69 @@
 
 <fullquery name="select_weekday_info">
 <querytext>
-        select   to_char(to_date(:current_date, 'yyyy-mm-dd'), 'D') 
+        select   to_char(to_date(:start_date, 'YYYY-MM-DD'), 'D') 
         as       day_of_the_week,
-        to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'SUNDAY')) 
+        to_char(next_day(to_date(:start_date, 'YYYY-MM-DD')-7, 'SUNDAY'))
         as       sunday_of_the_week,
-        to_char(next_day(to_date(:current_date, 'yyyy-mm-dd'), 'Saturday')) 
+        to_char(next_day(to_date(:start_date, 'YYYY-MM-DD'), 'Saturday')) 
         as       saturday_of_the_week
         from     dual
 </querytext>
 </fullquery>
 
 <fullquery name="select_week_items">
 <querytext>
-select   to_char(start_date, 'J') as start_date_julian,
-         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,
-         to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date,
+select   to_char(start_date, :ansi_date_format) as ansi_start_date,
+         to_char(end_date, :ansi_date_format) as ansi_end_date,
          nvl(e.name, a.name) as name,
          nvl(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,
-	 on_which_calendar as calendar_id,
-	 (select calendar_name from calendars 
-	 where calendar_id = on_which_calendar)
-	 as calendar_name
+         (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,
          acs_events e,
          timespans s,
          time_intervals t,
-         cal_items
+         cal_items ci,
+         calendars cals
 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 = cal_items.cal_item_id       
-and      start_date >= to_date(:first_day_of_week_julian, 'J') 
-and      start_date <= to_date(:first_day_of_week_julian + 7, '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
+and      start_date between
+         to_date(:sunday_of_the_week_system, :ansi_date_format) and
+         to_date(:saturday_of_the_week_system, :ansi_date_format)
+and      cals.package_id= :package_id
+and      (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))
+and      cals.calendar_id = ci.on_which_calendar
+and      e.event_id = ci.cal_item_id
+order by to_char(start_date, 'J'), to_char(start_date,'HH24:MI')
 </querytext>
 </fullquery>
 
-<fullquery name="select_week_info">      
+<fullquery name="select_week_info">
 <querytext>
-select   to_char(to_date(:start_date, 'yyyy-mm-dd'), 'D') 
-as day_of_the_week,
-cast(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') as date)
-as sunday_date,
-to_char(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday'),'J') 
-as sunday_julian,
-cast(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('1 day' as interval) as date)
-as monday_date,
-to_char(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('1 day' as interval),'J')
-as monday_julian,
-cast(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('2 days' as interval) as date)
-as tuesday_date,
-to_char(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('2 days' as interval),'J') 
-as tuesday_julian,
-cast(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('3 days' as interval) as date)
-as wednesday_date,
-to_char(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('3 days' as interval),'J') 
-as wednesday_julian,
-cast(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('4 days' as interval) as date)
-as thursday_date,
-to_char(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('4 days' as interval),'J') 
-as thursday_julian,
-cast(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('5 days' as interval) as date)
-as friday_date,
-to_char(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('5 days' as interval),'J') 
-as friday_julian,
-cast(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('6 days' as interval) as date)
-as saturday_date,
-to_char(next_day(to_date(:start_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('6 days' as interval),'J') 
-as saturday_julian,
-cast(:start_date::timestamptz - cast('7 days' as interval) as date) as last_week,
-to_char(:start_date::timestamptz - cast('7 days' as interval), 'Month DD, YYYY') as last_week_pretty,
-cast(:start_date::timestamptz + cast('7 days' as interval) as date) as next_week,
-to_char(:start_date::timestamptz + cast('7 days' as interval), 'Month DD, YYYY') as next_week_pretty
+select to_char(to_date(:start_date, 'YYYY-MM-DD'), 'D') as day_of_the_week,
+next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') as sunday_date,
+to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday'),'J') as sunday_julian,
+next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 1 as monday_date,
+to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 1,'J') as monday_julian,
+next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 2 as tuesday_date,
+to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 2,'J') as tuesday_julian,
+next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 3 as wednesday_date,
+to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 3,'J') as wednesday_julian,
+next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 4 as thursday_date,
+to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 4,'J') as thursday_julian,
+next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 5 as friday_date,
+to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 5,'J') as friday_julian,
+next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 6 as saturday_date,
+to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - 7, 'Sunday') + 6,'J') as saturday_julian,
+to_char(to_date(:start_date) - 7, 'YYYY-MM-DD') as last_week,
+to_char(to_date(:start_date) - 7, 'Month DD, YYYY') as last_week_pretty,
+to_char(to_date(:start_date) + 7, 'YYYY-MM-DD') as next_week,
+to_char(to_date(:start_date) + 7, 'Month DD, YYYY') as next_week_pretty
 from     dual
 </querytext>
 </fullquery>
 
-<fullquery name="select_day_info">      
-<querytext>
-select   to_char(to_date(:start_date, 'yyyy-mm-dd'), 'Day, DD Month YYYY') 
-as day_of_the_week,
-to_char(to_date(:start_date, 'yyyy-mm-dd') - cast('1 day' as interval), 'yyyy-mm-dd')
-as yesterday,
-to_char(to_date(:start_date, 'yyyy-mm-dd') + cast('1 day' as interval), 'yyyy-mm-dd')
-as tomorrow
-from     dual
-</querytext>
-</fullquery>
-
- 
-
 </queryset>
-