Added view_hours_direct_reports privilege

sql/postgresql/intranet-absences-create.sql

@@ -232,8 +232,8 @@ SELECT acs_privilege__add_child('admin', 'add_absences_for_group');
 -- add absences for direct reports?
 select acs_privilege__create_privilege('view_absences_direct_reports','View Absences Direct Reports','View Absences Direct Reports');
 select acs_privilege__add_child('view', 'view_absences_direct_reports');
-select acs_privilege__create_privilege('add_hours_direct_reports','Add hours for direct reports','');
-select acs_privilege__add_child('admin', 'add_hours_direct_reports');
+select acs_privilege__create_privilege('add_absences_direct_reports','Add Absences for direct reports','');
+select acs_privilege__add_child('admin', 'add_absences_direct_reports');
 
 
 

sql/postgresql/intranet-timesheet2-create.sql

@@ -112,6 +112,8 @@ select acs_privilege__add_child('admin', 'add_hours_all');
 -- Add privilege to add absences for direct_reports
 select acs_privilege__create_privilege('add_hours_direct_reports','Add hours for direct reports','Add hours for direct reports');
 select acs_privilege__add_child('admin', 'add_hours_direct_reports');
+select acs_privilege__create_privilege('view_hours_direct_reports','View hours for direct reports','View hours for direct reports');
+select acs_privilege__add_child('admin', 'view_hours_direct_reports');
 
 
 select im_priv_create('add_hours', 'Employees');

sql/postgresql/upgrade/upgrade-5.1.0.0.0-5.1.0.0.1.sql

+-- upgrade-5.1.0.0.0-5.1.0.0.1.sql
+
+SELECT acs_log__debug('/packages/intranet-timesheet2/sql/postgresql/upgrade/upgrade-5.1.0.0.0-5.1.0.0.1.sql','');
+
+
+-- Add privilege to view/add hours for direct_reports
+select acs_privilege__create_privilege('add_hours_direct_reports','Add hours for direct reports','Add hours for direct reports');
+select acs_privilege__add_child('admin', 'add_hours_direct_reports');
+select acs_privilege__create_privilege('view_hours_direct_reports','View hours for direct reports','View hours for direct reports');
+select acs_privilege__view__child('admin', 'view_hours_direct_reports');
+

tcl/intranet-timesheet2-procs.tcl

@@ -56,6 +56,9 @@ ad_proc -public im_hour_permissions {
 } {
     Fill the by-reference variables read, write and admin
     with the permissions of $user_id on $hour_id
+
+    Fraber 2024-03-04: ToDo: add_hours_direct_reports is not 100%
+    correct, and view_hours_direct_reports isn't used yet.
 } {
     upvar $view_var view
     upvar $read_var read

www/hours/new-2.tcl

@@ -63,6 +63,8 @@ ad_page_contract {
 set current_user_id [auth::require_login]
 set add_hours_p [im_permission $current_user_id "add_hours"]
 set add_hours_all_p [im_permission $current_user_id "add_hours_all"]
+
+# ToDo: add_hours_direct_reports_p is not checked, is it possible to add hours to other users?
 set add_hours_direct_reports_p [im_permission $current_user_id "add_hours_direct_reports"]
 
 # Estimate to complete?