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.7 -r1.8 --- openacs-4/contrib/packages/project-manager/www/index-postgresql.xql 4 Sep 2003 22:45:23 -0000 1.7 +++ openacs-4/contrib/packages/project-manager/www/index-postgresql.xql 18 Sep 2003 01:09:14 -0000 1.8 @@ -11,14 +11,14 @@ p.object_type as content_type, p.title as project_name, p.project_code, - to_char(p.planned_start_date, 'Mon DD ''YY') as planned_start_date, - to_char(p.planned_end_date, 'Mon DD ''YY') as planned_end_date, + to_char(p.planned_start_date, 'MM/DD/YY') as planned_start_date, + to_char(p.planned_end_date, 'MM/DD/YY') as planned_end_date, p.ongoing_p, p.actual_hours_completed, p.estimated_hours_total, - to_char(p.estimated_finish_date, 'Mon DD ''YY') as estimated_finish_date, - to_char(p.earliest_finish_date, 'Mon DD ''YY') as earliest_finish_date, - to_char(p.latest_finish_date, 'Mon DD ''YY') as latest_finish_date + to_char(p.estimated_finish_date, 'MM/DD/YY') as estimated_finish_date, + to_char(p.earliest_finish_date, 'MM/DD/YY') as earliest_finish_date, + to_char(p.latest_finish_date, 'MM/DD/YY') as latest_finish_date FROM pm_projectsx p, cr_items i WHERE p.project_id = i.live_revision and p.parent_id = :root_folder 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.17 -r1.18 --- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 17 Sep 2003 22:20:59 -0000 1.17 +++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 18 Sep 2003 01:09:14 -0000 1.18 @@ -33,13 +33,13 @@ p.project_code, p.goal, p.description, - to_char(p.planned_start_date,'Mon DD ''YY') as planned_start_date, - to_char(p.planned_end_date,'Mon DD ''YY') as planned_end_date, + to_char(p.planned_start_date,'MM/DD/YY') as planned_start_date, + to_char(p.planned_end_date,'MM/DD/YY') as planned_end_date, p.ongoing_p, i.live_revision, - to_char(p.estimated_finish_date,'Mon DD ''YY') as estimated_finish_date, - to_char(p.earliest_finish_date,'Mon DD ''YY') as earliest_finish_date, - to_char(p.latest_finish_date,'Mon DD ''YY') as latest_finish_date, + to_char(p.estimated_finish_date,'MM/DD/YY') as estimated_finish_date, + to_char(p.earliest_finish_date,'MM/DD/YY') as earliest_finish_date, + to_char(p.latest_finish_date,'MM/DD/YY') as latest_finish_date, p.actual_hours_completed, p.estimated_hours_total, p.parent_id @@ -61,13 +61,13 @@ p.project_code, p.goal, p.description, - to_char(p.planned_start_date,'Mon DD ''YY') as planned_start_date, - to_char(p.planned_end_date,'Mon DD ''YY') as planned_end_date, + to_char(p.planned_start_date,'MM/DD/YY') as planned_start_date, + to_char(p.planned_end_date,'MM/DD/YY') as planned_end_date, p.ongoing_p, i.live_revision, - to_char(p.estimated_finish_date,'Mon DD ''YY') as estimated_finish_date, - to_char(p.earliest_finish_date,'Mon DD ''YY') as earliest_finish_date, - to_char(p.latest_finish_date,'Mon DD ''YY') as latest_finish_date, + to_char(p.estimated_finish_date,'MM/DD/YY') as estimated_finish_date, + to_char(p.earliest_finish_date,'MM/DD/YY') as earliest_finish_date, + to_char(p.latest_finish_date,'MM/DD/YY') as latest_finish_date, p.estimated_hours_total FROM pm_projectsx p, cr_items i @@ -84,12 +84,12 @@ SELECT t.item_id as task_id, t.title, - 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_finish,'Mon DD ''YY') as earliest_finish, - to_char(t.latest_start,'Mon DD ''YY') as latest_start, - to_char(t.latest_finish,'Mon DD ''YY') as latest_finish, - to_char(t.latest_start-t.earliest_start,'DD') || ' days' as slack_time, + to_char(t.end_date,'MM/DD/YY') as end_date, + to_char(t.earliest_start,'MM/DD/YY') as earliest_start, + to_char(t.earliest_finish,'MM/DD/YY') as earliest_finish, + to_char(t.latest_start,'MM/DD/YY') as latest_start, + to_char(t.latest_finish,'MM/DD/YY') as latest_finish, + to_char(t.latest_start-t.earliest_start,'FMDD') || ' days' as slack_time, u.first_names, u.last_name, t.percent_complete, @@ -124,8 +124,8 @@ p.object_type as content_type, p.title as project_name, p.project_code, - to_char(p.planned_start_date, 'Mon DD ''YY') as planned_start_date, - to_char(p.planned_end_date, 'Mon DD ''YY') as planned_end_date, + to_char(p.planned_start_date, 'MM/DD/YY') as planned_start_date, + to_char(p.planned_end_date, 'MM/DD/YY') as planned_end_date, p.ongoing_p, p.actual_hours_completed, p.estimated_hours_total Index: openacs-4/contrib/packages/project-manager/www/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v diff -u -r1.23 -r1.24 --- openacs-4/contrib/packages/project-manager/www/one.adp 12 Sep 2003 22:54:07 -0000 1.23 +++ openacs-4/contrib/packages/project-manager/www/one.adp 18 Sep 2003 01:09:14 -0000 1.24 @@ -15,7 +15,7 @@ - +
Edit @@ -32,26 +32,26 @@ - - + - + - + @@ -70,32 +70,32 @@
Name + Name @project.project_name@
CodeCode @project.project_code@
GoalGoal @project.goal@
DescriptionDescription @project.description@
- + - + - + - + - + - + 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.21 -r1.22 --- openacs-4/contrib/packages/project-manager/www/one.tcl 17 Sep 2003 22:20:59 -0000 1.21 +++ openacs-4/contrib/packages/project-manager/www/one.tcl 18 Sep 2003 01:09:14 -0000 1.22 @@ -104,7 +104,7 @@ link_url_col item_url link_html { title "View this task" } display_template { - @tasks.title@ + @tasks.title@  @@ -121,36 +121,30 @@ } } - percent_complete { - label "Status" - display_template "@tasks.slack_time@ slack
@tasks.percent_complete@\% @tasks.actual_hours_worked@/[set work_display_template]" + slack_time { + label "Slack" + display_template "@tasks.slack_time@" } earliest_start { label "Earliest Start" - html {valign top} display_template "@tasks.earliest_start@" } earliest_finish { label "Earliest Finish" - html {valign top} display_template "@tasks.earliest_finish@" } latest_start { label "Latest Start" - html {valign top} display_template "@tasks.latest_start@" } latest_finish { label "Latest Finish" - html {valign top} display_template { @tasks.latest_finish@ - ! } } last_name { label "Who" - html {valign top} display_template { @tasks.first_names@ @tasks.last_name@
 } @@ -178,12 +172,12 @@ } \ -orderby { title {orderby title} - percent_complete {orderby percent_complete} earliest_start {orderby earliest_start} earliest_finish {orderby earliest_finish} latest_start {orderby latest_start} + slack_time {orderby slack_time} latest_finish {orderby latest_finish} - default_value earliest_start,asc + default_value slack_time,desc } \ -orderby_name orderby_tasks \ -html { Index: openacs-4/contrib/packages/project-manager/www/style.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/style.css,v diff -u -r1.6 -r1.7 --- openacs-4/contrib/packages/project-manager/www/style.css 12 Sep 2003 21:36:32 -0000 1.6 +++ openacs-4/contrib/packages/project-manager/www/style.css 18 Sep 2003 01:09:14 -0000 1.7 @@ -35,21 +35,18 @@ } TABLE { - border-right:solid; - border-left:solid; - border-top:solid; - border-bottom:solid; + border:1px; border-color:#eeeeee; } -TR { - border-width:1px; -} TD { font-size: 9pt; } +TD.highlight { + font-size: 9pt; + background-color:#ffffee; +} TH { font-size: 9pt; - text-align: left; - background-color:#dfdfff; + background-color:#ccccff; } A:link.button { Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 17 Sep 2003 22:20:59 -0000 1.17 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 18 Sep 2003 01:09:14 -0000 1.18 @@ -263,6 +263,8 @@ } } + project_manager::project::compute_parent_status $project_item_id + } -select_query_name task_query -after_submit { # now go through the use_dependency_p items. For each that is checked,
StartStart @project.planned_start_date@
Earliest finishEarliest finish @project.earliest_finish_date@
DeadlineDeadline @project.planned_end_date@
Estimated finishEstimated finish @project.estimated_finish_date@
Latest finishLatest finish @project.latest_finish_date@
Hours completedHours completed @project.actual_hours_completed@ of @project.estimated_hours_total@