Index: openacs-4/packages/calendar/www/view-week-display-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/view-week-display-postgresql.xql	26 May 2003 10:00:10 -0000	1.1
+++ openacs-4/packages/calendar/www/view-week-display-postgresql.xql	21 Jul 2003 19:21:36 -0000	1.2
@@ -5,11 +5,11 @@
 	
 <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')- '1 week'::interval, 'Sunday'), 'YYYY-MM-DD')
+        to_char(next_day(to_date(:start_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')
+        to_char(next_day(to_date(:start_date, 'yyyy-mm-dd'), 'Saturday'), 'YYYY-MM-DD')
         as       saturday_of_the_week
         from     dual
 </querytext>
@@ -18,8 +18,12 @@
 <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, 'D') as day_of_week,
+         to_char(start_date, 'Day') as start_date_weekday,
+         to_char(start_date,'YYYY-MM-DD') as start_date,
+         to_char(end_date,'YYYY-MM-DD') as end_date,
+         to_char(start_date,'HH24:MI') as start_time,
+         to_char(end_date,'HH24:MI') as end_time,
          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,
          coalesce(e.name, a.name) as name,
@@ -48,9 +52,63 @@
          from    cal_items
          where   on_which_calendar in ([join $calendar_id_list ","])
          )
+order by start_date_julian, start_time
 </querytext>
 </fullquery>
 
+<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
+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>