Index: openacs-4/packages/project-manager/lib/task-date-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/Attic/task-date-portlet.adp,v diff -u -N --- openacs-4/packages/project-manager/lib/task-date-portlet.adp 29 Aug 2005 06:19:13 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,45 +0,0 @@ - -#project-manager.Dates# - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#project-manager.Earliest_start#@task_info.earliest_start@ 
#project-manager.Earliest_finish#@task_info.earliest_finish@
#project-manager.Latest_start#@task_info.latest_start@
#project-manager.Latest_finish#@task_info.latest_finish@
#project-manager.Deadline_1#@task_info.end_date@
-
Index: openacs-4/packages/project-manager/lib/task-date-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/Attic/task-date-portlet.tcl,v diff -u -N --- openacs-4/packages/project-manager/lib/task-date-portlet.tcl 29 Aug 2005 06:19:13 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,42 +0,0 @@ -# packages/project-manager/lib/project-portlet.tcl -# -# Portlet for short project information -# -# @author Malte Sussdorff (sussdorff@sussdorff.de) -# @creation-date 2005-05-01 -# @arch-tag: c502a3ed-d1c0-4217-832a-6ccd86256024 -# @cvs-id $Id: task-date-portlet.tcl,v 1.3 2005/08/29 06:19:13 maltes Exp $ - -set user_id [auth::require_login] - -# terminology and other parameters -set project_term [_ project-manager.Project] -set use_goal_p [parameter::get -parameter "UseGoalP" -default "1"] -set use_project_code_p [parameter::get -parameter "UseUserProjectCodesP" -default "1"] -set default_layout_url [parameter::get -parameter DefaultPortletLayoutP] - - - -# format the hours remaining section - -set task_info(hours_remaining) \ - [pm::task::hours_remaining \ - -estimated_hours_work $task_info(estimated_hours_work) \ - -estimated_hours_work_min $task_info(estimated_hours_work_min) \ - -estimated_hours_work_max $task_info(estimated_hours_work_max) \ - -percent_complete $task_info(percent_complete)] - -set task_info(days_remaining) \ - [pm::task::days_remaining \ - -estimated_hours_work $task_info(estimated_hours_work) \ - -estimated_hours_work_min $task_info(estimated_hours_work_min) \ - -estimated_hours_work_max $task_info(estimated_hours_work_max) \ - -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_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(end_date) [lc_time_fmt $task_info(end_date) "%x"] - Index: openacs-4/packages/project-manager/lib/task-dates-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-dates-portlet.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/project-manager/lib/task-dates-portlet.adp 26 Aug 2005 20:59:12 -0000 1.2 +++ openacs-4/packages/project-manager/lib/task-dates-portlet.adp 17 Sep 2005 10:23:36 -0000 1.3 @@ -1,38 +1,63 @@ #project-manager.Dates# - +
-
- - - - - + -
#project-manager.Earliest_start#@task_info.earliest_start@ 
+ + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - + - + + + + + + + + + + + + + + + + + + +
#project-manager.Earliest_start#@task_info.earliest_start@ 
#project-manager.Earliest_finish#@task_info.earliest_finish@
#project-manager.Earliest_finish#@task_info.earliest_finish@
#project-manager.Latest_start#@task_info.latest_start@
#project-manager.Latest_start#@task_info.latest_start@
#project-manager.Latest_finish#@task_info.latest_finish@
#project-manager.Latest_finish#@task_info.latest_finish@
#project-manager.Deadline_1# @task_info.end_date@
#project-manager.Slack_time#@task_info.slack_time@
#project-manager.Percent_complete#@task_info.percent_complete@%
#project-manager.Estimated_hours_work#@task_info.estimated_hours_work@
 
Index: openacs-4/packages/project-manager/lib/task-dates-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-dates-portlet.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/project-manager/lib/task-dates-portlet.tcl 26 Aug 2005 20:59:54 -0000 1.1 +++ openacs-4/packages/project-manager/lib/task-dates-portlet.tcl 17 Sep 2005 10:23:36 -0000 1.2 @@ -1 +1,43 @@ -set default_layout_url [parameter::get -parameter DefaultPortletLayoutP] \ No newline at end of file +set default_layout_url [parameter::get -parameter DefaultPortletLayoutP] +# packages/project-manager/lib/task-dates-portlet.tcl +# +# Portlet for tasks timing information +# +# @author Malte Sussdorff (sussdorff@sussdorff.de) +# @creation-date 2005-05-01 +# @arch-tag: c502a3ed-d1c0-4217-832a-6ccd86256024 +# @cvs-id $Id$ + +set user_id [auth::require_login] + +# terminology and other parameters +set project_term [_ project-manager.Project] +set use_goal_p [parameter::get -parameter "UseGoalP" -default "1"] +set use_project_code_p [parameter::get -parameter "UseUserProjectCodesP" -default "1"] +set default_layout_url [parameter::get -parameter DefaultPortletLayoutP] + + + +# format the hours remaining section + +set task_info(hours_remaining) \ + [pm::task::hours_remaining \ + -estimated_hours_work $task_info(estimated_hours_work) \ + -estimated_hours_work_min $task_info(estimated_hours_work_min) \ + -estimated_hours_work_max $task_info(estimated_hours_work_max) \ + -percent_complete $task_info(percent_complete)] + +set task_info(days_remaining) \ + [pm::task::days_remaining \ + -estimated_hours_work $task_info(estimated_hours_work) \ + -estimated_hours_work_min $task_info(estimated_hours_work_min) \ + -estimated_hours_work_max $task_info(estimated_hours_work_max) \ + -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_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(end_date) [lc_time_fmt $task_info(end_date) "%x"] + Index: openacs-4/packages/project-manager/lib/task-info-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-info-portlet.adp,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/project-manager/lib/task-info-portlet.adp 15 Sep 2005 19:00:00 -0000 1.4 +++ openacs-4/packages/project-manager/lib/task-info-portlet.adp 17 Sep 2005 10:23:36 -0000 1.5 @@ -27,28 +27,16 @@
- +
- + + + + +
+ @task_info.description;noquote@
- @task_info.creation_user@
+

- - - - - - - - - - - - - - - - - - @@ -59,76 +47,28 @@ + + + + + + - + + +
#project-manager.Deadline_1#@task_info.end_date@
#project-manager.Slack_time#@task_info.slack_time@
#project-manager.Percent_complete#@task_info.percent_complete@%
#project-manager.Estimated_hours_work#@task_info.estimated_hours_work@
#project-manager.Process_status##project-manager.Priority# @task_info.priority@
@dynamic_attributes.name@@dynamic_attributes.value@
#project-manager.Actions##project-manager.View_task_changes#
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#project-manager.Earliest_start#@task_info.earliest_start@ 
#project-manager.Earliest_finish#@task_info.earliest_finish@
#project-manager.Latest_start#@task_info.latest_start@
#project-manager.Latest_finish#@task_info.latest_finish@
- - - -   - - #project-manager.Description# - - - @task_info.description;noquote@ - - +

+ - - - - - - - - - - - - - -
@dynamic_attributes.name@
@dynamic_attributes.value@
- @task_info.creation_user@
 
#project-manager.Comments#
@comments;noquote@

- @comments_link;noquote@ +

  • @comments_link;noquote@
Index: openacs-4/packages/project-manager/lib/task-info-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/task-info-portlet.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/project-manager/lib/task-info-portlet.tcl 26 Aug 2005 20:59:12 -0000 1.2 +++ openacs-4/packages/project-manager/lib/task-info-portlet.tcl 17 Sep 2005 10:23:36 -0000 1.3 @@ -6,7 +6,16 @@ # @creation-date 2005-05-01 # @arch-tag: c502a3ed-d1c0-4217-832a-6ccd86256024 # @cvs-id $Id$ +# +# Initialize Variables that might not exist + +foreach optional_param {slack_time} { + if {![info exists task_info($optional_param)]} { + set task_info($optional_param) {} + } +} + set user_id [auth::require_login] set urgency_threshold 8 set task_term [_ project-manager.Task]