devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1955 from expsa/samir-aladawi-fix-attendances-records 

[FIX] attendances
This commit is contained in:
SamirLADOUI-sa 2024-12-22 12:42:29 +01:00 committed by GitHub
parent cc68e6c55c d882764e06
commit ecdfcd30f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
odex25_hr/attendances/models/hr_attendance_transactions.py
View File

@ -177,15 +177,15 @@ class HrAttendanceTransactions(models.Model):
if official_mission_module and item.official_id:
mission_start = item.official_id.hour_from
mission_end = mission_start + item.total_mission_hours
if mission_start < adjusted_sign_in: # Mission overlaps with lateness
lateness_covered_time += adjusted_sign_in - mission_end
if mission_start <= full_sign_in <= mission_end:
lateness_covered_time += min(lateness_time, mission_end - full_sign_in)
# Check coverage by personal permission
if item.personal_permission_id:
permission_start = start_permission_time_float
permission_end = permission_start + item.total_permission_hours
if permission_start < adjusted_sign_in: # Permission overlaps with lateness
lateness_covered_time += adjusted_sign_in - permission_end
if permission_start <= full_sign_in <= permission_end:
lateness_covered_time += min(lateness_time, permission_end - full_sign_in)
# Determine remaining uncovered lateness
uncovered_lateness = lateness_time - lateness_covered_time
@ -204,15 +204,15 @@ class HrAttendanceTransactions(models.Model):
if official_mission_module and item.official_id:
mission_start = item.official_id.hour_from
mission_end = mission_start + item.total_mission_hours
if mission_start < full_sign_out: # Mission overlaps with early exit
early_exit_covered_time += adjusted_sign_out - mission_end
if mission_start <= adjusted_sign_out <= mission_end:
early_exit_covered_time += min(remaining_work_time, mission_end - adjusted_sign_out)
# Check coverage by personal permission
if item.personal_permission_id:
permission_start = start_permission_time_float
permission_end = permission_start + item.total_permission_hours
if permission_start < full_sign_out: # Permission overlaps with early exit
early_exit_covered_time += adjusted_sign_out - permission_end
if permission_start <= adjusted_sign_out <= permission_end:
early_exit_covered_time += min(remaining_work_time, permission_end - adjusted_sign_out)
# Determine remaining uncovered early exit
uncovered_early_exit = remaining_work_time - early_exit_covered_time