Index: openacs-4/packages/project-manager/lib/project-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/project-portlet.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/project-manager/lib/project-portlet.tcl 25 Jun 2007 07:25:06 -0000 1.19
+++ openacs-4/packages/project-manager/lib/project-portlet.tcl 26 Jul 2007 10:35:40 -0000 1.20
@@ -26,6 +26,9 @@
if {$contacts_package_id ne ""} {
set contacts_installed_p 1
set contacts_url [apm_package_url_from_id $contacts_package_id]
+} else {
+ set contacts_installed_p 0
+ set contacts_url ""
}
#URL to rate this project
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 -r1.4 -r1.5
--- openacs-4/packages/project-manager/lib/task-dates-portlet.adp 23 Mar 2007 07:52:26 -0000 1.4
+++ openacs-4/packages/project-manager/lib/task-dates-portlet.adp 26 Jul 2007 10:35:40 -0000 1.5
@@ -57,6 +57,12 @@
@task_info.hours_remaining@ (@task_info.estimated_hours_work_min@ - @task_info.estimated_hours_work_max@) |
+
+
+
+ @task_info.priority@ |
+
+
Index: openacs-4/packages/project-manager/tcl/task-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/task-procs-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/project-manager/tcl/task-procs-postgresql.xql 3 May 2006 18:02:12 -0000 1.7
+++ openacs-4/packages/project-manager/tcl/task-procs-postgresql.xql 26 Jul 2007 10:35:40 -0000 1.8
@@ -253,6 +253,8 @@
t.percent_complete,
p.title as project_name,
t.parent_id as project_item_id,
+ t.priority,
+ t.end_date,
a.process_instance
FROM
pm_tasks_revisionsx t,
Index: openacs-4/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/task-procs.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/project-manager/tcl/task-procs.tcl 24 Jul 2007 04:14:13 -0000 1.30
+++ openacs-4/packages/project-manager/tcl/task-procs.tcl 26 Jul 2007 10:35:40 -0000 1.31
@@ -1755,12 +1755,16 @@
[_ project-manager.Project] |
- $project_name |
+ $project_name |
[_ project-manager.Your_role] |
$role |
+
+ [_ project-manager.Priority] |
+ $priority |
+
$process_html
@@ -1772,17 +1776,31 @@
[_ project-manager.Dates_1]
-
-
- [_ project-manager.Latest_start_1] |
- $latest_start |
-
-
- [_ project-manager.Latest_finish] |
- $latest_finish |
-
-
"
+"
+ if {$latest_start ne ""} {
+ append notification_text "
+
+ [_ project-manager.Latest_start_1] |
+ $latest_start |
+
+
+ [_ project-manager.Latest_finish] |
+ $latest_finish |
+
+
"
+ } elseif {$end_date ne ""} {
+ append notification_text "
+
+ [_ project-manager.End_date] |
+ $end_date |
+
+
"
+ } else {
+ append notification_text "No dates specified"
+ }
+
+
pm::util::email \
-to_addr $to_address \
-from_addr $from_address \
@@ -1993,13 +2011,11 @@
} {
set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
# If we should round, we are not using the uncertain_completion_times
-ns_log Notice "round $round_p"
if {$round_p} {
set use_uncertain_completion_times_p 0
}
if {[string equal $use_uncertain_completion_times_p 1]} {
-ns_log Notice "uncertain"
if {[string equal $estimated_hours_work_min $estimated_hours_work_max]} {
set display_value "$estimated_hours_work_min"
} else {
Index: openacs-4/packages/project-manager/templates/task-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/project-manager/templates/task-ae.tcl 25 Jun 2007 07:26:11 -0000 1.19
+++ openacs-4/packages/project-manager/templates/task-ae.tcl 26 Jul 2007 10:35:40 -0000 1.20
@@ -606,7 +606,6 @@
# -------------------------------------
set logger_project [lindex [application_data_link::get_linked -from_object_id $project_item_id -to_object_type logger_project] 0]
- ns_log Notice "Hours:: $hours,,, $priority"
if {[exists_and_not_null hours]} {
pm::project::log_hours \