Index: openacs-4/packages/project-manager/tcl/install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/install-procs.tcl,v diff -u -r1.28 -r1.29 --- openacs-4/packages/project-manager/tcl/install-procs.tcl 23 Mar 2007 07:53:21 -0000 1.28 +++ openacs-4/packages/project-manager/tcl/install-procs.tcl 25 Jun 2007 07:26:11 -0000 1.29 @@ -74,8 +74,7 @@ # Create pm_task - - dtype::create -name {pm_task} -supertype {content_revision} -pretty_name {[_ project-manager.Task]} -pretty_plural {[_ project-manager.Tasks]} -table_name {pm_tasks_revisions} -id_column {task_revision_id} + dtype::create -name {pm_task} -supertype {content_revision} -pretty_name {#project-manager.Task#} -pretty_plural {#project-manager.Tasks#} -table_name {pm_tasks_revisions} -id_column {task_revision_id} content::type::attribute::new -content_type {pm_task} -attribute_name {end_date} -datatype {date} -pretty_name {[_ project-manager.End_date]} -pretty_plural {[_ project-manager.End_dates]} -column_spec {timestamptz} content::type::attribute::new -content_type {pm_task} -attribute_name {percent_complete} -datatype {number} -pretty_name {[_ project-manager.Percent_complete]} -pretty_plural {[_ project-manager.Percents_complete]} -column_spec {numeric} content::type::attribute::new -content_type {pm_task} -attribute_name {estimated_hours_work} -datatype {number} -pretty_name {[_ project-manager.Estimated_hours_work]} -pretty_plural {[_ project-manager.Estimated_hours_work]} -column_spec {numeric} Index: openacs-4/packages/project-manager/templates/project-ae.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-ae.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/project-manager/templates/project-ae.adp 10 Aug 2005 18:32:39 -0000 1.1 +++ openacs-4/packages/project-manager/templates/project-ae.adp 25 Jun 2007 07:26:11 -0000 1.2 @@ -3,6 +3,4 @@ @context_bar;noquote@ @title@ -
-
Index: openacs-4/packages/project-manager/templates/project-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-ae.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/project-manager/templates/project-ae.tcl 22 Jan 2007 16:05:20 -0000 1.12 +++ openacs-4/packages/project-manager/templates/project-ae.tcl 25 Jun 2007 07:26:11 -0000 1.13 @@ -244,9 +244,14 @@ if {![empty_string_p $customer_name]} { append customer_name " - " } - if {[empty_string_p $parent_id]} { + if {$parent_id eq ""} { set parent_id $folder_id } + + if {$parent_id eq ""} { + set parent_id $package_id + } + set planned_end_date_list [split $planned_end_date "-"] append planned_end_date_list " [lrange $planned_end_time 3 5]" Index: openacs-4/packages/project-manager/templates/task-ae.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/project-manager/templates/task-ae.adp 11 Aug 2005 21:09:30 -0000 1.1 +++ openacs-4/packages/project-manager/templates/task-ae.adp 25 Jun 2007 07:26:11 -0000 1.2 @@ -2,6 +2,4 @@ @title;noquote@ @context@ -
-
Index: openacs-4/packages/project-manager/templates/task-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.tcl,v diff -u -r1.18 -r1.19 --- openacs-4/packages/project-manager/templates/task-ae.tcl 22 Mar 2007 12:54:58 -0000 1.18 +++ openacs-4/packages/project-manager/templates/task-ae.tcl 25 Jun 2007 07:26:11 -0000 1.19 @@ -184,11 +184,11 @@ if {[string is true $edit_p]} { ad_form -extend -name task_add_edit \ -form { + {-section "sec1" {legendtext "[_ project-manager.Comment]"}} {comment:richtext(richtext),optional {label "[_ project-manager.Comment]"} {options $desc_options} {html {rows 20 cols 80 wrap soft}} - {section "[_ project-manager.Comment]"} } } } else { @@ -201,45 +201,43 @@ if {!$use_uncertain_completion_times_p} { ad_form -extend -name task_add_edit \ -form { + {-section "sec2" {legendtext "[_ project-manager.Work_required]"}} {estimated_hours_work:float {label " "} {html {size 5}} {after_html $work_units} - {section "[_ project-manager.Work_required]"} } } } elseif {[string is true $use_day_p]} { ad_form -extend -name task_add_edit \ -form { + {-section "sec2" {legendtext "[_ project-manager.Work_required]"}} {estimated_days_work_min:float {label "[_ project-manager.Min]"} {html {size 5}} {after_html $work_units} - {section "[_ project-manager.Work_required]"} } {estimated_days_work_max:float {label "[_ project-manager.Max]"} {html {size 5}} {after_html $work_units} - {section "[_ project-manager.Work_required]"} } } } else { ad_form -extend -name task_add_edit \ -form { + {-section "sec2" {legendtext "[_ project-manager.Work_required]"}} {estimated_hours_work_min:float {label "[_ project-manager.Min]"} {html {size 5}} {after_html $work_units} - {section "[_ project-manager.Work_required]"} } {estimated_hours_work_max:float {label "[_ project-manager.Max]"} {html {size 5}} {after_html $work_units} - {section "[_ project-manager.Work_required]"} } } } @@ -321,30 +319,27 @@ ad_form -extend -name task_add_edit \ -form { + {-section "sec3" {legendtext "[_ project-manager.Log_entry]"}} {hours:text,optional {label $logger_variable(name)} {html {size 4}} - {section "[_ project-manager.Log_entry]"} {after_html $logger_variable(unit)} } {logger_variable_id:text(hidden) - {section "[_ project-manager.Log_entry]"} } {log_date:text(text),optional {label "[_ logger.Date]"} {html {id sel2}} {after_html { \[y-m-d \] }} - {section "[_ project-manager.Log_entry]"} } {log:text,optional {label "[_ logger.Description]"} {html {size 30}} {help_text "[_ project-manager.lt_You_can_optionally_lo]"} - {section "[_ project-manager.Log_entry]"} } } @@ -418,7 +413,6 @@ [list assignee.$role\:text(checkbox),optional,multiple \ [list label $role_name] \ [list options $assignee_options] \ - [list section "[_ project-manager.Assignees]"] \ [list values $assignees] \ ] ] } Index: openacs-4/packages/project-manager/templates/task-one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-one.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/project-manager/templates/task-one.tcl 6 Feb 2007 11:34:20 -0000 1.4 +++ openacs-4/packages/project-manager/templates/task-one.tcl 25 Jun 2007 07:26:11 -0000 1.5 @@ -1,6 +1,6 @@ # --------------------------------------------------------------- # +package require struct - # the unique identifier for this package #set package_id [ad_conn package_id] #set package_url [ad_conn package_url] Index: openacs-4/packages/project-manager/www/process-dependency-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/process-dependency-add-edit.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/project-manager/www/process-dependency-add-edit.tcl 14 Sep 2005 22:48:33 -0000 1.7 +++ openacs-4/packages/project-manager/www/process-dependency-add-edit.tcl 25 Jun 2007 07:26:11 -0000 1.8 @@ -185,8 +185,8 @@ {value {$tasks(task_id)}} } + {-section sec1 {legendtext {$tasks(task_title)}}} {task_title.$tasks(task_id):text(hidden) - {section {$tasks(task_title)}} {label \"#project-manager.Subject_2#\"} {value {$tasks(task_title)}} } Index: openacs-4/packages/project-manager/www/projects.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/projects.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/project-manager/www/projects.adp 19 Feb 2007 15:54:15 -0000 1.1 +++ openacs-4/packages/project-manager/www/projects.adp 25 Jun 2007 07:26:11 -0000 1.2 @@ -16,6 +16,7 @@ actions_p="1" bulk_p="1" fmt="@fmt@" + filter_p="1" date_range="@date_range@" user_space_p="@user_space_p@" is_observer_p="@is_observer_p@" Index: openacs-4/packages/project-manager/www/tasks.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/project-manager/www/tasks.adp 14 Nov 2006 16:13:16 -0000 1.11 +++ openacs-4/packages/project-manager/www/tasks.adp 25 Jun 2007 07:26:11 -0000 1.12 @@ -26,6 +26,7 @@ searchterm="@searchterm@" tasks_orderby="@tasks_orderby@" role_id="@role_id@" + display_mode="all" filter_package_id="@filter_package_id@" subproject_tasks="@subproject_tasks@" orderby_p="1" Index: openacs-4/packages/project-manager/www/admin/linking.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/linking.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/project-manager/www/admin/linking.tcl 20 Feb 2007 07:53:39 -0000 1.2 +++ openacs-4/packages/project-manager/www/admin/linking.tcl 25 Jun 2007 07:26:11 -0000 1.3 @@ -38,7 +38,7 @@ set current_link [lindex [application_link::get_linked -from_package_id $this_package_id -to_package_key $key] 0] regsub -all -- {-} $key {_} key - ad_form -extend -name linking -form [list [list keys.$key\:text(select) [list label $package_pretty_name] [list options $options_list] [list value $current_link]]] + ad_form -extend -name linking -form [list [list keys.$key\:text(select),optional [list label $package_pretty_name] [list options $options_list] [list value $current_link]]] } ad_form -extend -name linking -export {return_url} -on_request { Index: openacs-4/packages/project-manager/www/comments/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/comments/add.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/project-manager/www/comments/add.tcl 22 Mar 2007 12:54:58 -0000 1.17 +++ openacs-4/packages/project-manager/www/comments/add.tcl 25 Jun 2007 07:26:12 -0000 1.18 @@ -145,9 +145,9 @@ {options $desc_options} {html {rows 20 cols 80 wrap soft}} } + {-section "sec1" {legendtext "[_ project-manager.Assignees]"}} {assignee:text(checkbox),multiple,optional {label "[_ project-manager.Send_email]"} - {section "[_ project-manager.Assignees]"} {options $assignee_list} {values $listed_party_ids} {html {"checked" ""}} @@ -175,9 +175,9 @@ if {[llength $assignee_list] > 0} { ad_form -extend -name comment -form { + {-section "sec_$group_id" {legendtext "$group_title"}} {${group_id}:text(checkbox),multiple,optional {label "[_ project-manager.Send_email]"} - {section "$group_title" } {options $assignee_list} } }