Index: openacs-4/packages/project-manager/lib/forums-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/forums-portlet.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/project-manager/lib/forums-portlet.adp 4 Jan 2006 09:40:25 -0000 1.6
+++ openacs-4/packages/project-manager/lib/forums-portlet.adp 10 May 2006 18:51:41 -0000 1.7
@@ -5,10 +5,14 @@
<tr>
<td colspan="2" class="fill-list-middle">
<if @forum_id@ ne "">
- <include src="/packages/forums/lib/message/threads-chunk" forum_id="@forum_id@" moderate_p="@permissions.moderate_p@" admin_p="@permissions.admin_p@" orderby="last_child_post,desc" base_url="@base_url@">
+ <include src="/packages/forums/lib/message/threads-chunk"
+ forum_id="@forum_id@" moderate_p="@permissions.moderate_p@"
+ admin_p="@permissions.admin_p@" orderby="last_child_post,desc"
+ base_url="@base_url@" &="permissions" page_size="@page_size@">
</if>
<else>Create new forum</else>
</td>
</tr>
</table>
<!-- Forums Portlet Stop -->
+@base_url@
\ No newline at end of file
Index: openacs-4/packages/project-manager/lib/forums-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/forums-portlet.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/lib/forums-portlet.tcl 26 Aug 2005 20:59:12 -0000 1.3
+++ openacs-4/packages/project-manager/lib/forums-portlet.tcl 10 May 2006 18:51:41 -0000 1.4
@@ -35,4 +35,6 @@
if {![info exists $optional_param]} {
set $optional_param {}
}
-}
\ No newline at end of file
+}
+
+set page_size 5
\ No newline at end of file
Index: openacs-4/packages/project-manager/lib/projects-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects-postgresql.xql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/project-manager/lib/projects-postgresql.xql 12 Mar 2006 16:54:57 -0000 1.12
+++ openacs-4/packages/project-manager/lib/projects-postgresql.xql 10 May 2006 18:51:41 -0000 1.13
@@ -16,8 +16,6 @@
to_char(p.planned_start_date, 'YYYY-MM-DD HH24:MI:SS') as planned_start_date,
to_char(p.planned_end_date, 'YYYY-MM-DD HH24:MI:SS') as planned_end_date,
p.ongoing_p,
- p.etat_id,
- p.contact_id,
c.category_id,
c.category_name,
p.earliest_finish_date - current_date as days_to_earliest_finish,
Index: openacs-4/packages/project-manager/lib/projects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/projects.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/project-manager/lib/projects.tcl 5 Apr 2006 15:09:05 -0000 1.34
+++ openacs-4/packages/project-manager/lib/projects.tcl 10 May 2006 18:51:41 -0000 1.35
@@ -18,7 +18,7 @@
set required_param_list "package_id"
set optional_param_list [list orderby pm_status_id searchterm bulk_p action_p page_num page_size\
filter_p base_url end_date_f user_space_p hidden_vars]
-set optional_unset_list [list assignee_id pm_etat_id pm_contact_id date_range is_observer_p previous_status_f current_package_f subprojects_p]
+set optional_unset_list [list assignee_id date_range is_observer_p previous_status_f current_package_f subprojects_p]
set dotlrn_installed_p [apm_package_installed_p dotlrn]
set invoice_installed_p [apm_package_installed_p dotlrn-invoices]
set contacts_installed_p [apm_package_installed_p contacts]
@@ -64,7 +64,7 @@
# initialize the pa_from_clause. It should be empty unless needed
set pa_from_clause ""
-if [empty_string_p $user_space_p] {
+if {[empty_string_p $user_space_p] && $dotlrn_installed_p} {
set user_space_p 0
set dotlrn_club_id [dotlrn_community::get_community_id]
set pm_package_id [dotlrn_community::get_package_id_from_package_key \
@@ -235,22 +235,12 @@
}
# If this filter is provided we can see all projects for a given contact
-set organization_id [lindex [application_data_link::get_linked -from_object_id [dotlrn_community::get_community_id] -to_object_type "organization"] 0]
-set contact_filter [lrange [wieners::get_contacts -customer_id $organization_id] 1 end]
-if { [exists_and_not_null pm_contact_id] } {
- set contact_where_clause "p.contact_id = :pm_contact_id"
+if {$dotlrn_installed_p} {
+ set organization_id [lindex [application_data_link::get_linked -from_object_id [dotlrn_community::get_community_id] -to_object_type "organization"] 0]
} else {
- set contact_where_clause ""
+ set organization_id ""
}
-# If this filter is provided we can see all projects for a given etat
-set etat_filter [lrange [wieners::get_etats -customer_id $organization_id] 1 end]
-if { [exists_and_not_null pm_etat_id] } {
- set etat_where_clause "p.etat_id = :pm_etat_id"
-} else {
- set etat_where_clause ""
-}
-
# If this filter is provided we can watch the projects in
# all project manager instances
if { [exists_and_not_null current_package_f] } {
@@ -319,16 +309,6 @@
values { {All "-1"} [pm::status::project_status_select]} \
where_clause { $status_where_clause } \
] \
- pm_contact_id [list \
- label "[_ acs-translations.pm_project_contact_id]" \
- values { $contact_filter } \
- where_clause {$contact_where_clause}
- ] \
- pm_etat_id [list \
- label "[_ acs-translations.pm_project_etat_id]" \
- values { $etat_filter } \
- where_clause {$etat_where_clause}
- ] \
assignee_id [list \
label "[_ project-manager.Assignee]" \
default_value $user_id \
@@ -379,14 +359,6 @@
<if @projects.customer_id@ not nil>$contact_column</if><else>@projects.customer_name@</else>
"
}
- contact_id {
- label "[_ acs-translations.pm_project_contact_id]"
- display_template {<if @projects.contact_id@ not nil><a href="@projects.contact_url@">@projects.contact_name@</a></if><else> </else>}
- }
- etat_id {
- label "[_ acs-translations.pm_project_etat_id]"
- display_template {<if @projects.etat_id@ not nil><a href="@projects.etat_url@">@projects.etat_name@</a></if><else> </else>}
- }
creation_date {
label "[_ project-manager.Creation_date]"
display_template "@projects.creation_date_lc@"
@@ -504,17 +476,12 @@
width 100%
}
-db_multirow -extend { item_url customer_url category_select earliest_finish_date latest_finish_date start_date_lc earliest_start_date creation_date_lc planned_end_date_lc etat_name etat_url contact_name contact_url} projects project_folders " " {
+db_multirow -extend { item_url customer_url category_select earliest_finish_date latest_finish_date start_date_lc earliest_start_date creation_date_lc planned_end_date_lc} projects project_folders " " {
set earliest_finish_date [lc_time_fmt $earliest_finish_date $fmt]
set latest_finish_date [lc_time_fmt $latest_finish_date $fmt]
set creation_date_lc [lc_time_fmt $creation_date $fmt]
set start_date_lc [lc_time_fmt $start_date "%x"]
set planned_end_date_lc [lc_time_fmt $planned_end_date $fmt]
- set etat_name [contact::name -party_id $etat_id]
- set etat_url "/contacts/$etat_id"
- set contact_name [contact::name -party_id $contact_id -reverse_order]
- set contact_url "/contacts/$contact_id"
-
set _base_url [site_node::get_url_from_object_id -object_id $package_id]
if {![empty_string_p $_base_url]} {
set base_url $_base_url
Index: openacs-4/packages/project-manager/templates/project-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-one.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/project-manager/templates/project-one.adp 18 Nov 2005 16:41:04 -0000 1.15
+++ openacs-4/packages/project-manager/templates/project-one.adp 10 May 2006 18:51:42 -0000 1.16
@@ -51,7 +51,7 @@
page="@page@"
/>
<p />
- <if @use_fs_p@>
+ <if @folder_id@ ge 0>
<include
src="/packages/project-manager/lib/fs-portlet"
folder_id="@folder_id@" />
Index: openacs-4/packages/project-manager/templates/project-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-one.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/templates/project-one.tcl 14 Oct 2005 18:51:07 -0000 1.4
+++ openacs-4/packages/project-manager/templates/project-one.tcl 10 May 2006 18:51:42 -0000 1.5
@@ -44,6 +44,7 @@
set my_title "$project_term \#$project_item_id: $project(project_name)"
set forum_id [application_data_link::get_linked -from_object_id $project(item_id) -to_object_type "forums_forum"]
+
set folder_id [lindex [application_data_link::get_linked -from_object_id $project(item_id) -to_object_type "content_folder"] 0]
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.7 -r1.8
--- openacs-4/packages/project-manager/templates/task-ae.tcl 30 Jan 2006 11:17:21 -0000 1.7
+++ openacs-4/packages/project-manager/templates/task-ae.tcl 10 May 2006 18:51:42 -0000 1.8
@@ -484,13 +484,12 @@
}
}
- if {$estimated_hours_work_min > $estimated_hours_work_max} {
- set temp $estimated_hours_work_max
- set estimated_hours_work_max $estimated_hours_work_min
- set estimated_hours_work_min $temp
- }
-
if {[string is true $use_uncertain_completion_times_p]} {
+ if {$estimated_hours_work_min > $estimated_hours_work_max} {
+ set temp $estimated_hours_work_max
+ set estimated_hours_work_max $estimated_hours_work_min
+ set estimated_hours_work_min $temp
+ }
set estimated_hours_work [expr .5 * ($estimated_hours_work_max - $estimated_hours_work_min) + $estimated_hours_work_min]
} else {
set estimated_hours_work_min $estimated_hours_work
Index: openacs-4/packages/project-manager/templates/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/templates/task-one.adp 15 Sep 2005 19:00:01 -0000 1.3
+++ openacs-4/packages/project-manager/templates/task-one.adp 10 May 2006 18:51:42 -0000 1.4
@@ -23,16 +23,6 @@
<P />
-<include src="/packages/project-manager/lib/task-logger-portlet"
- project_item_id="@project_item_id@"
- master="@portlet_master@"
- logger_project="@logger_project@"
- logger_days="@logger_days@"
- return_url="@return_url;noquote@"
- pm_url="@package_url;noquote@"
- &task_info=task_info
- use_days_p="@use_days_p@"
- pm_task_id="@task_id@" />
<include
src="/packages/project-manager/lib/categories-portlet"
@@ -50,20 +40,28 @@
</td>
<td width="20%" valign="top">
- <if 0 eq 1>
- <include src="/packages/project-manager/lib/task-date-portlet"
+ <include src="/packages/project-manager/lib/task-dates-portlet"
&task_info=task_info
/>
<p />
- </if>
<include
src="/packages/project-manager/lib/task-assignee-portlet"
task_id="@task_id@"
return_url="@return_url@" />
<p />
+<include src="/packages/project-manager/lib/task-logger-portlet"
+ project_item_id="@project_item_id@"
+ master="@portlet_master@"
+ logger_project="@logger_project@"
+ logger_days="@logger_days@"
+ return_url="@return_url;noquote@"
+ pm_url="@package_url;noquote@"
+ &task_info=task_info
+ use_days_p="@use_days_p@"
+ pm_task_id="@task_id@" />
</td>
</tr>
Index: openacs-4/packages/project-manager/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/index.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/project-manager/www/index.adp 5 Apr 2006 15:09:04 -0000 1.15
+++ openacs-4/packages/project-manager/www/index.adp 10 May 2006 18:51:42 -0000 1.16
@@ -10,10 +10,8 @@
pm_status_id="@pm_status_id@"
searchterm="@searchterm@"
assignee_id="@assignee_id@"
- pm_contact_id="@pm_contact_id@"
- pm_etat_id="@pm_etat_id@"
category_id="@pass_cat@"
- elements="project_code customer_name contact_id etat_id category_id start_date planned_end_date status_id"
+ elements="project_code customer_name category_id start_date planned_end_date status_id"
package_id=@package_id@
actions_p="1"
bulk_p="1"
Index: openacs-4/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/index.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/project-manager/www/index.tcl 5 Apr 2006 15:09:04 -0000 1.15
+++ openacs-4/packages/project-manager/www/index.tcl 10 May 2006 18:51:42 -0000 1.16
@@ -27,7 +27,7 @@
{pm_contact_id ""}
{pm_etat_id ""}
{user_space_p "0"}
- {subprojects_p "t"}
+ {subprojects_p "f"}
{is_observer_p ""}
{previous_status_f ""}
{current_package_f ""}
Index: openacs-4/packages/project-manager/www/task-add-edit-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-add-edit-3.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/www/task-add-edit-3.tcl 30 Jul 2005 00:26:33 -0000 1.5
+++ openacs-4/packages/project-manager/www/task-add-edit-3.tcl 10 May 2006 18:51:42 -0000 1.6
@@ -97,7 +97,7 @@
if {[parameter::get -parameter "UseDayInsteadOfHour" -default "f" -package_id $package_id]} {
pm::project::compute_status $project_item_id($num)
} else {
- pm::project::compute_status_mins $project_item_id($num)
+# pm::project::compute_status_mins $project_item_id($num)
}
lappend computed_projects $project_item_id($num)
}
Index: openacs-4/packages/project-manager/www/comments/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/comments/add.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/project-manager/www/comments/add.tcl 3 May 2006 18:02:11 -0000 1.8
+++ openacs-4/packages/project-manager/www/comments/add.tcl 10 May 2006 18:51:42 -0000 1.9
@@ -48,7 +48,7 @@
# to see if it is an observer.
if { [string equal [lsearch $observer_role_id [lindex $assignee 1]] "-1"]} {
# Not an observer. Added to the list
- set name [contact::name -party_id [lindex $assignee 0]]
+ set name [person::name -person_id [lindex $assignee 0]]
set email [party::email -party_id [lindex $assignee 0]]
if {$show_role_p} {
@@ -63,7 +63,7 @@
} else {
# We want every assignee so we just get the assignees name
foreach assignee $assignees {
- set name [contact::name -party_id [lindex $assignee 0]]
+ set name [person::name -person_id [lindex $assignee 0]]
set email [party::email -party_id [lindex $assignee 0]]
if {$show_role_p} {
@@ -86,7 +86,7 @@
set sub_assignees [pm::project::assignee_role_list -project_item_id $subproject_id]
foreach assignee $sub_assignees {
if { [string equal [lsearch $observer_role_id [lindex $assignee 1]] "-1"] || $exclude_observers_p != 1 } {
- set name [contact::name -party_id [lindex $assignee 0]]
+ set name [person::name -person_id [lindex $assignee 0]]
set email [party::email -party_id [lindex $assignee 0]]
if {[lsearch -exact $listed_emails $email] == -1} {
@@ -100,7 +100,7 @@
set employee_list [group::get_members -group_id [group::get_id -group_name "Employees"]]
foreach employee_id $employee_list {
- set name [contact::name -party_id $employee_id]
+ set name [person::name -person_id $employee_id]
set email [party::email -party_id $employee_id]
if {[lsearch -exact $listed_emails $email] == -1} {