Index: openacs-4/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/project-manager.info,v
diff -u -r1.49 -r1.50
--- openacs-4/packages/project-manager/project-manager.info	22 May 2006 06:14:27 -0000	1.49
+++ openacs-4/packages/project-manager/project-manager.info	29 May 2006 16:36:16 -0000	1.50
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="3.1d26" url="http://openacs.org/repository/download/apm/project-manager-3.1d26.apm">
+    <version name="3.1d27" url="http://openacs.org/repository/download/apm/project-manager-3.1d27.apm">
         <owner url="mailto:jade@rubick.com">Jade Rubick</owner>
         <owner url="mailto:malte.sussdorff@cognovis.de">Malte Sussdorff</owner>
         <summary>Project management tool for OpenACS</summary>
@@ -17,7 +17,7 @@
         <description format="text/plain">Track tasks, estimates and actual progress for a project.  See the &lt;a href=&quot;http://openacs.org/projects/dotwrk/project_management/&quot;&gt;project page&lt;/a&gt; for more information.</description>
         <maturity>0</maturity>
 
-        <provides url="project-manager" version="3.1d26"/>
+        <provides url="project-manager" version="3.1d27"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-subsite" version="5.2.0a4"/>
         <requires url="acs-templating" version="5.1.6d1"/>
@@ -49,6 +49,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="OngoingByDefaultP"  default="f" description="If set to t, then projects are by default ongoing (no deadline), unless the user selects otherwise. If set to f, then projects by default have a deadline." section_name="projects"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ProjectAdd"  default="/packages/project-manager/templates/project-ae" description="The template for adding/editing of an individual project" section_name="Templates"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ProjectOne"  default="/packages/project-manager/templates/project-one" description="The template for display of an individual project" section_name="Templates"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ProjectList"  default="/packages/lib/projects" description="The template for display of the list of projects" section_name="Templates"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SendDailyEmail"  default="0" description="Whether or not to send a daily email reminder to all people who are assigned tasks. A 1 indicates yes, and a 0 indicates no." section_name="email"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowObserverTasksP"  default="0" description="If set to 1, then the user will see all his tasks, even if he is only an observer. Otherwise, not shown" section_name="tasks"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TaskAdd"  default="/packages/project-manager/templates/task-ae" description="The template for the adding/editing of an individual task" section_name="Templates"/>
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} } \
Index: openacs-4/packages/project-manager/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/index.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/project-manager/www/index.adp	10 May 2006 18:51:42 -0000	1.16
+++ openacs-4/packages/project-manager/www/index.adp	29 May 2006 16:36:17 -0000	1.17
@@ -5,7 +5,7 @@
 <property name="title">#project-manager.Projects#</property>
 <property name="context">@context;noquote@</property>
 
-<include src="/packages/project-manager/lib/projects" 
+<include src="@template_src@" 
 	orderby="@orderby;noquote@" 
 	pm_status_id="@pm_status_id@" 
 	searchterm="@searchterm@" 
@@ -26,5 +26,7 @@
 	page="@page@"
 	page_num="@page_num@" 
 	subprojects_p="@subprojects_p@"
+	pm_etat_id="@pm_etat_id@"
+	pm_contact_id="@pm_contact_id@"
 	/>
 
Index: openacs-4/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/index.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/project-manager/www/index.tcl	10 May 2006 18:51:42 -0000	1.16
+++ openacs-4/packages/project-manager/www/index.tcl	29 May 2006 16:36:17 -0000	1.17
@@ -52,7 +52,7 @@
 # Sending only one value to the include
 set date_range "${start_range_f}/$end_range_f"
 
-set exporting_vars { status_id category_id assignee_id orderby format }
+set exporting_vars { status_id category_id assignee_id orderby format pm_status_id pm_contact_id pm_etat_id previous_status_f current_package_f subprojects_p }
 set hidden_vars [export_vars -form $exporting_vars]
 
 # set up context bar
@@ -108,3 +108,6 @@
 if {$current_package_f ne 1} {
     set current_package_f $package_id
 }
+
+# Retrieving the name of the template to call
+set template_src [parameter::get -parameter "ProjectList"]