Index: openacs-4/packages/calendar/tcl/calendar-outlook-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-outlook-procs.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/calendar/tcl/calendar-outlook-procs.tcl 1 Nov 2003 08:45:37 -0000 1.12 +++ openacs-4/packages/calendar/tcl/calendar-outlook-procs.tcl 9 Jan 2004 23:11:23 -0000 1.13 @@ -61,8 +61,6 @@ The client timezone helps to make things right. It is the number offset from GMT. } { - set date_format "YYYY-MM-DD HH24:MI:SS" - calendar::item::get -cal_item_id $cal_item_id -array cal_item # If necessary, select recurrence information Index: openacs-4/packages/calendar/www/view-list-display-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-list-display-oracle.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/calendar/www/view-list-display-oracle.xql 21 Sep 2003 22:16:11 -0000 1.4 +++ openacs-4/packages/calendar/www/view-list-display-oracle.xql 9 Jan 2004 23:11:23 -0000 1.5 @@ -25,8 +25,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and ci.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 (start_date > to_date(:start_date,'YYYY-MM-DD HH24:MI') or :start_date is null) and + (start_date < to_date(:end_date,'YYYY-MM-DD HH24:MI') or :end_date is null) and cals.calendar_id = ci.on_which_calendar $calendars_clause order by $sort_by Index: openacs-4/packages/calendar/www/view-list-display-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-list-display-postgresql.xql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/calendar/www/view-list-display-postgresql.xql 9 Sep 2003 09:12:54 -0000 1.5 +++ openacs-4/packages/calendar/www/view-list-display-postgresql.xql 9 Jan 2004 23:11:23 -0000 1.6 @@ -26,8 +26,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and ci.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 (start_date > to_date(:start_date,'YYYY-MM-DD HH24:MI') or :start_date is null) and + (start_date < to_date(:end_date,'YYYY-MM-DD HH24:MI') or :end_date is null) and cals.calendar_id = ci.on_which_calendar $calendars_clause order by $sort_by Index: openacs-4/packages/calendar/www/view-list-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v diff -u -N -r1.16 -r1.17 --- openacs-4/packages/calendar/www/view-list-display.tcl 5 Nov 2003 18:05:28 -0000 1.16 +++ openacs-4/packages/calendar/www/view-list-display.tcl 9 Jan 2004 23:11:23 -0000 1.17 @@ -45,8 +45,6 @@ set package_id [ad_conn package_id] set user_id [ad_conn user_id] -set date_format "YYYY-MM-DD HH24:MI" - # The title if {[empty_string_p $start_date] && [empty_string_p $end_date]} { set title "" Index: openacs-4/packages/calendar/www/view-month-display-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-month-display-oracle.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/calendar/www/view-month-display-oracle.xql 25 Sep 2003 23:11:12 -0000 1.2 +++ openacs-4/packages/calendar/www/view-month-display-oracle.xql 9 Jan 2004 23:11:23 -0000 1.3 @@ -5,8 +5,8 @@ - select to_char(start_date, :ansi_date_format) as ansi_start_date, - to_char(end_date, :ansi_date_format) as ansi_end_date, + select 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, nvl(e.name, a.name) as name, nvl(e.description, a.description) as description, nvl(e.status_summary, a.status_summary) as status_summary, @@ -22,8 +22,8 @@ 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_date_of_month_system, :ansi_date_format) - and to_date(:last_date_in_month_system, :ansi_date_format) + and start_date between to_date(:first_date_of_month_system, 'YYYY-MM-DD HH24:MI:SS') + and to_date(:last_date_in_month_system, 'YYYY-MM-DD HH24:MI:SS') and cals.calendar_id = ci.on_which_calendar and e.event_id = ci.cal_item_id $calendars_clause 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 -N -r1.6 -r1.7 --- openacs-4/packages/calendar/www/view-month-display-postgresql.xql 25 Sep 2003 23:11:12 -0000 1.6 +++ openacs-4/packages/calendar/www/view-month-display-postgresql.xql 9 Jan 2004 23:11:23 -0000 1.7 @@ -5,8 +5,8 @@ - select to_char(start_date, :ansi_date_format) as ansi_start_date, - to_char(end_date, :ansi_date_format) as ansi_end_date, + select 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, coalesce(e.description, a.description) as description, coalesce(e.status_summary, a.status_summary) as status_summary, @@ -22,8 +22,8 @@ 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_timestamp(:first_date_of_month_system, :ansi_date_format) - and to_timestamp(:last_date_in_month_system, :ansi_date_format) + and start_date between to_timestamp(:first_date_of_month_system, 'YYYY-MM-DD HH24:MI:SS') + and to_timestamp(:last_date_in_month_system, 'YYYY-MM-DD HH24:MI:SS') and cals.calendar_id = ci.on_which_calendar and e.event_id = ci.cal_item_id $calendars_clause Index: openacs-4/packages/calendar/www/view-month-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/calendar/www/view-month-display.tcl 30 Dec 2003 23:30:09 -0000 1.11 +++ openacs-4/packages/calendar/www/view-month-display.tcl 9 Jan 2004 23:11:23 -0000 1.12 @@ -40,7 +40,6 @@ set this_day [dt_trim_leading_zeros [lindex $date_list 2]] set month_string [lindex [dt_month_names] [expr $this_month - 1]] -set ansi_date_format "YYYY-MM-DD HH24:MI:SS" set package_id [ad_conn package_id] set user_id [ad_conn user_id] Index: openacs-4/packages/calendar/www/view-one-day-display-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-one-day-display-oracle.xql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/calendar/www/view-one-day-display-oracle.xql 25 Sep 2003 23:11:12 -0000 1.5 +++ openacs-4/packages/calendar/www/view-one-day-display-oracle.xql 9 Jan 2004 23:11:23 -0000 1.6 @@ -21,8 +21,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and start_date between - to_date(:current_date_system,:ansi_date_format) and - (to_date(:current_date_system,:ansi_date_format) + (24 - 1/3600)/24) + to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') and + (to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') + (24 - 1/3600)/24) and ci.cal_item_id = e.event_id and to_char(start_date, 'HH24:MI') = '00:00' and to_char(end_date, 'HH24:MI') = '00:00' @@ -34,8 +34,8 @@ - select to_char(start_date, :ansi_date_format) as ansi_start_date, - to_char(end_date, :ansi_date_format) as ansi_end_date, + select 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, nvl(e.name, a.name) as name, nvl(e.status_summary, a.status_summary) as status_summary, e.event_id as item_id, @@ -52,8 +52,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and start_date between - to_date(:current_date_system,:ansi_date_format) and - (to_date(:current_date_system,:ansi_date_format) + (:end_display_hour - 1/3600)/:end_display_hour) + to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') and + (to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') + (:end_display_hour - 1/3600)/:end_display_hour) and ci.cal_item_id = e.event_id and (to_char(start_date, 'HH24:MI') <> '00:00' or to_char(end_date, 'HH24:MI') <> '00:00') Index: openacs-4/packages/calendar/www/view-one-day-display-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/view-one-day-display-postgresql.xql,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/calendar/www/view-one-day-display-postgresql.xql 26 Sep 2003 08:20:06 -0000 1.10 +++ openacs-4/packages/calendar/www/view-one-day-display-postgresql.xql 9 Jan 2004 23:11:23 -0000 1.11 @@ -21,8 +21,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and start_date between - to_date(:current_date_system,:ansi_date_format) and - to_date(:current_date_system,:ansi_date_format) + cast('23 hours 59 minutes 59 seconds' as interval) + to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') and + to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') + cast('23 hours 59 minutes 59 seconds' as interval) and ci.cal_item_id= e.event_id and to_char(start_date, 'HH24:MI') = '00:00' and to_char(end_date, 'HH24:MI') = '00:00' @@ -34,8 +34,8 @@ - select to_char(start_date, :ansi_date_format) as ansi_start_date, - to_char(end_date, :ansi_date_format) as ansi_end_date, + select 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, coalesce(e.status_summary, a.status_summary) as status_summary, e.event_id as item_id, @@ -52,8 +52,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and start_date between - to_date(:current_date_system,:ansi_date_format) and - to_date(:current_date_system,:ansi_date_format) + cast('23 hours 59 minutes 59 seconds' as interval) + to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') and + to_date(:current_date_system,'YYYY-MM-DD HH24:MI:SS') + cast('23 hours 59 minutes 59 seconds' as interval) and ci.cal_item_id= e.event_id and (to_char(start_date, 'HH24:MI') <> '00:00' or to_char(end_date, 'HH24:MI') <> '00:00') Index: openacs-4/packages/calendar/www/view-one-day-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v diff -u -N -r1.23 -r1.24 --- openacs-4/packages/calendar/www/view-one-day-display.tcl 11 Dec 2003 21:39:59 -0000 1.23 +++ openacs-4/packages/calendar/www/view-one-day-display.tcl 9 Jan 2004 23:11:23 -0000 1.24 @@ -55,9 +55,6 @@ } } -# The database needs this for proper formatting. -set ansi_date_format "YYYY-MM-DD HH24:MI:SS" - set current_date $date set current_date_system "$date 00:00:00" if {[empty_string_p $date]} { 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 -N -r1.4 -r1.5 --- openacs-4/packages/calendar/www/view-week-display-oracle.xql 25 Sep 2003 23:11:12 -0000 1.4 +++ openacs-4/packages/calendar/www/view-week-display-oracle.xql 9 Jan 2004 23:11:23 -0000 1.5 @@ -17,10 +17,10 @@ -select to_char(start_date, :ansi_date_format) as ansi_start_date, - to_char(end_date, :ansi_date_format) as ansi_end_date, +select 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, trunc(start_date - to_date(:first_weekday_of_the_week_tz, - :ansi_date_format)) as day_of_week, + 'YYYY-MM-DD HH24:MI:SS')) as day_of_week, nvl(e.name, a.name) as name, nvl(e.status_summary, a.status_summary) as status_summary, e.event_id as item_id, @@ -37,8 +37,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and start_date between - to_date(:first_weekday_of_the_week_tz, :ansi_date_format) and - to_date(:last_weekday_of_the_week_tz, :ansi_date_format) + to_date(:first_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS') and + to_date(:last_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS') and cals.calendar_id = ci.on_which_calendar and e.event_id = ci.cal_item_id $calendars_clause 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 -N -r1.7 -r1.8 --- openacs-4/packages/calendar/www/view-week-display-postgresql.xql 25 Sep 2003 23:11:12 -0000 1.7 +++ openacs-4/packages/calendar/www/view-week-display-postgresql.xql 9 Jan 2004 23:11:23 -0000 1.8 @@ -17,13 +17,13 @@ -select to_char(start_date, :ansi_date_format) as ansi_start_date, - to_char(end_date, :ansi_date_format) as ansi_end_date, +select 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, coalesce(e.status_summary, a.status_summary) as status_summary, e.event_id as item_id, - (to_date(start_date,:ansi_date_format) - to_date(:first_weekday_of_the_week_tz, - :ansi_date_format)) as day_of_week, + (to_date(start_date,'YYYY-MM-DD HH24:MI:SS') - to_date(:first_weekday_of_the_week_tz, + 'YYYY-MM-DD HH24:MI:SS')) as day_of_week, (select type from cal_item_types where item_type_id= cal_items.item_type_id) as item_type, cals.calendar_id, cals.calendar_name @@ -37,8 +37,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and start_date between - to_date(:first_weekday_of_the_week_tz, :ansi_date_format) and - to_date(:last_weekday_of_the_week_tz, :ansi_date_format) + to_date(:first_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS') and + to_date(:last_weekday_of_the_week_tz, 'YYYY-MM-DD HH24:MI:SS') and cals.calendar_id = ci.on_which_calendar and e.event_id = ci.cal_item_id $calendars_clause Index: openacs-4/packages/calendar/www/view-week-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/calendar/www/view-week-display.tcl 5 Nov 2003 18:05:28 -0000 1.12 +++ openacs-4/packages/calendar/www/view-week-display.tcl 9 Jan 2004 23:11:23 -0000 1.13 @@ -42,8 +42,6 @@ set package_id [ad_conn package_id] set user_id [ad_conn user_id] -set ansi_date_format "YYYY-MM-DD HH24:MI:SS" - set start_date $date # Convert date from user timezone to system timezone