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.8 -r1.9
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 10 Mar 2002 21:42:36 -0000 1.8
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 11 Mar 2002 16:42:00 -0000 1.9
@@ -146,7 +146,11 @@
break
}
- append return_html "[ns_set value $calendar_details $index]
\n"
+ if {$overlap_p} {
+ append return_html "[lindex [ns_set value $calendar_details $index] 2]"
+ } else {
+ append return_html "[ns_set value $calendar_details $index]
\n"
+ }
ns_set delete $calendar_details $index
}
@@ -199,9 +203,19 @@
}
if {$overlap_p} {
- set end_time [expr $hour + 2]
+ set one_item_val [ns_set value $calendar_details $index]
+
+ # One ugly hack
+ set end_time_lst [split [lindex $one_item_val 1] ":"]
+
+ if {[lindex $end_time_lst 1] == 0} {
+ set end_time [expr [string trimleft [lindex $end_time_lst 0] 0] - 1]
+ } else {
+ set end_time [lindex $end_time_lst 1]
+ }
+
set start_time $hour
- append return_html "