Index: openacs-4/packages/calendar/www/cal-dayview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-dayview.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/calendar/www/cal-dayview.tcl 18 Sep 2001 06:34:46 -0000 1.6 +++ openacs-4/packages/calendar/www/cal-dayview.tcl 23 Sep 2001 14:40:55 -0000 1.7 @@ -29,58 +29,6 @@ set current_date $date set date_format "YYYY-MM-DD HH24:MI" -#get cal-item -set sql " -select to_char(start_date, 'HH24') as start_hour, - to_char(start_date, 'HH24:MI') as pretty_start_date, - to_char(end_date, 'HH24:MI') as pretty_end_date, - coalesce(e.name, a.name) as name, - 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) + (24 - 1/3600)/24 -and e.event_id -in ( - select cal_item_id - from cal_items - where on_which_calendar = :calendar_id - ) - -" - -#set sql " -#select to_char(start_date, 'HH24') as start_hour, -# to_char(start_date, 'HH24:MI') as pretty_start_date, -# to_char(end_date, 'HH24:MI') as pretty_end_date, -# nvl(e.name, a.name) as name, -# 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) + (24 - 1/3600)/24 -#and e.event_id -#in ( -# select cal_item_id -# from cal_items -# where on_which_calendar = :calendar_id -# ) -#" - - - set mlist "" set set_id [ns_set new day_items] @@ -105,7 +53,7 @@ set calendar_name [calendar_get_name $calendar_id] } - db_foreach get_day_items $sql { + db_foreach get_day_items "" { ns_set put $set_id $start_hour " $pretty_start_date - $pretty_end_date $name ($calendar_name) @@ -130,7 +78,7 @@ set calendar_name [calendar_get_name $calendar_id] } - db_foreach get_day_items $sql { + db_foreach get_day_items "" { ns_set put $set_id $start_hour " $pretty_start_date - $pretty_end_date $name ($calendar_name)
"