Index: openacs-4/packages/project-manager/lib/projects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects.tcl,v diff -u -r1.35 -r1.36 --- openacs-4/packages/project-manager/lib/projects.tcl 10 May 2006 18:51:41 -0000 1.35 +++ openacs-4/packages/project-manager/lib/projects.tcl 29 May 2006 16:36:16 -0000 1.36 @@ -152,13 +152,12 @@ set start_range_f [lindex [split $date_range "/"] 0] set end_range_f [lindex [split $date_range "/"] 1] if {![empty_string_p $start_range_f] && ![empty_string_p $end_range_f]} { - set p_range_where "to_char(p.planned_end_date,'YYYY-MM-DD') >= :start_range_f and - to_char(p.planned_end_date,'YYYY-MM-DD') <= :end_range_f" + set p_range_where "p.planned_start_date > to_timestamp(:start_range_f, 'YYYY-MM-DD') and p.planned_start_date < to_timestamp(:end_range_f, 'YYYY-MM-DD') + interval '1 day'" } else { if {![empty_string_p $start_range_f] } { - set p_range_where "to_char(p.planned_end_date,'YYYY-MM-DD') >= :start_range_f" + set p_range_where "p.planned_start_date > to_timestamp(:start_range_f, 'YYYY-MM-DD')" } elseif { ![empty_string_p $end_range_f] } { - set p_range_where "to_char(p.planned_end_date,'YYYY-MM-DD') <= :end_range_f" + set p_range_where "p.planned_start_date < to_timestamp(:end_range_f, 'YYYY-MM-DD') + interval '1 day'" } else { set p_range_where "" } @@ -320,6 +319,8 @@ where_clause {c.category_id = [join [value_if_exists category_id] ","]} ] \ user_space_p [list] \ + start_range_f [list] \ + end_range_f [list] \ subprojects_p [list \ label "[_ project-manager.ShowSubprojects]" \ values { {"[_ project-manager.True]" t } { "[_ project-manager.False]" f} } \