Index: openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-manager-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl	10 Jun 2004 20:23:11 -0000	1.6
+++ openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl	11 Jun 2004 20:58:13 -0000	1.7
@@ -402,3 +402,95 @@
         -body "$nice_text"
     
 }
+
+
+ad_proc -public pm::util::category_selects {
+    {-export_vars ""}
+    {-category_id ""}
+    {-package_id ""}
+} {
+    Returns an HTML fragment of forms, one for each
+    category tree, suitable for use on a page.
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @param export_vars Variables already exported with export_vars -form
+    
+    @param category_id If set, the currently selected category
+
+    @return 
+    
+    @error 
+} {
+    if {[empty_string_p $package_id]} {
+        set package_id [ad_conn package_id]
+    }
+    
+    # caches results for 5 minutes.
+    return [util_memoize [list pm::util::category_selects_helper -export_vars $export_vars -category_id $category_id -package_id $package_id] 300]
+}
+
+
+
+ad_proc -public pm::util::category_selects_helper {
+    {-export_vars ""}
+    {-category_id ""}
+    -package_id:required
+} {
+    Returns an HTML fragment of forms, one for each
+    category tree, suitable for use on a page. This proc
+    is used so that pm::util::category_selects can cache
+    the categories
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @param export_vars Variables already exported with export_vars -form
+    
+    @param category_id If set, the currently selected category
+
+    @return 
+    
+    @error 
+} {
+    # Categories are arranged into category trees. 
+    # Set up an array for each tree. The array contains the category for each tree
+    
+    db_foreach get_categories { } {
+        lappend category_choices($tree_id) [list $cat_name $cat_id]
+    }
+
+
+    set category_select ""
+    
+    foreach tree_list [db_list_of_lists get_category_trees { }] {
+        
+        set tree_name [lindex $tree_list 0]
+        set tree_id   [lindex $tree_list 1]
+        
+        if {![exists_and_not_null category_choices($tree_id)]} {
+            set category_choices($tree_id) [list]
+        }
+        
+        
+        append category_select "<form method=\"post\" action=\"index\">$export_vars $tree_name: <br /><select name=\"category_id\"><option value=\"\">--Select All--</option>"
+    }
+    
+    foreach cat_item $category_choices($tree_id) {
+            set cat_name [lindex $cat_item 0]
+            set cat_id   [lindex $cat_item 1]
+            
+            if {[exists_and_not_null category_id] && [lsearch $category_id $cat_id] != -1} {
+                set select "selected"
+            } else {
+                set select ""
+            }
+            
+            append category_select "<option $select value=\"$cat_id\">$cat_name</option>"
+    }
+    
+    append category_select "</select><input type=\"submit\" value=\"Go\" /></form>"
+    
+    return $category_select
+}
Index: openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl	4 Jun 2004 16:19:45 -0000	1.12
+++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl	11 Jun 2004 20:58:14 -0000	1.13
@@ -1462,3 +1462,145 @@
 
     return $return_val
 }
+
+
+ad_proc -public pm::project::assign {
+    {-project_item_id:required}
+    {-role_id:required}
+    {-party_id:required}
+} {
+    Assigns a user to a project
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @param project_item_id
+
+    @param role_id 
+
+    @param party_id
+
+    @return 
+    
+    @error 
+} {
+
+    db_dml insert_assignment {
+        insert into pm_project_assignment 
+        (project_id, role_id, party_id)
+        VALUES
+        (:project_item_id, :role_id, :party_id)
+    }
+
+    return
+}
+
+
+ad_proc -public pm::project::unassign {
+    {-project_item_id:required}
+    {-party_id:required}
+} {
+    Removes a user from a project
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @param project_item_id
+
+    @param party_id
+
+    @return 
+    
+    @error 
+} {
+
+    db_dml remove_assignment {
+        DELETE FROM
+        pm_project_assignment 
+        WHERE
+        project_id = :project_item_id and
+        party_id   = :party_id
+    }
+
+    return
+}
+
+
+ad_proc -public pm::project::assign_remove_everyone {
+    {-project_item_id:required}
+} {
+    Removes all users from a project
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @param project_item_id
+
+    @return 
+    
+    @error 
+} {
+
+    db_dml remove_assignment {
+        DELETE FROM
+        pm_project_assignment 
+        WHERE
+        project_id = :project_item_id
+    }
+
+    return
+}
+
+
+ad_proc -public pm::project::assignee_filter_select {
+    {-status_id:required}
+} {
+    Returns a list of lists, people who are assigned to projects with a 
+    status of status_id. Used in the list-builder filters for
+    the projects list page. Cached 5 minutes.
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @param status_id
+
+    @return 
+    
+    @error 
+} {
+    return [util_memoize [list pm::project::assignee_filter_select_helper -status_id $status_id] 3]
+}
+
+
+ad_proc -private pm::project::assignee_filter_select_helper {
+    {-status_id:required}
+} {
+    Returns a list of lists, people who are assigned projects with a 
+    status of status_id. Used in the list-builder filters for
+    the projects list page. Cached 5 minutes.
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @param status_id
+
+    @return 
+    
+    @error 
+} {
+    return [db_list_of_lists get_people {
+        SELECT
+        distinct(first_names || ' ' || last_name) as fullname, 
+        u.person_id 
+        FROM
+        persons u, 
+        pm_project_assignment a,
+        pm_projects p
+        WHERE 
+        u.person_id = a.party_id and
+        p.project_id = a.project_id and
+        p.status_id = :status_id
+        ORDER BY
+        fullname
+    }]
+}
Index: openacs-4/contrib/packages/project-manager/tcl/role-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/role-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/tcl/role-procs.tcl	27 Apr 2004 00:49:28 -0000	1.1
+++ openacs-4/contrib/packages/project-manager/tcl/role-procs.tcl	11 Jun 2004 20:58:14 -0000	1.2
@@ -28,3 +28,66 @@
     set returnval [db_string get_default "select role_id from pm_roles limit 1" -default "-1"]
     return $returnval
 }
+
+
+ad_proc -public pm::role::select_list_filter {} {
+    Returns a select list.
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @return 
+    
+    @error 
+} {
+    return [util_memoize [list pm::role::select_list_filter_helper] 300]
+}
+
+
+ad_proc -private pm::role::select_list_filter_helper {} {
+    Returns a select list. Used so pm::role::select_list can be cached.
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @return 
+    
+    @error 
+} {
+    return [db_list_of_lists get_roles "
+                SELECT
+                one_line,
+                role_id
+                FROM
+                pm_roles
+                ORDER BY
+                role_id"]
+}
+
+
+ad_proc -public pm::role::select_list {
+    {-select_name:required}
+} {
+    Returns a select list, suitable for use in an HTML form.
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @return 
+    
+    @error 
+} {
+    set select_list "<select name=\"$select_name\">"
+
+    set select_list_options [pm::role::select_list_filter]
+
+    foreach option $select_list_options {
+        set description [lindex $option 0]
+        set value       [lindex $option 1]
+        append select_list "<option value=\"$value\">$description</option>"
+    }
+
+    append select_list "</select>"
+
+    return $select_list
+}
Index: openacs-4/contrib/packages/project-manager/tcl/status-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/status-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/tcl/status-procs.tcl	3 Jun 2004 21:32:02 -0000	1.1
+++ openacs-4/contrib/packages/project-manager/tcl/status-procs.tcl	11 Jun 2004 20:58:14 -0000	1.2
@@ -38,3 +38,33 @@
 
     return $return_val
 }
+
+
+ad_proc -public pm::status::project_status_select {
+} {
+    Returns a list of project status codes, suitable for list-builder filters
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @return 
+    
+    @error 
+} {
+    return [util_memoize [list pm::status::project_status_select_helper] 300]
+}
+
+
+ad_proc -private pm::status::project_status_select_helper {
+} {
+    Returns a list of project status codes, suitable for list-builder filters
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @return 
+    
+    @error 
+} {
+    return [db_list_of_lists get_status "select description, status_id from pm_project_status order by status_type desc, description"]
+}
Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	10 Jun 2004 20:23:11 -0000	1.10
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	11 Jun 2004 20:58:14 -0000	1.11
@@ -1671,3 +1671,56 @@
     }]
     
 }
+
+
+ad_proc -public pm::task::assignee_filter_select {
+    {-status_id:required}
+} {
+    Returns a list of lists, people who are assigned tasks with a 
+    status of status_id. Used in the list-builder filters for
+    the tasks list page. Cached 5 minutes.
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @param status_id
+
+    @return 
+    
+    @error 
+} {
+    return [util_memoize [list pm::task::assignee_filter_select_helper -status_id $status_id] 1]
+}
+
+
+ad_proc -private pm::task::assignee_filter_select_helper {
+    {-status_id:required}
+} {
+    Returns a list of lists, people who are assigned tasks with a 
+    status of status_id. Used in the list-builder filters for
+    the tasks list page. Cached 5 minutes.
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    
+    @param status_id
+
+    @return 
+    
+    @error 
+} {
+    return [db_list_of_lists get_people "
+                SELECT
+                distinct(first_names || ' ' || last_name) as fullname, 
+                u.person_id 
+                FROM
+                persons u, 
+                pm_task_assignment a,
+                pm_tasks ts
+                WHERE 
+                u.person_id = a.party_id and
+                ts.task_id = a.task_id and
+                ts.status = :status_id
+                ORDER BY
+                fullname"]
+}
Index: openacs-4/contrib/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/contrib/packages/project-manager/www/index.tcl	27 Apr 2004 00:49:29 -0000	1.14
+++ openacs-4/contrib/packages/project-manager/www/index.tcl	11 Jun 2004 20:58:19 -0000	1.15
@@ -65,75 +65,19 @@
     set status_id [pm::project::default_status_open]
 }
 
-# Categories are arranges into category trees. 
-# Set up an array for each tree. The array contains the category for each tree
 
-db_foreach get_choices {
-    select 
-    t.name as cat_name, 
-    t.category_id as cat_id, 
-    tm.tree_id 
-    from 
-    category_tree_map tm, 
-    categories c, 
-    category_translations t 
-    where 
-    c.tree_id      = tm.tree_id and 
-    c.category_id  = t.category_id and 
-    tm.object_id   = :package_id and
-    c.deprecated_p = 'f'
-    order 
-    by t.name
-} {
-    lappend category_choices($tree_id) [list $cat_name $cat_id]
-}
-
 # We want to set up a filter for each category tree.
 
 set export_vars [export_vars -form {status_id orderby}]
 
-set category_select ""
+set category_select [pm::util::category_selects \
+                         -export_vars $export_vars \
+                         -category_id [template::util::nvl category_id ""] \
+                         -package_id $package_id \
+                        ] 
 
-foreach tree_list [db_list_of_lists get_category_trees {
-    select 
-    tt.name as tree_name, 
-    tt.tree_id 
-    from 
-    category_tree_map tm, 
-    category_tree_translations tt 
-    where 
-    tm.object_id = :package_id and 
-    tm.tree_id = tt.tree_id
-}] {
-    
-    set tree_name [lindex $tree_list 0]
-    set tree_id   [lindex $tree_list 1]
+# set assignees_filter [pm::project::assignee_filter_select -status_id $status_id]
 
-    if {![exists_and_not_null category_choices($tree_id)]} {
-        set category_choices($tree_id) [list]
-    }
-
-
-
-    append category_select "<form method=\"post\" action=\"index\">$export_vars $tree_name: <br /><select name=\"category_id\"><option value=\"\">--Select All--</option>"
-
-    foreach cat_item $category_choices($tree_id) {
-        set cat_name [lindex $cat_item 0]
-        set cat_id   [lindex $cat_item 1]
-
-        if {[exists_and_not_null category_id] && [lsearch $category_id $cat_id] != -1} {
-            set select "selected"
-        } else {
-            set select ""
-        }
-
-        append category_select "<option $select value=\"$cat_id\">$cat_name</option>"
-    }
-
-    append category_select "</select><input type=\"submit\" value=\"Go\" /></form>"
-}
-
-
 template::list::create \
     -name projects \
     -multirow projects \
@@ -174,7 +118,7 @@
     -filters {
         status_id {
             label "Status" 
-            values {[db_list_of_lists get_status "select description, status_id from pm_project_status order by status_type desc, description"]}
+            values {[pm::status::project_status_select]}
             where_clause {s.status_id = :status_id}
         }
         category_id {
@@ -263,23 +207,9 @@
 # This spits out the CSV if we happen to be in CSV layout
 
 if {[string equal $format csv]} {
-    #set csv [list::write_output -name pan]
-    #set outputheaders [ns_conn outputheaders]
-    #ns_set cput $outputheaders "Content-Disposition" "attachment; filename=pan.csv"
-    #doc_return 200 "application/text" "$csv"
 
-    # set csv [list::write_output -name projects]
-
-    set outputheaders [ns_conn outputheaders]
-    ns_set cput $outputheaders "Content-Disposition" "attachment; filename=projects.xls"
-
-    # ns_log Notice "csv: $csv"
-
     list::write_output -name projects
 
-    # doc_return 200 application/vnd.ms-excel $csv
-    # ns_return 200 application/vnd.ms-excel $csv
-
 }
 
 
Index: openacs-4/contrib/packages/project-manager/www/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one-postgresql.xql,v
diff -u -N -r1.25 -r1.26
--- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	3 Jun 2004 21:32:05 -0000	1.25
+++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	11 Jun 2004 20:58:19 -0000	1.26
@@ -111,12 +111,20 @@
 
   <fullquery name="project_people_query">
     <querytext>
-        select
-        project_id,
-        role_id,
-        party_id
-        from pm_project_assignment
-        where project_id = :project_item_id
+        SELECT
+        a.project_id,
+        r.one_line as role_name,
+        p.first_names || ' ' || p.last_name as user_name
+        FROM 
+        pm_project_assignment a,
+        pm_roles r,
+        persons p
+        WHERE
+        a.role_id = r.role_id and
+        a.party_id = p.person_id and
+        project_id = :project_item_id
+        ORDER BY
+        p.first_names, p.last_name
     </querytext>
   </fullquery>
 
Index: openacs-4/contrib/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v
diff -u -N -r1.35 -r1.36
--- openacs-4/contrib/packages/project-manager/www/one.adp	3 Jun 2004 21:32:05 -0000	1.35
+++ openacs-4/contrib/packages/project-manager/www/one.adp	11 Jun 2004 20:58:19 -0000	1.36
@@ -106,6 +106,28 @@
       
       <p />
       
+      <table border="1" class="list" width="100%">
+        <tr>
+          <th>Assignees</th>
+        </tr>
+        <tr>
+          <td>
+            <listtemplate name="people"></listtemplate>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <ul>
+              <li>@assignee_add_self_widget;noquote@</li>
+              <li><a href="@assignee_remove_self_url;noquote@">Remove myself</a></li>
+              <li><a href="@assignee_edit_url;noquote@">Edit assignees</a></li>
+            </ul>
+          </td>
+        </tr>
+      </table>
+
+      <p />
+
       <if @use_project_customizations_p@>
         <p />
         <table border="1" cellpadding="0" cellspacing="0" width="100%" class="list">
Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -N -r1.36 -r1.37
--- openacs-4/contrib/packages/project-manager/www/one.tcl	3 Jun 2004 21:32:13 -0000	1.36
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	11 Jun 2004 20:58:19 -0000	1.37
@@ -37,6 +37,7 @@
     my_title:onevalue
     context:onevalue
     project:multirow
+    people:multirow
     tasks:multirow
     people:multirow
     write_p:onevalue
@@ -166,6 +167,12 @@
 
 set log_url "${logger_url}log?project_id=$project(logger_project)&pm_project_id=$project_item_id&return_url=$return_url&variable_id=$logger_variable_id"
 
+set assignee_add_self_widget "Add myself as <form method=\"post\" action=\"project-assign-add\">[export_vars -form {project_item_id user_id return_url}][pm::role::select_list -select_name "role_id"]<input type=\"Submit\" value=\"OK\" /></form>"
+
+set assignee_remove_self_url [export_vars -base project-assign-remove {project_item_id user_id return_url}]
+
+set assignee_edit_url [export_vars -base project-assign-edit {project_item_id return_url}]
+
 set today_ansi [clock format [clock scan today] -format "%Y-%m-%d"]
 set then_ansi [clock format [clock scan "-$logger_days days"] -format "%Y-%m-%d"]
 
@@ -276,28 +283,28 @@
     -orderby {
         default_value latest_start,asc
         title {
-            orderby_asc "title asc"
-            orderby_desc "title desc"
+            orderby_asc "title asc, task_id asc"
+            orderby_desc "title desc, task_id desc"
             default_direction asc
         }
         earliest_start {
-            orderby_asc "earliest_start, u.first_names, u.last_name"
-            orderby_desc "earliest_start desc, u.first_names, u.last_name"
+            orderby_asc "earliest_start, task_id asc, u.first_names, u.last_name"
+            orderby_desc "earliest_start desc, task_id desc, u.first_names, u.last_name"
             default_direction asc
         }
         earliest_finish {
-            orderby_asc "earliest_finish, u.first_names, u.last_name"
-            orderby_desc "earliest_finish desc, u.first_names, u.last_name"
+            orderby_asc "earliest_finish, task_id asc, u.first_names, u.last_name"
+            orderby_desc "earliest_finish desc, task_id desc, u.first_names, u.last_name"
             default_direction asc
         }
         latest_start {
-            orderby_asc "latest_start, u.first_names, u.last_name"
-            orderby_desc "latest_start desc, u.first_names, u.last_name"
+            orderby_asc "latest_start, task_id asc, u.first_names, u.last_name"
+            orderby_desc "latest_start desc, task_id desc, u.first_names, u.last_name"
             default_direction asc
         }
         latest_finish {
-            orderby_asc "latest_finish, u.first_names, u.last_name"
-            orderby_desc "latest_finish desc, u.first_names, u.last_name"
+            orderby_asc "latest_finish, task_id asc, u.first_names, u.last_name"
+            orderby_desc "latest_finish desc, task_id desc, u.first_names, u.last_name"
             default_direction asc
         }
     } \
@@ -377,10 +384,10 @@
     -multirow people \
     -key item_id \
     -elements {
-        party_id {
+        user_name {
             label "Who"
         }
-        role_id {
+        role_name {
             label "Role"
         }
     } \
@@ -402,10 +409,9 @@
     }
 
 
-
-db_multirow -extend { item_url } subproject project_subproject_query {
+db_multirow -extend { item_url } subproject project_people_query {
 } {
-    set item_url [export_vars -base "one" -override {{project_item_id $item_id}} {project_item_id}]
+
 }
 
 
Index: openacs-4/contrib/packages/project-manager/www/project-assign-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/project-assign-add.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/project-assign-add.tcl	11 Jun 2004 20:58:19 -0000	1.1
@@ -0,0 +1,42 @@
+# 
+
+ad_page_contract {
+    
+    Adds assignees to a project
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    @arch-tag: f52518ee-57d2-474b-a627-9050654c2f3f
+    @cvs-id $Id: project-assign-add.tcl,v 1.1 2004/06/11 20:58:19 jader Exp $
+} {
+    project_item_id:notnull
+    user_id:notnull,multiple
+    role_id:notnull,multiple
+    return_url:notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+set index 0
+
+foreach user $user_id {
+
+    set role [lindex $role_id $index]
+
+    pm::project::assign \
+        -project_item_id $project_item_id \
+        -role_id $role_id \
+        -party_id $user
+
+
+    incr index
+}
+
+if {[llength $user_id] > 1} {
+    set assign "Assignments"
+} else {
+    set assign "Assignment"
+}
+
+ad_returnredirect -message "$assign saved" $return_url
Index: openacs-4/contrib/packages/project-manager/www/project-assign-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/project-assign-edit-2.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/project-assign-edit-2.tcl	11 Jun 2004 20:58:19 -0000	1.1
@@ -0,0 +1,36 @@
+# 
+
+ad_page_contract {
+    
+    Processes the form for assignments and removals
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    @arch-tag: acef7904-fdc0-4fd7-9346-b6a1e011f604
+    @cvs-id $Id: project-assign-edit-2.tcl,v 1.1 2004/06/11 20:58:19 jader Exp $
+} {
+    project_item_id:integer,notnull
+    return_url:notnull
+    assignee:multiple
+} -properties {
+} -validate {
+} -errors {
+}
+
+set user_id [ad_maybe_redirect_for_registration]
+
+# remove assignments 
+pm::project::assign_remove_everyone -project_item_id $project_item_id
+
+foreach ass $assignee {
+
+    regexp {(.*)-(.*)} $ass match party_id role_id
+
+    pm::project::assign \
+        -project_item_id $project_item_id \
+        -party_id $party_id \
+        -role_id $role_id
+
+}
+
+ad_returnredirect -message "Assignments saved" $return_url
Index: openacs-4/contrib/packages/project-manager/www/project-assign-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/project-assign-edit.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/project-assign-edit.adp	11 Jun 2004 20:58:19 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+  <property name="title">@title@</property>
+  <property name="context">@context@</property>
+  
+@html;noquote@
Index: openacs-4/contrib/packages/project-manager/www/project-assign-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/project-assign-edit.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/project-assign-edit.tcl	11 Jun 2004 20:58:19 -0000	1.1
@@ -0,0 +1,109 @@
+# 
+
+ad_page_contract {
+    
+    Allows the user to edit the assignees for a project
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    @arch-tag: e7f97c50-b2de-4483-b0a6-daadd802965b
+    @cvs-id $Id: project-assign-edit.tcl,v 1.1 2004/06/11 20:58:19 jader Exp $
+} {
+    project_item_id:integer,notnull
+    return_url:notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+# The unique identifier for this package.
+set package_id [ad_conn package_id]
+
+# The id of the person logged in and browsing this page
+set user_id [ad_maybe_redirect_for_registration]
+
+set subsite_id [ad_conn subsite_id]
+
+set user_group_id [application_group::group_id_from_package_id \
+                       -package_id $subsite_id]
+
+
+set title "Edit project assignees"
+set context [list "Edit assignees"]
+
+set roles_list_of_lists [pm::role::select_list_filter]
+
+db_foreach assignee_query { 
+    SELECT
+    a.party_id,
+    r.role_id
+    FROM
+    pm_project_assignment a,
+    pm_roles r,
+    persons p
+    WHERE
+    a.role_id = r.role_id and
+    a.party_id = p.person_id and
+    a.project_id = :project_item_id
+    ORDER BY
+    r.role_id,
+    p.first_names,
+    p.last_name
+
+} {
+    set assigned($party_id-$role_id) 1
+}
+
+set assignee_list_of_lists [db_list_of_lists get_assignees {
+    select
+    p.first_names || ' ' || p.last_name as name,
+    p.person_id
+    FROM
+    persons p,
+    acs_rels r,
+    membership_rels mr
+    WHERE
+    r.object_id_one = :user_group_id and
+    mr.rel_id = r.rel_id and
+    p.person_id = r.object_id_two and
+    member_state = 'approved'
+    ORDER BY
+    p.first_names, p.last_name
+}]
+
+
+set html "<form action=\"project-assign-edit-2\" method=\"post\"><table border=0 width=\"100\%\"><tr>"
+
+foreach role_list $roles_list_of_lists {
+
+    set role_name [lindex $role_list 0]
+    set role      [lindex $role_list 1]
+
+    append html "
+      <td><p /><B><I>Assignee: $role_name</I></B><p />"
+
+    foreach assignee_list $assignee_list_of_lists {
+        set name [lindex $assignee_list 0]
+        set person_id [lindex $assignee_list 1]
+
+        if {[exists_and_not_null assigned($person_id-$role)]} {
+            set checked "checked"
+        } else {
+            set checked ""
+        }
+
+        append html "
+          <input name=\"assignee\" value=\"$person_id-$role\"
+              type=\"checkbox\" $checked />$name
+          <br />
+        "
+
+    }
+
+    append html "</td>"
+
+}
+
+set export_vars [export_vars -form {project_item_id return_url}]
+
+append html "<tr><td colspan=\"[llength $roles_list_of_lists]\" align=\"center\"><input type=\"Submit\" value=\"Save\"></td></tr></table>$export_vars</form>"
Index: openacs-4/contrib/packages/project-manager/www/project-assign-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/project-assign-remove.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/project-assign-remove.tcl	11 Jun 2004 20:58:19 -0000	1.1
@@ -0,0 +1,34 @@
+# 
+
+ad_page_contract {
+    
+    Remove a project assignment for a list of assignees
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-06-11
+    @arch-tag: 479be68c-3849-4017-b950-ff6029839362
+    @cvs-id $Id: project-assign-remove.tcl,v 1.1 2004/06/11 20:58:19 jader Exp $
+} {
+    project_item_id:notnull
+    user_id:notnull,multiple
+    return_url:notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+
+foreach user $user_id {
+
+    pm::project::unassign \
+        -project_item_id $project_item_id \
+        -party_id $user
+}
+
+if {[llength $user_id] > 1} {
+    set assign "Assignments"
+} else {
+    set assign "Assignment"
+}
+
+ad_returnredirect -message "$assign removed" $return_url
Index: openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-postgresql.xql,v
diff -u -N -r1.25 -r1.26
--- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	10 Jun 2004 20:38:29 -0000	1.25
+++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	11 Jun 2004 20:58:19 -0000	1.26
@@ -85,15 +85,15 @@
     <querytext>
         select
         r.one_line,
-        u.first_names || ' ' || u.last_name || ' (' || u.email || ')' as user_info,
+        u.first_names || ' ' || u.last_name as user_info,
         r.role_id
         from 
         pm_task_assignment a,
-        acs_users_all u,
+        persons u,
         pm_roles r
         where 
         a.task_id  = :task_id and
-        u.party_id = a.party_id and
+        u.person_id = a.party_id and
         a.role_id  = r.role_id
     </querytext>
   </fullquery>
Index: openacs-4/contrib/packages/project-manager/www/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/contrib/packages/project-manager/www/tasks.tcl	3 Jun 2004 21:32:13 -0000	1.13
+++ openacs-4/contrib/packages/project-manager/www/tasks.tcl	11 Jun 2004 20:58:19 -0000	1.14
@@ -157,39 +157,14 @@
         }
         role_id {
             label "Roles"
-            values {[db_list_of_lists get_roles "
-                SELECT
-                one_line,
-                role_id
-                FROM
-                pm_roles
-                ORDER BY
-                role_id"]}
+            values {[pm::role::select_list_filter]}
             where_clause {
                 ta.role_id = :role_id
             }
         }
         party_id {
             label "People"
-            values {[db_list_of_lists get_people "
-                SELECT
-                distinct(first_names || ' ' || last_name) as fullname, 
-                u.person_id 
-                FROM
-                persons u, 
-                pm_task_assignment a,
-                cr_items t,
-                pm_tasks ts,
-                pm_tasks_revisionsx r
-                WHERE 
-                u.person_id = a.party_id and
-                t.item_id = a.task_id and
-                t.item_id = ts.task_id and
-                ts.status = :status_id and
-                t.item_id = r.item_id and
-                t.live_revision = r.revision_id
-                ORDER BY
-                fullname"]}
+            values {[pm::task::assignee_filter_select -status_id $status_id]}
             where_clause {
                 ta.party_id = :party_id
             }
Index: openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/lib/Attic/nav-bar.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl	3 Jun 2004 21:32:19 -0000	1.4
+++ openacs-4/contrib/packages/project-manager/www/lib/nav-bar.tcl	11 Jun 2004 20:58:20 -0000	1.5
@@ -31,7 +31,7 @@
 
     lappend link_list [list "${package_url}task-select-project"]
     lappend link_list {}
-    lappend link_list "New task"
+    lappend link_list "Add task"
 }
 
 if { $admin_p } {