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.11 -r1.6.2.12 --- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 5 Nov 2004 01:25:06 -0000 1.6.2.11 +++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 5 Nov 2004 21:08:05 -0000 1.6.2.12 @@ -757,12 +757,7 @@ set old_EF_j($my_iid) $old_earliest_finish_j set old_LS_j($my_iid) $old_latest_start_j set old_LF_j($my_iid) $old_latest_finish_j - # set old_task_status($my_iid) $status_type - if {[string is true $debug]} { - # ns_log Notice "old_task_status: $my_iid $status_type (o=open, c=closed)" - } - set activity_time($my_iid) [expr [expr $to_work * [expr 100 - $my_percent_complete] / 100]] if {[exists_and_not_null task_deadline_j]} { @@ -1483,10 +1478,7 @@ [string equal $lf $old_LF_j($task_item)]} { # do nothing } else { - # if the task is open... - #if {[string equal "o" $old_task_status($task_item)]} { db_dml update_task { } - #} } Index: openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs-postgresql.xql,v diff -u -r1.4.2.6 -r1.4.2.7 --- openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql 26 Oct 2004 15:02:53 -0000 1.4.2.6 +++ openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql 5 Nov 2004 21:08:06 -0000 1.4.2.7 @@ -182,7 +182,7 @@ :title, :description, :mime_type, - [pm::util::datenvl -value $end_date -value_if_null "null" -value_if_not_null "to_timestamp('$end_date','YYYY MM DD HH24 MI SS')"], + [pm::util::datenvl -value $end_date -value_if_null "null" -value_if_not_null ":end_date"], :percent_complete, :estimated_hours_work, :estimated_hours_work_min, Index: openacs-4/contrib/packages/project-manager/www/task-one-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-oracle.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/contrib/packages/project-manager/www/task-one-oracle.xql 22 Oct 2004 04:28:37 -0000 1.1.2.1 +++ openacs-4/contrib/packages/project-manager/www/task-one-oracle.xql 5 Nov 2004 21:08:08 -0000 1.1.2.2 @@ -15,6 +15,7 @@ to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, to_char(t.latest_start,'J') as latest_start_j, to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + to_char(t.end_date,'YYYY-MM-DD HH24:MI') as end_date, to_char(current_date,'J') as today_j, t.estimated_hours_work, t.estimated_hours_work_min, Index: openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-postgresql.xql,v diff -u -r1.19.2.4 -r1.19.2.5 --- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 26 Oct 2004 01:21:11 -0000 1.19.2.4 +++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 5 Nov 2004 21:08:08 -0000 1.19.2.5 @@ -3,36 +3,37 @@ - SELECT + SELECT t.item_id, t.parent_id as project_item_id, t.title as task_title, t.revision_id, t.description, t.mime_type, - to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, - to_char(t.earliest_start,'J') as earliest_start_j, - 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_start,'J') as latest_start_j, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - to_char(current_date,'J') as today_j, + to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, + to_char(t.earliest_start,'J') as earliest_start_j, + 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_start,'J') as latest_start_j, + to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + to_char(t.end_date,'YYYY-MM-DD HH24:MI') as end_date, + to_char(current_date,'J') as today_j, t.estimated_hours_work, t.estimated_hours_work_min, 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, a.process_instance - FROM - pm_tasks_revisionsx t, + FROM + pm_tasks_revisionsx t, cr_items i, persons p, cr_items proj, cr_revisions proj_rev, pm_tasks_active a - WHERE + WHERE t.item_id = :task_id and t.revision_id = :task_revision_id and t.item_id = i.item_id and @@ -45,16 +46,16 @@ - SELECT + SELECT t.title as task_title, - to_char(t.end_date,'MM/DD/YYYY') as end_date, + to_char(t.end_date,'MM/DD/YYYY') as end_date, t.percent_complete, i.live_revision, d.parent_task_id, d.dependency_type - FROM - pm_tasks_revisionsx t, cr_items i, pm_task_dependency d - WHERE + FROM + pm_tasks_revisionsx t, cr_items i, pm_task_dependency d + WHERE d.task_id = :task_id and d.parent_task_id = t.item_id and t.revision_id = i.live_revision and @@ -65,17 +66,17 @@ - SELECT + SELECT t.title as task_title, - to_char(t.end_date,'MM/DD/YYYY') as end_date, + to_char(t.end_date,'MM/DD/YYYY') as end_date, t.percent_complete, i.live_revision, d.parent_task_id, d.dependency_type, d.task_id as d_task_id - FROM - pm_tasks_revisionsx t, cr_items i, pm_task_dependency d - WHERE + FROM + pm_tasks_revisionsx t, cr_items i, pm_task_dependency d + WHERE d.task_id = t.item_id and d.parent_task_id = :task_id and t.revision_id = i.live_revision and @@ -108,17 +109,17 @@ SELECT x.task_id_1 as x_task_id, r.title, - to_char(r.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, - r.earliest_start - current_date as days_to_earliest_start, - to_char(r.earliest_start,'J') as earliest_start_j, - to_char(r.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, - r.earliest_finish - current_date as days_to_earliest_finish, - to_char(r.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - r.latest_start - current_date as days_to_latest_start, - to_char(r.latest_start,'J') as latest_start_j, - to_char(current_date,'J') as today_j, - to_char(r.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - r.latest_finish - current_date as days_to_latest_finish + to_char(r.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, + r.earliest_start - current_date as days_to_earliest_start, + to_char(r.earliest_start,'J') as earliest_start_j, + to_char(r.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, + r.earliest_finish - current_date as days_to_earliest_finish, + to_char(r.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + r.latest_start - current_date as days_to_latest_start, + to_char(r.latest_start,'J') as latest_start_j, + to_char(current_date,'J') as today_j, + to_char(r.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + r.latest_finish - current_date as days_to_latest_finish FROM pm_task_xref x, pm_tasks_revisionsx r, cr_items i WHERE @@ -129,17 +130,17 @@ SELECT x2.task_id_2 as x_task_id, r2.title, - to_char(r2.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, - r2.earliest_start - current_date as days_to_earliest_start, - to_char(r2.earliest_start,'J') as earliest_start_j, - to_char(r2.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, - r2.earliest_finish - current_date as days_to_earliest_finish, - to_char(r2.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - r2.latest_start - current_date as days_to_latest_start, - to_char(r2.latest_start,'J') as latest_start_j, - to_char(current_date,'J') as today_j, - to_char(r2.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - r2.latest_finish - current_date as days_to_latest_finish + to_char(r2.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, + r2.earliest_start - current_date as days_to_earliest_start, + to_char(r2.earliest_start,'J') as earliest_start_j, + to_char(r2.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, + r2.earliest_finish - current_date as days_to_earliest_finish, + to_char(r2.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + r2.latest_start - current_date as days_to_latest_start, + to_char(r2.latest_start,'J') as latest_start_j, + to_char(current_date,'J') as today_j, + to_char(r2.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + r2.latest_finish - current_date as days_to_latest_finish FROM pm_task_xref x2, pm_tasks_revisionsx r2, cr_items i2 WHERE 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.2.7 -r1.23.2.8 --- openacs-4/contrib/packages/project-manager/www/task-one.adp 4 Nov 2004 21:58:11 -0000 1.23.2.7 +++ openacs-4/contrib/packages/project-manager/www/task-one.adp 5 Nov 2004 21:08:08 -0000 1.23.2.8 @@ -163,6 +163,14 @@ Latest finish @task_info.latest_finish@ + + + + Deadline + @task_info.end_date@ + + +   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.2.8 -r1.24.2.9 --- openacs-4/contrib/packages/project-manager/www/task-one.tcl 26 Oct 2004 01:21:11 -0000 1.24.2.8 +++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 5 Nov 2004 21:08:08 -0000 1.24.2.9 @@ -116,10 +116,11 @@ -percent_complete $task_info(percent_complete)] # format the dates according to the local settings -set task_info(earliest_start) [lc_time_fmt $task_info(earliest_start) "%x"] +set task_info(earliest_start) [lc_time_fmt $task_info(earliest_start) "%x"] set task_info(earliest_finish) [lc_time_fmt $task_info(earliest_finish) "%x"] -set task_info(latest_start) [lc_time_fmt $task_info(latest_start) "%x"] -set task_info(latest_finish) [lc_time_fmt $task_info(latest_finish) "%x"] +set task_info(latest_start) [lc_time_fmt $task_info(latest_start) "%x"] +set task_info(latest_finish) [lc_time_fmt $task_info(latest_finish) "%x"] +set task_info(end_date) [lc_time_fmt $task_info(end_date) "%x"] # we do this for the hours include portion set project_item_id $task_info(project_item_id)