Index: openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-dependency-add-edit-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit-postgresql.xql 3 Oct 2003 22:21:45 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit-postgresql.xql 3 Oct 2003 23:13:15 -0000 1.2 @@ -28,10 +28,10 @@ select - r.item_id, - r.title as task_title + process_task_id as task_id, + one_line as task_title FROM - pm_process_tasks + pm_process_task WHERE process_id = :process_id ORDER BY Index: openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-dependency-add-edit.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl 3 Oct 2003 22:21:45 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl 3 Oct 2003 23:13:15 -0000 1.2 @@ -11,13 +11,14 @@ @return task_term_lower Terminology to use for Task @param dependency_id The new ID for dependencies we create - + @param use_dependency The tasks for whom we want to create dependencies + } { + {use_dependency:integer,multiple ""} process_id:integer dependency_id:integer,optional - task_revisions:integer,multiple,optional - task_revisions_list:optional + process_task_id:integer,multiple,optional dependency_type:array,optional dependency_task_id:array,optional {project_item_id:integer ""} @@ -33,6 +34,7 @@ # --------------------------------------------------------------- # + ns_log notice depedency page set mypage [ns_getform] if {[string equal "" $mypage]} { @@ -43,20 +45,16 @@ } + # HACK because there isn't a facility for exporting multiple hidden # form variables in ad_form -#if {[info exists task_revisions_list]} { - # convert task_revisions_list to task_revisions -# set task_revisions_list_tmp [lindex $task_revisions_list 0] -# set task_revisions [split $task_revisions_list " "] -#} -#if {[empty_string_p $project_item_id]} { - # get a parent project -# set project_item_id [db_string get_parent_project { }] -#} +set process_task_id_pass $process_task_id +set process_task_id_pass [string map {"-" " "} $process_task_id_pass] +set process_task_id $process_task_id_pass -if {![exists_and_not_null task_revisions]} { + +if {![exists_and_not_null use_dependency]} { ad_returnredirect "process-one?[export_url_vars process_id]" } @@ -71,19 +69,25 @@ # permissions set title "Add $task_term_lower dependencies" -set context_bar [ad_context_bar [list "process-task-add-edit?[export_vars -url {{process_id process_task_id:multiple}}" "Assignments"] "New $task_term dependency"] +set context_bar [ad_context_bar [list "process-task-add-edit?[export_vars -url {{process_id process_task_id:multiple}}]" "Assignments"] "New $task_term dependency"] permission::require_permission -party_id $user_id -object_id $package_id -privilege create +set process_task_id_pass $process_task_id +set process_task_id_pass [string map {" " "-"} $process_task_id] ad_form -name add_edit -form { dependency_id:key(pm_process_task_dependency_seq) {process_task_id:text(hidden) - {value $process_task_id} + {value $process_task_id_pass} } + {process_id:text(hidden) + {value $process_id} + } + } -export { } -on_submit { @@ -93,7 +97,7 @@ } -new_data { - foreach tr $task_revisions { + foreach tr $use_dependency { set type_id $dependency_type($tr) set parent_tsk_id $dependency_task_id($tr) @@ -127,7 +131,7 @@ db_foreach get_dependency_tasks { } -column_array dependency_tasks { - set dependency_options($dependency_tasks(task_title)) $dependency_tasks(item_id) + set dependency_options($dependency_tasks(task_title)) $dependency_tasks(task_id) lappend dependency_keys $dependency_tasks(task_title) } @@ -139,9 +143,9 @@ -# get the information on tasks from their revision_numbers +# get the information on tasks from their task_id numbers -db_foreach get_task_info { } -column_array tasks { +db_foreach dependency_query { } -column_array tasks { # set up the tasks that can be viewed. Takes out the current task set dependency_options_full "" @@ -152,32 +156,27 @@ } append add_edit_definition " - {item_id.$tasks(revision_id):text(hidden) - {value {$tasks(item_id)}} + {task_id.$tasks(task_id):text(hidden) + {value {$tasks(task_id)}} } - {task_title.$tasks(revision_id):text(inform) + {task_title.$tasks(task_id):text(inform) {label \"Subject\"} {value {$tasks(task_title)}} } - {description.$tasks(revision_id):text(inform) + {description.$tasks(task_id):text(inform) {label \"Description\"} {value {$tasks(description)}} } - {end_date.$tasks(revision_id):text(inform) - {label \"Deadline\"} - {value {$tasks(end_date)}} - } - - {dependency_type.$tasks(revision_id):text(select) + {dependency_type.$tasks(task_id):text(select) {label \"Dependency type\"} {options {[join $options " "]}} {value {finish_before_start}} } - {dependency_task_id.$tasks(revision_id):text(select) + {dependency_task_id.$tasks(task_id):text(select) {label \"Dependency\"} {options {$dependency_options_full}} {help_text {$task_term the dependency is based on}} Index: openacs-4/contrib/packages/project-manager/www/process-task-add-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-add-edit-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/process-task-add-edit-2.tcl 3 Oct 2003 22:21:45 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/process-task-add-edit-2.tcl 3 Oct 2003 23:13:15 -0000 1.2 @@ -21,6 +21,7 @@ @param estimated_hours_work Estimated hours worked (min) @param estimated_hours_work Estimated hours worked (max) @param process_task_id the ID for each process + @param use_dependency this task will depend on others } { @@ -31,6 +32,7 @@ {estimated_hours_work_min:multiple ""} {estimated_hours_work_max:multiple ""} process_task_id:integer,multiple + {use_dependency:integer,multiple ""} } -validate { process_id_missing { @@ -141,5 +143,5 @@ } -ad_returnredirect "process-task-assign-add-edit?[export_vars -url {use_dependency_p:multiple process_id process_task_id:multiple}]" +ad_returnredirect "process-task-assign-add-edit?[export_vars -url {use_dependency:multiple process_id process_task_id:multiple}]" ad_script_abort Index: openacs-4/contrib/packages/project-manager/www/process-task-add-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-add-edit.adp,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/project-manager/www/process-task-add-edit.adp 3 Oct 2003 22:21:45 -0000 1.2 +++ openacs-4/contrib/packages/project-manager/www/process-task-add-edit.adp 3 Oct 2003 23:13:15 -0000 1.3 @@ -46,7 +46,7 @@

- + depends on another @task_term_lower@ Index: openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-assign-add-edit.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.tcl 3 Oct 2003 22:21:45 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.tcl 3 Oct 2003 23:13:15 -0000 1.2 @@ -23,13 +23,13 @@ @param process_id The process that we're adding or editing items for. @param process_task_id The tasks we're creating and adding assignments for - @param use_dependency_p Although it says _p, it actually a list of items that will need dependencies. Needs to be passed to the depedency page. + @param use_dependency A list of tasks that will need dependencies. Needs to be passed to the depedency page. } { my_key:integer,optional process_id:integer,notnull process_task_id:notnull,multiple - use_dependency_p:integer,multiple,optional + use_dependency:integer,multiple,optional role_id:array,optional party_id:array,optional @@ -52,15 +52,14 @@ # hack to get around lack of multiple hidden support with ad_form set process_task_id_pass $process_task_id -set process_task_id_pass [string map {"-" " "} $process_task_id] +set process_task_id_pass [string map {"-" " "} $process_task_id_pass] set process_task_id $process_task_id_pass -#set task_revision_nodep_pass $revision_no_dependencies -#set task_revision_nodep_pass [string map {"-" " "} $task_revision_nodep_pass] -#set revision_no_dependencies $task_revision_nodep_pass +set use_dependency_pass $use_dependency +set use_dependency_pass [string map {"-" " "} $use_dependency_pass] +set use_dependency $use_dependency_pass - # terminology set task_term [parameter::get -parameter "TaskName" -default "Task"] set task_term_lower [parameter::get -parameter "taskname" -default "task"] @@ -109,9 +108,10 @@ set process_task_id_pass $process_task_id set process_task_id_pass [string map {" " "-"} $process_task_id] -#set task_revision_nodep_pass $revision_no_dependencies -#set task_revision_nodep_pass [string map {" " "-"} $task_revision_nodep_pass] +set use_dependency_pass $use_dependency +set use_dependency_pass [string map {" " "-"} $use_dependency] + ad_form -name add_edit -form { my_key:key(acs_object_id_seq) @@ -121,6 +121,9 @@ {process_task_id:text(hidden) {value $process_task_id_pass}} + + {use_dependency:text(hidden) + {value $use_dependency_pass}} } -on_submit { @@ -285,7 +288,7 @@ #set task_revisions $revision_has_dependencies - ad_returnredirect "process-dependency-add-edit?[export_vars -url {process_task_id:multiple process_id}]" + ad_returnredirect "process-dependency-add-edit?[export_vars -url {process_task_id:multiple process_id use_dependency:multiple}]" ad_script_abort }