Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-table-create.sql,v diff -u -r1.8 -r1.9 --- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql 22 Aug 2003 00:27:33 -0000 1.8 +++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql 22 Aug 2003 21:06:10 -0000 1.9 @@ -39,7 +39,7 @@ -- these are computed but stored in projects table for efficient -- access. estimated_completion_date timestamptz, - earliest_completion_date timestamptz, + earliest_completion_date timestamptz, latest_completion_date timestamptz, actual_hours_completed numeric, estimated_hours_total numeric Index: openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql 13 Aug 2003 18:56:29 -0000 1.4 +++ openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql 22 Aug 2003 21:06:10 -0000 1.5 @@ -32,9 +32,9 @@ :parent_id, :goal, :description, - :deadline_scheduling, - :planned_start_date, - :planned_end_date, + :deadline_scheduling, + to_timestamp(:planned_start_date,'YYYY MM DD HH24 MI SS'), + to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'), null, null, :ongoing_p, 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.7 -r1.8 --- openacs-4/contrib/packages/project-manager/www/add-edit.tcl 7 Aug 2003 23:08:45 -0000 1.7 +++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl 22 Aug 2003 21:06:10 -0000 1.8 @@ -66,81 +66,72 @@ {value $item_id} } -} -select_query_name project_query -on_submit { - - set user_id [ad_conn user_id] - set peeraddr [ad_conn peeraddr] - -} -new_data { - set project_id [db_exec_plsql new_project_item { *SQL* }] - - ad_returnredirect "one?[export_url_vars project_id]" - ad_script_abort - -} -edit_data { - - set project_id [db_exec_plsql new_project_revision { *SQL* }] - -} -after_submit { - - ad_returnredirect "one?[export_url_vars project_id]" - ad_script_abort -} - - -# We put this in an ad_form extend because we want to be able to -# parameterize what the label calls projects. - -set extend_txt " {project_name:text - {label \"$project_term name\"} + {label "[set project_term] name"} {value $project_name} } {project_code:text - {label \"$project_term code\"} + {label "[set project_term] code"} {value $project_code} } {goal:text(textarea) - {label \"$project_term goal\"} + {label "[set project_term] goal"} {optional} {value $goal} {html { rows 5 cols 40 wrap soft}}} {description:text(textarea) - {label \"Description\"} + {label "Description"} {optional} {value $description} {html { rows 5 cols 40 wrap soft}}} {deadline_scheduling:text(select) - {label \"Scheduling\"} - {options {{\"From today\" \"t\"} {\"From deadline\" \"e\"}} + {label "Scheduling"} + {options {{"From today" "t"} {"From deadline" "e"}} {value $deadline_scheduling}} } - {planned_start_date:date,to_sql(linear_date),from_sql(linear_date_no_time) - {label \"Planned start date\"} - {format \"MONTH DD YYYY\"} - {value \$planned_start_date} + {planned_start_date:date,to_sql(linear_date) + {label "Planned start date"} + {format "MONTH DD YYYY"} + {value {[util::date acquire clock [clock scan $planned_start_date]]}} {today} {help} } - {planned_end_date:date,to_sql(linear_date),from_sql(linear_date_no_time) - {label \"Planned end date\"} - {format \"MONTH DD YYYY\"} - {value \$planned_end_date} + {planned_end_date:date,to_sql(linear_date) + {label "Planned end date"} + {format "MONTH DD YYYY"} + {value {[util::date acquire clock [clock scan $planned_end_date]]}} {today} {help} } {ongoing_p:text(select) - {label \"Project is ongoing?\"} - {options {{\"Yes\" \"t\"} {\"No\" \"f\"}} {value \$ongoing_p}} } + {label "Project is ongoing?"} + {options {{"Yes" "t"} {"No" "f"}} {value \$ongoing_p}} } -" +} -select_query_name project_query -on_submit { -ns_log Notice $extend_txt + set user_id [ad_conn user_id] + set peeraddr [ad_conn peeraddr] -ad_form -extend -name add_edit -form $extend_txt -select_query_name project_query +} -new_data { + set project_id [db_exec_plsql new_project_item { *SQL* }] + + ad_returnredirect "one?[export_url_vars project_id]" + ad_script_abort + +} -edit_data { + + set project_id [db_exec_plsql new_project_revision { *SQL* }] + +} -after_submit { + + ad_returnredirect "one?[export_url_vars project_id]" + ad_script_abort +} + + Index: openacs-4/contrib/packages/project-manager/www/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/project-manager/www/index-postgresql.xql 13 Aug 2003 18:56:29 -0000 1.3 +++ openacs-4/contrib/packages/project-manager/www/index-postgresql.xql 22 Aug 2003 21:06:10 -0000 1.4 @@ -14,7 +14,12 @@ p.project_code, to_char(p.planned_start_date, 'YYYY MM DD') as planned_start_date, to_char(p.planned_end_date, 'YYYY MM DD') as planned_end_date, - p.ongoing_p + p.ongoing_p, + p.estimated_completion_date - p.planned_end_date as days_late, + p.earliest_completion_date - p.planned_end_date as days_late_earliest, + p.latest_completion_date - p.planned_end_date as days_late_latest, + actual_hours_completed, + estimated_hours_total FROM pm_projectsx p, cr_items i WHERE p.project_id = i.live_revision ORDER BY i.tree_sortkey Index: openacs-4/contrib/packages/project-manager/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.adp,v diff -u -r1.8 -r1.9 --- openacs-4/contrib/packages/project-manager/www/index.adp 21 Aug 2003 22:34:43 -0000 1.8 +++ openacs-4/contrib/packages/project-manager/www/index.adp 22 Aug 2003 21:06:10 -0000 1.9 @@ -35,7 +35,7 @@  @projects.project_code@ -   + @projects.days_late@  @projects.planned_start_date@