Index: openacs-4/packages/dotlrn-ecommerce/tcl/section-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/section-procs-oracle.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn-ecommerce/tcl/section-procs-oracle.xql 13 Mar 2006 14:06:25 -0000 1.3 +++ openacs-4/packages/dotlrn-ecommerce/tcl/section-procs-oracle.xql 13 Mar 2006 17:15:12 -0000 1.4 @@ -44,7 +44,7 @@ to_char(end_date, 'hh:mi') as timeend, to_char(start_date, 'am') as startampm, to_char(end_date, 'am') as endampm, - to_char(start_date, 'yyyymmddhh24miss') as datenum + to_char(start_date, 'yyyy-mm-dd hh24:mi:ss') as datenum from cal_items ci, acs_events e, acs_activities a, timespans s, time_intervals t where e.timespan_id = s.timespan_id and s.interval_id = t.interval_id Index: openacs-4/packages/dotlrn-ecommerce/tcl/section-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/section-procs-postgresql.xql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/dotlrn-ecommerce/tcl/section-procs-postgresql.xql 13 Mar 2006 14:06:25 -0000 1.5 +++ openacs-4/packages/dotlrn-ecommerce/tcl/section-procs-postgresql.xql 13 Mar 2006 17:15:12 -0000 1.6 @@ -37,7 +37,7 @@ - select distinct to_char(start_date, 'Mon') as month, to_char(start_date, 'dd') as day, to_char(start_date, 'hh:mi') as timestart, to_char(end_date, 'hh:mi') as timeend, to_char(start_date, 'am') as startampm, to_char(end_date, 'am') as endampm, to_char(start_date, 'yyyymmddhh24miss') as datenum + select distinct to_char(start_date, 'Mon') as month, to_char(start_date, 'dd') as day, to_char(start_date, 'hh:mi') as timestart, to_char(end_date, 'hh:mi') as timeend, to_char(start_date, 'am') as startampm, to_char(end_date, 'am') as endampm, to_char(start_date, 'yyyy-mm-dd hh24:mi:ss') as datenum from cal_items ci, acs_events e, acs_activities a, timespans s, time_intervals t where e.timespan_id = s.timespan_id and s.interval_id = t.interval_id Index: openacs-4/packages/dotlrn-ecommerce/tcl/section-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/section-procs.tcl,v diff -u -N -r1.39 -r1.40 --- openacs-4/packages/dotlrn-ecommerce/tcl/section-procs.tcl 13 Mar 2006 14:06:25 -0000 1.39 +++ openacs-4/packages/dotlrn-ecommerce/tcl/section-procs.tcl 13 Mar 2006 17:15:12 -0000 1.40 @@ -91,6 +91,7 @@ array set arr_sessions [list] db_foreach sessions { } { lappend arr_sessions(${month}_${timestart}_${timeend}_${startampm}_${endampm}) $day + lappend arr_sessions_sort(${month}_${timestart}_${timeend}_${startampm}_${endampm}) [clock scan $datenum] } set days [list] @@ -103,6 +104,7 @@ set endampm [lindex $times 4] set _sessions $arr_sessions(${month}_${start}_${end}_${startampm}_${endampm}) + set datenum $arr_sessions_sort(${month}_${start}_${end}_${startampm}_${endampm}) set _days [list] foreach day $_sessions { @@ -132,7 +134,7 @@ } # Sort dates - set _text_sessions [lsort -index end -integer $text_sessions] + set _text_sessions [lsort -index end $text_sessions] set text_sessions [list] foreach _text_session $_text_sessions { lappend text_sessions [join [lrange $_text_session 0 2]] @@ -149,9 +151,9 @@ if { [llength $text_sessions] > 3 } { set sessions [join [lrange $text_sessions 0 2] ",
"] if { [exists_and_not_null anchor] } { - append sessions "
[expr [llength $text_sessions]-3] more" + append sessions "
[_ dotlrn-ecommerce.lt_Show_additional_dates] ([expr [llength $text_sessions]-3] [_ dotlrn-ecommerce.more])" } else { - append sessions "
[expr [llength $text_sessions]-3] more" + append sessions "
[_ dotlrn-ecommerce.lt_Show_additional_dates] ([expr [llength $text_sessions]-3] [_ dotlrn-ecommerce.more])" } return $sessions @@ -161,9 +163,9 @@ set sessions [join $text_sessions ",
"] if { [llength $text_sessions] > 3 } { if { [exists_and_not_null anchor] } { - append sessions "
less" + append sessions "
[_ dotlrn-ecommerce.lt_Hide_additional_dates]" } else { - append sessions "
less" + append sessions "
[_ dotlrn-ecommerce.lt_Hide_additional_dates]" } }