Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 6 Mar 2002 00:20:36 -0000 1.7 +++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 10 Mar 2002 21:42:36 -0000 1.8 @@ -96,7 +96,8 @@ -day_bgcolor "#DDDDDD" -today_bgcolor "#DDDDDD" -day_text_color "white" - -empty_bgcolor "white" + -empty_bgcolor "white" + -overlap_p 0 } } { Returns a calendar for a specific day, with details supplied by @@ -125,19 +126,17 @@ } # Loop through the hours of the day - append return_html " + + + + + +
- \n" + append return_html "
+ \n" # The items that have no hour set hour "" set next_hour "" set start_time "" set display_hour "No Time" - append return_html "" + append return_html "" if {[ns_set find $calendar_details ""] != -1} { - append return_html "" - if {[ns_set find $calendar_details $index_hour] != -1} { - append return_html "" + } else { + append return_html "[ns_set value $calendar_details $index]
\n" + } ns_set delete $calendar_details $index } - append return_html "\n" + append return_html "\n" } append return_html "
 [subst $hour_template]
 [subst $hour_template]" - } else { - append return_html "" + append return_html "" } # Go through events @@ -192,25 +191,25 @@ set display_hour [subst $hour_template] append return_html "
 $display_hour" - } else { - append return_html "" - } - # Go through events while {1} { set index [ns_set find $calendar_details $index_hour] if {$index == -1} { break } - append return_html "[ns_set value $calendar_details $index]
\n" + if {$overlap_p} { + set end_time [expr $hour + 2] + set start_time $hour + append return_html "		[ns_set value $calendar_details $index]
" Index: openacs-4/packages/calendar/tcl/calendar-display-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/calendar/tcl/calendar-display-procs.tcl 6 Mar 2002 00:20:24 -0000 1.5 +++ openacs-4/packages/calendar/tcl/calendar-display-procs.tcl 10 Mar 2002 21:42:49 -0000 1.6 @@ -172,7 +172,7 @@ return [dt_widget_day -hour_template $hour_template \ -start_hour $widget_start_hour -end_hour $widget_end_hour \ - -calendar_details $items -date $date] + -calendar_details $items -date $date -overlap_p 1] } Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/calendar/tcl/calendar-procs.tcl 23 Jan 2002 09:24:55 -0000 1.7 +++ openacs-4/packages/calendar/tcl/calendar-procs.tcl 10 Mar 2002 21:42:49 -0000 1.8 @@ -21,15 +21,28 @@ to be imported into oracle. (yyyy-mm-dd hh24:mi format)s } { + # MUST CONVERT TO ARRAYS! (ben) + array set event_date_arr $event_date + array set event_time_arr $event_time + # extract from even-date - set year [lindex $event_date 5] - set day [lindex $event_date 7] - set month [lindex $event_date 9] + set year $event_date_arr(year) + set day $event_date_arr(day) + set month $event_date_arr(month) # extract from event_time - set hours [lindex $event_time 3] - set minutes [lindex $event_time 1] + set hours $event_time_arr(hours) + set minutes $event_time_arr(minutes) + # AM/PM? (ben - openacs fix) + if {[info exists event_time_arr(ampm)]} { + if {$event_time_arr(ampm)} { + if {$hours < 12} { + incr hours 12 + } + } + } + if {$month < 10} { set month "0$month" } Index: openacs-4/packages/calendar/www/cal-item-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-create.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/calendar/www/cal-item-create.tcl 6 Mar 2002 00:20:24 -0000 1.6 +++ openacs-4/packages/calendar/www/cal-item-create.tcl 10 Mar 2002 21:42:49 -0000 1.7 @@ -19,8 +19,15 @@ {date now} {calendar_id "-1"} {return_url ""} + {recurrence_p 0} } +if {$recurrence_p} { + # We must ask for recurrence information + ad_returntemplate cal-item-create-recurrence + ad_script_abort +} + if { $date == "now" } { set date [dt_sysdate] } Index: openacs-4/packages/calendar/www/cal-item.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/calendar/www/cal-item.adp 6 Mar 2002 00:20:24 -0000 1.7 +++ openacs-4/packages/calendar/www/cal-item.adp 10 Mar 2002 21:42:49 -0000 1.8 @@ -109,6 +109,17 @@
+ Recurrence? + + No       + Yes +