Index: openacs-4/packages/project-manager-portlet/lib/projects-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/lib/projects-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager-portlet/lib/projects-postgresql.xql	15 Aug 2005 09:21:01 -0000	1.2
+++ openacs-4/packages/project-manager-portlet/lib/projects-postgresql.xql	24 Aug 2005 15:04:05 -0000	1.3
@@ -12,40 +12,10 @@
         p.object_type as content_type,
         p.title as project_name,
         p.project_code,
-        to_char(p.planned_start_date, 'YYYY-MM-DD HH24:MI:SS') as planned_start_date,
         to_char(p.planned_end_date, 'YYYY-MM-DD HH24:MI:SS') as planned_end_date,
         p.ongoing_p,
-        c.category_id,
-        c.category_name,
-        p.earliest_finish_date - current_date as days_to_earliest_finish,
-        p.latest_finish_date - current_date as days_to_latest_finish,
-        p.actual_hours_completed,
-        p.estimated_hours_total,
-        to_char(p.estimated_finish_date, 'YYYY-MM-DD HH24:MI:SS') as estimated_finish_date,
-        to_char(p.earliest_finish_date, 'YYYY-MM-DD HH24:MI:SS') as earliest_finish_date,
-        to_char(p.latest_finish_date, 'YYYY-MM-DD HH24:MI:SS') as latest_finish_date,
-        case when o.name is null then '--no customer--' else o.name
-                end as customer_name,
-        o.organization_id as customer_id, f.package_id
-        FROM pm_projectsx p 
-             LEFT JOIN pm_project_assignment pa 
-                ON p.item_id = pa.project_id
-             LEFT JOIN organizations o ON p.customer_id =
-                o.organization_id 
-             LEFT JOIN (
-                        select 
-                        om.category_id, 
-                        om.object_id, 
-                        t.name as category_name 
-                        from 
-                        category_object_map om, 
-                        category_translations t, 
-                        categories ctg 
-                        where 
-                        om.category_id = t.category_id and 
-                        ctg.category_id = t.category_id and 
-                        ctg.deprecated_p = 'f')
-                 c ON p.item_id = c.object_id, 
+        p.customer_id as customer_id, f.package_id
+        FROM pm_projectsx p, 
         cr_items i, 
 	cr_folders f
         WHERE 
Index: openacs-4/packages/project-manager-portlet/lib/projects.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/lib/projects.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager-portlet/lib/projects.adp	23 Aug 2005 16:41:59 -0000	1.2
+++ openacs-4/packages/project-manager-portlet/lib/projects.adp	24 Aug 2005 15:04:05 -0000	1.3
@@ -1,23 +1,4 @@
-   <multiple name=pm_packages>    
-    <if @filter_p@ ne 0>
-        <form method=post name=search action=index>
-          <b>#project-manager.Search#</b><br />
-          <input type=text name=searchterm value="@searchterm@" size="15" />
-          @hidden_vars;noquote@
-	  <br> <br>
-          <b>#project-manager.planned_end_date_between#</b><br />
-	  #project-manager.Start_date#:
-          <input type=text name="start_range_f" value="@start_range_f@" id="sel1" size="10"/>
-          <input type='reset' value='...' onclick="return showCalendar('sel1', 'y-m-d');">
-	  & #project-manager.End_date#:
-          <input type=text name="end_range_f" value="@end_range_f@" id="sel2" size="10"/>
-          <input type='reset' value='...' onclick="return showCalendar('sel2', 'y-m-d');"> [<b>YYYY-MM-DD</b>]
-          <input type="submit" value="Go" />
-        </form>
-        @category_select;noquote@
-    </if>
-    <listtemplate name="@pm_packages.list_id@"></listtemplate>
-   </multiple>
+    <listtemplate name="projects"></listtemplate>
   
    <br>
    <center>
Index: openacs-4/packages/project-manager-portlet/lib/projects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/lib/projects.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager-portlet/lib/projects.tcl	23 Aug 2005 16:41:59 -0000	1.3
+++ openacs-4/packages/project-manager-portlet/lib/projects.tcl	24 Aug 2005 15:04:05 -0000	1.4
@@ -44,7 +44,6 @@
 # --------------------------------------------------------------- #
 
 set package_id $package_id
-template::multirow create pm_packages "list_id" "contact_column" "community_name"
 set c_row 0
 
 set exporting_vars { status_id category_id assignee_id format }
@@ -129,9 +128,6 @@
 # Store project names and all other project individuel data
 set contact_coloum "fff" 
 
-template::multirow append pm_packages "projects" "$contact_column" 
-
-ns_log notice "projects = projects c_row=$c_row\n [template::multirow get pm_packages 1 list_id] , [template::multirow columns pm_packages] , [template::multirow size pm_packages]"
 incr c_row
 
 # Get the rows to display
@@ -161,7 +157,7 @@
     }
     
 } else {
-    set actions [list "Project: $community_name" "$base_url"]
+    set actions [list]
 }
 
 template::list::create \
@@ -253,15 +249,13 @@
 set count 0
 set more_p 0
 
-db_multirow -extend { item_url } "projects" project_folders {
+db_multirow -extend { item_url customer_name } "projects" project_folders {
 } {
     incr count
     if {[string equal $count 26] } {
 	set more_p 1
 	break
     }
-    set earliest_finish_date [lc_time_fmt $earliest_finish_date $fmt]
-    set latest_finish_date [lc_time_fmt $latest_finish_date $fmt]
     set item_url [export_vars -base "${base_url}one" {project_item_id}]
     set _base_url [site_node::get_url_from_object_id -object_id $package_id]
     
@@ -282,6 +276,7 @@
         set portal_info_url  [lindex $base_url 0] 
         
     }
+    set customer_name [contact::name -party_id $customer_id]
 }