- merged fix of employee_info component

sql/common/intranet-hr-common.sql

@@ -77,8 +77,8 @@ column_render_tcl, extra_select, extra_from, extra_where, sort_order, visible_fo
 ) values (5500,55,NULL,'Name',
 	'"<a href=/intranet/users/view?user_id=$user_id>$name</a>"',
 	'e.supervisor_id, im_name_from_user_id(e.supervisor_id) as supervisor_name',
-	'im_employees e',
-	'u.user_id = e.employee_id',
+	'',
+	'',
 	0,
 	''
 );

tcl/intranet-hr-procs.tcl

@@ -75,8 +75,8 @@ ad_proc im_employee_info_component { employee_id return_url {view_name ""} } {
 		p.email,
 		e.*,
 		ci.*,
-		to_char(ci.start_date,:date_format) as start_date_formatted,
-		to_char(ci.end_date,:date_format) as end_date_formatted,
+		to_char(rc.start_date,:date_format) as start_date_formatted,
+		to_char(rc.end_date,:date_format) as end_date_formatted,
 		to_char(e.birthdate,:date_format) as birthdate_formatted,
 		to_char(salary, :number_format) as salary_formatted,
 		to_char(hourly_cost, :number_format) as hourly_cost_formatted,
@@ -87,23 +87,20 @@ ad_proc im_employee_info_component { employee_id return_url {view_name ""} } {
 		cc.cost_center_name as department_name,
 		im_name_from_user_id(e.supervisor_id) as supervisor_name
 	from	
-		users u,
-		parties p,
-		persons pe,
-		im_employees e
+		users u
+		LEFT OUTER JOIN im_employees e ON (u.user_id = e.employee_id)
 		LEFT OUTER JOIN im_cost_centers cc ON (e.department_id = cc.cost_center_id)
-		LEFT OUTER JOIN (
-			select	ci.*, rc.*
-			from	im_costs ci,
-				im_repeating_costs rc
-			where	ci.cost_id = rc.rep_cost_id
-		) ci ON (e.employee_id = ci.cause_object_id)
+		LEFT OUTER JOIN im_costs ci ON (u.user_id = ci.cause_object_id)
+		LEFT OUTER JOIN im_repeating_costs rc ON (ci.cost_id = rc.rep_cost_id),
+		parties p,
+		persons pe
 	where	
 		pe.person_id = u.user_id
 		and p.party_id = u.user_id
 		and u.user_id = :employee_id
-		and u.user_id = e.employee_id
+
     "} err_msg]} {
+	ns_log Notice "im_employees: err=$err_msg"
 	set employee_info_exists 0
     } else {
 	set employee_info_exists 1