nngo/GOV_QR_Codes_Management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feb25 2026: updated export to Excel time calculation logic

Browse Source
This commit is contained in:
nngo
2026-02-25 17:23:45 -05:00
parent 553adb6293
commit 0b69978846
2 changed files with 170 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.py
+11 -9
View File
@@ -14,8 +14,8 @@ from dotenv import load_dotenv
# Import the logging handler # Import the logging handler
from logger_handler import AppLogger, log_user_activity, log_database_operations from logger_handler import AppLogger, log_user_activity, log_database_operations
from single_checkin_calculator import SingleCheckInCalculator from working_hours_calculator import (WorkingHoursCalculator,
from working_hours_calculator import WorkingHoursCalculator round_time_to_quarter_hour)
from payroll_excel_exporter import PayrollExcelExporter from payroll_excel_exporter import PayrollExcelExporter
from enhanced_payroll_excel_exporter import EnhancedPayrollExcelExporter from enhanced_payroll_excel_exporter import EnhancedPayrollExcelExporter
from time_attendance_import_service import TimeAttendanceImportService from time_attendance_import_service import TimeAttendanceImportService
@@ -9667,14 +9667,16 @@ def export_time_attendance_excel(records, project_name_for_filename, date_range_
first_datetime = datetime.combine(date_obj, first_time) first_datetime = datetime.combine(date_obj, first_time)
last_datetime = datetime.combine(date_obj, last_time) last_datetime = datetime.combine(date_obj, last_time)
calculated_hours = (last_datetime - first_datetime).total_seconds() / 3600.0 _raw_min = (last_datetime - first_datetime).total_seconds() / 60.0
calculated_hours = round(calculated_hours, 2) calculated_hours = round_time_to_quarter_hour(_raw_min) / 60.0
weekly_total_hours += calculated_hours weekly_total_hours += calculated_hours
total_hours = calculated_hours total_hours = calculated_hours
# Daily total display (only shown on last location's last row) # Daily total display (only shown on last location's last row)
daily_total_display = round(total_hours, 2) if total_hours > 0 else '' # Daily Total: quarter-hour rounding → decimal hours
_dt_min = total_hours * 60.0
daily_total_display = round_time_to_quarter_hour(_dt_min) / 60.0 if total_hours > 0 else ''
# FIXED: Get all records for the day and sort by time FIRST, then group by location # FIXED: Get all records for the day and sort by time FIRST, then group by location
all_day_records = [] all_day_records = []
@@ -10481,15 +10483,15 @@ def export_time_attendance_by_building_excel(records, project_name_for_filename,
i += 1 i += 1
# Calculate daily hours # Calculate daily hours (Daily Total = quarter-hour rounding)
daily_hours = 0 _raw_day_min = 0
for pair in pairs: for pair in pairs:
if pair['check_in'] and pair['check_out'] and not pair['is_miss_punch']: if pair['check_in'] and pair['check_out'] and not pair['is_miss_punch']:
pair_in = datetime.combine(date_obj, pair['check_in'].check_in_time) pair_in = datetime.combine(date_obj, pair['check_in'].check_in_time)
pair_out = datetime.combine(date_obj, pair['check_out'].check_in_time) pair_out = datetime.combine(date_obj, pair['check_out'].check_in_time)
daily_hours += (pair_out - pair_in).total_seconds() / 3600.0 _raw_day_min += (pair_out - pair_in).total_seconds() / 60.0
daily_hours = round(daily_hours, 2) daily_hours = round_time_to_quarter_hour(_raw_day_min) / 60.0
weekly_total_hours += daily_hours weekly_total_hours += daily_hours
# Write pairs # Write pairs
working_hours_calculator.py
+159 -41
View File
@@ -30,6 +30,95 @@ RECORD_GROUPING_MAX_MINUTES = 60 * 6 # 6 hours
MAX_REGULAR_TIME_MINUTES = 60 * 40 # 40 hours per week MAX_REGULAR_TIME_MINUTES = 60 * 40 # 40 hours per week
# ---------------------------------------------------------------------------
# Time rounding utilities (ported from SingleCheckInCalculator)
# ---------------------------------------------------------------------------
def round_time_to_quarter_hour(minutes: float) -> float:
"""
Round a duration in minutes to the nearest quarter hour using
7.5-minute boundary increments.
Rules:
0:00 – 0:07 → 0:00
0:08 – 0:22 → 0:15
0:23 – 0:37 → 0:30
0:38 – 0:52 → 0:45
0:53 – 1:07 → 1:00
"""
if minutes < 0:
return 0.0
hours = int(minutes // 60)
minutes_in_hour = minutes % 60
if minutes_in_hour <= 7:
rounded_in_hour = 0
elif minutes_in_hour <= 22:
rounded_in_hour = 15
elif minutes_in_hour <= 37:
rounded_in_hour = 30
elif minutes_in_hour <= 52:
rounded_in_hour = 45
else: # 53 – 59
hours += 1
rounded_in_hour = 0
return hours * 60 + rounded_in_hour
def convert_minutes_to_base100(minutes: float) -> float:
"""
Convert a duration in minutes to base-100 hours
(each fractional hour expressed as hundredths, not sixtieths).
Example: 90 min → 1.50 base-100 hours
"""
if minutes < 0:
return 0.0
decimal_hours = minutes / 60.0
whole_hours = int(decimal_hours)
fractional_hours = decimal_hours - whole_hours
base100_fraction = fractional_hours * 100
return whole_hours + (base100_fraction / 100)
def round_base100_hours(base100_hours: float) -> float:
"""
Round base-100 hours to the nearest quarter (.00 / .25 / .50 / .75)
using 12.5-unit thresholds.
Examples:
4.12 → 4.00
4.18 → 4.25
8.02 → 8.00
8.87 → 9.00
"""
if base100_hours < 0:
return 0.0
whole_hours = int(base100_hours)
fractional_part = (base100_hours - whole_hours) * 100
if fractional_part < 12.5:
rounded_fraction = 0
elif fractional_part < 37.5:
rounded_fraction = 25
elif fractional_part < 62.5:
rounded_fraction = 50
elif fractional_part < 87.5:
rounded_fraction = 75
else:
whole_hours += 1
rounded_fraction = 0
return round(whole_hours + (rounded_fraction / 100), 2)
# ---------------------------------------------------------------------------
def parse_employee_id_for_work_type(employee_id: str) -> Tuple[str, str]: def parse_employee_id_for_work_type(employee_id: str) -> Tuple[str, str]:
""" """
Parse employee ID to extract base ID and work type (supports SP, PW, PT) Parse employee ID to extract base ID and work type (supports SP, PW, PT)
@@ -140,17 +229,33 @@ class DailyTimeCalculator(TimeCalculator):
"""Add a record pair to the daily calculation""" """Add a record pair to the daily calculation"""
self.record_pairs.append(pair) self.record_pairs.append(pair)
def get_minutes_total_exclude_travel_time(self) -> int: def get_minutes_total_exclude_travel_time(self) -> float:
"""Calculate total minutes excluding travel time""" """
Calculate total minutes excluding travel time.
Returns -1 for miss punches, otherwise returns the quarter-hour-
rounded total minutes (using the 7.5-minute boundary rule).
"""
minute_total = 0 minute_total = 0
for pair in self.record_pairs: for pair in self.record_pairs:
if not pair.is_miss_punch: if not pair.is_miss_punch:
minute_total += pair.duration_minutes minute_total += pair.duration_minutes
else: else:
return -1 # Miss punch detected return -1 # Miss punch detected
return self.round_time_to_nearest_quarter_hour(minute_total) # Use the 7.5-minute boundary rounding (matches SingleCheckInCalculator)
return round_time_to_quarter_hour(minute_total)
def get_base100_hours(self) -> float:
"""
Return daily total as base-100 rounded hours.
Returns 0.0 for miss punches.
"""
rounded_minutes = self.get_minutes_total_exclude_travel_time()
if rounded_minutes < 0:
return 0.0
base100 = convert_minutes_to_base100(rounded_minutes)
return round_base100_hours(base100)
class WeeklyTimeCalculator(TimeCalculator): class WeeklyTimeCalculator(TimeCalculator):
@@ -402,14 +507,19 @@ class WorkingHoursCalculator:
pairs = RecordPairBuilder.build_pairs_from_records(day_records) pairs = RecordPairBuilder.build_pairs_from_records(day_records)
for pair in pairs: for pair in pairs:
daily_calc.add_record_pair(pair) daily_calc.add_record_pair(pair)
total_minutes = daily_calc.get_minutes_total_exclude_travel_time() total_minutes = daily_calc.get_minutes_total_exclude_travel_time()
if total_minutes < 0: if total_minutes < 0:
hours_by_type[work_type] = 0.0 hours_by_type[work_type] = 0.0
is_miss_punch_by_type[work_type] = True is_miss_punch_by_type[work_type] = True
else: else:
hours_by_type[work_type] = total_minutes / 60.0 # Apply full rounding pipeline:
# 1. round_time_to_quarter_hour (already done inside get_minutes_total)
# 2. convert to base-100
# 3. round_base100_hours
base100 = convert_minutes_to_base100(total_minutes)
hours_by_type[work_type] = round_base100_hours(base100)
is_miss_punch_by_type[work_type] = False is_miss_punch_by_type[work_type] = False
else: else:
hours_by_type[work_type] = 0.0 hours_by_type[work_type] = 0.0
@@ -451,38 +561,46 @@ class WorkingHoursCalculator:
week_pw_total = current_week_hours['PW'] week_pw_total = current_week_hours['PW']
week_pt_total = current_week_hours['PT'] week_pt_total = current_week_hours['PT']
week_total = week_regular_total + week_sp_total + week_pw_total + week_pt_total week_total = week_regular_total + week_sp_total + week_pw_total + week_pt_total
# Only regular hours count toward overtime (40 hour rule) # Only regular hours count toward overtime (40 hour rule)
week_regular_hours = min(week_regular_total, 40.0) week_regular_hours = min(week_regular_total, 40.0)
week_overtime_hours = max(0, week_regular_total - 40.0) week_overtime_hours = max(0, week_regular_total - 40.0)
# Apply round_base100_hours to all weekly totals
week_total_r = round_base100_hours(week_total)
week_regular_r = round_base100_hours(week_regular_hours)
week_overtime_r = round_base100_hours(week_overtime_hours)
week_sp_r = round_base100_hours(week_sp_total)
week_pw_r = round_base100_hours(week_pw_total)
week_pt_r = round_base100_hours(week_pt_total)
weekly_hours.append({ weekly_hours.append({
'total_hours': round(week_total, 2), 'total_hours': week_total_r,
'regular_hours': round(week_regular_hours, 2), 'regular_hours': week_regular_r,
'overtime_hours': round(week_overtime_hours, 2), 'overtime_hours': week_overtime_r,
'sp_hours': round(week_sp_total, 2), 'sp_hours': week_sp_r,
'pw_hours': round(week_pw_total, 2), 'pw_hours': week_pw_r,
'pt_hours': round(week_pt_total, 2), 'pt_hours': week_pt_r,
'total_minutes': int(week_total * 60), 'total_minutes': int(week_total_r * 60),
'regular_minutes': int(week_regular_hours * 60), 'regular_minutes': int(week_regular_r * 60),
'overtime_minutes': int(week_overtime_hours * 60), 'overtime_minutes': int(week_overtime_r * 60),
'sp_minutes': int(week_sp_total * 60), 'sp_minutes': int(week_sp_r * 60),
'pw_minutes': int(week_pw_total * 60), 'pw_minutes': int(week_pw_r * 60),
'pt_minutes': int(week_pt_total * 60) 'pt_minutes': int(week_pt_r * 60),
}) })
# Reset for next week # Reset for next week
current_week_hours = {'regular': 0, 'SP': 0, 'PW': 0, 'PT': 0} current_week_hours = {'regular': 0, 'SP': 0, 'PW': 0, 'PT': 0}
current_date += timedelta(days=1) current_date += timedelta(days=1)
# Calculate grand totals # Calculate grand totals — apply round_base100_hours to each sum
grand_total_hours = sum(week['total_hours'] for week in weekly_hours) grand_total_hours = round_base100_hours(sum(week['total_hours'] for week in weekly_hours))
grand_regular_hours = sum(week['regular_hours'] for week in weekly_hours) grand_regular_hours = round_base100_hours(sum(week['regular_hours'] for week in weekly_hours))
grand_overtime_hours = sum(week['overtime_hours'] for week in weekly_hours) grand_overtime_hours = round_base100_hours(sum(week['overtime_hours'] for week in weekly_hours))
grand_sp_hours = sum(week['sp_hours'] for week in weekly_hours) grand_sp_hours = round_base100_hours(sum(week['sp_hours'] for week in weekly_hours))
grand_pw_hours = sum(week['pw_hours'] for week in weekly_hours) grand_pw_hours = round_base100_hours(sum(week['pw_hours'] for week in weekly_hours))
grand_pt_hours = sum(week.get('pt_hours', 0) for week in weekly_hours) grand_pt_hours = round_base100_hours(sum(week.get('pt_hours', 0) for week in weekly_hours))
print(f"✅ Employee {employee_id}: Total: {grand_total_hours:.2f}h (Regular: {grand_regular_hours:.2f}h, OT: {grand_overtime_hours:.2f}h, SP: {grand_sp_hours:.2f}h, PW: {grand_pw_hours:.2f}h, PT: {grand_pt_hours:.2f}h)") print(f"✅ Employee {employee_id}: Total: {grand_total_hours:.2f}h (Regular: {grand_regular_hours:.2f}h, OT: {grand_overtime_hours:.2f}h, SP: {grand_sp_hours:.2f}h, PW: {grand_pw_hours:.2f}h, PT: {grand_pt_hours:.2f}h)")
@@ -494,18 +612,18 @@ class WorkingHoursCalculator:
'daily_hours': daily_hours, 'daily_hours': daily_hours,
'weekly_hours': weekly_hours, 'weekly_hours': weekly_hours,
'grand_totals': { 'grand_totals': {
'total_hours': round(grand_total_hours, 2), 'total_hours': grand_total_hours,
'regular_hours': round(grand_regular_hours, 2), 'regular_hours': grand_regular_hours,
'overtime_hours': round(grand_overtime_hours, 2), 'overtime_hours': grand_overtime_hours,
'sp_hours': round(grand_sp_hours, 2), 'sp_hours': grand_sp_hours,
'pw_hours': round(grand_pw_hours, 2), 'pw_hours': grand_pw_hours,
'pt_hours': round(grand_pt_hours, 2), 'pt_hours': grand_pt_hours,
'total_minutes': int(grand_total_hours * 60), 'total_minutes': int(grand_total_hours * 60),
'regular_minutes': int(grand_regular_hours * 60), 'regular_minutes': int(grand_regular_hours * 60),
'overtime_minutes': int(grand_overtime_hours * 60), 'overtime_minutes': int(grand_overtime_hours * 60),
'sp_minutes': int(grand_sp_hours * 60), 'sp_minutes': int(grand_sp_hours * 60),
'pw_minutes': int(grand_pw_hours * 60), 'pw_minutes': int(grand_pw_hours * 60),
'pt_minutes': int(grand_pt_hours * 60) 'pt_minutes': int(grand_pt_hours * 60),
} }
} }