Index: openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	8 Jun 2005 16:36:18 -0000	1.2
+++ openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	8 Jun 2005 20:54:19 -0000	1.3
@@ -51,6 +51,8 @@
   <msg key="Goal">Ziel</msg>
   <msg key="hours">Stunden</msg>
   <msg key="Hours_completed">Erfasste Stunden</msg>
+  <msg key="Hours_remaining">Verbleibende Stunden</msg>
+  <msg key="Hours_worked">Stunden gearbeitet</msg>
   <msg key="hrs">Std.</msg>
   <msg key="Key">Schl�ssel</msg>
   <msg key="Latest_Finish">Sp�testes Ende</msg>
Index: openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	8 Jun 2005 16:36:18 -0000	1.8
+++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	8 Jun 2005 20:54:19 -0000	1.9
@@ -116,6 +116,8 @@
   <msg key="Hour_to_date">Hour to date</msg>
   <msg key="hours">hours</msg>
   <msg key="Hours_completed">Hours completed</msg>
+  <msg key="Hours_remaining">Hours remaining</msg>
+  <msg key="Hours_worked">Hours worked</msg>
   <msg key="hrs">hrs</msg>
   <msg key="HTML">HTML</msg>
   <msg key="ID">ID</msg>
@@ -152,6 +154,8 @@
   with logger. This section sets up which logger instances you
   want to be fully integrated with project-manager, so that new
   project-manager projects appear in the logger instance.</msg>
+  <msg key="lt_A_person_interested_i">A person interested in developments, possibly helping out on it.</msg>
+  <msg key="lt_A_person_on_the_team_">A person on the team responsible for completion of the project</msg>
   <msg key="lt_Add_a_comment_to_titl">Add a comment to: %title%</msg>
   <msg key="lt_Add_a_process_task_te">Add a process %task_term_lower%</msg>
   <msg key="lt_Add_a_process_task_te_1">Add a process %task_term_lower% (assignment)</msg>
@@ -192,6 +196,8 @@
   <msg key="lt_Enter_100_to_close_th">Enter 100% to close the %task_term_lower%, or less to open it.</msg>
   <msg key="lt_Enter_100_to_close_th_1">Enter 100% to close the %task_term_lower%, or less to open it.</msg>
   <msg key="lt_Enter_a_number_for_or">Enter a number for ordering the priority. 0 is the default and also the lowest priority.</msg>
+  <msg key="lt_Finishes_before_this_">Finishes before this starts</msg>
+  <msg key="lt_Finishes_before_this__1">Finishes before this finishes</msg>
   <msg key="lt_For_new_tasks_a_proje">For new tasks, a project must be passed in</msg>
   <msg key="lt_Hard_deadline_changed">Hard deadline changed &lt;i&gt;from&lt;/i&gt; %date_old% &lt;i&gt;to&lt;/i&gt; &lt;b&gt;%date_new%&lt;/b&gt;</msg>
   <msg key="lt_Hours_remaining_task_">Hours remaining: %task_info.hours_remaining%</msg>
@@ -267,6 +273,8 @@
   <msg key="lt_skip_adding_dependenc">skip adding dependencies</msg>
   <msg key="lt_Slack_task_infoslack_">Slack: %task_info.slack_time%</msg>
   <msg key="lt_Slack_time_task_infos">Slack time: %task_info.slack_time%</msg>
+  <msg key="lt_Starts_before_this_fi">Starts before this finishes</msg>
+  <msg key="lt_Starts_before_this_st">Starts before this starts</msg>
   <msg key="lt_Synchronize_logger_pr">Synchronize logger projects</msg>
   <msg key="lt_task_infoestimated_ho">%task_info.estimated_hours_work_min% - %task_info.estimated_hours_work_max% hrs estimated</msg>
   <msg key="lt_task_infopercent_comp">%task_info.percent_complete%% complete</msg>
@@ -283,6 +291,7 @@
         there is a bug in the categories package that prevents the
         context bar at the top of the screen from returning you to the
         project-manager pages.</msg>
+  <msg key="lt_Team_members_who_are_">Team members who are responsible for the completion of the project</msg>
   <msg key="lt_The_administrator_nee">The administrator needs to</msg>
   <msg key="lt_The_data_model_has_a_">The data model has a facility for default roles, although
         it is not currently used at all. This shows what is in the
@@ -384,6 +393,7 @@
   <msg key="Percent_Complete">Percent Complete\</msg>
   <msg key="Percent_complete">Percent complete</msg>
   <msg key="Plain_Text">Plain Text</msg>
+  <msg key="Player">Player</msg>
   <msg key="Please_wait">Please wait...</msg>
   <msg key="Pressing_Tasks">Pressing Tasks</msg>
   <msg key="Priority">Priority:</msg>
@@ -492,6 +502,7 @@
   <msg key="View_task_changes">View task changes</msg>
   <msg key="View_this_revision">View this revision</msg>
   <msg key="View_this_task">View this task</msg>
+  <msg key="Watcher">Watcher</msg>
   <msg key="Who">Who</msg>
   <msg key="Work">Work</msg>
   <msg key="Work_estimate">Work estimate</msg>
Index: openacs-4/packages/project-manager/lib/subprojects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/subprojects.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/subprojects.tcl	1 Jun 2005 05:12:30 -0000	1.2
+++ openacs-4/packages/project-manager/lib/subprojects.tcl	8 Jun 2005 20:54:19 -0000	1.3
@@ -56,7 +56,7 @@
 db_multirow -extend {item_url} subproject project_subproject_query {} {
 
     set item_url [export_vars \
-		      -base "one" -override {{project_item_id $item_id}} {project_item_id}]
+		      -base "$base_url/one" -override {{project_item_id $item_id}} {project_item_id}]
 }
 
 
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.4 -r1.5
--- openacs-4/packages/project-manager/tcl/project-procs-postgresql.xql	5 Jun 2005 00:11:04 -0000	1.4
+++ openacs-4/packages/project-manager/tcl/project-procs-postgresql.xql	8 Jun 2005 20:54:20 -0000	1.5
@@ -58,7 +58,6 @@
                 to_timestamp(:planned_end_date,'YYYY MM DD HH24 MI SS'),
                 null,
                 null,
-                null,
                 :ongoing_p,
                 :status_id,
                 :organization_id,
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.7 -r1.8
--- openacs-4/packages/project-manager/tcl/project-procs.tcl	8 Jun 2005 20:53:32 -0000	1.7
+++ openacs-4/packages/project-manager/tcl/project-procs.tcl	8 Jun 2005 20:54:20 -0000	1.8
@@ -243,7 +243,7 @@
     db_dml update_context_id "update acs_objects set context_id = :parent_id where object_id = :project_item_id"
 
     if {!$no_callback_p} {
-	callback pm::project_new -package_id $package_id -project_id $project_item_id
+	callback pm::project_new -package_id $package_id -project_id $project_item_id -data [list organization_id $organization_id]
     }
 
     return $project_revision
Index: openacs-4/packages/project-manager/www/add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/add-edit-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/www/add-edit-postgresql.xql	5 Jun 2005 00:11:05 -0000	1.3
+++ openacs-4/packages/project-manager/www/add-edit-postgresql.xql	8 Jun 2005 20:54:20 -0000	1.4
@@ -13,7 +13,7 @@
         p.customer_id,
         p.status_id,
  	to_char(p.planned_start_date,'YYYY-MM-DD') as planned_start_date,
- 	to_char(p.planned_end_date,'YYYY-MM-DD') as planned_end_date,
+ 	to_char(p.planned_end_date,'YYYY-MM-DD HH24:MI:SS') as planned_end_date,
  	p.ongoing_p,
 	p.dform
         FROM
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.9 -r1.10
--- openacs-4/packages/project-manager/www/add-edit.tcl	6 Jun 2005 07:56:13 -0000	1.9
+++ openacs-4/packages/project-manager/www/add-edit.tcl	8 Jun 2005 20:54:20 -0000	1.10
@@ -113,17 +113,23 @@
         {planned_start_date:text(text)
             {label "[_ project-manager.Starts]"}
 	    {html {id sel1}}
-	    {after_html {<input type='reset' value=' ... ' onclick=\"return showCalendar('sel1', 'y-m-d');\"> \[<b>y-m-d </b>\]
+	    {after_html {<input type='reset' value=' ... ' onclick=\"return showCalendar('sel1', 'y-m-d');\"> \[<b>d.m.y </b>\]
 	    }}
         }
         
-        {planned_end_date:text(text) 
+        {planned_end_date:text(text)
             {label "[_ project-manager.Deadline_1]"}
 	    {html {id sel2}}
-	    {after_html {<input type='reset' value=' ... ' onclick=\"return showCalendar('sel2', 'y-m-d');\"> \[<b>y-m-d </b>\]
+	    {after_html {<input type='reset' value=' ... ' onclick=\"return showCalendar('sel2', 'y-m-d');\"> \[<b>d.m.y </b>\]
 	    }}
         }
 
+        {planned_end_time:date
+            {label "[_ project-manager.Deadline_Time]"}
+	    {value {[template::util::date::now]}}
+	    {format {[lc_get formbuilder_time_format]}} 
+        }
+
         
         {ongoing_p:text(select)
             {label "[_ project-manager.Project_is_ongoing]"}
@@ -194,13 +200,15 @@
             set ongoing_p t
         }
 
-        set planned_end_date [util::date acquire clock [clock scan $planned_end_date]]
-        set planned_end_date "[lindex $planned_end_date 0]-[lindex $planned_end_date 1]-[lindex $planned_end_date 2]"
-        set planned_start_date [util::date acquire clock [clock scan $planned_start_date]]
-       set planned_start_date "[lindex $planned_start_date 0]-[lindex $planned_start_date 1]-[lindex $planned_start_date 2]"
+	set planned_end_date [dt_sysdate]
+	set planned_start_date [dt_sysdate]
 
     } -edit_request {
+
 	db_1row project_query {}
+	set planned_end_time [template::util::date::from_ansi $planned_end_date [lc_get frombuilder_time_format]]
+	set planned_end_date [lindex $planned_end_date 0]
+
     } -on_submit {
         
         set user_id [ad_conn user_id]
@@ -216,8 +224,11 @@
 	if {[empty_string_p $parent_id]} {
 	    set parent_id $folder_id
 	}
+	set planned_end_date_list [split $planned_end_date "-"]
+	append planned_end_date_list " [lrange $planned_end_time 3 5]"
+
 	set planned_start_date_sql "to_timestamp('$planned_start_date','YYYY MM DD HH24 MI SS')"
-	set planned_end_date_sql "to_timestamp('$planned_end_date','YYYY MM DD HH24 MI SS')"
+	set planned_end_date_sql "to_timestamp('$planned_end_date_list','YYYY MM DD HH24 MI SS')"
 
     } -new_data {
 
Index: openacs-4/packages/project-manager/www/task-add-edit-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-add-edit-one.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/project-manager/www/task-add-edit-one.tcl	8 Jun 2005 20:53:32 -0000	1.10
+++ openacs-4/packages/project-manager/www/task-add-edit-one.tcl	8 Jun 2005 20:54:20 -0000	1.11
@@ -271,11 +271,16 @@
 ad_form -extend -name task_add_edit \
     -form {
         {task_end_date:text(text),optional
-            {label "[_ project-manager.lt_Deadline_task]"}
+            {label "[_ project-manager.Deadline]"}
 	    {html {id sel1}}
 	    {after_html {<input type='reset' value=' ... ' onclick=\"return showCalendar('sel1', 'y-m-d');\"> \[<b>y-m-d </b>\]
 	    }}
         }
+        {task_end_time:date,optional
+            {label "[_ project-manager.Deadline_Time]"}
+	    {value {[template::util::date::now]}}
+	    {format {[lc_get formbuilder_time_format]}} 
+        }
     }
 
 if {[string is true $edit_p]} {
@@ -323,6 +328,7 @@
 		{after_html $logger_variable(unit)}
 	    }
         
+
 	    {logger_variable_id:text(hidden)
 		{section "[_ project-manager.Log_entry]"}
 	    }
@@ -412,6 +418,9 @@
     set priority 0
 } -edit_request {
     db_1row get_task_data {}
+    
+    set task_end_time [template::util::date::from_ansi $task_end_date [lc_get frombuilder_time_format]]
+    set task_end_date [lindex $task_end_date 0]
 
     set hours_day [pm::util::hours_day]
     set estimated_days_work_min [expr $estimated_hours_work_min / $hours_day]
@@ -429,8 +438,13 @@
     set end_date(year)   [lindex [set end_date_split] 0]
     set end_date(format) ""
     ad_page_contract_filter_proc_date end_date end_date
-    set end_date_sql [pm::util::datenvl -value $end_date(date) -value_if_null "null" -value_if_not_null "to_timestamp('$end_date(date)','YYYY-MM-DD')"]
 
+    set task_end_date_list [split $end_date(date) "-"]
+    append task_end_date_list " [lrange $task_end_time 3 5]"
+
+    set end_date(date) $task_end_date_list 
+    set end_date_sql [pm::util::datenvl -value $end_date(date) -value_if_null "null" -value_if_not_null "to_timestamp('$end_date(date)','YYYY MM DD HH24 MI SS')"]
+
     if {[info exists log_date]} {
 	set log_date_split [split $log_date "-"]
 	set log_date_array(day)    [lindex [set log_date_split] 2]
Index: openacs-4/packages/project-manager/www/task-add-edit-one.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-add-edit-one.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/project-manager/www/task-add-edit-one.xql	5 Jun 2005 22:58:35 -0000	1.3
+++ openacs-4/packages/project-manager/www/task-add-edit-one.xql	8 Jun 2005 20:54:20 -0000	1.4
@@ -21,7 +21,7 @@
   <fullquery name="get_task_data">
     <querytext>
 	select title as task_title, description, mime_type as description_mime_type,
-	       percent_complete, to_char(end_date,'YYYY-MM-DD') as task_end_date,
+	       percent_complete, to_char(end_date,'YYYY-MM-DD HH24:MI:SS') as task_end_date,
 	       estimated_hours_work, estimated_hours_work_min,
 	       estimated_hours_work_max, priority
 	from pm_tasks_revisionsi