Index: openacs-4/packages/logger/lib/entries-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries-oracle.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/logger/lib/entries-oracle.xql 3 Jun 2004 21:08:23 -0000 1.2 +++ openacs-4/packages/logger/lib/entries-oracle.xql 30 Nov 2005 06:47:38 -0000 1.2.2.1 @@ -13,17 +13,19 @@ to_char(le.time_stamp, 'IW-YYYY') as time_stamp_week, le.value, le.description, + $task_select lp.project_id, lp.name as project_name, - submitter.user_id, + submitter.person_id as user_id, submitter.first_names || ' ' || submitter.last_name as user_name from logger_entries le, + $task_left_join logger_projects lp, acs_objects ao, - cc_users submitter + persons submitter where le.project_id = lp.project_id and ao.object_id = le.entry_id - and ao.creation_user = submitter.user_id + and ao.creation_user = submitter.person_id [list::filter_where_clauses -and -name "entries"] [list::orderby_clause -orderby -name "entries"] @@ -39,13 +41,15 @@ le.description, lp.project_id, lp.name as project_name, + $task_select submitter.person_id as user_id, submitter.first_names || ' ' || submitter.last_name as user_name, c.category_id, c.tree_id from logger_entries le LEFT OUTER JOIN - category_object_map_tree c on (c.object_id = le.entry_id), + category_object_map_tree c on (c.object_id = le.entry_id) + $task_left_join logger_projects lp, acs_objects ao, persons submitter Index: openacs-4/packages/project-manager/project-manager.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/project-manager.info,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/project-manager.info 5 May 2005 06:38:11 -0000 1.3 +++ openacs-4/packages/project-manager/project-manager.info 30 Nov 2005 06:47:36 -0000 1.3.2.1 @@ -7,21 +7,21 @@ f f - + Jade Rubick Project management tool for OpenACS 2005-01-13 Integrated Bakery Resources Track tasks, estimates and actual progress for a project. See the <a href="http://openacs.org/projects/dotwrk/project_management/">project page</a> for more information. - + - + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/lib/process-instance.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/lib/process-instances-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/sql/oracle/project-manager-custom-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/sql/oracle/project-manager-custom-drop.sql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/sql/oracle/project-manager-custom-drop.sql 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/sql/oracle/project-manager-custom-drop.sql 30 Nov 2005 06:47:36 -0000 1.2.2.1 @@ -8,5 +8,9 @@ -- drop any custom tables here. -select content_type__drop_attribute ('pm_project', 'customer_id', 't'); +begin +content_type.drop_attribute ('pm_project', 'customer_id', 't'); +end; +/ +show errors Index: openacs-4/packages/project-manager/sql/oracle/project-manager-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/sql/oracle/project-manager-drop.sql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/sql/oracle/project-manager-drop.sql 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/sql/oracle/project-manager-drop.sql 30 Nov 2005 06:47:36 -0000 1.2.2.1 @@ -10,140 +10,114 @@ -- TASKS -------- -\i project-manager-custom-drop.sql -\i project-manager-notifications-drop.sql +@project-manager-custom-drop.sql +@project-manager-notifications-drop.sql drop table pm_task_logger_proj_map; -create function inline_0 () -returns integer as ' declare - v_item RECORD; - begin - for v_item in select + for row in (select item_id from cr_items where - content_type = ''pm_task'' + content_type = 'pm_task') LOOP - PERFORM pm_task__delete_task_item(v_item.item_id); + pm_task.delete_task_item(row.item_id); end loop; - - return 0; end; -' language 'plpgsql'; +/ +show errors -select inline_0(); -drop function inline_0(); - -- unregister content_types from folder -create function inline_0 () -returns integer as ' declare v_folder_id cr_folders.folder_id%TYPE; v_item_id cr_items.item_id%TYPE; - v_item_cursor RECORD; begin - -- delete all contents of projects folder - FOR v_item_cursor IN - select + FOR row IN + (select item_id from cr_items where - content_type = ''pm_task'' + content_type = 'pm_task') LOOP - PERFORM pm_project__delete_task_item(v_item_cursor.item_id); + pm_task.delete_task_item(row.item_id); END LOOP; - -- this table must not hold reference to ''pm_tasks'' type - delete from cr_folder_type_map where content_type = ''pm_tasks''; - - return 0; + -- this table must not hold reference to 'pm_tasks' type + delete from cr_folder_type_map where content_type = 'pm_tasks'; end; -' language 'plpgsql'; +/ +show errors -select inline_0(); -drop function inline_0(); -- unregister content_types from folder -create function inline_0 () -returns integer as ' declare v_folder_id cr_folders.folder_id%TYPE; v_item_id cr_items.item_id%TYPE; - v_item_cursor RECORD; begin - -- delete all contents of projects folder - FOR v_item_cursor IN - select + FOR row IN + (select item_id from cr_items where - content_type = ''pm_project'' + content_type = 'pm_project') LOOP - PERFORM pm_project__delete_project_item(v_item_cursor.item_id); + pm_project.delete_project_item(row.item_id); END LOOP; - - return 0; end; -' language 'plpgsql'; +/ +show errors -select inline_0(); -drop function inline_0(); -- unregister content_types from folder -create function inline_0 () -returns integer as ' declare v_folder_id cr_folders.folder_id%TYPE; v_item_id cr_items.item_id%TYPE; - v_item_cursor RECORD; begin - - FOR v_item_cursor IN - select folder_id from cr_folders where description=''Project Repository'' + FOR row IN + (select folder_id from cr_folders where description='Project Repository' ) LOOP - PERFORM content_folder__unregister_content_type ( - v_item_cursor.folder_id, -- folder_id - ''pm_project'', -- content_type - ''t'' -- include_subtypes + content_folder.unregister_content_type ( + row.folder_id, -- folder_id + 'pm_project', -- content_type + 't' -- include_subtypes ); - PERFORM content_folder__delete(v_item_cursor.folder_id); + content_folder.del(row.folder_id); END LOOP; - -- this table must not hold reference to ''pm_project'' type - delete from cr_folder_type_map where content_type = ''pm_project''; - - return 0; + -- this table must not hold reference to 'pm_project' type + delete from cr_folder_type_map where content_type = 'pm_project'; end; -' language 'plpgsql'; +/ +show errors -select inline_0(); -drop function inline_0(); - -- task dependency types -drop table pm_task_dependency_types cascade; -drop table pm_task_dependency cascade; +drop table pm_task_dependency_types cascade constraints; +drop table pm_task_dependency cascade constraints; drop sequence pm_task_dependency_seq; drop sequence pm_tasks_number_seq; -select content_type__drop_attribute ('pm_task', 'end_date', 't'); -select content_type__drop_attribute ('pm_task', 'percent_complete', 't'); -select content_type__drop_attribute ('pm_task', 'estimated_hours_work', 't'); -select content_type__drop_attribute ('pm_task', 'estimated_hours_work_min', 't'); -select content_type__drop_attribute ('pm_task', 'estimated_hours_work_max', 't'); -select content_type__drop_attribute ('pm_task', 'actual_hours_worked', 't'); -select content_type__drop_attribute ('pm_task', 'earliest_start', 't'); -select content_type__drop_attribute ('pm_task', 'earliest_finish', 't'); -select content_type__drop_attribute ('pm_task', 'latest_start', 't'); -select content_type__drop_attribute ('pm_task', 'latest_finish', 't'); +begin +content_type.drop_attribute ('pm_task', 'end_date', 't'); +content_type.drop_attribute ('pm_task', 'percent_complete', 't'); +content_type.drop_attribute ('pm_task', 'estimated_hours_work', 't'); +content_type.drop_attribute ('pm_task', 'estimated_hours_work_min', 't'); +content_type.drop_attribute ('pm_task', 'estimated_hours_work_max', 't'); +content_type.drop_attribute ('pm_task', 'actual_hours_worked', 't'); +content_type.drop_attribute ('pm_task', 'earliest_start', 't'); +content_type.drop_attribute ('pm_task', 'earliest_finish', 't'); +content_type.drop_attribute ('pm_task', 'latest_start', 't'); +content_type.drop_attribute ('pm_task', 'latest_finish', 't'); +end; +/ +show errors ------------- -- WORKGROUPS @@ -161,22 +135,22 @@ drop sequence pm_process_task_seq; drop sequence pm_process_task_dependency_seq; -drop table pm_process_task_assignment; -drop table pm_process_task_dependency; -drop table pm_process_task; -drop table pm_process; +drop table pm_process_task_assignment cascade constraints; +drop table pm_process_task_dependency cascade constraints; +drop table pm_process_task cascade constraints; +drop table pm_process cascade constraints; --------- -- OTHERS --------- -drop table pm_default_roles; -drop table pm_project_assignment; -drop table pm_task_assignment; -drop table pm_roles; +drop table pm_default_roles cascade constraints; +drop table pm_project_assignment cascade constraints; +drop table pm_task_assignment cascade constraints; +drop table pm_roles cascade constraints; drop sequence pm_role_seq; -select drop_package('pm_task'); +drop package pm_task; ----------- @@ -188,25 +162,32 @@ -- drop package, which drops all functions created with define_function_args -select drop_package('pm_project'); +drop package pm_project; --drop table -drop table pm_projects cascade; +drop table pm_projects cascade constraints; drop sequence pm_project_status_seq; -drop table pm_project_status cascade; +drop table pm_project_status cascade constraints; drop sequence pm_task_status_seq; -drop table pm_task_status cascade; +drop table pm_task_status cascade constraints; -drop table pm_tasks cascade; -drop table pm_tasks_revisions cascade; +drop table pm_tasks cascade constraints; +drop table pm_tasks_revisions cascade constraints; -select content_type__drop_type('pm_task', 't', 'f'); +begin +content_type.drop_type('pm_task', 't', 'f'); +content_type.drop_type('pm_project', 't', 'f'); +end; +/ +show errors -select content_type__drop_type('pm_project', 't', 'f'); - +drop table pm_task_xref cascade constraints; +drop table pm_users_viewed cascade constraints; +drop sequence pm_process_instance_seq; +drop table pm_process_instance cascade constraints; -- note that the Project Repository folder is not deleted Index: openacs-4/packages/project-manager/sql/oracle/project-manager-functions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/sql/oracle/project-manager-functions-create.sql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/sql/oracle/project-manager-functions-create.sql 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/sql/oracle/project-manager-functions-create.sql 30 Nov 2005 06:47:36 -0000 1.2.2.1 @@ -392,17 +392,19 @@ p_project_id in integer , p_title in varchar2, p_description in varchar2, - p_mime_type in varchar2, + p_mime_type in varchar2, p_end_date in date, p_percent_complete in numeric, p_estimated_hours_work in numeric, p_estimated_hours_work_min in numeric, p_estimated_hours_work_max in numeric, p_status_id in integer, + p_process_instance_id in integer, p_creation_date in date default sysdate, p_creation_user in integer, p_creation_ip in varchar2, - p_package_id in integer + p_package_id in integer, + p_priority in integer ) return integer; function new_task_revision ( @@ -421,7 +423,8 @@ p_creation_date in date default sysdate, p_creation_user in integer, p_creation_ip in varchar2, - p_package_id in integer + p_package_id in integer, + p_priority in integer ) return integer; procedure delete_task_item (p_task_id in integer); @@ -456,10 +459,12 @@ p_estimated_hours_work_min in numeric, p_estimated_hours_work_max in numeric, p_status_id in integer, + p_process_instance_id in integer, p_creation_date in date default sysdate, p_creation_user in integer, p_creation_ip in varchar2, - p_package_id in integer + p_package_id in integer, + p_priority in integer ) return integer is v_item_id cr_items.item_id%TYPE; @@ -507,14 +512,14 @@ content_item.set_live_revision (v_revision_id); insert into pm_tasks ( - task_id, task_number, status) + task_id, task_number, status, process_instance) values ( - v_item_id, v_task_number, p_status_id); + v_item_id, v_task_number, p_status_id, p_process_instance_id); insert into pm_tasks_revisions ( - task_revision_id, end_date, percent_complete, estimated_hours_work, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked) + task_revision_id, end_date, percent_complete, estimated_hours_work, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked, priority) values ( - v_revision_id, p_end_date, p_percent_complete, p_estimated_hours_work, p_estimated_hours_work_min, p_estimated_hours_work_max, '0'); + v_revision_id, p_end_date, p_percent_complete, p_estimated_hours_work, p_estimated_hours_work_min, p_estimated_hours_work_max, '0', p_priority); acs_permission.grant_permission( v_revision_id, @@ -542,7 +547,8 @@ p_creation_date in date default sysdate, p_creation_user in integer, p_creation_ip in varchar2, - p_package_id in integer + p_package_id in integer, + p_priority in integer ) return integer is v_revision_id cr_revisions.revision_id%TYPE; @@ -572,9 +578,9 @@ content_item.set_live_revision (v_revision_id); insert into pm_tasks_revisions ( - task_revision_id, end_date, percent_complete, estimated_hours_work, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked) + task_revision_id, end_date, percent_complete, estimated_hours_work, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked, priority) values ( - v_revision_id, p_end_date, p_percent_complete, p_estimated_hours_work, p_estimated_hours_work_min, p_estimated_hours_work_max, p_actual_hours_worked); + v_revision_id, p_end_date, p_percent_complete, p_estimated_hours_work, p_estimated_hours_work_min, p_estimated_hours_work_max, p_actual_hours_worked, p_priority); update pm_tasks set status = p_status_id Index: openacs-4/packages/project-manager/sql/oracle/project-manager-notifications-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/sql/oracle/project-manager-notifications-create.sql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/sql/oracle/project-manager-notifications-create.sql 29 Apr 2005 17:43:36 -0000 1.1 +++ openacs-4/packages/project-manager/sql/oracle/project-manager-notifications-create.sql 30 Nov 2005 06:47:36 -0000 1.1.2.1 @@ -13,18 +13,19 @@ impl_id := acs_sc_impl.new ( impl_contract_name => 'NotificationType', impl_name => 'pm_task_notif_type', - impl_owner_name => 'project-manager' + impl_pretty_name => 'pm_task_notif_type', + impl_owner_name => 'project-manager' ); - v_foo := acs_sc_impl_alias.new ( + v_foo := acs_sc_impl.new_alias ( impl_contract_name => 'NotificationType', impl_name => 'pm_task_notif_type', impl_operation_name => 'GetURL', impl_alias => 'pm::task::get_url', impl_pl => 'TCL' ); - v_foo := acs_sc_impl_alias.new ( + v_foo := acs_sc_impl.new_alias ( impl_contract_name => 'NotificationType', impl_name => 'pm_task_notif_type', impl_operation_name => 'ProcessReply', @@ -38,15 +39,13 @@ ); v_foo:= notification_type.new ( - type_id => NULL, sc_impl_id => impl_id, short_name => 'pm_task_notif', pretty_name => 'Task Notification', description => 'Notifications of task changes', creation_date => sysdate , creation_user => null, - creation_ip => null, - context_id => NULL + creation_ip => null ); -- enable the various intervals and delivery methods Index: openacs-4/packages/project-manager/sql/oracle/project-manager-notifications-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/sql/oracle/project-manager-notifications-drop.sql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/sql/oracle/project-manager-notifications-drop.sql 29 Apr 2005 17:43:36 -0000 1.1 +++ openacs-4/packages/project-manager/sql/oracle/project-manager-notifications-drop.sql 30 Nov 2005 06:47:36 -0000 1.1.2.1 @@ -10,83 +10,77 @@ -- Jade in turn lifted this from gwong and ben. -- -create function inline_0 () -returns integer as ' -declare - row record; begin - for row in select nt.type_id + for row in (select nt.type_id from notification_types nt - where nt.short_name in (''pm_task_notif'') + where nt.short_name in ('pm_task_notif')) loop - perform notification_type__delete(row.type_id); + notification_type.del(row.type_id); end loop; +end; +/ +show errors - return null; -end;' language 'plpgsql'; -select inline_0(); -drop function inline_0 (); - -- -- Service contract drop stuff was missing - Roberto Mello -- -create function inline_0() returns integer as ' declare - impl_id integer; v_foo integer; + v_impl_id integer; begin - -- the notification type impl - impl_id := acs_sc_impl__get_id ( - ''NotificationType'', -- impl_contract_name - ''pm_task_notif_type'' -- impl_name + v_impl_id := acs_sc_impl.get_id ( + 'NotificationType', -- impl_contract_name + 'pm_task_notif_type' -- impl_name ); - PERFORM acs_sc_binding__delete ( - ''NotificationType'', - ''pm_task_notif_type'' - ); - - v_foo := acs_sc_impl_alias__delete ( - ''NotificationType'', -- impl_contract_name - ''pm_task_notif_type'', -- impl_name - ''GetURL'' -- impl_operation_name - ); - - v_foo := acs_sc_impl_alias__delete ( - ''NotificationType'', -- impl_contract_name - ''pm_task_notif_type'', -- impl_name - ''ProcessReply'' -- impl_operation_name - ); - - select into v_foo type_id + select type_id into v_foo from notification_types - where sc_impl_id = impl_id - and short_name = ''pm_task_notif''; + where sc_impl_id = v_impl_id + and short_name = 'pm_task_notif'; - perform notification_type__delete (v_foo); - delete from notification_types_intervals where type_id = v_foo and interval_id in ( select interval_id from notification_intervals - where name in (''instant'',''hourly'',''daily'') + where name in ('instant','hourly','daily') ); delete from notification_types_del_methods where type_id = v_foo and delivery_method_id in ( select delivery_method_id from notification_delivery_methods - where short_name in (''email'') + where short_name in ('email') ); - return (0); -end; -' language 'plpgsql'; + notification_type.del (v_foo); -select inline_0(); -drop function inline_0(); + acs_sc_binding.del ( + contract_name => 'NotificationType', + impl_name => 'pm_task_notif_type' + ); + + v_foo := acs_sc_impl.delete_alias ( + 'NotificationType', -- impl_contract_name + 'pm_task_notif_type', -- impl_name + 'GetURL' -- impl_operation_name + ); + + v_foo := acs_sc_impl.delete_alias ( + 'NotificationType', -- impl_contract_name + 'pm_task_notif_type', -- impl_name + 'ProcessReply' -- impl_operation_name + ); + + acs_sc_impl.del( + 'NotificationType', + 'pm_task_notif_type' + ); + +end; +/ +show errors Index: openacs-4/packages/project-manager/sql/oracle/project-manager-table-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/sql/oracle/project-manager-table-create.sql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/sql/oracle/project-manager-table-create.sql 29 Apr 2005 17:43:36 -0000 1.1 +++ openacs-4/packages/project-manager/sql/oracle/project-manager-table-create.sql 30 Nov 2005 06:47:36 -0000 1.1.2.1 @@ -98,7 +98,10 @@ sort_order integer, is_observer_p char(1) default 'f' constraint pm_role_is_observer_ck - check (is_observer_p in ('t','f')) + check (is_observer_p in ('t','f')), + is_lead_p char(1) default 'f' + constraint pm_role_is_lead_ck + check (is_lead_p in ('t','f')) ); @@ -156,6 +159,166 @@ '; +-- PROCESSES + +create sequence pm_process_seq; + +create table pm_process ( + process_id integer + constraint pm_process_id_pk + primary key, + one_line varchar(200) + constraint pm_process_one_line_nn + not null, + description varchar(1000), + party_id integer + constraint pm_process_party_fk + references parties + constraint pm_process_party_nn + not null, + creation_date date, + deleted_p char(1) default 'f' + constraint pm_process_deleted_p_ck + check (deleted_p in ('t','f')) +); + +comment on table pm_process is ' + Processes are a set of templates for tasks, so that people can + create sets of tasks quickly. Their structure needs to match that of + tasks. The process holds the meta information, and is also an identifier + that is used by the user to select which process they''d like to copy or + use +'; + +create or replace view +pm_process_active as + SELECT * FROM pm_process where deleted_p = 'f'; + +-- each time a process is used, it creates an instance of that process +-- we use this to allow a user to see overviews of process status, etc.. + +create sequence pm_process_instance_seq start with 1; + +create table pm_process_instance ( + instance_id integer + constraint pm_process_instance_id_pk + primary key, + name varchar(200), + process_id integer + constraint pm_process_instance_process_fk + references pm_process on delete cascade, + project_item_id integer + constraint pm_process_project_fk + references cr_items +); + + +create sequence pm_process_task_seq; + +create table pm_process_task ( + process_task_id integer + constraint pm_process_task_id_pk + primary key, + process_id integer + constraint pm_process_process_id_fk + references + pm_process + constraint pm_process_process_id_nn + not null, + one_line varchar(200) + constraint pm_process_task_one_line_nn + not null, + description varchar(4000), + mime_type varchar(200) default 'text/plain' + constraint pm_process_task_mime_type_fk + references cr_mime_types(mime_type), + -- dates are optional, because it may be computed in reference + -- to all other items, or simply not have a deadline + -- percent complete is always 0 + estimated_hours_work numeric, + -- PERT charts require minimum and maximum estimates + -- these are optionally used + estimated_hours_work_min numeric, + estimated_hours_work_max numeric, + ordering integer +); + +comment on table pm_process_task is ' + A template for the tasks that will be created by the process +'; + + +-- DEPENDENCIES + +-- dependency types +-- such as: +-- cannot start until Task X finishes +-- cannot start until Task X begins +-- cannot finish until Task X finishes +-- cannot finish until Task X begins + +create table pm_task_dependency_types ( + short_name varchar(100) + constraint pm_task_const_sn_pk + primary key, + description varchar(1000) +); + +insert into pm_task_dependency_types (short_name, description) values ('start_before_start','Starts before this starts'); +insert into pm_task_dependency_types (short_name, description) values ('start_before_finish','Starts before this finishes'); +insert into pm_task_dependency_types (short_name, description) values ('finish_before_start','Finishes before this starts'); +insert into pm_task_dependency_types (short_name, description) values ('finish_before_finish','Finishes before this finishes'); + +create sequence pm_process_task_dependency_seq; + +create table pm_process_task_dependency ( + dependency_id integer + constraint pm_proc_task_dependcy_pk + primary key, + process_task_id integer + constraint pm_proc_task_proc_task_fk + references pm_process_task + on delete cascade, + parent_task_id integer + constraint pm_proc_task_parent_id_fk + references pm_process_task + on delete cascade, + dependency_type varchar(100) + constraint pm_process_task_dep_type + references pm_task_dependency_types, + constraint pm_proc_task_depend_uq + unique (process_task_id, parent_task_id) +); + +comment on table pm_process_task_dependency is ' + Keeps track of dependencies. Used to create the dependencies in the + new tasks. +'; + +create table pm_process_task_assignment ( + process_task_id integer + constraint pm_proc_task_assign_task_fk + references pm_process_task(process_task_id) + on delete cascade, + role_id integer + constraint pm_proc_task_assign_role_fk + references pm_roles, + party_id integer + constraint pm_proc_task_assign_party_fk + references parties(party_id) + on delete cascade, + constraint pm_proc_task_assgn_uq + unique (process_task_id, role_id, party_id) +); + + +comment on table pm_process_task_assignment is ' + Maps who is assigned to process tasks. These will be the default people + assigned to the new tasks +'; + + + -- TASKS -- we create two tables to store task information @@ -196,12 +359,16 @@ references pm_task_status, deleted_p char(1) default 'f' constraint pm_tasks_deleted_p_ck - check (deleted_p in ('t','f')) + check (deleted_p in ('t','f')), + process_instance integer + constraint pm_tasks_process_instance_fk + references + pm_process_instance ); CREATE OR REPLACE view pm_tasks_active as - SELECT task_id, task_number, status FROM pm_tasks where deleted_p = 'f'; + SELECT task_id, task_number, status, process_instance FROM pm_tasks where deleted_p = 'f'; create table pm_tasks_revisions ( @@ -234,7 +401,9 @@ earliest_start date, earliest_finish date, latest_start date, - latest_finish date + latest_finish date, + -- How important is this task + priority integer default 0 ); -- create the content type @@ -389,28 +558,6 @@ ); --- DEPENDENCIES - --- dependency types --- such as: --- cannot start until Task X finishes --- cannot start until Task X begins --- cannot finish until Task X finishes --- cannot finish until Task X begins - -create table pm_task_dependency_types ( - short_name varchar(100) - constraint pm_task_const_sn_pk - primary key, - description varchar(1000) -); - -insert into pm_task_dependency_types (short_name, description) values ('start_before_start','Starts before this starts'); -insert into pm_task_dependency_types (short_name, description) values ('start_before_finish','Starts before this finishes'); -insert into pm_task_dependency_types (short_name, description) values ('finish_before_start','Finishes before this starts'); -insert into pm_task_dependency_types (short_name, description) values ('finish_before_finish','Finishes before this finishes'); - - create sequence pm_task_dependency_seq; create table pm_task_dependency ( @@ -438,8 +585,9 @@ ); --- WORKGROUPS +-- WORKGROUPS: currently not used + create sequence pm_workgroup_seq; create table pm_workgroup ( @@ -493,6 +641,8 @@ Maps who is a part of what task, and in what capacity '; +-- TASK CROSS REFERENCES + create table pm_task_xref ( task_id_1 integer constraint pm_task_xref_task1_nn @@ -514,113 +664,6 @@ '; --- PROCESSES - -create sequence pm_process_seq; - -create table pm_process ( - process_id integer - constraint pm_process_id_pk - primary key, - one_line varchar(200) - constraint pm_process_one_line_nn - not null, - description varchar(1000), - party_id integer - constraint pm_process_party_fk - references parties - constraint pm_process_party_nn - not null, - creation_date date -); - -comment on table pm_process is ' - Processes are a set of templates for tasks, so that people can - create sets of tasks quickly. Their structure needs to match that of - tasks. The process holds the meta information, and is also an identifier - that is used by the user to select which process they''d like to copy or - use -'; - -create sequence pm_process_task_seq; - -create table pm_process_task ( - process_task_id integer - constraint pm_process_task_id_pk - primary key, - process_id integer - constraint pm_process_process_id_fk - references - pm_process - constraint pm_process_process_id_nn - not null, - one_line varchar(200) - constraint pm_process_task_one_line_nn - not null, - description varchar(4000), - -- dates are optional, because it may be computed in reference - -- to all other items, or simply not have a deadline - -- percent complete is always 0 - estimated_hours_work numeric, - -- PERT charts require minimum and maximum estimates - -- these are optionally used - estimated_hours_work_min numeric, - estimated_hours_work_max numeric, - ordering integer -); - -comment on table pm_process_task is ' - A template for the tasks that will be created by the process -'; - -create sequence pm_process_task_dependency_seq; - -create table pm_process_task_dependency ( - dependency_id integer - constraint pm_proc_task_dependcy_pk - primary key, - process_task_id integer - constraint pm_proc_task_proc_task_fk - references pm_process_task - on delete cascade, - parent_task_id integer - constraint pm_proc_task_parent_id_fk - references pm_process_task - on delete cascade, - dependency_type varchar(100) - constraint pm_process_task_dep_type - references pm_task_dependency_types, - constraint pm_proc_task_depend_uq - unique (process_task_id, parent_task_id) -); - -comment on table pm_process_task_dependency is ' - Keeps track of dependencies. Used to create the dependencies in the - new tasks. -'; - -create table pm_process_task_assignment ( - process_task_id integer - constraint pm_proc_task_assign_task_fk - references pm_process_task(process_task_id) - on delete cascade, - role_id integer - constraint pm_proc_task_assign_role_fk - references pm_roles, - party_id integer - constraint pm_proc_task_assign_party_fk - references parties(party_id) - on delete cascade, - constraint pm_proc_task_assgn_uq - unique (process_task_id, role_id, party_id) -); - - -comment on table pm_process_task_assignment is ' - Maps who is assigned to process tasks. These will be the default people - assigned to the new tasks -'; - create table pm_users_viewed ( viewing_user integer constraint pm_usrs_viewed_viewing_user_fk Index: openacs-4/packages/project-manager/tcl/calendar-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/calendar-procs-oracle.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/calendar-procs-oracle.xql 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/calendar-procs-oracle.xql 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -1,70 +1,78 @@ - - - - - - oracle8.0 +oracle9.2 + + + + SELECT + viewed_user + FROM + pm_users_viewed + WHERE + viewing_user = :user_id + + + - SELECT ts.task_id, - ts.task_id as item_id, - ts.task_number, - t.task_revision_id, - t.title, - t.parent_id as project_item_id, - to_char(t.earliest_start,'J') as earliest_start_j, - to_char(sysdate,'J') as today_j, - to_char(t.latest_start,'J') as latest_start_j, - to_char(t.latest_finish,'J') as latest_finish_j, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - t.percent_complete, - t.estimated_hours_work, - t.estimated_hours_work_min, - t.estimated_hours_work_max, - case when t.actual_hours_worked is null then 0 - else t.actual_hours_worked end as actual_hours_worked, - to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, - to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - p.first_names || ' ' || p.last_name || ' (' || - substr(r.one_line,1,1) || ')' as full_name, - p.person_id, - s.status_type as status, - r.is_lead_p, - projectr.title as project_name - FROM pm_tasks_active ts, - pm_task_status s, - cr_items i, - pm_tasks_revisionsx t, - pm_roles r, - persons p, - pm_task_assignment ta, - cr_items projecti, - cr_revisions projectr - WHERE ta.role_id = r.role_id (+) and - t.item_id = ta.task_id (+) and - ta.party_id = p.person_id (+) and - ta.role_id = r.role_id and - ts.status = s.status_id and - ts.task_id = t.item_id and - i.item_id = t.item_id and - t.task_revision_id = i.live_revision and - t.latest_start >= :first_of_month_date and - t.latest_start <= :last_of_month_date and - t.parent_id = projecti.item_id and - projecti.live_revision = projectr.revision_id - $hide_closed_clause - $selected_users_clause + SELECT + ts.task_id, + ts.task_id as item_id, + ts.task_number, + t.task_revision_id, + t.title, + t.parent_id as project_item_id, + to_char(t.earliest_start,'J') as earliest_start_j, + to_char(current_timestamp,'J') as today_j, + to_char(t.latest_start,'J') as latest_start_j, + to_char(t.latest_finish,'J') as latest_finish_j, + to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + t.percent_complete, + t.estimated_hours_work, + t.estimated_hours_work_min, + t.estimated_hours_work_max, + case when t.actual_hours_worked is null then 0 + else t.actual_hours_worked end as actual_hours_worked, + to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, + to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, + to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + p.first_names || ' ' || p.last_name || ' (' || + substr(r.one_line, 1, 1) || ')' as full_name, + p.person_id, + s.status_type as status, + r.is_lead_p, + projectr.title as project_name + FROM + pm_tasks_active ts, + pm_task_status s, + cr_items i, + pm_tasks_revisionsx t + LEFT JOIN pm_task_assignment ta + ON t.item_id = ta.task_id + LEFT JOIN persons p + ON ta.party_id = p.person_id + LEFT JOIN pm_roles r + ON ta.role_id = r.role_id, + cr_items projecti, + cr_revisions projectr + WHERE + ts.status = s.status_id and + ts.task_id = t.item_id and + i.item_id = t.item_id and + t.task_revision_id = i.live_revision and + t.latest_start >= :first_of_month_date and + t.latest_start <= :last_of_month_date and + t.parent_id = projecti.item_id and + projecti.live_revision = projectr.revision_id + $hide_closed_clause + $selected_users_clause ORDER BY - t.latest_start, ts.task_id, r.role_id, p.first_names, p.last_name + t.latest_start, ts.task_id, r.role_id, p.first_names, p.last_name - Index: openacs-4/packages/project-manager/tcl/calendar-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/calendar-procs-postgresql.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/calendar-procs-postgresql.xql 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/calendar-procs-postgresql.xql 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -1,13 +1,9 @@ - - - - - - postgresql7.3 +postgresql7.3 + SELECT @@ -68,5 +64,4 @@ - Index: openacs-4/packages/project-manager/tcl/calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/calendar-procs.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/calendar-procs.tcl 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/calendar-procs.tcl 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -27,14 +27,7 @@ } { set user_id [ad_conn user_id] - set user_list [db_list get_users { - SELECT - viewed_user - FROM - pm_users_viewed - WHERE - viewing_user = :user_id - }] + set user_list [db_list get_users {}] if {[empty_string_p $user_list]} { return $user_id Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/calendar-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/tcl/install-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/install-procs-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/tcl/install-procs-oracle.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/tcl/install-procs-oracle.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,8 +1,9 @@ - postgresql7.1 +oracle9.2 + select pm_project.get_root_folder(:package_id,'t') from dual Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/process-procs-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/tcl/process-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/process-procs.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/process-procs.tcl 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/process-procs.tcl 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -49,19 +49,9 @@ } { if {[llength $process_task_id] > 1} { - db_dml delete_assignments " - DELETE FROM - pm_process_task_assignment - WHERE - process_task_id in ([join $process_task_id ", "]) - " + db_dml delete_assignments {} } else { - db_dml delete_assignments { - DELETE FROM - pm_process_task_assignment - WHERE - process_task_id = :process_task_id - } + db_dml delete_assignment {} } return @@ -89,17 +79,7 @@ @error } { - db_dml add_assignment { - INSERT INTO - pm_process_task_assignment - (process_task_id, - role_id, - party_id) - VALUES - (:process_task_id, - :role_id, - :party_id) - } + db_dml add_assignment {} return } @@ -122,15 +102,9 @@ } { if {[llength $process_task_id] > 1} { - db_dml delete_dependency " - DELETE FROM pm_process_task_dependency - WHERE process_task_id in ([join $process_task_id ", "]) - " + db_dml delete_dependencies {} } else { - db_dml delete_dependency { - DELETE FROM pm_process_task_dependency - WHERE process_task_id = :process_task_id - } + db_dml delete_dependency {} } return @@ -159,12 +133,7 @@ } { set dependency_id [db_nextval pm_task_dependency_seq] - db_dml add_dependency { - INSERT INTO pm_process_task_dependency - (dependency_id, process_task_id, parent_task_id, dependency_type) - VALUES - (:dependency_id, :process_task_id, :parent_task_id, :dependency_type_id) - } + db_dml add_dependency {} return } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/process-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/tcl/project-manager-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-manager-procs-oracle.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/project-manager-procs-oracle.xql 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/project-manager-procs-oracle.xql 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -1,44 +1,47 @@ - - - - - - - - oracle - 8.0 - - - + +oracle9.2 + + - SELECT t.name as cat_name, - t.category_id as cat_id, - tm.tree_id, - tt.name as tree_name - FROM category_tree_map tm, - categories c, - category_translations t, - category_tree_translations tt - WHERE c.tree_id = tm.tree_id and - c.category_id = t.category_id and - tm.object_id = :package_id and - tm.tree_id = tt.tree_id and - c.deprecated_p = 'f' - ORDER BY tt.name, - t.name + select content_item.get_latest_revision(:comment_id) as revision_id from dual - + - SELECT package_id - FROM cr_folders - WHERE description = 'Project Repository' + update cr_revisions + set content = empty_blob() + where revision_id = :revision_id + returning content into :1 - + + + begin + :1 := acs_message.new ( + message_id => :comment_id, + reply_to => NULL, + sent_date => current_timestamp, + sender => NULL, + rfc822_id => NULL, + title => :title, + description => NULL, + mime_type => :mime_type, + text => NULL, + data => empty_blob(), + parent_id => 0, + context_id => :object_id, + creation_user => :user_id, + creation_ip => :peeraddr, + object_type => 'acs_message', + is_live => :is_live + ); + end; + + + Index: openacs-4/packages/project-manager/tcl/project-manager-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-manager-procs-postgresql.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/project-manager-procs-postgresql.xql 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/project-manager-procs-postgresql.xql 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -1,57 +1,43 @@ - - - - - - - - postgresql - 7.3 - - - + postgresql7.3 + + - SELECT - t.name as cat_name, - t.category_id as cat_id, - tm.tree_id, - tt.name as tree_name - FROM - category_tree_map tm, - categories c, - category_translations t, - category_tree_translations tt - WHERE - c.tree_id = tm.tree_id and - c.category_id = t.category_id and - tm.object_id = :package_id and - tm.tree_id = tt.tree_id and - c.deprecated_p = 'f' - ORDER BY - tt.name, - t.name + select content_item__get_latest_revision(:comment_id) as revision_id - + - SELECT DISTINCT - p.first_names || ' ' || p.last_name as name, - p.person_id - FROM - persons p, - acs_rels r, - membership_rels mr - WHERE - r.object_id_one = :user_group_id and - mr.rel_id = r.rel_id and - p.person_id = r.object_id_two and - member_state = 'approved' - ORDER BY name + update cr_revisions + set content = :comment + where revision_id = :revision_id - + + + + select acs_message__new ( + :comment_id, -- 1 p_message_id + NULL, -- 2 p_reply_to + current_timestamp, -- 3 p_sent_date + NULL, -- 4 p_sender + NULL, -- 5 p_rfc822_id + :title, -- 6 p_title + NULL, -- 7 p_description + :mime_type, -- 8 p_mime_type + NULL, -- 9 p_text + NULL, -- empty_blob() -- 10 p_data + 0, -- 11 p_parent_id + :object_id, -- 12 p_context_id + :user_id, -- 13 p_creation_user + :peeraddr, -- 14 p_creation_ip + 'acs_message', -- 15 p_object_type + :is_live -- 16 p_is_live + ) + + + Index: openacs-4/packages/project-manager/tcl/project-manager-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-manager-procs.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/project-manager-procs.tcl 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/project-manager-procs.tcl 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -377,48 +377,14 @@ set comment_id [db_nextval acs_object_id_seq] db_transaction { - db_exec_plsql insert_comment { - select acs_message__new ( - :comment_id, -- 1 p_message_id - NULL, -- 2 p_reply_to - current_timestamp, -- 3 p_sent_date - NULL, -- 4 p_sender - NULL, -- 5 p_rfc822_id - :title, -- 6 p_title - NULL, -- 7 p_description - :mime_type, -- 8 p_mime_type - NULL, -- 9 p_text - NULL, -- empty_blob() -- 10 p_data - 0, -- 11 p_parent_id - :object_id, -- 12 p_context_id - :user_id, -- 13 p_creation_user - :peeraddr, -- 14 p_creation_ip - 'acs_message', -- 15 p_object_type - :is_live -- 16 p_is_live - ) - } + db_exec_plsql insert_comment {} - db_dml add_entry { - insert into general_comments - (comment_id, - object_id, - category) - values - (:comment_id, - :object_id, - null) - } + db_dml add_entry {} - db_1row get_revision { - select content_item__get_latest_revision(:comment_id) as revision_id - } + db_1row get_revision {} + + db_dml set_content {} -blobs [list $comment] - db_dml set_content { - update cr_revisions - set content = :comment - where revision_id = :revision_id - } - if {![empty_string_p $user_id]} { permission::grant \ -object_id $comment_id \ @@ -447,7 +413,7 @@ set to_address $assignees - set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"] + set from_address [db_string get_from_email {}] set task_url [pm::task::get_url $object_id] @@ -479,7 +445,7 @@ set to_address $assignees - set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"] + set from_address [db_string get_from_email {}] set project_url [pm::project::url \ -project_item_id $object_id] @@ -675,15 +641,7 @@ @error } { - return [db_string get_package_id { - SELECT - package_id - FROM - cr_folders - WHERE - description = 'Project Repository' - LIMIT 1 - }] + return [db_string get_package_id {}] } Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/project-manager-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/tcl/project-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-procs-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/tcl/project-procs-oracle.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/tcl/project-procs-oracle.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,26 +1,9 @@ - oracle8.0 - - - SELECT live_revision - FROM cr_items - WHERE item_id = :project_item_id - - +oracle9.2 - - - SELECT i.item_id - FROM cr_items i, - cr_revisions r - WHERE i.item_id = r.item_id and - r.revision_id = :project_id - - - select status_id @@ -39,138 +22,12 @@ - - - begin - :1 := pm_project.new_project_item ( - p_project_name => :project_name, - p_project_code => :project_code, - p_parent_id => :parent_id, - p_goal => :goal, - p_description => :description, - p_mime_type => :mime_type, - p_planned_start_date => to_date(:planned_start_date,'YYYY MM DD HH24 MI SS'), - p_planned_end_date => to_date(:planned_end_date,'YYYY MM DD HH24 MI SS'), - p_actual_start_date => null, - p_actual_end_date => null, - p_logger_project => :logger_project, - p_ongoing_p => :ongoing_p, - p_status_id => :status_id, - p_customer_id => :organization_id, - p_creation_user => :creation_user, - p_creation_ip => :creation_ip, - p_package_id => :package_id - ); - end; - - - - - - SELECT i.item_id, - i.content_type - FROM cr_items i, - pm_tasks_active t - WHERE i.item_id = t.task_id and - i.parent_id = :project_item_id - - - - - - select sum(t.actual_hours_worked) as actual_hours_completed, - sum(t.estimated_hours_work) as estimated_hours_total, - to_char(current_timestamp,'J') as today_j - from pm_tasks_revisionsx t, - cr_items i, - pm_tasks_active a - where i.item_id = a.task_id and - t.item_id in ([join $task_list ", "]) and - i.live_revision = t.revision_id - - - - - - SELECT case when t.actual_hours_worked is null then 0 - else t.actual_hours_worked end as worked, - t.estimated_hours_work as to_work, - t.item_id as my_iid, - to_char(end_date,'J') as task_deadline_j, - to_char(earliest_start,'J') as old_earliest_start_j, - to_char(earliest_finish,'J') as old_earliest_finish_j, - to_char(latest_start,'J') as old_latest_start_j, - to_char(latest_finish,'J') as old_latest_finish_j, - t.percent_complete as my_percent_complete, - s.status_type - from pm_tasks_revisionsx t, - cr_items i, - pm_tasks_active ti, - pm_task_status s - where t.item_id in ([join $task_list ", "]) and - i.live_revision = t.revision_id and - i.item_id = ti.task_id and - ti.status = s.status_id - - - - - - SELECT d.dependency_id, - d.task_id as task_item_id, - d.parent_task_id, - d.dependency_type - FROM pm_task_dependency d - WHERE d.task_id in ([join $task_list ", "]) - - - - - - SELECT to_char(planned_start_date,'J') as start_date_j, - to_char(planned_end_date,'J') as end_date_j, - ongoing_p - FROM pm_projects - WHERE project_id = (select live_revision from cr_items where item_id = :project_item_id) - - - - - - UPDATE pm_projects - SET actual_hours_completed = :actual_hours_completed, - estimated_hours_total = :estimated_hours_total, - earliest_finish_date = :max_earliest_finish, - latest_finish_date = :min_latest_start - WHERE project_id = (select live_revision from cr_items where item_id = :project_item_id) - - - - - - select parent_id - from cr_items - where item_id = :my_item_id - - - select pm_project.get_root_folder (:package_id, 'f') from dual - - - UPDATE pm_tasks_revisions - SET earliest_start = :es, - earliest_finish = :ef, - latest_start = :ls, - latest_finish = :lf - WHERE task_revision_id = (select live_revision from cr_items where item_id = :task_item) - - - SELECT @@ -180,8 +37,60 @@ WHERE project_id = :project_item_id and party_id = :party_id - LIMIT 1 + and rownum = 1 + + + select pm_project.new_project_revision ( + :project_item_id, + :project_name, + :project_code, + :parent_id, + :goal, + :description, + to_timestamp(:planned_start_date,'YYYY MM DD HH24 MI SS'), + to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'), + null, + null, + :logger_project, + :ongoing_p, + :status_id, + :organization_id, + now(), + :creation_user, + :creation_ip, + :package_id + ) from dual + + + + + + begin + :1 := pm_project.new_project_item ( + :project_name, + :project_code, + :parent_id, + :goal, + :description, + :mime_type, + to_timestamp(:planned_start_date,'YYYY MM DD HH24 MI SS'), + to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'), + null, + null, + :logger_project, + :ongoing_p, + :status_id, + :organization_id, + current_timestamp, + :creation_user, + :creation_ip, + :package_id + ); + end; + + + Index: openacs-4/packages/project-manager/tcl/project-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-procs-postgresql.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/tcl/project-procs-postgresql.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/tcl/project-procs-postgresql.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -3,30 +3,6 @@ postgresql7.3 - - - SELECT - live_revision - FROM - cr_items - WHERE - item_id = :project_item_id - - - - - - SELECT - i.item_id - FROM - cr_items i, - cr_revisions r - WHERE - i.item_id = r.item_id and - r.revision_id = :project_id - - - select status_id @@ -45,18 +21,50 @@ - + - INSERT INTO - pm_task_logger_proj_map - (task_item_id, - logger_entry) - VALUES - (:task_item_id, - :entry_id) + select pm_project__get_root_folder (:package_id, 'f') + + + SELECT + party_id + FROM + pm_project_assignment + WHERE + project_id = :project_item_id and + party_id = :party_id + LIMIT 1 + + + + + + select pm_project__new_project_revision ( + :project_item_id, + :project_name, + :project_code, + :parent_id, + :goal, + :description, + to_timestamp(:planned_start_date,'YYYY MM DD HH24 MI SS'), + to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'), + null, + null, + :logger_project, + :ongoing_p, + :status_id, + :organization_id, + now(), + :creation_user, + :creation_ip, + :package_id + ) + + + select pm_project__new_project_item ( @@ -78,171 +86,8 @@ :creation_user, :creation_ip, :package_id - ); + ) - - - SELECT - i.item_id, - i.content_type - FROM - cr_items i, - pm_tasks_active t - WHERE - i.item_id = t.task_id and - i.parent_id = :project_item_id - - - - - - select - sum(t.actual_hours_worked) as actual_hours_completed, - sum(t.estimated_hours_work) as estimated_hours_total, - to_char(current_timestamp,'J') as today_j - from - pm_tasks_revisionsx t, - cr_items i, - pm_tasks_active a - where - i.item_id = a.task_id and - t.item_id in ([join $task_list ", "]) and - i.live_revision = t.revision_id - - - - - - SELECT - case when t.actual_hours_worked is null then 0 - else t.actual_hours_worked end as worked, - t.estimated_hours_work as to_work, - t.item_id as my_iid, - to_char(end_date,'J') as task_deadline_j, - to_char(earliest_start,'J') as old_earliest_start_j, - to_char(earliest_finish,'J') as old_earliest_finish_j, - to_char(latest_start,'J') as old_latest_start_j, - to_char(latest_finish,'J') as old_latest_finish_j, - t.percent_complete as my_percent_complete, - s.status_type - from - pm_tasks_revisionsx t, - cr_items i, - pm_tasks_active ti, - pm_task_status s - where - t.item_id in ([join $task_list ", "]) and - i.live_revision = t.revision_id and - i.item_id = ti.task_id and - ti.status = s.status_id - - - - - - select - d.dependency_id, - d.task_id as task_item_id, - d.parent_task_id, - d.dependency_type - from - pm_task_dependency d - where - d.task_id in ([join $task_list ", "]) - - - - - - select - to_char(planned_start_date,'J') as start_date_j, - to_char(planned_end_date,'J') as end_date_j, - ongoing_p - from - pm_projects - where - project_id = (select live_revision from cr_items where item_id = :project_item_id) - - - - - - update - pm_projects - set - actual_hours_completed = :actual_hours_completed, - estimated_hours_total = :estimated_hours_total, - earliest_finish_date = :max_earliest_finish, - latest_finish_date = :min_latest_start - where - project_id = (select live_revision from cr_items where item_id = :project_item_id) - - - - - - select - parent_id - from - cr_items - where - item_id = :my_item_id - - - - - - select pm_project__get_root_folder (:package_id, 'f') - - - - - - update - pm_tasks_revisions - set - earliest_start = :es, - earliest_finish = :ef, - latest_start = :ls, - latest_finish = :lf - where - task_revision_id = (select live_revision from cr_items where item_id = :task_item) - - - - - - SELECT - case when o.name is null then p.title else p.title || ' (' || o.name || ')' end, - p.item_id - FROM pm_projectsx p - LEFT JOIN - organizations o - ON p.customer_id = o.organization_id, - cr_items i, - pm_project_status s - WHERE - p.project_id = i.live_revision and - s.status_id = p.status_id and - s.status_type = 'o' - ORDER BY - lower(p.title), lower(o.name) - - - - - - SELECT - party_id - FROM - pm_project_assignment - WHERE - project_id = :project_item_id and - party_id = :party_id - LIMIT 1 - - - Index: openacs-4/packages/project-manager/tcl/project-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-procs.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/project-procs.tcl 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/project-procs.tcl 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -326,28 +326,7 @@ -project_lead $creation_user \ -active_p $active_p - set returnval [db_exec_plsql update_project " - select pm_project__new_project_revision ( - :project_item_id, - :project_name, - :project_code, - :parent_id, - :goal, - :description, - to_timestamp(:planned_start_date,'YYYY MM DD HH24 MI SS'), - to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'), - null, - null, - :logger_project, - :ongoing_p, - :status_id, - :organization_id, - now(), - :creation_user, - :creation_ip, - :package_id - ); - "] + set returnval [db_exec_plsql update_project ""] return $returnval } @@ -1436,8 +1415,6 @@ } } - set max_earliest_finish "J[expr floor([set max_earliest_finish])]" - set min_latest_start "J[expr floor([set min_latest_start])]" } @@ -1452,25 +1429,25 @@ foreach task_item $task_list { if {[exists_and_not_null earliest_start($task_item)]} { - set es "J[expr ceil( [set earliest_start($task_item)])]" + set es [set earliest_start($task_item)] } else { set es "" } if {[exists_and_not_null earliest_finish($task_item)]} { - set ef "J[expr ceil( [set earliest_finish($task_item)])]" + set ef [set earliest_finish($task_item)] } else { set ef "" } if {[exists_and_not_null latest_start($task_item)]} { - set ls "J[expr floor([set latest_start($task_item)])]" + set ls [set latest_start($task_item)] } else { set ls "" } if {[exists_and_not_null latest_finish($task_item)]} { - set lf "J[expr floor($latest_finish($task_item))]" + set lf $latest_finish($task_item) } else { set lf "" } @@ -1552,15 +1529,7 @@ @error returns no_project if no such project_item_id exists } { - return [db_string get_logger_project " - SELECT - logger_project - FROM - pm_projects - WHERE - project_id = - (select live_revision from cr_items where item_id = :project_item_id) - " -default "no_project"] + return [db_string get_logger_project "" -default "no_project"] } @@ -1578,14 +1547,7 @@ @error } { - return [db_string get_logger_project " - SELECT - i.item_id - FROM - pm_projectsx p, cr_items i - WHERE - i.live_revision = p.revision_id and logger_project = :logger_project - " -default "no_project"] + return [db_string get_logger_project "" -default "no_project"] } @@ -1669,14 +1631,7 @@ set closed_id [pm::status::default_closed] - db_dml update_status { - UPDATE - pm_projects - SET - status_id = :closed_id - WHERE - project_id in (select live_revision from cr_items where item_id = :project_item_id) - } + db_dml update_status {} } @@ -1695,19 +1650,7 @@ @error } { - set return_val [db_string get_open_or_closed { - SELECT - case when status_type = 'c' then 0 else 1 end - FROM - pm_projectsx p, - cr_items i, - pm_project_status s - WHERE - i.item_id = p.item_id and - i.live_revision = p.revision_id and - p.status_id = s.status_id and - p.item_id = :project_item_id - } -default "0"] + set return_val [db_string get_open_or_closed {} -default "0"] return $return_val } @@ -1735,12 +1678,7 @@ @error } { - db_dml insert_assignment { - insert into pm_project_assignment - (project_id, role_id, party_id) - VALUES - (:project_item_id, :role_id, :party_id) - } + db_dml insert_assignment {} # Flush the cache that remembers which roles to offer the current user in the 'assign role to myself' listbox util_memoize_flush [list pm::role::project_select_list_filter_not_cached -project_item_id $project_item_id -party_id $party_id] @@ -1792,13 +1730,7 @@ @error } { - db_dml remove_assignment { - DELETE FROM - pm_project_assignment - WHERE - project_id = :project_item_id and - party_id = :party_id - } + db_dml remove_assignment {} # Flush the cache that remembers which roles to offer the current user in the 'assign role to myself' listbox if {[ad_conn user_id == $party_id]} { @@ -1824,21 +1756,9 @@ @error } { - set current_assignees [db_list get_assignees { - SELECT - party_id - FROM - pm_project_assignment - WHERE - project_id = :project_item_id - }] + set current_assignees [db_list get_assignees {}] - db_dml remove_assignment { - DELETE FROM - pm_project_assignment - WHERE - project_id = :project_item_id - } + db_dml remove_assignment {} # Flush the cache that remembers which roles to offer the current user in the 'assign role to myself' listbox util_memoize_flush [list pm::role::project_select_list_filter_not_cached -project_item_id $project_item_id -party_id [ad_conn user_id]] @@ -1882,23 +1802,7 @@ @error } { - return [db_list_of_lists get_people { -SELECT - distinct(first_names || ' ' || last_name) as fullname, - u.person_id - FROM - persons u, - pm_project_assignment a, - pm_projects p, - cr_items i - WHERE - u.person_id = a.party_id and - i.item_id = a.project_id and - p.status_id = :status_id and - i.live_revision = p.project_id - ORDER BY - fullname - }] + return [db_list_of_lists get_people {}] } @@ -1917,16 +1821,7 @@ @error } { - return [db_list get_addresses { - SELECT - p.email - FROM - parties p, - pm_project_assignment a - WHERE - a.project_id = :project_item_id and - a.party_id = p.party_id - }] + return [db_list get_addresses {}] } @@ -1949,16 +1844,7 @@ @error } { - return [db_0or1row assigned_p { - SELECT - party_id - FROM - pm_project_assignment - WHERE - project_id = :project_item_id and - party_id = :party_id - LIMIT 1 - }] + return [db_0or1row assigned_p {}] } @@ -1977,16 +1863,7 @@ @error } { - return [db_string get_name { - SELECT - title - FROM - cr_revisions p, - cr_items i - WHERE - i.live_revision = p.revision_id - and i.item_id = :project_item_id - } -default ""] + return [db_string get_name {} -default ""] } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/project-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/tcl/role-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/role-procs-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/tcl/role-procs-oracle.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/tcl/role-procs-oracle.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,8 +1,9 @@ - oracle8.0 +oracle9.2 + SELECT role_id @@ -12,12 +13,53 @@ - + SELECT one_line || ' (' || substr(one_line,1,1) || ')' as one_line, role_id FROM pm_roles ORDER BY role_id + + + + SELECT + one_line || ' (' || substr(one_line, 1, 1) || ')' as one_line, + role_id + FROM + pm_roles r + WHERE NOT EXISTS + (SELECT 1 + FROM + pm_project_assignment pa + WHERE + r.role_id = pa.role_id and + pa.project_id = :project_item_id and + pa.party_id = :party_id) + ORDER BY + role_id + + + + + + SELECT + one_line || ' (' || substr(one_line, 1, 1) || ')' as one_line, + role_id + FROM + pm_roles r + WHERE NOT EXISTS + (SELECT 1 + FROM + pm_task_assignment ta + WHERE + r.role_id = ta.role_id and + ta.task_id = :task_item_id and + ta.party_id = :party_id) + ORDER BY + role_id + + + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/role-procs-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/tcl/role-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/role-procs.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/role-procs.tcl 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/role-procs.tcl 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -25,7 +25,7 @@ @error -1 if there is an error. } { - set returnval [db_string get_default "select role_id from pm_roles limit 1" -default "-1"] + set returnval [db_string get_default {} -default "-1"] return $returnval } @@ -54,14 +54,7 @@ @error } { - return [db_list_of_lists get_roles " - SELECT - one_line || ' (' || substring(one_line from 1 for 1) || ')' as one_line, - role_id - FROM - pm_roles - ORDER BY - role_id"] + return [db_list_of_lists get_roles ""] } @@ -131,22 +124,7 @@ @error } { - return [db_list_of_lists get_roles " - SELECT - one_line || ' (' || substring(one_line from 1 for 1) || ')' as one_line, - role_id - FROM - pm_roles as r - WHERE NOT EXISTS - (SELECT 1 - FROM - pm_project_assignment as pa - WHERE - r.role_id = pa.role_id and - pa.project_id = :project_item_id and - pa.party_id = :party_id) - ORDER BY - role_id"] + return [db_list_of_lists get_roles ""] } @@ -218,22 +196,7 @@ @error } { - return [db_list_of_lists get_roles " - SELECT - one_line || ' (' || substring(one_line from 1 for 1) || ')' as one_line, - role_id - FROM - pm_roles as r - WHERE NOT EXISTS - (SELECT 1 - FROM - pm_task_assignment as ta - WHERE - r.role_id = ta.role_id and - ta.task_id = :task_item_id and - ta.party_id = :party_id) - ORDER BY - role_id"] + return [db_list_of_lists get_roles ""] } @@ -299,12 +262,5 @@ @error } { - return [db_string get_one_line { - SELECT - one_line - FROM - pm_roles - WHERE - role_id = :role_id - } -default "error"] + return [db_string get_one_line {} -default "error"] } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/role-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/status-procs-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/status-procs-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/tcl/status-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/status-procs.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/status-procs.tcl 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/status-procs.tcl 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -27,14 +27,7 @@ @error } { - set return_val [db_string get_open_p { - SELECT - case when status_type = 'c' then 'f' else 't' end - FROM - pm_task_status - WHERE - status_id = :task_status_id - }] + set return_val [db_string get_open_p {}] return $return_val } @@ -53,15 +46,7 @@ @error } { - set return_val [db_string get_closed_status { - SELECT - status_id - FROM - pm_project_status - WHERE - status_type = 'c' - LIMIT 1 - }] + set return_val [db_string get_closed_status {}] return $return_val } @@ -80,15 +65,7 @@ @error } { - set return_val [db_string get_open_status { - SELECT - status_id - FROM - pm_project_status - WHERE - status_type = 'o' - LIMIT 1 - }] + set return_val [db_string get_open_status {}] return $return_val } @@ -120,5 +97,5 @@ @error } { - return [db_list_of_lists get_status "select description, status_id from pm_project_status order by status_type desc, description"] + return [db_list_of_lists get_status {}] } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/tcl/status-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/tcl/task-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/task-procs-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/tcl/task-procs-oracle.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/tcl/task-procs-oracle.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,46 +1,9 @@ - oracle8.0 - - - SELECT i.item_id - FROM cr_items i, - cr_revisions r - WHERE i.item_id = r.item_id and - r.revision_id = :task_id - - +oracle9.2 - - - SELECT live_revision - FROM cr_items i - WHERE i.item_id = :task_item_id - - - - - - select status - from pm_tasks - where task_id = :task_item_id - - - - - - SELECT case when status_type = 'c' - then 0 - else 1 end as open_p - FROM pm_tasks t, - pm_task_status s - WHERE task_id = :task_item_id and - t.status = s.status_id - - - select status_id @@ -59,24 +22,6 @@ - - - SELECT r.item_id, - r.title as task_title - FROM pm_tasks_revisionsx r, - cr_items i, - pm_tasks t, - pm_task_status s - WHERE r.parent_id = :project_item_id and - r.revision_id = i.live_revision and - i.item_id = t.task_id and - t.status = s.status_id and - s.status_type = 'o' - $union_clause - ORDER BY task_title - - - begin @@ -93,10 +38,11 @@ p_estimated_hours_work_max => :estimated_hours_work_max, p_actual_hours_worked => :actual_hours_worked, p_status_id => :status_id, - p_creation_date => sysdate , + p_creation_date => current_timestamp , p_creation_user => :update_user, p_creation_ip => :update_ip, - p_package_id => :package_id); + p_package_id => :package_id, + p_priority => :priority); end; @@ -115,12 +61,27 @@ p_estimated_hours_work_min => :estimated_hours_work_min, p_estimated_hours_work_max => :estimated_hours_work_max, p_status_id => :status_id, + p_process_instance_id => :process_instance_id, p_creation_date => :creation_date, p_creation_user => :creation_user, p_creation_ip => :creation_ip, - p_package_id => :package_id); + p_package_id => :package_id, + p_priority => :priority); end; + + + SELECT + party_id + FROM + pm_task_assignment + WHERE + task_id = :task_item_id and + party_id = :party_id and + rownum = 1 + + + 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.1 -r1.1.2.1 --- openacs-4/packages/project-manager/tcl/task-procs-postgresql.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/tcl/task-procs-postgresql.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -3,65 +3,6 @@ postgresql7.3 - - - SELECT - r.title - FROM - cr_items i, - cr_revisions r - WHERE - i.item_id = r.item_id and - i.item_id = :task_item_id and - i.live_revision = r.revision_id - - - - - - SELECT - i.item_id - FROM - cr_items i, - cr_revisions r - WHERE - i.item_id = r.item_id and - r.revision_id = :task_id - - - - - - SELECT - live_revision - FROM - cr_items i - WHERE - i.item_id = :task_item_id - - - - - - select status - from pm_tasks - where task_id = :task_item_id - - - - - - SELECT - case when status_type = 'c' then 0 else 1 end as open_p - FROM - pm_tasks t, - pm_task_status s - WHERE - task_id = :task_item_id and - t.status = s.status_id - - - select status_id @@ -80,100 +21,6 @@ - - - DELETE FROM - pm_task_dependency - WHERE - task_id = :task_item_id - - - - - - SELECT - task.item_id as t_item_id - FROM - cr_items task, - cr_items project - WHERE - task.parent_id = project.item_id and - project.item_id = :project_item_id - - - - - - SElECT - d.task_id as dep_task, - d.parent_task_id as dep_task_parent - FROM - pm_task_dependency d - WHERE - d.task_id in ([join $project_tasks ", "]) - - - - - - INSERT INTO - pm_task_dependency - (dependency_id, - task_id, - parent_task_id, - dependency_type) - values - (:dependency_id, - :task_item_id, - :parent_id, - 'finish_before_start') - - - - - - SELECT - r.item_id, - r.title as task_title - FROM - pm_tasks_revisionsx r, - cr_items i, - pm_tasks t, - pm_task_status s - WHERE - r.parent_id = :project_item_id and - r.revision_id = i.live_revision and - i.item_id = t.task_id and - t.status = s.status_id and - s.status_type = 'o' - $union_clause - ORDER BY - task_title - - - - - - SELECT - r.item_id, - r.title as task_title - FROM - pm_tasks_revisionsx r, - cr_items i, - pm_tasks t, - pm_task_status s - WHERE - r.parent_id = :project_item_id and - r.revision_id = i.live_revision and - i.item_id = t.task_id and - t.status = s.status_id and - s.status_type = 'o' - $union_clause - ORDER BY - task_title - - - select pm_task__new_task_revision ( @@ -197,23 +44,6 @@ - - - UPDATE - logger_entries - SET - project_id = :logger_project - WHERE - entry_id in - (select - logger_entry - from - pm_task_logger_proj_map - where - task_item_id = :task_item_id) - - - select pm_task__new_task_item ( @@ -236,150 +66,17 @@ - - + - SELECT - p.email as from_address, - p2.first_names || ' ' || p2.last_name as mod_username - FROM - parties p, - persons p2 - WHERE - p.party_id = :user_id and - p.party_id = p2.person_id - - - - - SELECT - t.title as subject, - t.description, - t.mime_type as description_mime_type, - to_char(t.earliest_start,'MM-DD-YYYY') as earliest_start, - to_char(t.earliest_finish,'MM-DD-YYYY') as earliest_finish, - to_char(t.latest_start,'MM-DD-YYYY') as latest_start, - to_char(t.latest_finish,'MM-DD-YYYY') as latest_finish, - t.estimated_hours_work as work, - t.estimated_hours_work_min as work_min, - t.estimated_hours_work_max as work_max, - t.percent_complete, - p.title as project_name, - t.parent_id as project_item_id, - a.process_instance + party_id FROM - pm_tasks_revisionsx t, - pm_tasks_active a, - cr_items i, - cr_items project, - pm_projectsx p - WHERE - t.item_id = :task_item_id and - t.item_id = a.task_id and - t.revision_id = i.live_revision and - t.item_id = i.item_id and - t.parent_id = project.item_id and - project.item_id = p.item_id and - project.live_revision = p.revision_id - - - - - - SELECT - p.email as to_address, - r.one_line as role, - r.is_lead_p - FROM - pm_task_assignment a, - parties p, - pm_roles r - WHERE - task_id = :task_item_id and - a.party_id = p.party_id and - a.role_id = r.role_id - - - - - - - SELECT - t.title as one_line, - t.description, - t.mime_type as description_mime_type, - t.estimated_hours_work as estimated_hours_work, - t.estimated_hours_work_min as estimated_hours_work_min, - t.estimated_hours_work_max as estimated_hours_work_max, - t.percent_complete, - to_char(t.end_date, 'DD') as end_date_day, - to_char(t.end_date, 'MM') as end_date_month, - to_char(t.end_date, 'YYYY') as end_date_year, - d.parent_task_id, - i.item_id as tid, - t.parent_id as project, - t.priority - FROM - pm_tasks_revisionsx t, - cr_items i - LEFT JOIN - pm_task_dependency d - ON i.item_id = d.task_id - WHERE - t.revision_id = i.live_revision and - t.item_id = i.item_id - $task_where_clause - - - - - - - SELECT - party_id, - role_id - FROM pm_task_assignment WHERE - task_id = :task_item_id + task_id = :task_item_id and + party_id = :party_id + LIMIT 1 - - - - UPDATE - pm_tasks - SET - status = :status_code - WHERE - task_id = :task_item_id - - - - - - UPDATE - pm_tasks - SET - status = :status_code - WHERE - task_id = :task_item_id - - - - - - SELECT - p.first_names || ' ' || p.last_name - FROM - pm_task_assignment a, - persons p - WHERE - task_id = :task_item_id and - a.party_id = p.person_id - - - 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.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/task-procs.tcl 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/task-procs.tcl 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -769,7 +769,7 @@ @error No error thrown if there is no such task. } { - db_dml mark_delete "update pm_tasks set deleted_p = 't' where task_id = :task_item_id" + db_dml mark_delete {} pm::project::compute_status [pm::task::project_item_id -task_item_id $task_item_id] @@ -791,7 +791,7 @@ @error } { - return [db_string get_project_id "select parent_id from cr_items where item_id = :task_item_id" -default -1] + return [db_string get_project_id "" -default -1] } @@ -800,7 +800,7 @@ object_id } { - set package_id [db_string pm_package_id "select package_id from cr_folders cf, cr_items ci1, cr_items ci2 where cf.folder_id = ci1.parent_id and ci1.item_id = ci2.parent_id and ci2.item_id = :object_id"] + set package_id [db_string pm_package_id ""] set url "[ad_url]" append url [site_node::get_url_from_object_id -object_id $package_id] @@ -909,20 +909,11 @@ } - set total_logged_hours [db_string total_hours " - select sum(le.value) from logger_entries le where entry_id in (select logger_entry from pm_task_logger_proj_map where task_item_id = :task_item_id) and le.variable_id = '[logger::variable::get_default_variable_id]' - " -default "0"] + set total_logged_hours [db_string total_hours "" -default "0"] if {[string is true $update_tasks_p]} { - db_dml update_current_task { - UPDATE - pm_tasks_revisions - SET - actual_hours_worked = :total_logged_hours - WHERE - task_revision_id = :task_revision_id - } + db_dml update_current_task {} } return $total_logged_hours @@ -952,19 +943,9 @@ # do nothing ns_log Notice "Project-manager: Cannot link a task to itself!" } elseif {$task_item_id_1 < $task_item_id_2} { - db_dml link_tasks " - INSERT INTO - pm_task_xref - (task_id_1, task_id_2) - VALUES - (:task_item_id_1, :task_item_id_2)" + db_dml link_tasks1 {} } else { - db_dml link_tasks " - INSERT INTO - pm_task_xref - (task_id_1, task_id_2) - VALUES - (:task_item_id_2, :task_item_id_1)" + db_dml link_tasks2 {} } } @@ -1045,24 +1026,9 @@ db_transaction { # make sure we avoid case when that assignment has already # been made. - db_dml delete_assignment { - delete from - pm_task_assignment - where - task_id = :task_item_id and - party_id = :party_id - } + db_dml delete_assignment {} - db_dml add_assignment { - insert into pm_task_assignment - (task_id, - role_id, - party_id) - values - (:task_item_id, - :role_id, - :party_id) - } + db_dml add_assignment {} } # Flush the cache that remembers which roles to offer the current user in the 'assign role to myself' listbox @@ -1145,7 +1111,7 @@ # also don't send reminders on weekends. - set today_j [db_string get_today "select to_char(current_timestamp,'J')"] + set today_j [db_string get_today {}] if {![pm::project::is_workday_p $today_j]} { return } @@ -1155,49 +1121,7 @@ # what if the person assigned is no longer a part of the subsite? # right now, we still email them. - db_foreach get_all_open_tasks { - SELECT - ts.task_id, - ts.task_id as item_id, - ts.task_number, - t.task_revision_id, - t.title, - to_char(t.earliest_start,'J') as earliest_start_j, - to_char(current_timestamp,'J') as today_j, - to_char(t.latest_start,'J') as latest_start_j, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - t.percent_complete, - t.estimated_hours_work, - t.estimated_hours_work_min, - t.estimated_hours_work_max, - case when t.actual_hours_worked is null then 0 - else t.actual_hours_worked end as actual_hours_worked, - to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, - to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - p.first_names || ' ' || p.last_name as full_name, - p.party_id, - (select one_line from pm_roles r where ta.role_id = r.role_id) as role - FROM - pm_tasks_active ts, - pm_tasks_revisionsx t, - pm_task_assignment ta, - acs_users_all p, - cr_items i, - pm_task_status s - WHERE - ts.task_id = t.item_id and - i.item_id = t.item_id and - t.task_revision_id = i.live_revision and - ts.status = s.status_id and - s.status_type = 'o' and - t.item_id = ta.task_id and - ta.party_id = p.party_id - ORDER BY - t.latest_start asc - } { + db_foreach get_all_open_tasks {} { set earliest_start_pretty [lc_time_fmt $earliest_start "%x"] set earliest_finish_pretty [lc_time_fmt $earliest_finish "%x"] set latest_start_pretty [lc_time_fmt $latest_start "%x"] @@ -1238,7 +1162,7 @@ foreach party $parties { set subject "Daily Task status report" - set address [db_string get_email "select email from parties where party_id = :party" -default "jade-errors@bread.com"] + set address [db_string get_email "" -default "nobody@nowhere.com"] set overdue [list] set pressing [list] @@ -1560,19 +1484,7 @@ @error } { - db_dml update_percent { - UPDATE - pm_tasks_revisions - SET - percent_complete = :percent_complete - WHERE - task_revision_id = (select - live_revision - from - cr_items - where - item_id = :task_item_id) - } + db_dml update_percent {} if {$percent_complete >= 100} { @@ -1794,16 +1706,7 @@ @error } { - return [db_list get_addresses { - SELECT - p.email - FROM - parties p, - pm_task_assignment a - WHERE - a.task_id = :task_item_id and - a.party_id = p.party_id - }] + return [db_list get_addresses {}] } @@ -1844,20 +1747,7 @@ @error } { - return [db_list_of_lists get_people " - SELECT - distinct(first_names || ' ' || last_name) as fullname, - u.person_id - FROM - persons u, - pm_task_assignment a, - pm_tasks_active ts - WHERE - u.person_id = a.party_id and - ts.task_id = a.task_id and - ts.status = :status_id - ORDER BY - fullname"] + return [db_list_of_lists get_people ""] } Index: openacs-4/packages/project-manager/tcl/task-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/task-procs.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/tcl/task-procs.xql 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/tcl/task-procs.xql 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -26,17 +26,510 @@ - + SELECT - party_id + r.title FROM - pm_task_assignment + cr_items i, + cr_revisions r WHERE + i.item_id = r.item_id and + i.item_id = :task_item_id and + i.live_revision = r.revision_id + + + + + + SELECT + i.item_id + FROM + cr_items i, + cr_revisions r + WHERE + i.item_id = r.item_id and + r.revision_id = :task_id + + + + + + SELECT + live_revision + FROM + cr_items i + WHERE + i.item_id = :task_item_id + + + + + + select status + from pm_tasks + where task_id = :task_item_id + + + + + + SELECT + case when status_type = 'c' then 0 else 1 end as open_p + FROM + pm_tasks t, + pm_task_status s + WHERE task_id = :task_item_id and - party_id = :party_id - LIMIT 1 + t.status = s.status_id + + + DELETE FROM + pm_task_dependency + WHERE + task_id = :task_item_id + + + + + + SELECT + task.item_id as t_item_id + FROM + cr_items task, + cr_items project + WHERE + task.parent_id = project.item_id and + project.item_id = :project_item_id + + + + + + SElECT + d.task_id as dep_task, + d.parent_task_id as dep_task_parent + FROM + pm_task_dependency d + WHERE + d.task_id in ([join $project_tasks ", "]) + + + + + + INSERT INTO + pm_task_dependency + (dependency_id, + task_id, + parent_task_id, + dependency_type) + values + (:dependency_id, + :task_item_id, + :parent_id, + 'finish_before_start') + + + + + + SELECT + r.item_id, + r.title as task_title + FROM + pm_tasks_revisionsx r, + cr_items i, + pm_tasks t, + pm_task_status s + WHERE + r.parent_id = :project_item_id and + r.revision_id = i.live_revision and + i.item_id = t.task_id and + t.status = s.status_id and + s.status_type = 'o' + $union_clause + ORDER BY + task_title + + + + + + SELECT + r.item_id, + r.title as task_title + FROM + pm_tasks_revisionsx r, + cr_items i, + pm_tasks t, + pm_task_status s + WHERE + r.parent_id = :project_item_id and + r.revision_id = i.live_revision and + i.item_id = t.task_id and + t.status = s.status_id and + s.status_type = 'o' + $union_clause + ORDER BY + task_title + + + + + + UPDATE + logger_entries + SET + project_id = :logger_project + WHERE + entry_id in + (select + logger_entry + from + pm_task_logger_proj_map + where + task_item_id = :task_item_id) + + + + + + SELECT + p.email as from_address, + p2.first_names || ' ' || p2.last_name as mod_username + FROM + parties p, + persons p2 + WHERE + p.party_id = :user_id and + p.party_id = p2.person_id + + + + + + SELECT + t.title as subject, + t.description, + t.mime_type as description_mime_type, + to_char(t.earliest_start,'MM-DD-YYYY') as earliest_start, + to_char(t.earliest_finish,'MM-DD-YYYY') as earliest_finish, + to_char(t.latest_start,'MM-DD-YYYY') as latest_start, + to_char(t.latest_finish,'MM-DD-YYYY') as latest_finish, + t.estimated_hours_work as work, + t.estimated_hours_work_min as work_min, + t.estimated_hours_work_max as work_max, + t.percent_complete, + p.title as project_name, + t.parent_id as project_item_id, + a.process_instance + FROM + pm_tasks_revisionsx t, + pm_tasks_active a, + cr_items i, + cr_items project, + pm_projectsx p + WHERE + t.item_id = :task_item_id and + t.item_id = a.task_id and + t.revision_id = i.live_revision and + t.item_id = i.item_id and + t.parent_id = project.item_id and + project.item_id = p.item_id and + project.live_revision = p.revision_id + + + + + + SELECT + p.email as to_address, + r.one_line as role, + r.is_lead_p + FROM + pm_task_assignment a, + parties p, + pm_roles r + WHERE + task_id = :task_item_id and + a.party_id = p.party_id and + a.role_id = r.role_id + + + + + + SELECT + party_id, + role_id + FROM + pm_task_assignment + WHERE + task_id = :task_item_id + + + + + + + UPDATE + pm_tasks + SET + status = :status_code + WHERE + task_id = :task_item_id + + + + + + UPDATE + pm_tasks + SET + status = :status_code + WHERE + task_id = :task_item_id + + + + + + SELECT + p.first_names || ' ' || p.last_name + FROM + pm_task_assignment a, + persons p + WHERE + task_id = :task_item_id and + a.party_id = p.person_id + + + + + + update pm_tasks set deleted_p = 't' where task_id = :task_item_id + + + + + + select parent_id from cr_items where item_id = :task_item_id + + + + + + SELECT sum(le.value) + FROM logger_entries le + WHERE entry_id in + (select logger_entry + from pm_task_logger_proj_map + where task_item_id = :task_item_id) + AND le.variable_id = '[logger::variable::get_default_variable_id]' + + + + + + UPDATE + pm_tasks_revisions + SET + actual_hours_worked = :total_logged_hours + WHERE + task_revision_id = :task_revision_id + + + + + + INSERT INTO + pm_task_xref + (task_id_1, task_id_2) + VALUES + (:task_item_id_1, :task_item_id_2) + + + + + + INSERT INTO + pm_task_xref + (task_id_1, task_id_2) + VALUES + (:task_item_id_2, :task_item_id_1) + + + + + + delete from + pm_task_assignment + where + task_id = :task_item_id and + party_id = :party_id + + + + + + insert into pm_task_assignment + (task_id, + role_id, + party_id) + values + (:task_item_id, + :role_id, + :party_id) + + + + + + select email from parties where party_id = :party + + + + + + UPDATE + pm_tasks_revisions + SET + percent_complete = :percent_complete + WHERE + task_revision_id = (select + live_revision + from + cr_items + where + item_id = :task_item_id) + + + + + + SELECT + p.email + FROM + parties p, + pm_task_assignment a + WHERE + a.task_id = :task_item_id and + a.party_id = p.party_id + + + + + + SELECT + distinct(first_names || ' ' || last_name) as fullname, + u.person_id + FROM + persons u, + pm_task_assignment a, + pm_tasks_active ts + WHERE + u.person_id = a.party_id and + ts.task_id = a.task_id and + ts.status = :status_id + ORDER BY + fullname + + + + + + SELECT + t.title as one_line, + t.description, + t.mime_type as description_mime_type, + t.estimated_hours_work as estimated_hours_work, + t.estimated_hours_work_min as estimated_hours_work_min, + t.estimated_hours_work_max as estimated_hours_work_max, + t.percent_complete, + to_char(t.end_date, 'DD') as end_date_day, + to_char(t.end_date, 'MM') as end_date_month, + to_char(t.end_date, 'YYYY') as end_date_year, + d.parent_task_id, + i.item_id as tid, + t.parent_id as project, + t.priority + FROM + pm_tasks_revisionsx t, + cr_items i + LEFT JOIN + pm_task_dependency d + ON i.item_id = d.task_id + WHERE + t.revision_id = i.live_revision and + t.item_id = i.item_id + $task_where_clause + + + + + + select to_char(current_timestamp,'J') from dual + + + + + + SELECT + ts.task_id, + ts.task_id as item_id, + ts.task_number, + t.task_revision_id, + t.title, + to_char(t.earliest_start,'J') as earliest_start_j, + to_char(current_timestamp,'J') as today_j, + to_char(t.latest_start,'J') as latest_start_j, + to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + t.percent_complete, + t.estimated_hours_work, + t.estimated_hours_work_min, + t.estimated_hours_work_max, + case when t.actual_hours_worked is null then 0 + else t.actual_hours_worked end as actual_hours_worked, + to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, + to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, + to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + p.first_names || ' ' || p.last_name as full_name, + p.party_id, + (select one_line from pm_roles r where ta.role_id = r.role_id) as role + FROM + pm_tasks_active ts, + pm_tasks_revisionsx t, + pm_task_assignment ta, + acs_users_all p, + cr_items i, + pm_task_status s + WHERE + ts.task_id = t.item_id and + i.item_id = t.item_id and + t.task_revision_id = i.live_revision and + ts.status = s.status_id and + s.status_type = 'o' and + t.item_id = ta.task_id and + ta.party_id = p.party_id + ORDER BY + t.latest_start asc + + + + + + select package_id + from cr_folders cf, cr_items ci1, cr_items ci2 + where cf.folder_id = ci1.parent_id + and ci1.item_id = ci2.parent_id + and ci2.item_id = :object_id + + + Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/add-edit-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/add-edit-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/add-edit-2.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/add-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/add-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/add-edit.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/add-edit.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/add-edit.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -109,7 +109,7 @@ {customer_id:text(select),optional {label "Customer"} - {options {{"--- TBD ---" ""} [db_list_of_lists get_customer "select o.name, o.organization_id from organizations o order by o.name"]}} + {options {{"--- TBD ---" ""} [db_list_of_lists get_customer {}]}} } {planned_start_date:text(text) Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/add-edit.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/calendar-users-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/calendar-users-update.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/calendar-users-update.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/calendar-users-update.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -22,20 +22,10 @@ } db_transaction { - db_dml delete_old_user_list { - DELETE FROM - pm_users_viewed - WHERE - viewing_user = :user_id - } + db_dml delete_old_user_list {} foreach party $party_id { - db_dml add_user_to_view { - INSERT INTO - pm_users_viewed - (viewing_user, viewed_user) values - (:user_id, :party) - } + db_dml add_user_to_view {} } } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/calendar-users-update.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/Attic/index-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/index-oracle.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/www/index-oracle.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,62 +1,7 @@ - oracle8.0 - - - SELECT - p.item_id as project_item_id, - p.project_id, - p.parent_id as folder_id, - p.object_type as content_type, - p.title as project_name, - p.project_code, - 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, - c.category_id, - c.category_name, - p.earliest_finish_date - sysdate as days_to_earliest_finish, - p.latest_finish_date - sysdate as days_to_latest_finish, - p.actual_hours_completed, - p.estimated_hours_total, - 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, - case when o.name is null then '--no customer--' else o.name - end as customer_name, - o.organization_id as customer_id - FROM pm_projectsx p - LEFT JOIN pm_project_assignment pa - ON p.item_id = pa.project_id - LEFT JOIN organizations o ON p.customer_id = - o.organization_id - LEFT JOIN ( - select - om.category_id, - om.object_id, - t.name as category_name - from - category_object_map om, - category_translations t, - categories ctg - where - om.category_id = t.category_id and - ctg.category_id = t.category_id and - ctg.deprecated_p = 'f') - c ON p.item_id = c.object_id, - cr_items i, - cr_folders f, - pm_project_status s - WHERE - p.project_id = i.live_revision and - s.status_id = p.status_id - and i.parent_id = f.folder_id - and f.package_id = :package_id - [template::list::filter_where_clauses -and -name projects] - [template::list::orderby_clause -orderby -name projects] - - +oracle9.2 Index: openacs-4/packages/project-manager/www/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/Attic/index-postgresql.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/index-postgresql.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/www/index-postgresql.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -2,60 +2,11 @@ postgresql7.3 - - - SELECT - p.item_id as project_item_id, - p.project_id, - p.parent_id as folder_id, - p.object_type as content_type, - p.title as project_name, - p.project_code, - 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, - c.category_id, - c.category_name, - p.earliest_finish_date - current_date as days_to_earliest_finish, - p.latest_finish_date - current_date as days_to_latest_finish, - p.actual_hours_completed, - p.estimated_hours_total, - 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, - case when o.name is null then '--no customer--' else o.name - end as customer_name, - o.organization_id as customer_id - FROM pm_projectsx p - LEFT JOIN pm_project_assignment pa - ON p.item_id = pa.project_id - LEFT JOIN organizations o ON p.customer_id = - o.organization_id - LEFT JOIN ( - select - om.category_id, - om.object_id, - t.name as category_name - from - category_object_map om, - category_translations t, - categories ctg - where - om.category_id = t.category_id and - ctg.category_id = t.category_id and - ctg.deprecated_p = 'f') - c ON p.item_id = c.object_id, - cr_items i, - cr_folders f, - pm_project_status s - WHERE - p.project_id = i.live_revision and - s.status_id = p.status_id - and i.parent_id = f.folder_id - and f.package_id = :package_id - [template::list::filter_where_clauses -and -name projects] - [template::list::orderby_clause -orderby -name projects] - - + + + select pm_project__get_root_folder (:package_id, 'f') + from dual + + 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.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/index.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/index.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -62,7 +62,7 @@ set admin_p [permission::permission_p -object_id $package_id -privilege admin] # root CR folder -set root_folder [db_string get_root "select pm_project__get_root_folder (:package_id, 'f')"] +set root_folder [db_string get_root {}] # Projects, using list-builder --------------------------------- Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/index.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/log.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/one-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/one-oracle.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/www/one-oracle.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,80 +1,8 @@ - - - SELECT p.item_id, - p.project_id, - p.title as project_name, - p.project_code, - p.goal, - p.description, - p.mime_type, - to_char(p.planned_start_date,'YYYY-MM-DD HH24:MI') as planned_start_date, - to_char(p.planned_end_date,'YYYY-MM-DD HH24:MI') as planned_end_date, - p.logger_project, - p.ongoing_p, - i.live_revision, - to_char(p.estimated_finish_date,'YYYY-MM-DD HH24:MI') as estimated_finish_date, - to_char(p.earliest_finish_date,'YYYY-MM-DD HH24:MI') as earliest_finish_date, - to_char(p.latest_finish_date,'YYYY-MM-DD HH24:MI') as latest_finish_date, - p.actual_hours_completed, - p.estimated_hours_total, - p.parent_id - FROM pm_projectsx p, cr_items i - WHERE p.item_id = :project_item_id and - p.project_id = :project_id and - p.item_id = i.item_id - - +oracle9.2 - - - SELECT t.item_id as task_id, - t.title, - to_char(t.end_date,'YYYY-MM-DD HH24:MI') as end_date, - to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, - t.earliest_start - sysdate as days_to_earliest_start, - to_char(t.earliest_start,'J') as earliest_start_j, - to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, - t.earliest_finish - sysdate as days_to_earliest_finish, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - t.latest_start - sysdate as days_to_latest_start, - to_char(t.latest_start,'J') as latest_start_j, - to_char(sysdate,'J') as today_j, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - t.latest_finish - sysdate as days_to_latest_finish, - u.first_names, - u.last_name, - t.percent_complete, - d.parent_task_id, - d.dependency_type, - t.estimated_hours_work, - t.estimated_hours_work_min, - t.estimated_hours_work_max, - t.actual_hours_worked, - s.status_type, - s.description as status_description - FROM (SELECT * - FROM pm_tasks_revisionsx tk, - pm_task_assignment asg - WHERE tk.item_id = asg.task_id (+) - ) t , - persons u, - cr_items i, - pm_tasks_active ti, - pm_task_status s , - pm_task_dependency d - WHERE i.item_id = d.task_id (+) and - t.party_id = u.person_id (+) and - t.parent_id = :project_item_id and - t.revision_id = i.live_revision and - t.item_id = ti.task_id and - ti.status = s.status_id - [template::list::orderby_clause -name tasks -orderby] - - - begin @@ -83,53 +11,4 @@ - - - SELECT p.item_id, - p.project_id, - p.parent_id as folder_id, - p.object_type as content_type, - p.title as project_name, - p.project_code, - to_char(p.planned_start_date, 'Mon DD') as planned_start_date, - to_char(p.planned_end_date, 'Mon DD') as planned_end_date, - p.ongoing_p, - p.actual_hours_completed, - p.estimated_hours_total - FROM pm_projectsx p, - cr_items i - WHERE p.project_id = i.live_revision and - p.parent_id = :project_item_id - ORDER BY p.title - - - - - - SELECT a.project_id, - r.one_line as role_name, - p.first_names || ' ' || p.last_name as user_name - FROM pm_project_assignment a, - pm_roles r, - persons p - WHERE a.role_id = r.role_id and - a.party_id = p.person_id and - project_id = :project_item_id - ORDER BY r.role_id, - p.first_names, - p.last_name - - - - - - SELECT p.customer_id, - c.name as customer_name - FROM pm_projectsx p , - organizations c - WHERE p.customer_id = c.organization_id (+) and - p.project_id = :original_project_id - - - Index: openacs-4/packages/project-manager/www/one-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/one-postgresql.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/one-postgresql.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/www/one-postgresql.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,176 +1,11 @@ + postgresql7.3 - - - SELECT - p.item_id, - p.project_id, - p.title as project_name, - p.project_code, - p.goal, - p.description, - p.mime_type, - to_char(p.planned_start_date,'YYYY-MM-DD HH24:MI') as planned_start_date, - to_char(p.planned_end_date,'YYYY-MM-DD HH24:MI') as planned_end_date, - p.logger_project, - p.ongoing_p, - i.live_revision, - to_char(p.estimated_finish_date,'YYYY-MM-DD HH24:MI') as estimated_finish_date, - to_char(p.earliest_finish_date,'YYYY-MM-DD HH24:MI') as earliest_finish_date, - to_char(p.latest_finish_date,'YYYY-MM-DD HH24:MI') as latest_finish_date, - p.actual_hours_completed, - p.estimated_hours_total, - p.parent_id, - s.status_type - FROM - pm_projectsx p, - cr_items i, - pm_project_status s - WHERE - p.item_id = :project_item_id and - p.project_id = :project_id and - p.item_id = i.item_id and - p.status_id = s.status_id - - - - - - SELECT - t.item_id as task_item_id, - t.parent_id as project_item_id, - t.title, - to_char(t.end_date,'YYYY-MM-DD HH24:MI') as end_date, - to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, - t.earliest_start - current_date as days_to_earliest_start, - to_char(t.earliest_start,'J') as earliest_start_j, - to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, - t.earliest_finish - current_date as days_to_earliest_finish, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - t.latest_start - current_date as days_to_latest_start, - to_char(t.latest_start,'J') as latest_start_j, - to_char(current_date,'J') as today_j, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - t.latest_finish - current_date as days_to_latest_finish, - u.person_id, - u.first_names, - u.last_name, - t.percent_complete, - d.parent_task_id, - d.dependency_type, - t.estimated_hours_work, - t.estimated_hours_work_min, - t.estimated_hours_work_max, - t.actual_hours_worked, - s.status_type, - s.description as status_description, - r.is_lead_p, - t.priority - FROM - (select tr.item_id, - ta.party_id, - ta.role_id, - tr.title, - tr.end_date, - tr.earliest_start, - tr.earliest_finish, - tr.latest_start, - tr.latest_finish, - tr.percent_complete, - tr.estimated_hours_work, - tr.estimated_hours_work_min, - tr.estimated_hours_work_max, - tr.actual_hours_worked, - tr.parent_id, - tr.revision_id, - tr.priority - from pm_tasks_revisionsx tr - LEFT JOIN - pm_task_assignment ta ON tr.item_id = ta.task_id) t - LEFT JOIN - persons u - ON - t.party_id = u.person_id - LEFT JOIN - pm_roles r - ON t.role_id = r.role_id, - cr_items i - LEFT JOIN - pm_task_dependency d - ON - i.item_id = d.task_id, - pm_tasks_active ti, - pm_task_status s - WHERE - t.parent_id = :project_item_id and - t.revision_id = i.live_revision and - t.item_id = ti.task_id and - ti.status = s.status_id - $done_clause - [template::list::filter_where_clauses -and -name tasks] - [template::list::orderby_clause -name tasks -orderby] - - - select pm_project__get_root_folder (:package_id, 'f') - - - SELECT - p.item_id, - p.project_id, - p.parent_id as folder_id, - p.object_type as content_type, - p.title as project_name, - p.project_code, - to_char(p.planned_start_date, 'Mon DD') as planned_start_date, - to_char(p.planned_end_date, 'Mon DD') as planned_end_date, - p.ongoing_p, - p.actual_hours_completed, - p.estimated_hours_total - FROM pm_projectsx p, cr_items i - WHERE p.project_id = i.live_revision and - p.parent_id = :project_item_id - ORDER BY p.title - - - - - - SELECT - a.project_id, - r.one_line as role_name, - p.first_names || ' ' || p.last_name as user_name, - r.is_lead_p - FROM - pm_project_assignment a, - pm_roles r, - persons p - WHERE - a.role_id = r.role_id and - a.party_id = p.person_id and - project_id = :project_item_id - ORDER BY - r.role_id, p.first_names, p.last_name - - - - - - SELECT - p.customer_id, - c.name as customer_name - FROM - pm_projectsx p - LEFT JOIN organizations c ON p.customer_id = c.organization_id - WHERE - p.project_id = :original_project_id - - - Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/one.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-add-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-add-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-add-edit.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/process-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/process-delete.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/www/process-delete.tcl 30 Apr 2005 06:59:33 -0000 1.2 +++ openacs-4/packages/project-manager/www/process-delete.tcl 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -22,7 +22,7 @@ if {[string is false $confirm_p]} { - db_1row get_name "select one_line, description from pm_process where process_id = :process_id" + db_1row get_name {} set title "Delete process: $one_line" set context [list "Delete: $one_line"] Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-delete.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-dependency-add-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-dependency-add-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-dependency-add-edit.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-one-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-one-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-one.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/process-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/process-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/process-oracle.xql 29 Apr 2005 17:43:37 -0000 1.1 +++ openacs-4/packages/project-manager/www/process-oracle.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,7 +1,8 @@ -postgresql7.3 +oracle9.2 + SELECT p.process_id, Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-add-edit-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-add-edit-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/process-task-add-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/process-task-add-edit-2.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/process-task-add-edit-2.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/process-task-add-edit-2.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -117,8 +117,8 @@ set task_id [lindex $process_task_id $index] set one_line $task_title($array_index) - set desc $description($array_index) - set order $ordering($array_index) + set descr $description($array_index) + set sort_order $ordering($array_index) if {[string is true $use_days_p]} { if {[string is true $use_uncertain_completion_times_p]} { @@ -166,8 +166,8 @@ set task_id [lindex $process_task_id $index] set one_line $task_title($array_index) - set desc $description($array_index) - set order $ordering($array_index) + set descr $description($array_index) + set sort_order $ordering($array_index) if {[string is true $use_days_p]} { if {[string is true $use_uncertain_completion_times_p]} { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-add-edit-2.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-add-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-add-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/process-task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/process-task-add-edit.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/process-task-add-edit.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/process-task-add-edit.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -146,17 +146,7 @@ set process_task_id_tmp [lindex $process_task_id [expr $i-1]] # remember all the assignees for this task - db_foreach assignee_query { - SELECT - a.party_id, - a.role_id - FROM - pm_process_task_assignment a - WHERE - a.process_task_id = :process_task_id_tmp - ORDER BY - a.role_id - } { + db_foreach assignee_query {} { set assigned($process_task_id_tmp-$party_id-$role_id) 1 } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-add-edit.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-assign-add-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-assign-add-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-assign-add-edit.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-delete-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-delete-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-task-delete-2.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-use-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-use-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/process-use.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/processes-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/processes-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/processes.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/project-assign-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/project-assign-edit.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/project-assign-edit.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/project-assign-edit.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -37,42 +37,11 @@ set roles_list_of_lists [pm::role::select_list_filter] -db_foreach assignee_query { - SELECT - a.party_id, - r.role_id - FROM - pm_project_assignment a, - pm_roles r, - persons p - WHERE - a.role_id = r.role_id and - a.party_id = p.person_id and - a.project_id = :project_item_id - ORDER BY - r.role_id, - p.first_names, - p.last_name - -} { +db_foreach assignee_query {} { set assigned($party_id-$role_id) 1 } -set assignee_list_of_lists [db_list_of_lists get_assignees { - select distinct - p.first_names || ' ' || p.last_name as name, - p.person_id - FROM - persons p, - acs_rels r, - membership_rels mr - WHERE - r.object_id_one = :user_group_id and - mr.rel_id = r.rel_id and - p.person_id = r.object_id_two and - member_state = 'approved' - ORDER BY name -}] +set assignee_list_of_lists [db_list_of_lists get_assignees {}] set html "
" Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/project-assign-edit.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/project-assign-task-assignees.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/project-assign-task-assignees.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/www/project-assign-task-assignees.tcl 30 Apr 2005 06:59:34 -0000 1.2 +++ openacs-4/packages/project-manager/www/project-assign-task-assignees.tcl 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -24,17 +24,7 @@ # get all task assignments for this project -set assignments_lol [db_list_of_lists get_people { - SELECT - a.party_id, - a.role_id - FROM - pm_task_assignment a, - cr_items i - WHERE - i.parent_id = :project_item_id and - i.item_id = a.task_id -}] +set assignments_lol [db_list_of_lists get_people {}] set parties [list] Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/project-assign-task-assignees.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/project-revisions-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/project-revisions-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/project-revisions.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-add-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-add-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-add-edit.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/task-add-edit.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/task-add-edit.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -197,7 +197,7 @@ -project_item_id $this_project] set logger_variable_id [logger::project::get_primary_variable \ -project_id $logger_project] - set today_date [db_string today "select to_date(sysdate,'YYYY-MM-DD') from dual"] + set today_date [db_string today {}] set today_html$task "
y-m-d " #set end_date_html [pm::task::date_html \ @@ -316,7 +316,8 @@ # set end_date_html [pm::task::date_html] - set end_date_html "
y-m-d " +# set end_date_html "
y-m-d " +set end_date_html "" set number 1 @@ -382,7 +383,7 @@ # NEW # --- -set today_date [db_string today "select to_date(sysdate,'YYYY-MM-DD') from dual"] +set today_date [db_string today {}] # set end_date_html [pm::task::date_html] for {set i 1} {$i <= $new_tasks} {incr i} { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-add-edit.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-calendar-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/task-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-calendar.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/task-calendar.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/task-calendar.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -85,13 +85,7 @@ # make a key of list of roles and abbreviations # --------------------------------------------- -db_multirow roles roles_and_abbrevs { - SELECT - one_line as role, - substring(one_line from 1 for 1) as abbreviation - FROM - pm_roles -} +db_multirow roles roles_and_abbrevs {} # ------------------------------------- @@ -106,22 +100,7 @@ -package_id $subsite_id] -db_multirow -extend {checked_p} users users_list { - select - p.first_names || ' ' || p.last_name as name, - p.person_id as party_id - FROM - persons p, - acs_rels r, - membership_rels mr - WHERE - r.object_id_one = :user_group_id and - mr.rel_id = r.rel_id and - p.person_id = r.object_id_two and - member_state = 'approved' - ORDER BY - p.first_names, p.last_name -} { +db_multirow -extend {checked_p} users users_list {} { if {[lsearch $users_to_view $party_id] == -1} { set checked_p f } else { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-calendar.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-delete-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-delete-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-delete.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-one-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-one-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-one.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-print-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-print-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-print.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-revisions-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-revisions-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-revisions.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/task-select-project-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-select-project-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/task-select-project-oracle.xql 29 Apr 2005 17:43:38 -0000 1.1 +++ openacs-4/packages/project-manager/www/task-select-project-oracle.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,24 +1,7 @@ - - - SELECT p.item_id as project_item_id, - p.title as project_name, - p.description as description, - p.mime_type, - o.organization_id as customer_id, - o.name as customer_name - FROM pm_projectsx p LEFT JOIN organizations o on p.customer_id = o.organization_id, - cr_items i, - pm_project_status s - WHERE p.project_id = i.live_revision and - p.parent_id = :root_folder and - p.status_id = s.status_id - [template::list::filter_where_clauses -and -name projects] - [template::list::orderby_clause -orderby -name projects] - - +oracle9.2 Index: openacs-4/packages/project-manager/www/task-select-project-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-select-project-postgresql.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/task-select-project-postgresql.xql 29 Apr 2005 17:43:38 -0000 1.1 +++ openacs-4/packages/project-manager/www/task-select-project-postgresql.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,29 +1,11 @@ + postgresql7.3 - + - SELECT - p.item_id as project_item_id, - p.title as project_name, - p.description as description, - p.mime_type, - o.organization_id as customer_id, - o.name as customer_name - FROM - pm_projectsx p - LEFT JOIN - organizations o - ON - p.customer_id = o.organization_id, - cr_items i, - pm_project_status s - WHERE p.project_id = i.live_revision and - p.parent_id = :root_folder and - p.status_id = s.status_id - [template::list::filter_where_clauses -and -name projects] - [template::list::orderby_clause -orderby -name projects] + SELECT pm_project__get_root_folder (:package_id, 'f') + FROM dual - Index: openacs-4/packages/project-manager/www/task-select-project.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-select-project.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/task-select-project.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/task-select-project.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -80,7 +80,7 @@ # default, and then give you the option of selecting all projects # as an option. -set root_folder [db_string get_root "select pm_project__get_root_folder (:package_id, 'f')"] +set root_folder [db_string get_root {}] template::list::create \ -name projects \ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/task-select-project.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/tasks-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/tasks-oracle.xql 29 Apr 2005 17:43:38 -0000 1.1 +++ openacs-4/packages/project-manager/www/tasks-oracle.xql 30 Nov 2005 06:47:37 -0000 1.1.2.1 @@ -1,53 +1,36 @@ -oracle8.0 + oracle9.2 - + - SELECT ts.task_id as task_item_id, - ts.task_number, - t.task_revision_id, - t.title, - t.description, - t.parent_id as project_item_id, - proj_rev.logger_project, - proj_rev.title as project_name, - to_char(t.earliest_start,'J') as earliest_start_j, - to_char(sysdate,'J') as today_j, - to_char(t.latest_start,'J') as latest_start_j, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - t.percent_complete, - t.estimated_hours_work, - t.estimated_hours_work_min, - t.estimated_hours_work_max, - case when t.actual_hours_worked is null then 0 - else t.actual_hours_worked end as actual_hours_worked, - to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, - to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - p.first_names || ' ' || p.last_name as full_name, - substr(r.one_line,1,1) as role - FROM pm_tasks_active ts, - cr_items i, - pm_tasks_revisionsx t , - pm_task_assignment ta , - persons p , - pm_roles r , - cr_items proj, - pm_projectsx proj_rev - WHERE t.item_id = ta.task_id (+) and - ta.party_id = p.person_id (+) and - ta.role_id = r.role_id (+) and - ts.task_id = t.item_id and - i.item_id = t.item_id and - t.task_revision_id = i.live_revision and - t.parent_id = proj.item_id and - proj.live_revision = proj_rev.revision_id - [template::list::filter_where_clauses -and -name tasks] - [template::list::orderby_clause -orderby -name tasks] + select distinct task_id as tasks from ( + SELECT + ts.task_id + FROM + pm_tasks_active ts, + cr_items i, + pm_tasks_revisionsx t + LEFT JOIN pm_task_assignment ta + ON t.item_id = ta.task_id + LEFT JOIN persons p + ON ta.party_id = p.person_id + LEFT JOIN pm_roles r + ON ta.role_id = r.role_id, + cr_items proj, + cr_folders f, + pm_projectsx proj_rev + WHERE + ts.task_id = t.item_id and + i.item_id = t.item_id and + t.task_revision_id = i.live_revision and + t.parent_id = proj.item_id and + proj.live_revision = proj_rev.revision_id + and proj.parent_id = f.folder_id + and f.package_id = :package_id + [template::list::filter_where_clauses -and -name tasks] + [template::list::orderby_clause -orderby -name tasks]) - + Index: openacs-4/packages/project-manager/www/tasks-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks-postgresql.xql,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/project-manager/www/tasks-postgresql.xql 30 Apr 2005 06:59:34 -0000 1.2 +++ openacs-4/packages/project-manager/www/tasks-postgresql.xql 30 Nov 2005 06:47:37 -0000 1.2.2.1 @@ -1,94 +1,36 @@ -postgresql7.2 + postgresql7.3 - + - SELECT - ts.task_id, - ts.task_number, - t.task_revision_id, - t.title, - t.description, - tst.description as status, - t.parent_id as project_item_id, - proj_rev.logger_project, - proj_rev.title as project_name, - to_char(t.earliest_start,'J') as earliest_start_j, - to_char(current_timestamp,'J') as today_j, - to_char(t.latest_start,'J') as latest_start_j, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - t.percent_complete, - t.estimated_hours_work, - t.estimated_hours_work_min, - t.estimated_hours_work_max, - case when t.actual_hours_worked is null then 0 - else t.actual_hours_worked end as actual_hours_worked, - to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, - to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, - to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, - to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, - p.first_names || ' ' || p.last_name as full_name, - r.one_line as role - FROM - pm_tasks_active ts, - pm_task_status tst, - cr_items i, - pm_tasks_revisionsx t - LEFT JOIN pm_task_assignment ta - ON t.item_id = ta.task_id - LEFT JOIN persons p - ON ta.party_id = p.person_id - LEFT JOIN pm_roles r - ON ta.role_id = r.role_id, - cr_items proj, - cr_folders f, - pm_projectsx proj_rev - WHERE - ts.task_id = t.item_id and - tst.status_id = status and - i.item_id = t.item_id and - t.task_revision_id = i.live_revision and - t.parent_id = proj.item_id and - proj.live_revision = proj_rev.revision_id - and proj.parent_id = f.folder_id - and f.package_id = :package_id - [template::list::page_where_clause -and -name "tasks" -key "ts.task_id"] - [template::list::filter_where_clauses -and -name tasks] - [template::list::orderby_clause -orderby -name tasks] - - - - - select distinct task_id from ( SELECT - ts.task_id + ts.task_id FROM - pm_tasks_active ts, + pm_tasks_active ts, cr_items i, - pm_tasks_revisionsx t + pm_tasks_revisionsx t LEFT JOIN pm_task_assignment ta ON t.item_id = ta.task_id - LEFT JOIN persons p + LEFT JOIN persons p ON ta.party_id = p.person_id LEFT JOIN pm_roles r ON ta.role_id = r.role_id, cr_items proj, - cr_folders f, + cr_folders f, pm_projectsx proj_rev WHERE ts.task_id = t.item_id and i.item_id = t.item_id and - t.task_revision_id = i.live_revision and + t.task_revision_id = i.live_revision and t.parent_id = proj.item_id and proj.live_revision = proj_rev.revision_id - and proj.parent_id = f.folder_id - and f.package_id = :package_id + and proj.parent_id = f.folder_id + and f.package_id = :package_id [template::list::filter_where_clauses -and -name tasks] [template::list::orderby_clause -orderby -name tasks]) as tasks - + Index: openacs-4/packages/project-manager/www/tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/project-manager/www/tasks.tcl 30 Apr 2005 07:17:46 -0000 1.3 +++ openacs-4/packages/project-manager/www/tasks.tcl 30 Nov 2005 06:47:37 -0000 1.3.2.1 @@ -68,7 +68,7 @@ set context [list "Tasks"] # Get the currently available Status -set status_list [db_list_of_lists get_status_values "select description, status_id from pm_task_status order by status_type desc, description"] +set status_list [db_list_of_lists get_status_values {}] # the unique identifier for this package set package_id [ad_conn package_id] @@ -194,25 +194,25 @@ } -if {[string is true $use_days_p]} { - append elements { - actual_days_worked { - label "Days worked" - html { - align right - } - } - } -} else { - append elements { - actual_hours_worked { - label "Hours worked" - html { - align right - } - } - } -} +# if {[string is true $use_days_p]} { +# append elements { +# actual_days_worked { +# label "Days worked" +# html { +# align right +# } +# } +# } +# } else { +# append elements { +# actual_hours_worked { +# label "Hours worked" +# html { +# align right +# } +# } +# } +# } append elements { project_item_id { @@ -374,7 +374,7 @@ -estimated_hours_work_max $estimated_hours_work_max \ -percent_complete $percent_complete] - set actual_days_worked [expr $actual_hours_worked / 24] +# set actual_days_worked [expr $actual_hours_worked / 24] } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/tasks.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/admin/default-project-roles-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/default-project-roles-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/admin/default-project-roles-oracle.xql 29 Apr 2005 17:43:39 -0000 1.1 +++ openacs-4/packages/project-manager/www/admin/default-project-roles-oracle.xql 30 Nov 2005 06:47:38 -0000 1.1.2.1 @@ -2,14 +2,6 @@ oracle8.0 - - - SELECT role_id, - party_id - FROM pm_default_roles - - - select pm_project.get_root_folder (:package_id, 'f') Index: openacs-4/packages/project-manager/www/admin/default-project-roles-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/default-project-roles-postgresql.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/admin/default-project-roles-postgresql.xql 29 Apr 2005 17:43:39 -0000 1.1 +++ openacs-4/packages/project-manager/www/admin/default-project-roles-postgresql.xql 30 Nov 2005 06:47:38 -0000 1.1.2.1 @@ -2,13 +2,10 @@ postgresql7.2 - + - SELECT - role_id, - party_id - FROM - pm_default_roles + select pm_project.get_root_foldey (:packae_id, 'f') + from dual Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/admin/default-project-roles.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/admin/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/index-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/admin/index-oracle.xql 29 Apr 2005 17:43:39 -0000 1.1 +++ openacs-4/packages/project-manager/www/admin/index-oracle.xql 30 Nov 2005 06:47:38 -0000 1.1.2.1 @@ -2,30 +2,6 @@ oracle8.0 - - - SELECT p.item_id, - p.project_id, - p.parent_id as folder_id, - 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, - 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 - FROM pm_projectsx p, - cr_items i - WHERE p.project_id = i.live_revision and - p.parent_id = :root_folder - ORDER BY p.title - - - SELECT pm_project.get_root_folder (:package_id, 'f') Index: openacs-4/packages/project-manager/www/admin/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/index-postgresql.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/admin/index-postgresql.xql 29 Apr 2005 17:43:39 -0000 1.1 +++ openacs-4/packages/project-manager/www/admin/index-postgresql.xql 30 Nov 2005 06:47:38 -0000 1.1.2.1 @@ -2,27 +2,10 @@ postgresql7.2 - + - SELECT - p.item_id, - p.project_id, - p.parent_id as folder_id, - 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, - 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 - FROM pm_projectsx p, cr_items i - WHERE p.project_id = i.live_revision and - p.parent_id = :root_folder - ORDER BY p.title + SELECT pm_project__get_root_folder (:package_id, 'f') + FROM dual Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/admin/logger-sync.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/admin/roles-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/roles-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/admin/roles-oracle.xql 29 Apr 2005 17:43:39 -0000 1.1 +++ openacs-4/packages/project-manager/www/admin/roles-oracle.xql 30 Nov 2005 06:47:38 -0000 1.1.2.1 @@ -2,17 +2,6 @@ oracle8.0 - - - SELECT role_id, - one_line, - description, - is_observer_p, - sort_order - FROM pm_roles - - - select pm_project.get_root_folder (:package_id, 'f') Index: openacs-4/packages/project-manager/www/admin/roles-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/roles-postgresql.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/admin/roles-postgresql.xql 29 Apr 2005 17:43:39 -0000 1.1 +++ openacs-4/packages/project-manager/www/admin/roles-postgresql.xql 30 Nov 2005 06:47:38 -0000 1.1.2.1 @@ -2,16 +2,10 @@ postgresql7.2 - + - SELECT - role_id, - one_line, - description, - is_observer_p, - sort_order - FROM - pm_roles + select pm_project__get_root_folder (:package_id, 'f') + from dual Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/admin/roles.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/admin/update-projects.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/admin/workgroups-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/workgroups-oracle.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/admin/workgroups-oracle.xql 29 Apr 2005 17:43:39 -0000 1.1 +++ openacs-4/packages/project-manager/www/admin/workgroups-oracle.xql 30 Nov 2005 06:47:38 -0000 1.1.2.1 @@ -2,16 +2,6 @@ oracle8.0 - - - SELECT workgroup_id, - one_line, - description, - sort_order - FROM pm_workgroup - - - select pm_project.get_root_folder (:package_id, 'f') Index: openacs-4/packages/project-manager/www/admin/workgroups-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/admin/workgroups-postgresql.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/admin/workgroups-postgresql.xql 29 Apr 2005 17:43:39 -0000 1.1 +++ openacs-4/packages/project-manager/www/admin/workgroups-postgresql.xql 30 Nov 2005 06:47:38 -0000 1.1.2.1 @@ -2,15 +2,10 @@ postgresql7.2 - + - SELECT - workgroup_id, - one_line, - description, - sort_order - FROM - pm_workgroup + select pm_project__get_root_folder (:package_id, 'f') + from dual Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/admin/workgroups.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/lib/entries-table-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/project-manager/www/lib/entries-table-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/project-manager/www/lib/entries-table.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/lib/entries-table.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/project-manager/www/lib/entries-table.xql 29 Apr 2005 17:43:40 -0000 1.1 +++ openacs-4/packages/project-manager/www/lib/entries-table.xql 30 Nov 2005 06:47:38 -0000 1.1.2.1 @@ -12,4 +12,44 @@ + + + SELECT + le.entry_id as id, + acs_permission__permission_p(le.entry_id, :current_user_id, 'delete') as delete_p, + acs_permission__permission_p(le.entry_id, :current_user_id, 'write') as edit_p, + le.time_stamp, + to_char(le.time_stamp, 'fmDyfm fmMMfm-fmDDfm-YYYY') as time_stamp_pretty, + to_char(le.time_stamp, 'IW-YYYY') as time_stamp_week, + le.value, + le.description, + task.title as project_name, + submitter.person_id as user_id, + submitter.first_names || ' ' || submitter.last_name as user_name + FROM + logger_entries le + LEFT JOIN (select + r.title, + m.logger_entry + from + cr_items i, + cr_revisions r, + pm_task_logger_proj_map m + where + r.item_id = m.task_item_id and + i.live_revision = r.revision_id) task + ON le.entry_id = task.logger_entry, + logger_projects lp, + acs_objects ao, + persons submitter + WHERE + le.project_id = lp.project_id and + ao.object_id = le.entry_id and + ao.creation_user = submitter.person_id + [ad_decode $where_clauses "" "" "and [join $where_clauses "\n and "]"] + ORDER BY + $order_by + + +