-
+
@@ -94,7 +97,7 @@
-| Projects
+ | Project
|
|
@@ -109,7 +112,7 @@
|
-| Project code |
+Code |
@project_code@ |
Index: openacs-4/contrib/packages/project-manager/www/task-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-edit-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/task-edit-postgresql.xql 4 Aug 2003 23:44:52 -0000 1.1
@@ -0,0 +1,58 @@
+
+
+
+
+ select pm_task__new_task_item (
+ null,
+ :project_item_id,
+ '$task_title($i)',
+ '$description($i)',
+ to_timestamp(now(),'YYYY MM DD HH24 MI SS'),
+ to_timestamp(now(),'YYYY MM DD HH24 MI SS'),
+ '0',
+ now(),
+ :user_id,
+ :peeraddr,
+ :package_id
+ );
+
+
+
+
+
+ select pm_task__new_task_revision (
+ :task_id,
+ :project_item_id,
+ :task_title,
+ :description,
+ to_timestamp(:start_date,'YYYY MM DD HH24 MI SS'),
+ to_timestamp(:end_date,'YYYY MM DD HH24 MI SS'),
+ :percent_complete,
+ now(),
+ :user_id,
+ :peeraddr,
+ :package_id
+ );
+
+
+
+
+
+ select
+ t.task_revision_id,
+ t.title as task_title,
+ t.item_id,
+ t.description,
+ t.name,
+ t.parent_id,
+ to_char(t.start_date,'YYYY MM DD') as start_date,
+ to_char(t.end_date,'YYYY MM DD') as end_date,
+ t.percent_complete
+ FROM
+ pm_tasks_revisionsx t, cr_items i
+ WHERE
+ t.item_id = :task_id and
+ t.revision_id = i.live_revision
+
+
+
Index: openacs-4/contrib/packages/project-manager/www/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-edit.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/task-edit.adp 4 Aug 2003 23:44:52 -0000 1.1
@@ -0,0 +1,13 @@
+
+@context_bar@
+@title@
+
+
+
+
+
+
+
+
+
+
Index: openacs-4/contrib/packages/project-manager/www/task-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-edit.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/task-edit.tcl 4 Aug 2003 23:44:52 -0000 1.1
@@ -0,0 +1,117 @@
+ad_page_contract {
+
+ Edit form for tasks
+
+ This page only edits one task, and does not create new tasks.
+
+ @author jader@bread.com
+ @creation-date 2003-08-04
+ @cvs-id $Id: task-edit.tcl,v 1.1 2003/08/04 23:44:52 jader Exp $
+
+ @return context_bar Context bar.
+ @return title Page title.
+
+ @param task_revision_id Specifies the revision this task represents (each revision of a task has a separate id)
+ @param task_id Specifies the item for the task (every revision of a task shares the same task_id)
+} {
+
+ task_revision_id:integer,optional
+ task_id:integer,optional
+ task_title:optional
+ description:optional
+ name:optional
+ parent_id:optional
+ project_item_id:integer
+ project_id:integer
+ start_date:date,optional
+ end_date:date,optional
+ percent_complete:optional
+
+} -properties {
+
+ context_bar:onevalue
+ title:onevalue
+
+} -validate {
+ percent_is_in_range -requires {percent_complete:integer} {
+ if {$percent_complete < 0 || $percent_complete > 100} {
+ ad_complain
+ }
+ }
+} -errors {
+ percent_is_in_range {Percent completed must be between 0 and 100}
+}
+
+# --------------------------------------------------------------- #
+
+# the unique identifier for this package
+set package_id [ad_conn package_id]
+set user_id [ad_maybe_redirect_for_registration]
+
+# permissions
+
+set title "Edit a task"
+set context_bar [ad_context_bar [list "one?item_id=$project_item_id&project_id=$project_id" "One Project"] "Edit Task"]
+permission::require_permission -party_id $user_id -object_id $package_id -privilege write
+
+
+ad_form -name add_edit -form {
+ task_id:key
+
+ {project_item_id:text(hidden)
+ {value $project_item_id}
+ }
+
+ {project_id:text(hidden)
+ {value $project_id}
+ }
+
+ {task_title:text
+ {label \"Subject \#$i\"}
+ {html {size 59}}
+ }
+
+ {description:text(textarea)
+ {label \"Description\"}
+ {html {rows 15 cols 60}}
+ }
+
+ {parent_id:text(hidden)
+ }
+
+ {start_date:date,to_sql(linear_date),from_sql(sql_date)
+ {label "Start date"}
+ {format "MONTH DD YYYY"}
+ {help}
+ }
+
+ {end_date:date,to_sql(linear_date),from_sql(sql_date)
+ {label "End date"}
+ {format "MONTH DD YYYY"}
+ {help}
+ }
+
+ {percent_complete:integer
+ {label "Percent complete"}
+ {html {size 3}}
+ }
+
+} -on_submit {
+
+ set user_id [ad_conn user_id]
+ set peeraddr [ad_conn peeraddr]
+
+} -new_data {
+
+ #db_exec_plsql new_task_item { *SQL* }
+
+} -edit_data {
+
+ db_exec_plsql new_task_revision { *SQL* }
+
+} -select_query_name task_query -after_submit {
+
+ ad_returnredirect "one?item_id=$project_item_id&project_id=$project_id"
+ ad_script_abort
+}
+
Index: openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 4 Aug 2003 22:40:21 -0000 1.4
+++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 4 Aug 2003 23:44:52 -0000 1.5
@@ -11,6 +11,18 @@
+
+
+ SELECT
+ t.revision_id as task_revision_id
+ FROM
+ pm_tasks_revisionsx t, cr_items i
+ WHERE
+ t.item_id = :task_id and
+ i.live_revision = t.revision_id
+
+
+
SELECT
@@ -19,7 +31,7 @@
pm_tasks_revisionsx t, cr_items i
WHERE
i.item_id = t.item_id and
- t.item_id = :task_id
+ t.revision_id = :task_revision_id
@@ -31,12 +43,14 @@
t.description,
to_char(t.start_date,'MM/DD/YYYY') as start_date,
to_char(t.end_date,'MM/DD/YYYY') as end_date,
- t.percent_complete
+ t.percent_complete,
+ i.live_revision
FROM
pm_tasks_revisionsx t, cr_items i
WHERE
t.item_id = :task_id and
- t.revision_id = i.live_revision
+ t.revision_id = :task_revision_id and
+ t.item_id = i.item_id
@@ -57,7 +71,7 @@
t.item_id = :task_id and
t.item_id = i.item_id
ORDER BY
- t.revision_id
+ t.revision_id desc
Index: openacs-4/contrib/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/task-one.adp 4 Aug 2003 21:24:06 -0000 1.3
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp 4 Aug 2003 23:44:52 -0000 1.4
@@ -47,15 +47,15 @@
breakdown
- edit
+ edit
-
+
| Description |
Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl 4 Aug 2003 22:40:21 -0000 1.5
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 4 Aug 2003 23:44:52 -0000 1.6
@@ -29,6 +29,11 @@
set task_id [db_string get_task_id { }]
}
}
+ revision_id_exists {
+ if {![info exists task_revision_id]} {
+ set task_revision_id [db_string get_revision_id { }]
+ }
+ }
}
| |