" +# } + + set diff_pipe [open "| diff -f $old_f $new_f" "r"] + while {![eof $diff_pipe]} { + gets $diff_pipe diff + if {[regexp {^d(\d+)(\s+(\d+))?$} $diff full m1 m2]} { + if {$m2 != ""} {set d_end $m2} else {set d_end $m1} + for {set i $sv} {$i < $m1} {incr i} { + append res "${split_by}[lindex $old_w $i]" + } + for {set i $m1} {$i <= $d_end} {incr i} { + append res "${split_by}${start_old}[lindex $old_w $i]${end_old}" + } + set sv [expr $d_end + 1] + } elseif {[regexp {^c(\d+)(\s+(\d+))?$} $diff full m1 m2]} { + if {$m2 != ""} {set d_end $m2} else {set d_end $m1} + for {set i $sv} {$i < $m1} {incr i} { + append res "${split_by}[lindex $old_w $i]" + } + for {set i $m1} {$i <= $d_end} {incr i} { + append res "${split_by}${start_old}[lindex $old_w $i]${end_old}" + } + while {![eof $diff_pipe]} { + gets $diff_pipe diff + if {$diff == "."} { + break + } else { + append res "${split_by}${start_new}${diff}${end_new}" + } + } + set sv [expr $d_end + 1] + } elseif {[regexp {^a(\d+)$} $diff full m1]} { + set d_end $m1 + for {set i $sv} {$i < $m1} {incr i} { + append res "${split_by}[lindex $old_w $i]" + } + while {![eof $diff_pipe]} { + gets $diff_pipe diff + if {$diff == "."} { + break + } else { + append res "${split_by}${start_new}${diff}${end_new}" + } + } + set sv [expr $d_end + 1] + } + } + + for {set i $sv} {$i < [llength $old_w]} {incr i} { + append res "${split_by}[lindex $old_w $i]" + } + + file delete -- $old_f $new_f + + return $res +} +>>>>>>> 1.4 Index: openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs-postgresql.xql,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql 12 Mar 2004 13:44:43 -0000 1.4 +++ openacs-4/contrib/packages/project-manager/tcl/project-procs-postgresql.xql 20 May 2004 17:30:04 -0000 1.4.2.1 @@ -53,6 +53,7 @@ :parent_id, :goal, :description, + :mime_type, to_timestamp(:planned_start_date,'YYYY MM DD HH24 MI SS'), to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'), null, @@ -101,12 +102,22 @@ else t.actual_hours_worked end as worked, t.estimated_hours_work as to_work, t.item_id as my_iid, - to_char(end_date,'J') as task_deadline_j + to_char(end_date,'J') as task_deadline_j, + to_char(earliest_start,'J') as old_earliest_start_j, + to_char(earliest_finish,'J') as old_earliest_finish_j, + to_char(latest_start,'J') as old_latest_start_j, + to_char(latest_finish,'J') as old_latest_finish_j, + s.status_type from - pm_tasks_revisionsx t, cr_items i + pm_tasks_revisionsx t, + cr_items i, + pm_tasks ti, + pm_task_status s where t.item_id in ([join $task_list ", "]) and - i.live_revision = t.revision_id + i.live_revision = t.revision_id and + i.item_id = ti.task_id and + ti.status = s.status_id 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 -r1.6.2.1 -r1.6.2.2 --- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 25 Mar 2004 18:36:05 -0000 1.6.2.1 +++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 20 May 2004 17:30:04 -0000 1.6.2.2 @@ -86,13 +86,17 @@ {-task_item_id ""} {-project_item_id ""} {-update_status_p "t"} + {-party_id ""} } { Adds a logger entry to a project. If task_item_id is passed in, also links it up with that task, and updates the task hours. - + @author Jade Rubick (jader@bread.com) @creation-date 2004-03-05 + + @see logger::entry::new + @see pm::project::compute_status @param entry_id If passed in, determines the entry_id for the newly logged entry @@ -117,6 +121,9 @@ This can be set to f when editing a task, because these things are done later anyway. + @param party_id If set, the party that creates the new logger + entry. If not set, defaults to ad_conn user_id + @return 0 if there no task it is logged against, otherwise returns the total number of hours logged to that task @@ -132,13 +139,20 @@ set entry_id [db_nextval acs_object_id_seq] } + if {[exists_and_not_null party_id]} { + set creation_user $party_id + } else { + set creation_user [ad_conn user_id] + } + # add in the new entry logger::entry::new -entry_id $entry_id \ -project_id $logger_project_id \ -variable_id $variable_id \ -value $value \ -time_stamp $timestamp_ansi \ - -description $description + -description $description \ + -party_id $creation_user # if we have a pm_task_id, then we need to note that this # entry is logged to a particular task. @@ -173,6 +187,7 @@ {-parent_id ""} {-goal ""} {-description ""} + {-mime_type "text/plain"} {-planned_start_date ""} {-planned_end_date ""} {-actual_start_date ""} @@ -206,7 +221,6 @@ # create a logger project set logger_project [logger::project::new \ -name $project_name \ - -description $description \ -project_lead $creation_user \ ] @@ -265,8 +279,19 @@ } { Stub for project edit -
+ numX ++ + where X represents the number of the new task, ranging from 1 + to n. + + + + To be more efficient when creating multiple tasks at the same + time, we should cache the database calls. + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-05-13 + + @param edit_p Is this for a task being edited? Or a new task? + + @param project_item_id The project we're finding tasks from + + @param task_item_id The task ID. This is used because we do not + want a task to depend on itself, so it is excluded from the list. + + @param dependency_task_ids For edited tasks, the current task_ids + that it depends on. Used because sometimes it can be closed, and + it wouldn't otherwise appear on the list. This is a list. + + @param number When the list is returned, it includes entries for + number new tasks, in the numX format described in these docs. + + @param current_number The current number. Used for new tasks. It + prevents allowing dependencies on the task being created. + + @return + + @error +} { + + # get tasks this task can depend on + + if {[exists_and_not_null dependency_task_ids]} { + + set union_clause " + UNION + SELECT + r.item_id, + r.title as task_title + FROM + pm_tasks_revisionsx r, + cr_items i, + pm_tasks t + WHERE + r.parent_id = :project_item_id and + r.revision_id = i.live_revision and + i.item_id = t.task_id + and t.task_id in ([join $dependency_task_ids ","])" + } else { + set union_clause "" + } + + set keys [list] + + db_foreach get_dependency_tasks { } { + set options($task_title) $item_id + lappend keys $task_title + } + + set keys [lsort $keys] + + + set dependency_options_full "{\"--None--\" \"\"} " + + if {!$edit_p} { + # now set up dependency options + + for {set j 1} {$j <= $number} {incr j} { + if {![string equal $current_number $j]} { + append dependency_options_full "{\"New Task \#$j\" \"num$j\"} " + } + } + } + + # for editing tasks, we skip ourselves (because depending on + # ourselves just sometimes isn't an option) + + if {[string equal $edit_p t]} { + foreach key $keys { + + # make sure we're not dependent on ourselves + + if {![string equal $task_item_id $options($key)]} { + # check for case when there is a quote in the name of + # a task. We have to filter this out, or we get an error. + append dependency_options_full "{{$key} $options($key)} " + } + } + } else { + foreach key $keys { + + # check for case when there is a quote in the name of + # a task. We have to filter this out, or we get an error. + append dependency_options_full "{{$key} $options($key)} " + } + } + + + return $dependency_options_full +} + + ad_proc -public pm::task::dependency_delete_all { -task_item_id:required @@ -92,8 +221,17 @@ project.item_id = :project_item_id "] - set loop_limit [llength $project_tasks] + # we do not allow tasks to depend on items outside of their + # project. So if it's not in the list of tasks for that project, + # we reject it + if {[lsearch $project_tasks $parent_id] < 0} { + set loop_limit 0 + set valid_p FALSE + } else { + set loop_limit [llength $project_tasks] + } + if {$loop_limit > 0} { set dep_list [list] @@ -132,7 +270,7 @@ db_dml insert_dep "insert into pm_task_dependency (dependency_id, task_id, parent_task_id, dependency_type) values (:dependency_id, :task_item_id, :parent_id, 'finish_before_start')" } else { - ns_log Notice "Task $task_item_id was not added due to looping" + ns_log Notice "Task dependency for $task_item_id on $parent_id was not added due to looping or being outside of the current project" } } @@ -184,7 +322,13 @@ array set task_state [nsv_array get task_node_status] - set used $task_state($tNode) + # this should only happen if dependencies span projects + # they shouldn't, but I check anyway. + if {![info exists task_state($tNode)]} { + set used 0 + } else { + set used $task_state($tNode) + } if {[string equal $used 1]} { return FALSE @@ -225,9 +369,9 @@ @return task_item_id - @error + @error Returns -1 if there is no such task } { - set return_val [db_string get_item_id { }] + set return_val [db_string get_item_id { } -default "-1"] return $return_val } @@ -246,15 +390,37 @@ @return task_item_id - @error + @error If there is no such task item, then returns -1 } { - set return_val [db_string get_revision_id { }] + set return_val [db_string get_revision_id { } -default "-1"] return $return_val } +ad_proc -public pm::task::current_status { + -task_item_id:required +} { + Returns the current status value for open tasks +} { + set return_val [db_string get_current_status { }] + + return $return_val +} + + +ad_proc -public pm::task::open_p { + -task_item_id:required +} { + Returns 1 if the task is open, 0 otherwise +} { + set return_val [db_string open_p { }] + + return $return_val +} + + ad_proc -public pm::task::default_status_open {} { Returns the default status value for open tasks } { @@ -279,6 +445,7 @@ -project_item_id:required -title:required -description:required + {-mime_type "text/plain"} -end_date:required -percent_complete:required -estimated_hours_work:required @@ -303,6 +470,8 @@ @param description + @param mime_type + @param end_date @param percent_complete @@ -327,16 +496,26 @@ @error } { - if {$percent_complete >= 100} { - set status_id [pm::task::default_status_closed] + if {![exists_and_not_null status_id]} { + set status_id [pm::task::current_status \ + -task_item_id $task_item_id] } - if {![exists_and_not_null status_id]} { - set status_id [pm::task::default_status_open] + if {$estimated_hours_work_min > $estimated_hours_work_max} { + set temp $estimated_hours_work_max + set estimated_hours_work_max $estimated_hours_work_min + set estimated_hours_work_min $temp } set return_val [db_exec_plsql new_task_revision { *SQL }] + # if the we've done 100% of the work, then we close the task + if {$percent_complete >= 100} { + pm::task::close -task_item_id $task_item_id + } else { + pm::task::open -task_item_id $task_item_id + } + return $return_val } @@ -346,6 +525,7 @@ -project_id:required -title:required {-description ""} + {-mime_type "text/plain"} {-end_date ""} {-percent_complete "0"} {-estimated_hours_work "0"} @@ -361,13 +541,39 @@ set status_id [pm::task::default_status_open] } + if {$estimated_hours_work_min > $estimated_hours_work_max} { + set temp $estimated_hours_work_max + set estimated_hours_work_max $estimated_hours_work_min + set estimated_hours_work_min $temp + } + set return_val [db_exec_plsql new_task_item { *SQL }] return $return_val } +ad_proc -public pm::task::delete { + -task_item_id:required +} { + Deletes a given task + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-03-10 + + @param task_item_id + + @return 1, no matter once + + @error No error thrown if there is no such task. +} { + db_exec_plsql delete_task "select pm_task__delete_task_item(:task_item_id)" + + return 1 +} + + ad_proc -public pm::task::get_url { object_id } { @@ -496,3 +702,1527 @@ return $total_logged_hours } +<<<<<<< task-procs.tcl + + +ad_proc -public pm::task::link { + -task_item_id_1:required + -task_item_id_2:required +} { + Links two tasks together + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-03-10 + + @param task_item_id_1 + + @param task_item_id_2 + + @return + + @error +} { + + if {[string equal $task_item_id_1 $task_item_id_2]} { + # do nothing + ns_log Notice "Project-manager: Cannot link a task to itself!" + } elseif {$task_item_id_1 < $task_item_id_2} { + db_dml link_tasks " + INSERT INTO + pm_task_xref + (task_id_1, task_id_2) + VALUES + (:task_item_id_1, :task_item_id_2)" + } else { + db_dml link_tasks " + INSERT INTO + pm_task_xref + (task_id_1, task_id_2) + VALUES + (:task_item_id_2, :task_item_id_1)" + } + +} + + +ad_proc -public pm::task::assign_remove_everyone { + -task_item_id:required +} { + Removes all assignments for a task + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-09 + + @param task_item_id + + @return + + @error +} { + db_dml remove_assignment " + delete from pm_task_assignment where task_id = :task_item_id" +} + + +ad_proc -public pm::task::assign { + -task_item_id:required + -party_id:required + {-role_id ""} +} { + Assigns party_id to task_item_id + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-05 + + @param task_item_id + + @param party_id + + @param role_id the role under which the person is assigned + + @return + + @error +} { + if {![exists_and_not_null role_id]} { + set role_id [pm::role::default] + } + + db_dml add_assignment " + insert into pm_task_assignment + (task_id, + role_id, + party_id) + values + (:task_item_id, + :role_id, + :party_id) + " +} + + +ad_proc -public pm::task::open { + -task_item_id:required +} { + Opens a task, and sends notifications, unless it was already + open. If it was already open, does nothing. + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-22 + + @param task_item_id + + @return + + @error +} { + # find out what the status of the task was, and while we're at it, + # get other interesting information about the task, in case we + # want to close it. Then we can put this info in the email. + + db_1row get_status " + SELECT + t.status, + s.status_type, + s.description as status_description, + r.title as task_title, + r.estimated_hours_work, + r.estimated_hours_work_min, + r.estimated_hours_work_max, + to_char(r.earliest_start, 'YYYY-MM-DD HH24:MI:SS') as earliest_start_ansi, + to_char(r.earliest_finish, 'YYYY-MM-DD HH24:MI:SS') as earliest_finish_ansi, + to_char(r.latest_start, 'YYYY-MM-DD HH24:MI:SS') as latest_start_ansi, + to_char(r.latest_finish, 'YYYY-MM-DD HH24:MI:SS') as latest_finish_ansi, + r.description as task_description, + project_revision.title as project_name + FROM + pm_tasks t, + cr_items task_item, + pm_task_status s, + pm_tasks_revisionsx r, + cr_items project_item, + cr_revisions project_revision + WHERE + r.parent_id = project_item.item_id and + t.task_id = task_item.item_id and + task_item.live_revision = r.revision_id and + project_item.live_revision = project_revision.revision_id and + r.item_id = t.task_id and + t.status = s.status_id and + t.task_id = :task_item_id" + + if {[string equal $status_type "o"]} { + + # this is already open + return + + } + + # set the new status + + set status_code [pm::task::default_status_open] + + db_dml update_status " + UPDATE + pm_tasks + SET + status = :status_code + WHERE + task_id = :task_item_id" + + # send out an email notification + + set earliest_start [lc_time_fmt $earliest_start_ansi "%x"] + set earliest_finish [lc_time_fmt $earliest_finish_ansi "%x"] + set latest_start [lc_time_fmt $latest_start_ansi "%x"] + set latest_finish [lc_time_fmt $latest_finish_ansi "%x"] + + set assignees [db_list get_assignees " + select + email + FROM + pm_task_assignment a, + parties p + WHERE + task_id = :task_item_id and + a.party_id = p.party_id + "] + + if {[llength $assignees] > 0} { + + set to_address [join $assignees ", "] + + set user_id [ad_conn user_id] + + set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"] + + set task_url "[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][ad_conn package_url]task-one?task_id=$task_item_id" + + set subject "Task reopened (was $status_description): $task_title" + + if {[parameter::get_from_package_key -package_key project-manager -parameter UseUncertainCompletionTimesP]} { + set estimated_work "\nHrs work (min): $estimated_hours_work_min\nHrs work (max): $estimated_hours_work_max" + } else { + set estimated_work "\nHrs work: $estimated_hours_work" + + } + + set notification_text "Task reopened, was $status_description\n\n" + + append notification_text " +------------- +Task ID: \#$task_item_id +Description: $task_title +Project: $project_name + +Link: $task_url + +--------------- +Estimated work: +---------------$estimated_work + +------ +Dates: +------ +Earliest start: $earliest_start +Earliest finish: $earliest_finish +Latest start: $latest_start +Latest finish $latest_finish + +----------- +Description +----------- +$task_description" + + + append notification_text "\n" + + acs_mail_lite::send \ + -to_addr $to_address \ + -from_addr $from_address \ + -subject $subject \ + -body $notification_text + } + + return +} + +ad_proc -public pm::task::close { + -task_item_id:required +} { + Closes a task, and sends notifications, unless it was already + closed. If it was already closed, does nothing. + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-22 + + @param task_item_id + + @return + + @error +} { + # find out what the status of the task was + + db_1row get_status " + SELECT + t.status, + s.status_type, + s.description as status_description, + r.title as task_title, + r.estimated_hours_work, + r.estimated_hours_work_min, + r.estimated_hours_work_max, + to_char(r.earliest_start, 'YYYY-MM-DD HH24:MI:SS') as earliest_start_ansi, + to_char(r.earliest_finish, 'YYYY-MM-DD HH24:MI:SS') as earliest_finish_ansi, + to_char(r.latest_start, 'YYYY-MM-DD HH24:MI:SS') as latest_start_ansi, + to_char(r.latest_finish, 'YYYY-MM-DD HH24:MI:SS') as latest_finish_ansi, + r.description as task_description, + project_revision.title as project_name + FROM + pm_tasks t, + cr_items task_item, + pm_task_status s, + pm_tasks_revisionsx r, + cr_items project_item, + cr_revisions project_revision + WHERE + r.parent_id = project_item.item_id and + t.task_id = task_item.item_id and + task_item.live_revision = r.revision_id and + project_item.live_revision = project_revision.revision_id and + r.item_id = t.task_id and + t.status = s.status_id and + t.task_id = :task_item_id" + + if {[string equal $status_type "c"]} { + + # this is already closed + return + + } + + # set the new status + + set status_code [pm::task::default_status_closed] + + db_dml update_status " + UPDATE + pm_tasks + SET + status = :status_code + WHERE + task_id = :task_item_id" + + # send out an email notification + + set earliest_start [lc_time_fmt $earliest_start_ansi "%x"] + set earliest_finish [lc_time_fmt $earliest_finish_ansi "%x"] + set latest_start [lc_time_fmt $latest_start_ansi "%x"] + set latest_finish [lc_time_fmt $latest_finish_ansi "%x"] + + + set assignees [db_list get_assignees " + select + email + FROM + pm_task_assignment a, + parties p + WHERE + task_id = :task_item_id and + a.party_id = p.party_id + "] + + if {[llength $assignees] > 0} { + + set to_address [join $assignees ", "] + + set user_id [ad_conn user_id] + + set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"] + + set last_time_stamp "" + set work_log "----------------------\nWork done on this task\n----------------------\n\n" + + db_foreach get_logged_time " + SELECT + to_char(le.time_stamp, 'fmDyfm fmMMfm-fmDDfm-YYYY') as time_stamp_pretty, + le.value, + le.description, + r.title as task_name, + submitter.first_names || ' ' || submitter.last_name as user_name + FROM + logger_entries le, + cr_items i, + cr_revisions r, + pm_task_logger_proj_map m, + logger_projects lp, + acs_objects ao, + acs_users_all submitter + WHERE + r.item_id = m.task_item_id and + i.live_revision = r.revision_id and + r.item_id = :task_item_id and + le.project_id = lp.project_id and + ao.object_id = le.entry_id and + le.entry_id = m.logger_entry and + ao.creation_user = submitter.user_id + ORDER BY + le.time_stamp desc" { + if {![string equal $time_stamp_pretty $last_time_stamp]} { + append work_log "* $time_stamp_pretty\n\n" + } + append work_log "[pm::util::string_truncate_and_pad -length 25 -string "$user_name:"] $description ($value hrs)\n" + + set last_time_stamp $time_stamp_pretty + } + + set task_url "[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][ad_conn package_url]task-one?task_id=$task_item_id" + + set subject "Task closed (was $status_description) $task_title" + + if {[parameter::get_from_package_key -package_key project-manager -parameter UseUncertainCompletionTimesP]} { + set estimated_work "\nHrs work (min): $estimated_hours_work_min\nHrs work (max): $estimated_hours_work_max" + } else { + set estimated_work "\nHrs work: $estimated_hours_work" + + } + + set notification_text "Task closed, was $status_description\n\n" + + append notification_text " +------------- +Task ID: \#$task_item_id +Description: $task_title +Project: $project_name + +Link: $task_url +" + append notification_text "\n\n$work_log" + + append notification_text " +--------------- +Estimated work: +---------------$estimated_work + +------ +Dates: +------ +Earliest start: $earliest_start +Earliest finish: $earliest_finish +Latest start: $latest_start +Latest finish $latest_finish + +----------- +Description +----------- +$task_description" + + + acs_mail_lite::send \ + -to_addr $to_address \ + -from_addr $from_address \ + -subject $subject \ + -body $notification_text + } + + return +} + + + +ad_proc -public pm::task::email_status {} { + + set send_email_p [parameter::get_from_package_key -package_key "project-manager" -parameter SendDailyEmail -default "0"] + + if {[string equal $send_email_p "0"]} { + ns_log Notice "Parameter SendDailyEmail for project manager says skip email today" + return + } + + acs_mail_lite::send \ + -to_addr jader@bread.com \ + -from_addr jader@bread.com \ + -subject "Reminder: pm::task::email_status is starting..." \ + -body "It is starting" + + set parties [list] + + # what if the person assigned is no longer a part of the subsite? + # right now, we still email them. + + db_foreach get_all_open_tasks " + SELECT + ts.task_id, + ts.task_id as item_id, + ts.task_number, + t.task_revision_id, + t.title, + to_char(t.earliest_start,'J') as earliest_start_j, + to_char(current_timestamp,'J') as today_j, + to_char(t.latest_start,'J') as latest_start_j, + to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + t.percent_complete, + t.estimated_hours_work, + t.estimated_hours_work_min, + t.estimated_hours_work_max, + case when t.actual_hours_worked is null then 0 + else t.actual_hours_worked end as actual_hours_worked, + to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, + to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, + to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + p.first_names || ' ' || p.last_name as full_name, + p.party_id, + (select one_line from pm_roles r where ta.role_id = r.role_id) as role + FROM + pm_tasks ts, + pm_tasks_revisionsx t, + pm_task_assignment ta, + acs_users_all p, + cr_items i, + pm_task_status s + WHERE + ts.task_id = t.item_id and + i.item_id = t.item_id and + t.task_revision_id = i.live_revision and + ts.status = s.status_id and + s.status_type = 'o' and + t.item_id = ta.task_id and + ta.party_id = p.party_id + ORDER BY + t.latest_start asc" { + set earliest_start_pretty [lc_time_fmt $earliest_start "%x"] + set earliest_finish_pretty [lc_time_fmt $earliest_finish "%x"] + set latest_start_pretty [lc_time_fmt $latest_start "%x"] + set latest_finish_pretty [lc_time_fmt $latest_finish "%x"] + + if {[exists_and_not_null earliest_start_j]} { + set slack_time [pm::task::slack_time \ + -earliest_start_j $earliest_start_j \ + -today_j $today_j \ + -latest_start_j $latest_start_j] + + } + + if {[lsearch $parties $party_id] == -1} { + lappend parties $party_id + } + + lappend task_list($party_id) $task_id + set titles_arr($task_id) $title + set ls_arr($task_id) $latest_start_pretty + set lf_arr($task_id) $latest_finish_pretty + set slack_arr($task_id) $slack_time + + # how many tasks does this person have? + if {[info exists task_count($party_id)]} { + incr task_count($party_id) + } else { + set task_count($party_id) 1 + } + } + + # transitions are < this value + set OVERDUE_THRESHOLD 0 + set PRESSING_THRESHOLD 7 + set LONGTERM_THRESHOLD 90 + + set TASK_LENGTH 70 + set TASK_ID_LENGTH 9 + + foreach party $parties { + + set subject "Daily Task status report" + set address [db_string get_email "select email from parties where party_id = :party" -default "jade-errors@bread.com"] + + set overdue [list] + set pressing [list] + set longterm [list] + + foreach task $task_list($party) { + + if {$slack_arr($task) < $OVERDUE_THRESHOLD} { + set which_pile overdue + } elseif {$slack_arr($task) < $PRESSING_THRESHOLD} { + set which_pile pressing + } elseif {$slack_arr($task) < $PRESSING_THRESHOLD} { + set which_pile longterm + } else { + set which_pile "" + } + + if {![empty_string_p $which_pile]} { + + set trimmed_task [pm::util::string_truncate_and_pad -length $TASK_ID_LENGTH -string $task] + set trimmed_title [pm::util::string_truncate_and_pad -length $TASK_LENGTH -string $titles_arr($task)] + + lappend $which_pile "$trimmed_task $trimmed_title" + lappend $which_pile "[string repeat " " $TASK_ID_LENGTH] LS: $ls_arr($task) LF: $lf_arr($task) Slack: $slack_arr($task)" + lappend $which_pile "" + } + + } + + set description [list] + + set overdue_title "OVERDUE TASKS" + set overdue_title [pm::util::string_truncate_and_pad -length $TASK_LENGTH -string $overdue_title] + + set overdue_description "consult with people affected, and let them know deadlines are affected" + + set pressing_title "PRESSING TASKS" + set pressing_title [pm::util::string_truncate_and_pad -length $TASK_LENGTH -string $pressing_title] + + set pressing_description "you need to start working on these soon to avoid affecting deadlines" + + set longterm_title "LONG TERM TASKS" + set longterm_title [pm::util::string_truncate_and_pad -length $TASK_LENGTH -string $longterm_title] + set longterm_description "look over these to plan ahead" + + # okay, let's now set up the email body + + lappend description "This is a daily reminder of tasks that are assigned to you" + lappend description "You current have $task_count($party) tasks assigned to you" + + lappend description "" + lappend description "\# $overdue_title" + + set length [string length $overdue_description] + lappend description [string repeat "_" $length] + + lappend description $overdue_description + + lappend description "" + foreach overdue_item $overdue { + lappend description $overdue_item + } + + lappend description "" + lappend description "\# $pressing_title" + + set length [string length $pressing_description] + lappend description [string repeat "_" $length] + + lappend description $pressing_description + + + lappend description "" + foreach pressing_item $pressing { + lappend description $pressing_item + } + + lappend description "" + lappend description "\# $longterm_title" + + set length [string length $longterm_description] + lappend description [string repeat "_" $length] + + lappend description $longterm_description + + lappend description "" + foreach longterm_item $longterm { + lappend description $longterm_item + } + + acs_mail_lite::send \ + -to_addr $address \ + -from_addr $address \ + -subject $subject \ + -body [join $description "\n"] + + } + + # consider also sending out emails to people who have assigned + # tickets to nobody + +} + + + +ad_proc -private pm::task::email_status_init { +} { + Schedules the daily emailings + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-14 + + @return + + @error +} { + ns_log Notice "Scheduling daily email notifications for project manager to 5:00 am" + ad_schedule_proc -thread t -debug t -schedule_proc ns_schedule_daily "5 0" pm::task::email_status +} +======= + + +ad_proc -public pm::task::link { + -task_item_id_1:required + -task_item_id_2:required +} { + Links two tasks together + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-03-10 + + @param task_item_id_1 + + @param task_item_id_2 + + @return + + @error +} { + + if {[string equal $task_item_id_1 $task_item_id_2]} { + # do nothing + ns_log Notice "Project-manager: Cannot link a task to itself!" + } elseif {$task_item_id_1 < $task_item_id_2} { + db_dml link_tasks " + INSERT INTO + pm_task_xref + (task_id_1, task_id_2) + VALUES + (:task_item_id_1, :task_item_id_2)" + } else { + db_dml link_tasks " + INSERT INTO + pm_task_xref + (task_id_1, task_id_2) + VALUES + (:task_item_id_2, :task_item_id_1)" + } + +} + + +ad_proc -public pm::task::assign_remove_everyone { + -task_item_id:required +} { + Removes all assignments for a task + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-09 + + @param task_item_id + + @return + + @error +} { + db_dml remove_assignment " + delete from pm_task_assignment where task_id = :task_item_id" +} + + +ad_proc -public pm::task::assign { + -task_item_id:required + -party_id:required + {-role_id ""} +} { + Assigns party_id to task_item_id + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-05 + + @param task_item_id + + @param party_id + + @param role_id the role under which the person is assigned + + @return + + @error +} { + if {![exists_and_not_null role_id]} { + set role_id [pm::role::default] + } + + db_dml add_assignment " + insert into pm_task_assignment + (task_id, + role_id, + party_id) + values + (:task_item_id, + :role_id, + :party_id) + " +} + + +ad_proc -public pm::task::open { + -task_item_id:required +} { + Opens a task, and sends notifications, unless it was already + open. If it was already open, does nothing. + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-22 + + @param task_item_id + + @return + + @error +} { + # find out what the status of the task was, and while we're at it, + # get other interesting information about the task, in case we + # want to close it. Then we can put this info in the email. + + db_1row get_status " + SELECT + t.status, + s.status_type, + s.description as status_description, + r.title as task_title, + r.estimated_hours_work, + r.estimated_hours_work_min, + r.estimated_hours_work_max, + to_char(r.earliest_start, 'YYYY-MM-DD HH24:MI:SS') as earliest_start_ansi, + to_char(r.earliest_finish, 'YYYY-MM-DD HH24:MI:SS') as earliest_finish_ansi, + to_char(r.latest_start, 'YYYY-MM-DD HH24:MI:SS') as latest_start_ansi, + to_char(r.latest_finish, 'YYYY-MM-DD HH24:MI:SS') as latest_finish_ansi, + r.description as task_description, + project_revision.title as project_name + FROM + pm_tasks t, + cr_items task_item, + pm_task_status s, + pm_tasks_revisionsx r, + cr_items project_item, + cr_revisions project_revision + WHERE + r.parent_id = project_item.item_id and + t.task_id = task_item.item_id and + task_item.live_revision = r.revision_id and + project_item.live_revision = project_revision.revision_id and + r.item_id = t.task_id and + t.status = s.status_id and + t.task_id = :task_item_id" + + if {[string equal $status_type "o"]} { + + # this is already open + return + + } + + # set the new status + + set status_code [pm::task::default_status_open] + + db_dml update_status " + UPDATE + pm_tasks + SET + status = :status_code + WHERE + task_id = :task_item_id" + + # send out an email notification + + set earliest_start [lc_time_fmt $earliest_start_ansi "%x"] + set earliest_finish [lc_time_fmt $earliest_finish_ansi "%x"] + set latest_start [lc_time_fmt $latest_start_ansi "%x"] + set latest_finish [lc_time_fmt $latest_finish_ansi "%x"] + + set assignees [db_list get_assignees " + select + email + FROM + pm_task_assignment a, + parties p + WHERE + task_id = :task_item_id and + a.party_id = p.party_id + "] + + if {[llength $assignees] > 0} { + + set to_address [join $assignees ", "] + + set user_id [ad_conn user_id] + + set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"] + + set task_url "[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][ad_conn package_url]task-one?task_id=$task_item_id" + + set subject "Task reopened (was $status_description): $task_title" + + if {[parameter::get_from_package_key -package_key project-manager -parameter UseUncertainCompletionTimesP]} { + set estimated_work "\nHrs work (min): $estimated_hours_work_min\nHrs work (max): $estimated_hours_work_max" + } else { + set estimated_work "\nHrs work: $estimated_hours_work" + + } + + set notification_text "Task reopened, was $status_description\n\n" + + append notification_text " +------------- +Task ID: \#$task_item_id +Description: $task_title +Project: $project_name + +Link: $task_url + +--------------- +Estimated work: +---------------$estimated_work + +------ +Dates: +------ +Earliest start: $earliest_start +Earliest finish: $earliest_finish +Latest start: $latest_start +Latest finish $latest_finish + +----------- +Description +----------- +$task_description" + + + append notification_text "\n" + + acs_mail_lite::send \ + -to_addr $to_address \ + -from_addr $from_address \ + -subject $subject \ + -body $notification_text + } + + return +} + +ad_proc -public pm::task::close { + -task_item_id:required +} { + Closes a task, and sends notifications, unless it was already + closed. If it was already closed, does nothing. + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-22 + + @param task_item_id + + @return + + @error +} { + # find out what the status of the task was + + db_1row get_status " + SELECT + t.status, + s.status_type, + s.description as status_description, + r.title as task_title, + r.estimated_hours_work, + r.estimated_hours_work_min, + r.estimated_hours_work_max, + to_char(r.earliest_start, 'YYYY-MM-DD HH24:MI:SS') as earliest_start_ansi, + to_char(r.earliest_finish, 'YYYY-MM-DD HH24:MI:SS') as earliest_finish_ansi, + to_char(r.latest_start, 'YYYY-MM-DD HH24:MI:SS') as latest_start_ansi, + to_char(r.latest_finish, 'YYYY-MM-DD HH24:MI:SS') as latest_finish_ansi, + r.description as task_description, + project_revision.title as project_name + FROM + pm_tasks t, + cr_items task_item, + pm_task_status s, + pm_tasks_revisionsx r, + cr_items project_item, + cr_revisions project_revision + WHERE + r.parent_id = project_item.item_id and + t.task_id = task_item.item_id and + task_item.live_revision = r.revision_id and + project_item.live_revision = project_revision.revision_id and + r.item_id = t.task_id and + t.status = s.status_id and + t.task_id = :task_item_id" + + if {[string equal $status_type "c"]} { + + # this is already closed + return + + } + + # set the new status + + set status_code [pm::task::default_status_closed] + + db_dml update_status " + UPDATE + pm_tasks + SET + status = :status_code + WHERE + task_id = :task_item_id" + + # send out an email notification + + set earliest_start [lc_time_fmt $earliest_start_ansi "%x"] + set earliest_finish [lc_time_fmt $earliest_finish_ansi "%x"] + set latest_start [lc_time_fmt $latest_start_ansi "%x"] + set latest_finish [lc_time_fmt $latest_finish_ansi "%x"] + + + set assignees [db_list get_assignees " + select + email + FROM + pm_task_assignment a, + parties p + WHERE + task_id = :task_item_id and + a.party_id = p.party_id + "] + + if {[llength $assignees] > 0} { + + set to_address [join $assignees ", "] + + set user_id [ad_conn user_id] + + set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"] + + set last_time_stamp "" + set work_log "----------------------\nWork done on this task\n----------------------\n\n" + + db_foreach get_logged_time " + SELECT + to_char(le.time_stamp, 'fmDyfm fmMMfm-fmDDfm-YYYY') as time_stamp_pretty, + le.value, + le.description, + r.title as task_name, + submitter.first_names || ' ' || submitter.last_name as user_name + FROM + logger_entries le, + cr_items i, + cr_revisions r, + pm_task_logger_proj_map m, + logger_projects lp, + acs_objects ao, + acs_users_all submitter + WHERE + r.item_id = m.task_item_id and + i.live_revision = r.revision_id and + r.item_id = :task_item_id and + le.project_id = lp.project_id and + ao.object_id = le.entry_id and + le.entry_id = m.logger_entry and + ao.creation_user = submitter.user_id + ORDER BY + le.time_stamp desc" { + if {![string equal $time_stamp_pretty $last_time_stamp]} { + append work_log "* $time_stamp_pretty\n\n" + } + append work_log "[pm::util::string_truncate_and_pad -length 25 -string "$user_name:"] $description ($value hrs)\n" + + set last_time_stamp $time_stamp_pretty + } + + set task_url "[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][ad_conn package_url]task-one?task_id=$task_item_id" + + set subject "Task closed (was $status_description) $task_title" + + if {[parameter::get_from_package_key -package_key project-manager -parameter UseUncertainCompletionTimesP]} { + set estimated_work "\nHrs work (min): $estimated_hours_work_min\nHrs work (max): $estimated_hours_work_max" + } else { + set estimated_work "\nHrs work: $estimated_hours_work" + + } + + set notification_text "Task closed, was $status_description\n\n" + + append notification_text " +------------- +Task ID: \#$task_item_id +Description: $task_title +Project: $project_name + +Link: $task_url +" + append notification_text "\n\n$work_log" + + append notification_text " +--------------- +Estimated work: +---------------$estimated_work + +------ +Dates: +------ +Earliest start: $earliest_start +Earliest finish: $earliest_finish +Latest start: $latest_start +Latest finish $latest_finish + +----------- +Description +----------- +$task_description" + + + acs_mail_lite::send \ + -to_addr $to_address \ + -from_addr $from_address \ + -subject $subject \ + -body $notification_text + } + + return +} + + + +ad_proc -public pm::task::email_status {} { + + set send_email_p [parameter::get_from_package_key -package_key "project-manager" -parameter SendDailyEmail -default "0"] + + if {[string equal $send_email_p "0"]} { + ns_log Notice "Parameter SendDailyEmail for project manager says skip email today" + return + } + + # also don't send reminders on weekends. + + set today_j [db_string get_today "select to_char(current_timestamp,'J')"] + if {![pm::project::is_workday_p $today_j]} { + return + } + + set parties [list] + + # what if the person assigned is no longer a part of the subsite? + # right now, we still email them. + + db_foreach get_all_open_tasks " + SELECT + ts.task_id, + ts.task_id as item_id, + ts.task_number, + t.task_revision_id, + t.title, + to_char(t.earliest_start,'J') as earliest_start_j, + to_char(current_timestamp,'J') as today_j, + to_char(t.latest_start,'J') as latest_start_j, + to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + t.percent_complete, + t.estimated_hours_work, + t.estimated_hours_work_min, + t.estimated_hours_work_max, + case when t.actual_hours_worked is null then 0 + else t.actual_hours_worked end as actual_hours_worked, + to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, + to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, + to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + p.first_names || ' ' || p.last_name as full_name, + p.party_id, + (select one_line from pm_roles r where ta.role_id = r.role_id) as role + FROM + pm_tasks ts, + pm_tasks_revisionsx t, + pm_task_assignment ta, + acs_users_all p, + cr_items i, + pm_task_status s + WHERE + ts.task_id = t.item_id and + i.item_id = t.item_id and + t.task_revision_id = i.live_revision and + ts.status = s.status_id and + s.status_type = 'o' and + t.item_id = ta.task_id and + ta.party_id = p.party_id + ORDER BY + t.latest_start asc" { + set earliest_start_pretty [lc_time_fmt $earliest_start "%x"] + set earliest_finish_pretty [lc_time_fmt $earliest_finish "%x"] + set latest_start_pretty [lc_time_fmt $latest_start "%x"] + set latest_finish_pretty [lc_time_fmt $latest_finish "%x"] + + if {[exists_and_not_null earliest_start_j]} { + set slack_time [pm::task::slack_time \ + -earliest_start_j $earliest_start_j \ + -today_j $today_j \ + -latest_start_j $latest_start_j] + + } + + if {[lsearch $parties $party_id] == -1} { + lappend parties $party_id + } + + lappend task_list($party_id) $task_id + set titles_arr($task_id) $title + set ls_arr($task_id) $latest_start_pretty + set lf_arr($task_id) $latest_finish_pretty + set slack_arr($task_id) $slack_time + + # how many tasks does this person have? + if {[info exists task_count($party_id)]} { + incr task_count($party_id) + } else { + set task_count($party_id) 1 + } + } + + # transitions are < this value + set OVERDUE_THRESHOLD 0 + set PRESSING_THRESHOLD 7 + set LONGTERM_THRESHOLD 90 + + set TASK_LENGTH 70 + set TASK_ID_LENGTH 9 + + foreach party $parties { + + set subject "Daily Task status report" + set address [db_string get_email "select email from parties where party_id = :party" -default "jade-errors@bread.com"] + + set overdue [list] + set pressing [list] + set longterm [list] + + foreach task $task_list($party) { + + if {$slack_arr($task) < $OVERDUE_THRESHOLD} { + set which_pile overdue + } elseif {$slack_arr($task) < $PRESSING_THRESHOLD} { + set which_pile pressing + } elseif {$slack_arr($task) < $PRESSING_THRESHOLD} { + set which_pile longterm + } else { + set which_pile "" + } + + if {![empty_string_p $which_pile]} { + + set trimmed_task [pm::util::string_truncate_and_pad -length $TASK_ID_LENGTH -string $task] + set trimmed_title [pm::util::string_truncate_and_pad -length $TASK_LENGTH -string $titles_arr($task)] + + lappend $which_pile "$trimmed_task $trimmed_title" + lappend $which_pile "[string repeat " " $TASK_ID_LENGTH] LS: $ls_arr($task) LF: $lf_arr($task) Slack: $slack_arr($task)" + lappend $which_pile "" + } + + } + + set description [list] + + set overdue_title "OVERDUE TASKS" + set overdue_title [pm::util::string_truncate_and_pad -length $TASK_LENGTH -string $overdue_title] + + set overdue_description "consult with people affected, and let them know deadlines are affected" + + set pressing_title "PRESSING TASKS" + set pressing_title [pm::util::string_truncate_and_pad -length $TASK_LENGTH -string $pressing_title] + + set pressing_description "you need to start working on these soon to avoid affecting deadlines" + + set longterm_title "LONG TERM TASKS" + set longterm_title [pm::util::string_truncate_and_pad -length $TASK_LENGTH -string $longterm_title] + set longterm_description "look over these to plan ahead" + + # okay, let's now set up the email body + + lappend description "This is a daily reminder of tasks that are assigned to you" + lappend description "You current have $task_count($party) tasks assigned to you" + + lappend description "" + lappend description "\# $overdue_title" + + set length [string length $overdue_description] + lappend description [string repeat "_" $length] + + lappend description $overdue_description + + lappend description "" + foreach overdue_item $overdue { + lappend description $overdue_item + } + + lappend description "" + lappend description "\# $pressing_title" + + set length [string length $pressing_description] + lappend description [string repeat "_" $length] + + lappend description $pressing_description + + + lappend description "" + foreach pressing_item $pressing { + lappend description $pressing_item + } + + lappend description "" + lappend description "\# $longterm_title" + + set length [string length $longterm_description] + lappend description [string repeat "_" $length] + + lappend description $longterm_description + + lappend description "" + foreach longterm_item $longterm { + lappend description $longterm_item + } + + acs_mail_lite::send \ + -to_addr $address \ + -from_addr $address \ + -subject $subject \ + -body [join $description "\n"] + + } + + # consider also sending out emails to people who have assigned + # tickets to nobody + +} + + + +ad_proc -private pm::task::email_status_init { +} { + Schedules the daily emailings + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-14 + + @return + + @error +} { + ns_log Notice "Scheduling daily email notifications for project manager to 5:00 am" + ad_schedule_proc -thread t -debug t -schedule_proc ns_schedule_daily "5 0" pm::task::email_status +} + + + +ad_proc -public pm::task::email_alert { + -task_item_id:required + {-user_id ""} + {-assignee_id ""} + {-assignee_role_name ""} + {-edit_p "t"} + {-comment ""} + {-description ""} + {-old_description ""} + {-subject ""} + {-work ""} + {-work_min ""} + {-work_max ""} + {-project_name ""} + {-earliest_start ""} + {-earliest_finish ""} + {-latest_start ""} + {-latest_finish ""} + {-url ""} +} { + Sends out an email notification when changes have been made to a task + + + + If any of the following are missing, fills in from the database: + subject, work, work_min, work_max, project_name, earliest_start, + earliest_finish, latest_start, latest_finish + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-05-03 + + @param task_item_id + + @param user_id The user making the change + + @param assignee_id The party_id of the user assigned to the task. + + @param assignee_role_name The role name for what the party is + assigned to do + + @param edit_p Is this an edited task, or a new one? t for edited, + f otherwise. + + @param description + + @param old_description + + @param subject The one line description of the task + + @param work Estimated hours work + + @param work_min Estimated minimimum hours work + + @param work_max Estimated maximum hours work + + @param project_name + + @param earliest_start + + @param earliest_finish + + @param latest_start + + @param latest_finish + + @param url Optionally, a URL that the user is directed to + + @return + + @error +} { + + set task_term [parameter::get -parameter "Taskname" -default "Task"] + set task_term_lower [parameter::get -parameter "taskname" -default "task"] + set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "0"] + + # from address + + if {![exists_and_not_null $user_id]} { + set user_id [ad_conn user_id] + } + + db_1row get_from_address_and_more { + SELECT + p.email as from_address, + p2.first_names || ' ' || p2.last_name as mod_username + FROM + parties p, + persons p2 + WHERE + p.party_id = :user_id and + p.party_id = p2.person_id + } + + # to address + + if {![exists_and_not_null assignee_id]} { + + # bug: we should get the list of assignees here. + ns_log Error "the proc pm::task::email_alert is not complete: assignee" + + } + + set to_address [db_string get_email "select email from parties where party_id = :assignee_id"] + + + # if they left out any of the task info, then we get it from the database + if { \ + ![exists_and_not_null subject] || \ + ![exists_and_not_null work] || \ + ![exists_and_not_null work_min] || \ + ![exists_and_not_null work_max] || \ + ![exists_and_not_null project_name] || \ + ![exists_and_not_null earliest_start] || \ + ![exists_and_not_null earliest_finish] || \ + ![exists_and_not_null latest_start] || \ + ![exists_and_not_null latest_finish] \ + } { + + db_1row get_task_info { + SELECT + t.title as subject, + to_char(t.earliest_start,'MM-DD-YYYY') as earliest_start, + to_char(t.earliest_finish,'MM-DD-YYYY') as earliest_finish, + to_char(t.latest_start,'MM-DD-YYYY') as latest_start, + to_char(t.latest_finish,'MM-DD-YYYY') as latest_finish, + t.estimated_hours_work as work, + t.estimated_hours_work_min as work_min, + t.estimated_hours_work_max as work_max, + t.percent_complete, + p.title as project_name + FROM + pm_tasks_revisionsx t, + cr_items i, + cr_items project, + pm_projectsx p + WHERE + t.item_id = :task_item_id and + t.revision_id = i.live_revision and + t.item_id = i.item_id and + t.parent_id = project.item_id and + project.item_id = p.item_id and + project.live_revision = p.revision_id + } + + } + + + if {[string equal $edit_p "t"]} { + set subject_out "Edited $task_term \#$task_item_id: $subject" + set intro_text "$mod_username edited this $task_term_lower" + } else { + set subject_out "New $task_term \#$task_item_id: $subject" + set intro_text "$mod_username assigned you to a new $task_term_lower" + } + + if {[empty_string_p $comment]} { + set comment_text "" + } else { + set comment_text "--------\nCOMMENT:\n--------\n$comment\n\n" + } + + if {[exists_and_not_null url]} { + set task_url $url + } else { + set task_url "unavailable" + } + + + + if {![string equal $description $old_description] && [string equal $edit_p t]} { + set description_out "$description \n\n-------\nOld description:\n-------\n\n[ad_html_to_text $old_description]" + + append intro_text "\nSee below to see the changes in the description" + + } else { + set description_out [ad_html_to_text $description] + } + + if {[string equal $use_uncertain_completion_times_p 1]} { + set estimated_work "\nHrs work (min): $work_min" + append estimated_work "\nHrs work (max): $work_max" + } else { + set estimated_work "\nHrs work: $work" + } + + set notification_text "$intro_text\n\n$comment_text-------------" + append notification_text "\nTask overview\n-------------" + append notification_text "\nTask ID: \#$task_item_id" + append notification_text "\nSubject: $subject" + append notification_text "\nProject: $project_name" + append notification_text "\nYour role: $assignee_role_name" + append notification_text "\nLink: $task_url" + append notification_text "\n\n\n\n---------------" + append notification_text "\nEstimated work:\n---------------$estimated_work" + append notification_text "\n\n------\nDates:" + append notification_text "\n------\nEarliest start: $earliest_start" + append notification_text "\nEarliest finish: $earliest_finish" + append notification_text "\nLatest start: $latest_start" + append notification_text "\nLatest finish *$latest_finish" + append notification_text "\n\n-----------\nDescription\n-----------" + append notification_text "\n$description_out" + + acs_mail_lite::send \ + -to_addr $to_address \ + -from_addr $from_address \ + -subject $subject_out \ + -body $notification_text + + +} + + +>>>>>>> 1.8 Index: openacs-4/contrib/packages/project-manager/www/add-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-2.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/contrib/packages/project-manager/www/add-edit-2.tcl 12 Mar 2004 13:44:44 -0000 1.4 +++ openacs-4/contrib/packages/project-manager/www/add-edit-2.tcl 20 May 2004 17:30:05 -0000 1.4.2.1 @@ -38,8 +38,12 @@ # --------------------------------------------------------------- # # the unique identifier for this package set package_id [ad_conn package_id] +set subsite_id [ad_conn subsite_id] set user_id [ad_maybe_redirect_for_registration] +set user_group_id [application_group::group_id_from_package_id \ + -package_id $subsite_id] + # terminology set project_term [parameter::get -parameter "ProjectName" -default "Project"] set project_term_lower [parameter::get -parameter "projectname" -default "project"] Index: openacs-4/contrib/packages/project-manager/www/add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit.tcl,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/contrib/packages/project-manager/www/add-edit.tcl 12 Mar 2004 13:44:44 -0000 1.16 +++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl 20 May 2004 17:30:05 -0000 1.16.2.1 @@ -134,15 +134,15 @@ if {[exists_and_not_null project_id]} { if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} { ad_form -extend -name add_edit -form { - {category_ids:integer(category),multiple,optional {label "Categories"} + {category_ids:integer(category),multiple {label "Categories"} {html {size 4}} {value {$project_item_id $package_id}} } } } } else { if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} { ad_form -extend -name add_edit -form { - {category_ids:integer(category),multiple,optional {label "Categories"} + {category_ids:integer(category),multiple {label "Categories"} {html {size 4}} {value {}} } } @@ -256,7 +256,6 @@ set project_item_id [pm::project::get_project_item_id \ -project_id $project_id] - pm::project::compute_parent_status $project_item_id if {[exists_and_not_null category_ids]} { @@ -266,9 +265,11 @@ if {$use_project_customizations_p} { ad_returnredirect "add-edit-2?[export_url_vars project_id old_project_id]" + pm::project::compute_parent_status $project_item_id ad_script_abort } else { ad_returnredirect "one?[export_url_vars project_id]" + pm::project::compute_parent_status $project_item_id ad_script_abort } } 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 -r1.13 -r1.13.2.1 --- openacs-4/contrib/packages/project-manager/www/index.tcl 12 Mar 2004 13:44:44 -0000 1.13 +++ openacs-4/contrib/packages/project-manager/www/index.tcl 20 May 2004 17:30:05 -0000 1.13.2.1 @@ -142,7 +142,7 @@ customer_name { label "Customer" display_template " -
-You have already added this entry once. If you want to edit this entry, click here. +You have already added this entry once. If you want to edit this entry, click here. [ad_footer] " @@ -329,7 +364,7 @@ set pm_task_id [db_string task_entry_p "select task_item_id from pm_task_logger_proj_map where logger_entry = :entry_id" -default "-1"] - if {![string equal $pm_task_id -1]} { + if {![string equal $pm_task_id -1] && [exists_and_not_null percent_complete]} { db_dml update_percent " UPDATE @@ -346,13 +381,34 @@ pm::task::update_hours \ -task_item_id $pm_task_id - pm::project::compute_status $pm_project_id + + if {$percent_complete >= 100} { + set status_code [pm::task::default_status_closed] + } else { + set status_code [pm::task::default_status_open] + } + + db_dml update_percent " + UPDATE + pm_tasks + SET + status = :status_code + WHERE + task_id = :pm_task_id" + + } set pm_task_id $old_pm_task_id } -after_submit { ad_returnredirect "[ad_conn url]?[export_vars { project_id variable_id return_url pm_project_id pm_task_id}]" + # ad_returnredirect $return_url + + if {![string equal $pm_task_id -1]} { + pm::project::compute_status $pm_project_id + } + ad_script_abort } 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 -r1.23 -r1.23.2.1 --- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.23 +++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 20 May 2004 17:30:05 -0000 1.23.2.1 @@ -10,6 +10,7 @@ p.project_code, p.goal, p.description, + p.mime_type, to_char(p.planned_start_date,'YYYY-MM-DD HH24:MI') as planned_start_date, to_char(p.planned_end_date,'YYYY-MM-DD HH24:MI') as planned_end_date, p.logger_project, @@ -84,10 +85,26 @@ t.estimated_hours_work_max, t.actual_hours_worked FROM - (select * from pm_tasks_revisionsx LEFT JOIN pm_task_assignment ON item_id = task_id) t LEFT JOIN persons u ON t.party_id = u.person_id, cr_items i LEFT JOIN pm_task_dependency d ON i.item_id = d.task_id + (select * from pm_tasks_revisionsx + LEFT JOIN + pm_task_assignment ON item_id = task_id) t + LEFT JOIN + persons u + ON + t.party_id = u.person_id, + cr_items i + LEFT JOIN + pm_task_dependency d + ON + i.item_id = d.task_id, + pm_tasks ti, + pm_task_status s WHERE t.parent_id = :project_item_id and - t.revision_id = i.live_revision + t.revision_id = i.live_revision and + t.item_id = ti.task_id and + ti.status = s.status_id and + s.status_type = :status_type [template::list::orderby_clause -name tasks -orderby]
(not current, select live version below)
-
- @tasks.slack_time@ "
+ display_template "@tasks.slack_time@ "
}
earliest_start {
label "Earliest Start"
- display_template "@tasks.earliest_start_pretty@ @tasks.earliest_start_pretty@ "
+ display_template "@tasks.earliest_start_pretty@ @tasks.earliest_start_pretty@ "
}
earliest_finish {
label "Earliest Finish"
- display_template "@tasks.earliest_finish_pretty@ @tasks.earliest_finish_pretty@ "
+ display_template "@tasks.earliest_finish_pretty@ @tasks.earliest_finish_pretty@ "
}
latest_start {
label "Latest Start"
@@ -202,23 +224,73 @@
project_item_id
project_id
{my_key 1}
+ {return_url}
} \
-sub_class {
narrow
} \
-filters {
- project_item_id {}
- orderby_subproject {}
- orderby_versions {}
- orderby_people {}
+ status_type {
+ label "Status"
+ values {{"Open" "o"} {"Closed" "c"}}
+ where_clause {s.status_type = :status_type}
+ }
+ project_item_id {
+ hide_p 1
+ }
+ orderby_subproject {
+ hide_p 1
+ }
+ orderby_versions {
+ hide_p 1
+ }
+ orderby_people {
+ hide_p 1
+ }
} \
-orderby {
- title {orderby title}
+<<<<<<< one.tcl
+ default_value latest_start,asc
+ title {
+ label "Subject"
+ orderby_asc "title asc"
+ orderby_desc "title desc"
+ default_direction asc
+ }
earliest_start {orderby earliest_start}
earliest_finish {orderby earliest_finish}
latest_start {orderby latest_start}
latest_finish {orderby latest_finish}
+=======
default_value latest_start,asc
+ title {
+ label "Subject"
+ orderby_asc "title asc"
+ orderby_desc "title desc"
+ default_direction asc
+ }
+ earliest_start {
+ label "Earliest start"
+ orderby_asc "earliest_start, u.first_names, u.last_name"
+ orderby_desc "earliest_start 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"
+ 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"
+ 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"
+ default_direction asc
+ }
+>>>>>>> 1.35
} \
-orderby_name orderby_tasks \
-html {
@@ -385,10 +457,10 @@
db_1row custom_query { } -column_array custom
+set customer_link "[site_node::get_package_url -package_key organizations]one?organization_id=$custom(customer_id)"
# end of customizations
-
# -----------------------------------------------------------------
# Logger forms and so on - shows time logged, and allows you to log
# other time
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.6 -r1.6.2.1
--- openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl 12 Mar 2004 13:44:45 -0000 1.6
+++ openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl 20 May 2004 17:30:05 -0000 1.6.2.1
@@ -1,13 +1,3 @@
-ns_log notice it's my page!
-set mypage [ns_getform]
-if {[string equal "" $mypage]} {
- ns_log notice no form was submitted on my page
-} else {
- ns_log notice the following form was submitted on my page
- ns_set print $mypage
-}
-
-
ad_page_contract {
Form to add task dependencies
@@ -156,10 +146,10 @@
# get dependency types
-set options [list]
-db_foreach get_dependency_types { } -column_array dependencies {
- lappend options "{\"$dependencies(description)\" $dependencies(short_name)}"
-}
+#set options [list]
+#db_foreach get_dependency_types { } -column_array dependencies {
+# lappend options "{\"$dependencies(description)\" $dependencies(short_name)}"
+#}
# set up list of tasks that this task can be depend on
@@ -206,9 +196,7 @@
{value {$tasks(description)}}
}
- {dependency_type.$tasks(task_id):text(select)
- {label \"Dependency type\"}
- {options {[join $options " "]}}
+ {dependency_type.$tasks(task_id):text(hidden)
{value {finish_before_start}}
}
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.6 -r1.6.2.1
--- openacs-4/contrib/packages/project-manager/www/process-task-add-edit-2.tcl 12 Mar 2004 13:44:45 -0000 1.6
+++ openacs-4/contrib/packages/project-manager/www/process-task-add-edit-2.tcl 20 May 2004 17:30:05 -0000 1.6.2.1
@@ -26,6 +26,11 @@
{use_dependency:integer,multiple ""}
} -validate {
+ no_estimated_hours {
+ if {![exists_and_not_null estimated_hours_work] && ![exists_and_not_null estimated_hours_work_min] && ![exists_and_not_null estimated_hours_work_max]} {
+ ad_complain
+ }
+ }
process_id_missing {
if {![exists_and_not_null process_id]} {
ad_complain
@@ -60,6 +65,8 @@
}
}
} -errors {
+ no_estimated_hours {You must enter estimated hours. If nothing
+ else, enter 0 for the estimated hours}
process_id_missing {I don't know which process these tasks are for!}
task_title_too_long {A task subject is too long. It must be 198 characters or less}
description_too_long {A description subject is too long. It must be 3998 characters or less}
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.8 -r1.8.2.1
--- openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.tcl 12 Mar 2004 13:44:45 -0000 1.8
+++ openacs-4/contrib/packages/project-manager/www/process-task-assign-add-edit.tcl 20 May 2004 17:30:05 -0000 1.8.2.1
@@ -58,9 +58,13 @@
# the unique identifier for this package
set package_id [ad_conn package_id]
+set subsite_id [ad_conn subsite_id]
set user_id [ad_maybe_redirect_for_registration]
+set user_group_id [application_group::group_id_from_package_id \
+ -package_id $subsite_id]
+
# permissions and more
set title "Add a process $task_term_lower (assignment)"
Index: openacs-4/contrib/packages/project-manager/www/process-task-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-delete-2.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/contrib/packages/project-manager/www/process-task-delete-2.tcl 26 Jan 2004 15:39:40 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/process-task-delete-2.tcl 20 May 2004 17:30:05 -0000 1.2.2.1
@@ -17,7 +17,7 @@
set user_id [ad_maybe_redirect_for_registration]
# permissions
-permission::require_permission -party_id $user_id -object_id $package_id -privilege delete
+permission::require_permission -party_id $user_id -object_id $package_id -privilege write
db_dml delete_process_tasks { }
Index: openacs-4/contrib/packages/project-manager/www/process-task-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-delete.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/contrib/packages/project-manager/www/process-task-delete.tcl 26 Jan 2004 15:39:40 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/process-task-delete.tcl 20 May 2004 17:30:05 -0000 1.2.2.1
@@ -36,6 +36,6 @@
set context_bar [ad_context_bar "Delete process $task_term_lower"]
# permissions
-permission::require_permission -party_id $user_id -object_id $package_id -privilege delete
+permission::require_permission -party_id $user_id -object_id $package_id -privilege write
set hidden_vars [export_vars -form {process_task_id:multiple,sign process_id}]
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit-postgresql.xql,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.15
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 20 May 2004 17:30:05 -0000 1.15.2.1
@@ -20,27 +20,6 @@
-
-
- select pm_task__new_task_revision (
- :p_task_item_id,
- :project_item_id,
- :p_task_title,
- :p_description,
- [pm::util::datenvl -value [set end_date_$i] -value_if_null "null," -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS'),"]
- :p_percent,
- :p_work,
- :p_work_min,
- :p_work_max,
- :p_hours,
- current_timestamp,
- :user_id,
- :peeraddr,
- :package_id
- );
-
-
-
select
@@ -51,9 +30,11 @@
select
+ t.parent_id as my_project_item_id,
t.task_revision_id,
t.title as my_task_title,
t.description as my_description,
+ t.mime_type as my_mime_type,
to_char(t.end_date,'YYYY MM DD') as my_end_date,
t.percent_complete as my_percent_complete,
t.estimated_hours_work as my_estimated_work,
@@ -67,6 +48,8 @@
WHERE
t.item_id in ([join $task_id ","]) and
t.revision_id = i.live_revision
+ ORDER BY
+ t.item_id
@@ -94,22 +77,6 @@
-
-
- select
- r.item_id,
- r.title as task_title
- FROM
- pm_tasks_revisionsx r,
- cr_items i
- WHERE
- r.parent_id = :project_item_id and
- r.revision_id = i.live_revision
- ORDER BY
- upper(r.title)
-
-
-
select
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.adp,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 12 Mar 2004 22:28:12 -0000 1.12.2.1
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 20 May 2004 17:30:05 -0000 1.12.2.2
@@ -1,24 +1,31 @@
@title;noquote@
@context@
-
-
+
+
-
+
-
+
+
+
Error
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
@@ -231,8 +281,11 @@
-
+
+
select
@@ -15,24 +16,39 @@
+ select
+ title
+ FROM
+ pm_projects p, cr_revisions r, cr_items i
+ WHERE
+ r.item_id = :project_item_id and
+ i.item_id = r.item_id and
+ p.project_id = i.live_revision and
+ p.project_id = r.revision_id
+
select
- title as one_line,
- description,
- item_id,
- to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
- estimated_hours_work,
- estimated_hours_work_min,
- estimated_hours_work_max,
- to_char(earliest_start, 'YYYY-MM-DD HH24:MI:SS') as earliest_start_ansi,
- to_char(earliest_finish, 'YYYY-MM-DD HH24:MI:SS') as earliest_finish_ansi,
- to_char(latest_start, 'YYYY-MM-DD HH24:MI:SS') as latest_start_ansi,
- to_char(latest_finish, 'YYYY-MM-DD HH24:MI:SS') as latest_finish_ansi
+ t.title as one_line,
+ t.description,
+ t.item_id,
+ t.estimated_hours_work,
+ t.estimated_hours_work_min,
+ t.estimated_hours_work_max,
+ to_char(t.earliest_start, 'YYYY-MM-DD HH24:MI:SS') as earliest_start_ansi,
+ to_char(t.earliest_finish, 'YYYY-MM-DD HH24:MI:SS') as earliest_finish_ansi,
+ to_char(t.latest_start, 'YYYY-MM-DD HH24:MI:SS') as latest_start_ansi,
+ to_char(t.latest_finish, 'YYYY-MM-DD HH24:MI:SS') as
+ latest_finish_ansi,
+ proj_rev.title as project_name
FROM
- pm_tasks_revisionsx t
+ pm_tasks_revisionsx t,
+ cr_items proj,
+ cr_revisions proj_rev
WHERE
- revision_id in ([join $revisions ","])
+ t.revision_id in ([join $revisions ","]) and
+ t.parent_id = proj.item_id and
+ proj.live_revision = proj_rev.revision_id
ORDER BY
item_id
@@ -122,19 +138,4 @@
process_task_id = :ptid
-
-
-
- select
- title
- FROM
- pm_projects p, cr_revisions r, cr_items i
- WHERE
- r.item_id = :project_item_id and
- i.item_id = r.item_id and
- p.project_id = i.live_revision and
- p.project_id = r.revision_id
-
-
-
Index: openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-assign-add-edit.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.adp 12 Mar 2004 13:44:45 -0000 1.5
+++ openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.adp 20 May 2004 17:30:05 -0000 1.5.2.1
@@ -1,5 +1,5 @@
-
- @context_bar;noquote@
+
+ @context@
@title@
@@ -40,7 +40,7 @@
-
+
-
-
- SELECT
- t.parent_id as project_item_id
- FROM
- pm_tasks_revisionsx t, cr_items i
- WHERE
- i.item_id = t.item_id and
- t.revision_id = :task_revision_id
-
-
SELECT
t.item_id,
+ t.parent_id as project_item_id,
t.title as task_title,
t.description,
+ t.mime_type,
to_char(t.end_date,'Mon DD ''YY') as end_date,
to_char(t.earliest_start,'Mon DD ''YY') as earliest_start,
to_char(t.earliest_start,'J') as earliest_start_j,
@@ -31,42 +22,24 @@
t.estimated_hours_work_max,
t.percent_complete,
i.live_revision,
- p.first_names || ' ' || p.last_name as creation_user
+ p.first_names || ' ' || p.last_name as creation_user,
+ proj_rev.title as project_name
FROM
pm_tasks_revisionsx t,
cr_items i,
- persons p
+ persons p,
+ cr_items proj,
+ cr_revisions proj_rev
WHERE
t.item_id = :task_id and
t.revision_id = :task_revision_id and
t.item_id = i.item_id and
- t.creation_user = p.person_id
+ t.creation_user = p.person_id and
+ t.parent_id = proj.item_id and
+ proj.live_revision = proj_rev.revision_id
-
-
- SELECT
- t.item_id,
- t.revision_id,
- i.live_revision,
- t.title as task_title,
- t.description || ' -- ' || p.first_names || ' ' || p.last_name as description,
- to_char(t.end_date,'MM/DD/YYYY') as end_date,
- t.percent_complete,
- t.estimated_hours_work_min,
- t.estimated_hours_work_max,
- t.actual_hours_worked
- FROM
- pm_tasks_revisionsx t, cr_items i, persons p
- WHERE
- t.item_id = :task_id and
- t.item_id = i.item_id and
- t.creation_user = p.person_id
- [template::list::orderby_clause -name revisions -orderby]
-
-
-
SELECT
@@ -116,7 +89,7 @@
r.role_id
from
pm_task_assignment a,
- cc_users u,
+ acs_users_all u,
pm_roles r
where
a.task_id = :task_id and
@@ -145,7 +118,7 @@
pm_task_xref x, pm_tasks_revisionsx r, cr_items i
WHERE
x.task_id_2 = :task_id and
- x.task_id_2 = r.item_id and
+ x.task_id_1 = r.item_id and
r.revision_id = i.live_revision
UNION
SELECT
@@ -166,7 +139,7 @@
pm_task_xref x2, pm_tasks_revisionsx r2, cr_items i2
WHERE
x2.task_id_1 = :task_id and
- x2.task_id_1 = r2.item_id and
+ x2.task_id_2 = r2.item_id and
i2.live_revision = r2.revision_id
Index: openacs-4/contrib/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v
diff -u -r1.23 -r1.23.2.1
--- openacs-4/contrib/packages/project-manager/www/task-one.adp 12 Mar 2004 13:44:45 -0000 1.23
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp 20 May 2004 17:30:05 -0000 1.23.2.1
@@ -1,227 +1,232 @@
-
-
-
- @task_term@ #@item_id@: @task_info.task_title@
- @context@
-
+
+
+
-
+@task_term@(s) this depends on.
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+ TASKS
+
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- 
-
-
- @project_term@
-
- |
-
- ||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - | ||||||||||||||||||||||||||||||||||||||
-
-
Description |
+ @project.description;noquote@ |
+ |
+ ||||||||||||||||||||||||||||||||||||
| Project information | +Dates | |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
||||||||||||
| Categories | -|
|---|---|
-
|
- |
| Subprojects | -|||||
|---|---|---|---|---|---|
+
+ |
+
| ||||
| Categories | +|
|---|---|
+
|
+ |
| Subprojects | +|
|---|---|
|
+
+ |
+ |
| @task_term@ | -|||
|---|---|---|---|
| Comments | +|
|---|---|
| + @comments;noquote@ + + @comments_link;noquote@ + | +|
-
-
- - - -
| @task_term@ | +
|---|
|
+ |
+
+
|
+
| Logged hours | +|
|---|---|
| + + | ++ @log_note@ + | +
|
+ |
+ |
| Logged hours | -|
|---|---|
| - - | -- @log_note@ - | -
|
- |
- |
-
+
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 -r1.30 -r1.30.2.1
--- openacs-4/contrib/packages/project-manager/www/one.tcl 12 Mar 2004 13:44:45 -0000 1.30
+++ openacs-4/contrib/packages/project-manager/www/one.tcl 20 May 2004 17:30:05 -0000 1.30.2.1
@@ -28,9 +28,11 @@
{orderby_subproject ""}
{orderby_tasks ""}
{orderby_versions ""}
+ {status_type "o"}
} -properties {
categories:onelist
+ my_title:onevalue
context:onevalue
project:multirow
tasks:multirow
@@ -64,10 +66,24 @@
-project_item_id $project_item_id]
}
}
+ status_type_exists {
+ if {![string equal $status_type "o"] && ![string equal $status_type "c"]} {
+ set status_type "o"
+ }
+ }
}
set original_project_id $project_id
+<<<<<<< one.tcl
+# for edits of tasks. We want to come back to here.
+set return_url "[ad_conn url]?[ad_conn query]"
+
+=======
+# for edits of tasks. We want to come back to here.
+set return_url [ad_return_url -qualified]
+
+>>>>>>> 1.35
# --------------------------------------------------------------- #
# the unique identifier for this package
@@ -79,7 +95,7 @@
# ----------------
set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 $project_item_id "[ad_conn url]?project_item_id=$project_item_id"]
-set comments_link [general_comments_create_link -object_name cr_items -link_text "Add a comment" -context_id $package_id $project_item_id "[ad_conn url]?project_item_id=$project_item_id"]
+set comments_link [general_comments_create_link -object_name "Project" -link_text "Add a comment" -context_id $package_id $project_item_id "[ad_conn url]?project_item_id=$project_item_id"]
# terminology
@@ -107,6 +123,11 @@
}
db_1row project_query { } -column_array project
+
+set richtext_list [list $project(description) $project(mime_type)]
+
+set project(description) [template::util::richtext::get_property html_value $richtext_list]
+
set project_root [db_exec_plsql get_root_folder { }]
set project(planned_start_date) [lc_time_fmt $project(planned_start_date) "%x"]
@@ -124,15 +145,16 @@
set log_note "Last 30 days"
+set my_title "$project_term \#$project_item_id: $project(project_name)"
+
set edit_url "[ad_conn package_url]add-edit?[export_url_vars project_item_id]"
# set up context bar, needs parent_id
-
if {[string equal $project(parent_id) $project_root]} {
- set context [list "View"]
+ set context [list "$project(project_name)"]
} else {
- set context [list [list "one?project_item_id=$project(parent_id)" "Parent"] "View"]
+ set context [list [list "one?project_item_id=$project(parent_id)" "Parent"] "$project(project_name)"]
}
# Tasks, using list-builder ---------------------------------
@@ -168,15 +190,15 @@
}
slack_time {
label "Slack"
- display_template "REVISIONS
Comments
- @comments;noquote@ - - @comments_link;noquote@| #@num.rownum@ | +
+ |
Error + + + + Error + @@ -41,7 +59,7 @@ - Description: + Description: @@ -50,13 +68,23 @@ |
+
| |||||||||||||||||
| + |
+
+ |
+ |||||||||||||||||||
![[i]](/shared/images/info.gif "Help text"){kind=small}
- You must enter a number here (make your best
- guess)
- | - Deadline: - | -
+ Deadline: + |
|
- Dependency:
+ Dependency: |
|
+ Project: + + Error + |
+
-
-
+ @task_term@ #@task_id@:
+ @task_info.task_title;noquote@ @closed_message@
+ @context;noquote@
+
+
+
+
- @revisions.task_title@ @revisions.task_title@ }
- }
- description {
- label "Description"
- }
- percent_complete {
- label "Status"
- display_template "@revisions.percent_complete@\%"
- }
- actual_hours_worked {
- label "Hour to date"
- display_template "@revisions.actual_hours_worked@ hrs"
- }
- estimated_hours_work_min {
- label "Work estimate"
- display_template "@revisions.estimated_hours_work_min@ - @revisions.estimated_hours_work_max@ hrs"
- }
- end_date {
- label "Deadline"
- }
- } \
- -orderby {
- revision_id {orderby revision_id}
- percent_complete {orderby percent_complete}
- end_date {orderby end_date}
- default_value revision_id,desc
- } \
- -orderby_name orderby_revisions \
- -sub_class {
- narrow
- } \
- -filters {
- task_revision_id {}
- orderby_dependency {}
- orderby_dependency2 {}
- } \
- -html {
- width 100%
- }
-
-
-db_multirow -extend { item_url } revisions task_revisions_query {
-} {
- set item_url [export_vars -base "task-one" -override {{task_revision_id $revision_id}} -exclude {revision_id} { revision_id task_id}]
-}
-
# Dependency info ------------------------------------------------
template::list::create \
@@ -239,7 +203,6 @@
} \
-filters {
task_revision_id {}
- orderby_revisions {}
orderby_dependency2 {}
} \
-html {
@@ -299,7 +262,6 @@
} \
-filters {
task_revision_id {}
- orderby_revisions {}
orderby_dependency {}
} \
-html {
@@ -323,7 +285,7 @@
-elements {
first_names {
label {
- Who
+ Who
}
display_template {
@people.user_info@
@@ -388,7 +350,10 @@
label "LS"
}
latest_finish_pretty {
- label "ES"
+ label "LF"
+ display_template {
+ @xrefs.latest_finish_pretty@
+ }
}
} \
-sub_class {
Index: openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-print-postgresql.xql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql 20 May 2004 17:30:05 -0000 1.3.2.1
@@ -31,7 +31,8 @@
t.item_id,
t.title as task_title,
t.description,
- to_char(t.end_date,'Mon DD ''YY') as end_date,
+ t.mime_type,
+ to_char(current_timestamp,'Mon DD ''YY') as current_time,
to_char(t.earliest_start,'Mon DD ''YY') as earliest_start,
to_char(t.earliest_start,'J') as earliest_start_j,
to_char(t.earliest_finish,'Mon DD ''YY') as earliest_finish,
@@ -99,7 +100,7 @@
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,
Index: openacs-4/contrib/packages/project-manager/www/task-print.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-print.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/contrib/packages/project-manager/www/task-print.adp 12 Mar 2004 13:44:45 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/www/task-print.adp 20 May 2004 17:30:05 -0000 1.3.2.1
@@ -1,16 +1,18 @@
-
+
+
+@task_term@ #@task_id@: @task_info.task_title@
+
-@task_term@ #@task_id@: @task_info.task_title@
-@context_bar;noquote@
+
-
-
-
-
Comments |
+
-
- |
+
+
+ |
+
- |
- @log_note@
- |
-
-
- |
-
|
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
- 
-
-
-
-
-
-
Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v
diff -u -r1.24 -r1.24.2.1
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl 12 Mar 2004 13:44:45 -0000 1.24
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 20 May 2004 17:30:05 -0000 1.24.2.1
@@ -16,24 +16,22 @@
@param project_item_id the item_id for the project. Used for navigational links
@param project_id the revision_id for the project. Used for navigational links
@param context_bar value for context bar creation
- @param orderby_revisions specifies how the revisions table will be sorted
@param orderby_dependency specifies how the dependencies will be sorted
@param orderby_dependency2 specifies how the dependencies will be sorted (for tasks that have dependencies on this task)
} {
task_id:integer,optional
task_revision_id:integer,optional
- orderby_revisions:optional
orderby_dependency:optional
orderby_dependency2:optional
} -properties {
+ closed_message:onevalue
notification_chunk:onevalue
task_info:onerow
project_item_id:onevalue
project_id:onevalue
context:onevalue
write_p:onevalue
create_p:onevalue
- revisions:multirow
dependency:multirow
dependency2:multirow
people:multirow
@@ -43,6 +41,7 @@
watcher_term:onevalue
comments:onevalue
comments_link:onevalue
+ print_link:onevalue
use_uncertain_completion_times_p:onevalue
} -validate {
task_id_exists {
@@ -79,21 +78,13 @@
set project_term [parameter::get -parameter "ProjectName" -default "Project"]
set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
-db_1row get_project_ids { }
-set context [list "one?project_item_id=$project_item_id $project_term" "View"]
-
# the unique identifier for this package
set package_id [ad_conn package_id]
set user_id [ad_maybe_redirect_for_registration]
-set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 $task_id "[ad_conn url]?task_id=$task_id"]
-set comments_link [general_comments_create_link -object_name pm_task -link_text "Add a comment" -context_id $package_id $task_id "[ad_conn url]?task_id=$task_id"]
-
-
-
# permissions
permission::require_permission -party_id $user_id -object_id $package_id -privilege read
@@ -105,20 +96,51 @@
# Task info ----------------------------------------------------------
db_1row task_query { } -column_array task_info
-set task_info(description) [ad_text_to_html -- $task_info(description)]
+# we do this for the hours include portion
+set project_item_id $task_info(project_item_id)
+
+set context [list [list "one?project_item_id=$task_info(project_item_id)" "$task_info(project_name)"] "$task_info(task_title)"]
+
+
+set richtext_list [list $task_info(description) $task_info(mime_type)]
+
+set task_info(description) [template::util::richtext::get_property html_value $richtext_list]
+
if {[exists_and_not_null task_info(earliest_start_j)]} {
set task_info(slack_time) [pm::task::slack_time \
-earliest_start_j $task_info(earliest_start_j) \
-today_j $task_info(today_j) \
-latest_start_j $task_info(latest_start_j)]
}
+if {$task_info(percent_complete) >= 100} {
+ set closed_message "-- Closed"
+} else {
+ set closed_message ""
+}
+
+
+# set link to comments
+
+set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 $task_id "[ad_conn url]?task_id=$task_id"]
+
+set comments_link [general_comments_create_link -object_name "$task_term: $task_info(task_title)" -link_text "Add a comment" -context_id $package_id $task_id "[ad_conn url]?task_id=$task_id"]
+
+set print_link "task-print?&task_id=$task_id&project_item_id=$task_info(project_item_id)"
+
+
+# how to get back here
+set return_url [ad_return_url -qualified]
+
+set task_edit_url "task-add-edit?my_key=1&task_id=$task_id&return_url=$return_url"
+
+
set logger_project [pm::project::get_logger_project \
- -project_item_id $project_item_id]
+ -project_item_id $task_info(project_item_id)]
set logger_variable_id [logger::variable::get_default_variable_id]
-set log_url "[ad_conn package_url]log?project_id=$logger_project&pm_project_id=$project_item_id&pm_task_id=$task_id"
+set log_url "[ad_conn package_url]log?project_id=$logger_project&pm_project_id=$task_info(project_item_id)&pm_task_id=$task_id"
set log_note "Task logged time listed below"
@@ -133,64 +155,6 @@
]
-# Task Revisions, using list-builder ---------------------------------
-
-template::list::create \
- -name revisions \
- -multirow revisions \
- -key revision_id \
- -elements {
- revision_id {
- label "Subject"
- display_col task_title
- link_url_col item_url
- link_html { title "View this revision" }
- display_template {
+ Who
}
display_template {
@people.user_info@
@@ -388,7 +350,10 @@
label "LS"
}
latest_finish_pretty {
- label "ES"
+ label "LF"
+ display_template {
+ @xrefs.latest_finish_pretty@
+ }
}
} \
-sub_class {
Index: openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-print-postgresql.xql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql 20 May 2004 17:30:05 -0000 1.3.2.1
@@ -31,7 +31,8 @@
t.item_id,
t.title as task_title,
t.description,
- to_char(t.end_date,'Mon DD ''YY') as end_date,
+ t.mime_type,
+ to_char(current_timestamp,'Mon DD ''YY') as current_time,
to_char(t.earliest_start,'Mon DD ''YY') as earliest_start,
to_char(t.earliest_start,'J') as earliest_start_j,
to_char(t.earliest_finish,'Mon DD ''YY') as earliest_finish,
@@ -99,7 +100,7 @@
+
+
+
+
|
-
-
| |||||||||||||
| @task_info.percent_complete@% complete | +Assignees | |||||
|---|---|---|---|---|---|---|
| @task_info.estimated_hours_work_min@ - @task_info.estimated_hours_work_max@ hrs estimated | +||||||
| Slack time: @task_info.slack_time@ | +Work | |||||
| Dates | +@task_info.percent_complete@% complete | +|||||
| Deadline - | @task_info.end_date@ | +@task_info.estimated_hours_work_min@ - @task_info.estimated_hours_work_max@ hrs estimated | ||||
| Slack time: @task_info.slack_time@ | +||||||
| Dates | + +||||||
+
+
| ||||||
+
+
+@task_term@(s) depending on this @task_term@
+
-@task_term@(s) this depends on.
-@task_term@(s) depending on this @task_term@
+
+
+
-
+
-
+
+
+
-- -
-@comments;noquote@
-
-
+
+
Index: openacs-4/contrib/packages/project-manager/www/task-print.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-print.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/contrib/packages/project-manager/www/task-print.tcl 12 Mar 2004 13:44:45 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/www/task-print.tcl 20 May 2004 17:30:05 -0000 1.3.2.1
@@ -25,6 +25,7 @@
orderby_revisions:optional
orderby_dependency:optional
orderby_dependency2:optional
+ {show_comment_p "f"}
} -properties {
task_info:onerow
@@ -79,6 +80,7 @@
set comments_link [general_comments_create_link -object_name pm_task -link_text "Add a comment" -context_id $package_id $task_id "[ad_conn url]?task_id=$task_id"]
+set show_comment_link "show comments"
# permissions
@@ -90,7 +92,11 @@
# Task info ----------------------------------------------------------
db_1row task_query { } -column_array task_info
-set task_info(description) [ad_text_to_html -- $task_info(description)]
+
+set richtext_list [list $task_info(description) $task_info(mime_type)]
+
+set task_info(description) [template::util::richtext::get_property html_value $richtext_list]
+
set task_info(slack_time) [pm::task::slack_time \
-earliest_start_j $task_info(earliest_start_j) \
-today_j $task_info(today_j) \
Index: openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-select-project-postgresql.xql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql 12 Mar 2004 13:44:45 -0000 1.2
+++ openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql 20 May 2004 17:30:05 -0000 1.2.2.1
@@ -5,13 +5,24 @@
|
+
+
+
+ |
+
+
+
+ |
+
+
- Other tasks - - +