- changes at Opus5

- Fixed a lot with Forums
- Added Hours Matrix and fixed < > in Timehseet

sql/oracle/intranet-hr-create.sql

@@ -120,8 +120,7 @@ select
 	u.*,
 	e.*,
 	pa.*,
-	pe.*,
-        mr.member_state
+	pe.*
 from
 	users u,
 	parties pa,
@@ -129,7 +128,7 @@ from
 	im_employees e,
 	groups g,
 	group_distinct_member_map gdmm,
-	--
+	-- for member_state=approved check:
         membership_rels mr,
         acs_magic_objects mo,
         group_member_map m
@@ -140,13 +139,14 @@ where
 	and g.group_name = 'Employees'
 	and gdmm.group_id = g.group_id
 	and gdmm.member_id = u.user_id
-	--
+	-- for member_state=approved check:
 	and m.member_id = u.user_id
         and mo.name = 'registered_users'
         and m.group_id = mo.object_id
         and m.rel_id = mr.rel_id
         and m.rel_type = 'membership_rel'
         and m.container_id = m.group_id
+	and mr.member_state = 'approved'
 ;
 
 

tcl/intranet-hr-procs.tcl

@@ -85,7 +85,7 @@ ad_proc im_employee_info_component { employee_id return_url {view_name ""} } {
 		pe.person_id = u.user_id
 		and p.party_id = u.user_id
 		and u.user_id = ci.cause_object_id(+)
-		and ci.cost_id = rc.cost_id
+		and ci.cost_id = rc.rep_cost_id
 		and u.user_id = :employee_id
 		and u.user_id = e.employee_id(+)
 		and e.department_id = cc.cost_center_id(+)

www/new.tcl

@@ -183,7 +183,7 @@ ad_form -extend -name cost -on_request {
 		p.party_id = :employee_id
 		and p.party_id = e.employee_id
 		and p.party_id = ci.cause_object_id(+)
-		and ci.cost_id = rc.cost_id(+)
+		and ci.cost_id = rc.rep_cost_id(+)
 
 } -after_submit {
 
@@ -194,10 +194,10 @@ ad_form -extend -name cost -on_request {
     # The join between im_costs and im_repeating_costs is necessary
     # in order to elimiate all the non-repeating cost items.
     set rep_cost_id [db_string rep_costs_exist "
-	select	rc.cost_id
+	select	rc.rep_cost_id
 	from	im_repeating_costs rc,
 		im_costs ci
-	where 	rc.cost_id = ci.cost_id
+	where 	rc.rep_cost_id = ci.cost_id
 		and ci.cause_object_id = :employee_id
     " -default 0]
     if {!$rep_cost_id} {
@@ -205,7 +205,7 @@ ad_form -extend -name cost -on_request {
 	    set rep_cost_id [im_cost::new -cost_name $cost_name -cost_type_id [im_cost_type_repeating]]
 	    db_dml insert_repeating_costs "
 		insert into im_repeating_costs (
-			cost_id,
+			rep_cost_id,
 			start_date,
 			end_date
 		) values (

www/org-chart.tcl

@@ -37,7 +37,7 @@ if {![im_permission $user_id view_hr]} {
 
 set big_kahuna_list [db_list kahuna_find "
 select 
-	info.employee_id 
+	info.employee_id
 from
 	im_employees_active info
 where