Index: openacs-4/contrib/packages/project-manager/project-manager.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v diff -u -r1.8 -r1.9 --- openacs-4/contrib/packages/project-manager/project-manager.info 8 Aug 2003 19:13:53 -0000 1.8 +++ openacs-4/contrib/packages/project-manager/project-manager.info 21 Aug 2003 22:34:43 -0000 1.9 @@ -23,6 +23,7 @@ + Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-functions-create.sql,v diff -u -r1.6 -r1.7 --- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql 13 Aug 2003 18:56:29 -0000 1.6 +++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql 21 Aug 2003 22:34:43 -0000 1.7 @@ -416,16 +416,17 @@ -- If it is not associated with a project, then it is placed in the root -- project repository folder. -select define_function_args('pm_task__new_task_item', 'task_id, project_id, title, description, start_date, end_date, percent_complete, creation_date, creation_user, creation_ip, package_id'); +select define_function_args('pm_task__new_task_item', 'task_id, project_id, title, description, end_date, percent_complete, estimated_hours_work_min, estimated_hours_work_max, creation_date, creation_user, creation_ip, package_id'); create function pm_task__new_task_item ( integer, -- task_id integer, -- project_id varchar, -- title varchar, -- description - timestamptz, -- start_date timestamptz, -- end_date numeric, -- percent_complete + numeric, -- estimated_hours_work_min + numeric, -- estimated_hours_work_max, timestamptz, -- creation_date integer, -- creation_user varchar, -- creation_ip @@ -437,13 +438,14 @@ p_project_id alias for $2; p_title alias for $3; p_description alias for $4; - p_start_date alias for $5; - p_end_date alias for $6; - p_percent_complete alias for $7; - p_creation_date alias for $8; - p_creation_user alias for $9; - p_creation_ip alias for $10; - p_package_id alias for $11; + p_end_date alias for $5; + p_percent_complete alias for $6; + p_estimated_hours_work_min alias for $7; + p_estimated_hours_work_max alias for $8; + p_creation_date alias for $9; + p_creation_user alias for $10; + p_creation_ip alias for $11; + p_package_id alias for $12; v_item_id cr_items.item_id%TYPE; v_revision_id cr_revisions.revision_id%TYPE; @@ -496,9 +498,9 @@ v_item_id, v_task_number); insert into pm_tasks_revisions ( - task_revision_id, start_date, end_date, percent_complete) + task_revision_id, end_date, percent_complete, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked) values ( - v_revision_id, p_start_date, p_end_date, p_percent_complete); + v_revision_id, p_end_date, p_percent_complete, p_estimated_hours_work_min, p_estimated_hours_work_max, ''0''); PERFORM acs_permission__grant_permission( v_revision_id, @@ -510,16 +512,18 @@ end;' language 'plpgsql'; -select define_function_args('pm_task__new_task_revision', 'task_id, project_id, title, description, start_date, end_date, percent_complete, creation_date, creation_user, creation_ip, package_id'); +select define_function_args('pm_task__new_task_revision', 'task_id, project_id, title, description, end_date, percent_complete, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked, creation_date, creation_user, creation_ip, package_id'); create function pm_task__new_task_revision ( integer, -- task_id (the item_id) integer, -- project_id varchar, -- title varchar, -- description - timestamptz, -- start_date timestamptz, -- end_date numeric, -- percent_complete + numeric, -- estimated_hours_work_min + numeric, -- estimated_hours_work_max + numeric, -- actual_hours_worked timestamptz, -- creation_date integer, -- creation_user varchar, -- creation_ip @@ -531,13 +535,15 @@ p_project_id alias for $2; p_title alias for $3; p_description alias for $4; - p_start_date alias for $5; - p_end_date alias for $6; - p_percent_complete alias for $7; - p_creation_date alias for $8; - p_creation_user alias for $9; - p_creation_ip alias for $10; - p_package_id alias for $11; + p_end_date alias for $5; + p_percent_complete alias for $6; + p_estimated_hours_work_min alias for $7; + p_estimated_hours_work_max alias for $8; + p_actual_hours_worked alias for $9; + p_creation_date alias for $10; + p_creation_user alias for $11; + p_creation_ip alias for $12; + p_package_id alias for $13; v_revision_id cr_revisions.revision_id%TYPE; v_id cr_items.item_id%TYPE; @@ -563,9 +569,9 @@ PERFORM content_item__set_live_revision (v_revision_id); insert into pm_tasks_revisions ( - task_revision_id, start_date, end_date, percent_complete) + task_revision_id, end_date, percent_complete, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked) values ( - v_revision_id, p_start_date, p_end_date, p_percent_complete); + v_revision_id, p_end_date, p_percent_complete, p_estimated_hours_work_min, p_estimated_hours_work_max, p_actual_hours_worked); PERFORM acs_permission__grant_permission( v_revision_id, @@ -602,5 +608,3 @@ PERFORM content_item__delete(p_task_id); return 0; end;' language 'plpgsql'; - - 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.6 -r1.7 --- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql 13 Aug 2003 18:56:29 -0000 1.6 +++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql 21 Aug 2003 22:34:43 -0000 1.7 @@ -34,7 +34,15 @@ actual_end_date timestamptz, ongoing_p char(1) default 'f' constraint pm_projects_ongoing_p_ck - check (ongoing_p in ('t','f')) + check (ongoing_p in ('t','f')), + -- denormalized, computed values + -- these are computed but stored in projects table for efficient + -- access. + estimated_completion_date timestamptz, + earlier_completion_date timestamptz, + latest_completion_date timestamptz, + actual_hours_completed numeric, + estimated_hours_total numeric ); @@ -136,10 +144,19 @@ primary key, -- dates are optional, because it may be computed in reference -- to all other items, or simply not have a deadline - start_date timestamptz, end_date timestamptz, -- keep track of completion status - percent_complete numeric + percent_complete numeric, + -- PERT charts require minimum and maximum estimates + -- if we are not using these, then we set the min and max + -- estimates to the same value. + estimated_hours_work_min numeric, + estimated_hours_work_max numeric, + -- this should be computed by checking with logger? The actual + -- data should be in logger, logged by who did it, when etc.. + -- or we can create a separate table to keep track of task hours + -- and make sure its data model is similar to logger? + actual_hours_worked numeric ); -- create the content type @@ -157,17 +174,6 @@ select content_type__create_attribute ( 'pm_task', -- content_type - 'start_date', -- attribute_name - 'date', -- datatype (string, number, boolean, date, keyword, integer) - 'Start date', -- pretty_name - 'Start dates', -- pretty_plural - null, -- sort_order - null, -- default value - 'timestamptz' -- column_spec -); - -select content_type__create_attribute ( - 'pm_task', -- content_type 'end_date', -- attribute_name 'date', -- datatype 'End date', -- pretty_name @@ -188,8 +194,41 @@ 'numeric' -- column_spec ); +select content_type__create_attribute ( + 'pm_task', -- content_type + 'estimated_hours_work_min', -- attribute_name + 'number', -- datatype + 'Estimated minimum hours', -- pretty_name + 'Estimated minimum hours', -- pretty_plural + null, -- sort_order + null, -- default value + 'numeric' -- column_spec +); +select content_type__create_attribute ( + 'pm_task', -- content_type + 'estimated_hours_work_max', -- attribute_name + 'number', -- datatype + 'Estimated maximum hours', -- pretty_name + 'Estimated maximum hours', -- pretty_plural + null, -- sort_order + null, -- default value + 'numeric' -- column_spec +); +select content_type__create_attribute ( + 'pm_task', -- content_type + 'actual_hours_worked', -- attribute_name + 'number', -- datatype + 'Actual hours worked', -- pretty_name + 'Actual hours worked', -- pretty_plural + null, -- sort_order + null, -- default value + 'numeric' -- column_spec +); + + + -- constraint types -- such as: -- cannot start until Task X finishes 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.7 -r1.8 --- openacs-4/contrib/packages/project-manager/www/index.adp 6 Aug 2003 20:22:18 -0000 1.7 +++ openacs-4/contrib/packages/project-manager/www/index.adp 21 Aug 2003 22:34:43 -0000 1.8 @@ -13,6 +13,7 @@ Project Project Code + Status Start Date (planned) End Date (planned) On-going? @@ -34,6 +35,9 @@  @projects.project_code@ +   + +  @projects.planned_start_date@ @@ -50,6 +54,6 @@ - Add Project + Add Project 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.6 -r1.7 --- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 13 Aug 2003 18:56:29 -0000 1.6 +++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 21 Aug 2003 22:34:43 -0000 1.7 @@ -75,7 +75,6 @@ SELECT t.item_id, t.title, - to_char(t.start_date,'MM/DD/YY') as start_date, to_char(t.end_date,'MM/DD/YY') as end_date, t.percent_complete, c.parent_task_id, 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.13 -r1.14 --- openacs-4/contrib/packages/project-manager/www/one.adp 13 Aug 2003 20:03:27 -0000 1.13 +++ openacs-4/contrib/packages/project-manager/www/one.adp 21 Aug 2003 22:34:43 -0000 1.14 @@ -58,8 +58,8 @@

- Edit @project_term@ -Add sub-@project_term_lower@ + Edit +Breakdown

@@ -103,8 +103,6 @@ @tasks.percent_complete@% - @tasks.start_date@ - @tasks.end_date@ 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.5 -r1.6 --- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 4 Aug 2003 22:40:21 -0000 1.5 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 21 Aug 2003 22:34:43 -0000 1.6 @@ -8,8 +8,9 @@ '$task_title($i)', '$description($i)', to_timestamp(now(),'YYYY MM DD HH24 MI SS'), - to_timestamp(now(),'YYYY MM DD HH24 MI SS'), '0', + '$estimated_hours_work_min($i)', + '$estimated_hours_work_max($i)', now(), :user_id, :peeraddr, @@ -18,24 +19,6 @@ - - - select pm_task__new_task_revision ( - :task_id, - :project_item_id, - :task_title, - :description, - to_timestamp(:start_date,'YYYY MM DD HH24 MI SS'), - to_timestamp(:end_date,'YYYY MM DD HH24 MI SS'), - :percent_complete, - now(), - :user_id, - :peeraddr, - :package_id - ); - - - select @@ -45,9 +28,10 @@ t.description, t.name, t.parent_id, - to_char(t.start_date,'YYYY MM DD') as start_date, to_char(t.end_date,'YYYY MM DD') as end_date, - t.percent_complete + t.percent_complete, + t.estimated_hours_work_min, + t.estimated_hours_work_max FROM pm_tasks_revisionsx t, cr_items i WHERE 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.3 -r1.4 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 1 Aug 2003 20:51:04 -0000 1.3 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 21 Aug 2003 22:34:43 -0000 1.4 @@ -6,13 +6,7 @@
- - - + - + - + + Description:
- +

+ Work required:
Min: hrs
Max: hrs 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.8 -r1.9 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 7 Aug 2003 23:08:45 -0000 1.8 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 21 Aug 2003 22:34:43 -0000 1.9 @@ -21,17 +21,16 @@ project_id:integer,optional {number:integer "1"} added_tasks:integer,multiple,optional - task_revision_id:integer,optional task_id:multiple,integer,optional task_title:array,optional description:array,optional name:array,optional parent_id:array,optional - start_date:array,optional end_date:array,optional percent_complete:array,optional - + estimated_hours_work_min:array,optional + estimated_hours_work_max:array,optional } -properties { context_bar:onevalue @@ -63,17 +62,20 @@ template::multirow append num $i } -#if {[info exists start_date]} { +#if {[info exists end_date]} { # for {set i 1} {$i <= $number} {incr i} { -# ns_log Notice "Start_date: $start_date($i)" +# ns_log Notice "End_date: $end_date($i)" # } #} # terminology -set project_term [parameter::get -parameter "ProjectName" -default "Project"] -set task_term [parameter::get -parameter "TaskName" -default "Task"] +set project_term [parameter::get -parameter "ProjectName" -default "Project"] +set task_term [parameter::get -parameter "TaskName" -default "Task"] set task_term_lower [parameter::get -parameter "taskname" -default "task"] +# todo make this value do something! +set use_min_max_hour_estimates_p [parameter::get -parameter "UseMinMaxTaskHourEstimatesP" -default "1"] + # the unique identifier for this package set package_id [ad_conn package_id] set user_id [ad_maybe_redirect_for_registration] @@ -120,8 +122,6 @@ } -edit_data { - db_exec_plsql new_task_revision { *SQL* } - } -select_query_name task_query -after_submit { ad_returnredirect "task-constraint-add-edit?[export_vars -url task_revisions:multiple]" @@ -137,33 +137,32 @@ append add_edit_definition " {task_title.$i:text {label \"Subject \#$i\"} - {html {size 30}} + {html {size 39}} } {description.$i:text(textarea) {label \"Description\"} - {html {rows 5 cols 40}} + {html {rows 7 cols 40}} } {parent_id.$i:text(hidden) } - {start_date.$i:date,to_sql(linear_date),from_sql(sql_date) - {label \"Start date\"} - {format \"MONTH DD YYYY\"} - {help} - } - {end_date.$i:date,to_sql(linear_date),from_sql(sql_date) {label \"End date\"} {format \"MONTH DD YYYY\"} {help} } - {percent_complete.$i:integer - {label \"Percent complete\"} + {estimated_hours_work_min.$i:integer + {label \"Hours estimate - min\"} {html {size 3}} } + + {estimated_hours_work_max.$i:integer + {label \"Hours estimate - max\"} + {html {size 3}} + } " } Index: openacs-4/contrib/packages/project-manager/www/task-constraint-add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-constraint-add-edit-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/project-manager/www/task-constraint-add-edit-postgresql.xql 8 Aug 2003 22:24:14 -0000 1.2 +++ openacs-4/contrib/packages/project-manager/www/task-constraint-add-edit-postgresql.xql 21 Aug 2003 22:34:43 -0000 1.3 @@ -9,7 +9,6 @@ t.description, t.name, t.parent_id, - to_char(t.start_date,'YYYY MM DD') as start_date, to_char(t.end_date,'YYYY MM DD') as end_date, t.percent_complete FROM @@ -29,7 +28,6 @@ t.description, t.name, t.parent_id, - to_char(t.start_date,'YYYY MM DD') as start_date, to_char(t.end_date,'YYYY MM DD') as end_date, t.percent_complete FROM Index: openacs-4/contrib/packages/project-manager/www/task-constraint-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-constraint-add-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/project-manager/www/task-constraint-add-edit.tcl 13 Aug 2003 18:56:29 -0000 1.3 +++ openacs-4/contrib/packages/project-manager/www/task-constraint-add-edit.tcl 21 Aug 2003 22:34:43 -0000 1.4 @@ -141,13 +141,8 @@ {value $tasks(description)} } - {start_date.$tasks(revision_id):text(inform) - {label \"Start date\"} - {value $tasks(start_date)} - } - {end_date.$tasks(revision_id):text(inform) - {label \"End date\"} + {label \"Deadline\"} {value $tasks(end_date)} } " Index: openacs-4/contrib/packages/project-manager/www/task-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-edit-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/project-manager/www/task-edit-postgresql.xql 6 Aug 2003 20:22:18 -0000 1.2 +++ openacs-4/contrib/packages/project-manager/www/task-edit-postgresql.xql 21 Aug 2003 22:34:43 -0000 1.3 @@ -1,33 +1,17 @@ - - - select pm_task__new_task_item ( - null, - :project_item_id, - '$task_title($i)', - '$description($i)', - to_timestamp(now(),'YYYY MM DD HH24 MI SS'), - to_timestamp(now(),'YYYY MM DD HH24 MI SS'), - '0', - now(), - :user_id, - :peeraddr, - :package_id - ); - - - select pm_task__new_task_revision ( :task_id, :project_item_id, :task_title, :description, - to_timestamp(:start_date,'YYYY MM DD HH24 MI SS'), to_timestamp(:end_date,'YYYY MM DD HH24 MI SS'), :percent_complete, + :estimated_hours_work_min, + :estimated_hours_work_max, + :actual_hours_worked, now(), :user_id, :peeraddr, @@ -58,9 +42,11 @@ t.description, t.name, t.parent_id, - to_char(t.start_date,'YYYY MM DD') as start_date, to_char(t.end_date,'YYYY MM DD') as end_date, - t.percent_complete + 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 WHERE Index: openacs-4/contrib/packages/project-manager/www/task-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/project-manager/www/task-edit.tcl 8 Aug 2003 22:24:14 -0000 1.3 +++ openacs-4/contrib/packages/project-manager/www/task-edit.tcl 21 Aug 2003 22:34:43 -0000 1.4 @@ -21,7 +21,6 @@ description:optional name:optional parent_id:optional - start_date:date,optional end_date:date,optional percent_complete:optional @@ -79,14 +78,8 @@ {parent_id:text(hidden) } - {start_date:date,to_sql(linear_date),from_sql(sql_date) - {label "Start date"} - {format "MONTH DD YYYY"} - {help} - } - {end_date:date,to_sql(linear_date),from_sql(sql_date) - {label "End date"} + {label "Deadline"} {format "MONTH DD YYYY"} {help} } @@ -95,7 +88,22 @@ {label "Percent complete"} {html {size 3}} } - + + {estimated_hours_work_min:text + {label "Estimated hours work - min"} + {html {size 3}} + } + + {estimated_hours_work_max:text + {label "Estimated hours work - max"} + {html {size 3}} + } + + {actual_hours_worked:integer + {label "Hours worked"} + {html {size 3}} + } + } -on_submit { set user_id [ad_conn user_id] 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.9 -r1.10 --- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 11 Aug 2003 20:00:18 -0000 1.9 +++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 21 Aug 2003 22:34:43 -0000 1.10 @@ -41,7 +41,6 @@ t.item_id, t.title as task_title, t.description, - to_char(t.start_date,'MM/DD/YYYY') as start_date, to_char(t.end_date,'MM/DD/YYYY') as end_date, t.percent_complete, i.live_revision @@ -62,7 +61,6 @@ i.live_revision, t.title as task_title, t.description, - to_char(t.start_date,'MM/DD/YYYY') as start_date, to_char(t.end_date,'MM/DD/YYYY') as end_date, t.percent_complete FROM @@ -78,7 +76,6 @@ SELECT t.title as task_title, - to_char(t.start_date,'MM/DD/YYYY') as start_date, to_char(t.end_date,'MM/DD/YYYY') as end_date, t.percent_complete, i.live_revision, @@ -99,7 +96,6 @@ SELECT t.title as task_title, - to_char(t.start_date,'MM/DD/YYYY') as start_date, to_char(t.end_date,'MM/DD/YYYY') as end_date, t.percent_complete, i.live_revision, 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.9 -r1.10 --- openacs-4/contrib/packages/project-manager/www/task-one.adp 13 Aug 2003 20:03:27 -0000 1.9 +++ openacs-4/contrib/packages/project-manager/www/task-one.adp 21 Aug 2003 22:34:43 -0000 1.10 @@ -32,12 +32,7 @@

- - - - - - 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.11 -r1.12 --- openacs-4/contrib/packages/project-manager/www/task-one.tcl 11 Aug 2003 20:00:18 -0000 1.11 +++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 21 Aug 2003 22:34:43 -0000 1.12 @@ -103,17 +103,13 @@ label "Status" display_template "@revisions.percent_complete@\%" } - start_date { - label "Start date" - } end_date { - label "End date" + label "Deadline" } } \ -orderby { revision_id {orderby revision_id} percent_complete {orderby percent_complete} - start_date {orderby start_date} end_date {orderby end_date} default_value revision_id,desc } \ @@ -167,16 +163,12 @@ label "Status" display_template "@consts.percent_complete@\%" } - start_date { - label "Start date" - } end_date { - label "End date" + label "Deadline" } } \ -orderby { percent_complete {orderby percent_complete} - start_date {orderby start_date} end_date {orderby end_date} } \ -orderby_name orderby_consts \ @@ -228,16 +220,12 @@ label "Status" display_template "@consts2.percent_complete@\%" } - start_date { - label "Start date" - } end_date { - label "End date" + label "Deadline" } } \ -orderby { percent_complete {orderby percent_complete} - start_date {orderby start_date} end_date {orderby end_date} } \ -orderby_name orderby_consts2 \
Task -Subject -Description -Start/End - @@ -21,19 +15,20 @@
@num.rownum@Task @num.rownum@

-

Subject:

-


+		Deadline: + - Dates
Start date@task_info.start_date@
End date +Deadline @task_info.end_date@