Index: openacs-4/packages/tasks/www/task-interval.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tasks/www/Attic/task-interval.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/tasks/www/task-interval.tcl	27 Jul 2005 13:44:59 -0000	1.1
+++ openacs-4/packages/tasks/www/task-interval.tcl	25 Sep 2005 23:49:23 -0000	1.2
@@ -35,74 +35,33 @@
 }
 
 set package_id [ad_conn package_id]
-set user_id    [ad_maybe_redirect_for_registration]
-set peeraddr   [ad_conn peeraddr]
-set project_id [tasks::project_id]
-
 set title "Add/Edit"
 set context [list $title]
 
 db_1row get_task_info "
-    select ci.item_id as task_id,
-           cr.title as task,
-           to_char((ptr.end_date $operand '$days days'::interval),'YYYY-MM-DD') as end_date,
-           ptr.percent_complete,
-           ptr.priority,
-           cr.description
-      from pm_tasks_revisions ptr,
-           cr_revisions cr,
-           cr_items ci
-     where ci.item_id = :task_id
-       and ci.latest_revision = ptr.task_revision_id
-       and ci.live_revision = ptr.task_revision_id
-       and ptr.task_revision_id = cr.revision_id
+    select t.title as task, t.description, t.mime_type, t.priority,
+           to_char((t.due_date $operand '$days days'::interval),'YYYY-MM-DD') as due_date,
+           t.status_id as status, t.comment
+      from t_tasks t
+     where t.task_id = :task_id
     "
-if { $percent_complete >= "100" } {
-    set completed_p "1"
-}
-if {$percent_complete >= 100} {
-    set task_status_id [pm::task::default_status_closed]
-} elseif {$percent_complete < 100} {
-    set task_status_id [pm::task::default_status_open]
-}
-set task_item_id $task_id
-set project_item_id $project_id
-set title $task
-set mime_type "text/plain"
-set estimated_hours_work ""
-set estimated_hours_work_min ""
-set estimated_hours_work_max ""
-set actual_hours_worked ""
-set update_user $user_id
-set update_ip $peeraddr
 
-db_exec_plsql new_task_revision "
-    select pm_task__new_task_revision (
-				       :task_item_id,
-				       :project_item_id,
-				       :title,
-				       :description,
-				       :mime_type,
-				       [pm::util::datenvl -value $end_date -value_if_null "null" -value_if_not_null ":end_date"],
-				       :percent_complete,
-				       :estimated_hours_work,
-				       :estimated_hours_work_min,
-				       :estimated_hours_work_max,
-				       :actual_hours_worked,
-				       :task_status_id,
-				       current_timestamp,
-				       :update_user,
-				       :update_ip, 
-				       :package_id,
-				       :priority)
-"
+set task_id [tasks::task::edit \
+		 -task_id ${task_id} \
+		 -title ${task} \
+		 -description ${description} \
+		 -mime_type $mime_type \
+		 -comment ${comment} \
+		 -due_date ${due_date} \
+		 -status_id ${status} \
+		 -priority ${priority}]
 
-set task_url [export_vars -base task -url {task_id status_id orderby}]
+set task_url [export_vars -base "/tasks/task" -url {task_id status_id orderby}]
 
 if { $action == "minus" } {
-    util_user_message -html -message "The task <a href=\"/tasks/${task_url}\">$title</a> moved up 7 days"
+    util_user_message -html -message "[_ tasks.task_moved_up]"
 } else {
-    util_user_message -html -message "The task <a href=\"/tasks/${task_url}\">$title</a> delayed 7 days"
+    util_user_message -html -message "[_ tasks.task_delayed]"
 }