- task management:

  - edit resource: percentage
  - edit start/end times

tcl/intranet-timesheet2-tasks-procs.tcl

@@ -521,27 +521,6 @@ ad_proc -public im_timesheet_task_info_component {
 } {
     set html ""
 
-        if {![db_0or1row project_info "
-        select  p.*,
-		t.*,
-		o.object_type,
-                p.start_date::date as start_date,
-                p.end_date::date as end_date,
-		p.end_date::date - p.start_date::date as duration,
-                c.company_name
-        from    im_projects p
-		LEFT OUTER JOIN im_timesheet_tasks t on (p.project_id = t.task_id),
-		acs_objects o,
-                im_companies c
-        where   p.project_id = :task_id
-		and p.project_id = o.object_id
-                and p.company_id = c.company_id
-    "]} {
-	    return "task in not created yet"
-    }
-    
-    append html "<p>$start_date - $end_date $duration $company_name"
-
     foreach {a b info} {
 	two  one "This task depends on"
 	one  two "These tasks depend on this one"
@@ -607,7 +586,8 @@ ad_proc -public im_timesheet_task_members_component {
         SELECT 
             user_id,
             im_name_from_user_id(user_id) as name,
-            percentage
+            percentage,
+            im_biz_object_members.rel_id AS rel_id
         from 
             acs_rels,users,im_biz_object_members 
         where 
@@ -628,6 +608,9 @@ ad_proc -public im_timesheet_task_members_component {
 	    }
 	    percentage {
 		label "Percentage"
+		link_url_eval {
+		    [ return "/intranet-timesheet2-tasks/edit-resource?[export_vars -url { return_url rel_id }]" ]
+		}
 	    }
 	} \
 	-bulk_actions {

www/edit-resource.adp

+<master src="../../intranet-core/www/master">
+<property name="main_navbar_label">projects</property>
+
+
+<formtemplate id="edit_resource"></formtemplate>
\ No newline at end of file

www/edit-resource.tcl

+ad_page_contract {
+} {
+    rel_id
+    return_url
+}
+
+set action_url "xxx"
+
+ad_form \
+    -name edit_resource \
+    -cancel_url $return_url \
+    -action "/intranet-timesheet2-tasks/edit-resource" \
+    -actions { edit } \
+    -mode edit \
+    -export {next_url user_id return_url} \
+    -form {
+	rel_id:key
+	{percentage:float(text),optional {label "Percentage"} {html {size 10}}}
+    }
+
+
+ad_form -extend -name edit_resource -on_request {
+
+} -select_query {
+
+  select 
+    percentage
+  from
+    im_biz_object_members
+  where
+    rel_id=:rel_id
+
+} -edit_data {
+
+    db_dml edit_resource "UPDATE im_biz_object_members SET percentage=:percentage WHERE rel_id=:rel_id"
+
+} -after_submit {
+    
+    ad_returnredirect $return_url
+    ad_script_abort
+    
+}
+

www/new-postgresql.xql

@@ -62,7 +62,9 @@
 		project_type_id	= :task_type_id,
 		project_status_id = :task_status_id,
 		note		= :note,
-		percent_completed = :percent_completed
+		percent_completed = :percent_completed,
+		start_date      = $start_date_sql,
+                end_date        = $end_date_sql
 
 	where
 		project_id = :task_id;

www/new.tcl

@@ -161,7 +161,9 @@ ad_form \
 	{planned_units:float(text),optional {label "Planned Units"} {html {size 10}}}
 	{billable_units:float(text),optional {label "Billable Units"} {html {size 10}}}
 	{percent_completed:float(text),optional {label "Percentage completed"} {html {size 10}}}
-	{note:text(textarea),optional {label Note} {html {cols 40}}}
+	{note:text(textarea),optional {label "Note"} {html {cols 40}}}
+	{start_date:date(date),optional {label "Start Date"} {}}
+	{end_date:date(date),optional {label "End Date"} {}}
 	
     }
 
@@ -196,11 +198,11 @@ select t.*,
         p.percent_completed,
         p.project_type_id as task_type_id,
         p.project_status_id as task_status_id,
-        p.start_date,
-        p.end_date,
+        to_char(p.start_date,'YYYY-MM-DD') as start_date, 
+        to_char(p.end_date,'YYYY-MM-DD') as end_date, 
 	p.reported_hours_cache,
 	p.reported_hours_cache as reported_units_cache,
-        p.note 
+        p.note
 from
         im_projects p,
         im_timesheet_tasks t
@@ -223,6 +225,10 @@ where
 } -edit_data {
 
     set task_nr [string tolower $task_nr]
+
+    set start_date_sql [template::util::date get_property sql_date $start_date]
+    set end_date_sql [template::util::date get_property sql_timestamp $end_date]
+
     db_dml task_update {}
     db_dml project_update {}