From a731935a207587eae6eebd75a2c33bb60b737b5f Mon Sep 17 00:00:00 2001 From: NguyenND Date: Fri, 5 Dec 2025 15:09:11 -0500 Subject: [PATCH] Updated attendance report export file --- app.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index 7491cea..2c258e1 100644 --- a/app.py +++ b/app.py @@ -5620,11 +5620,11 @@ def create_excel_export(selected_columns, column_names, filters): try: # Handle each column type if column_key == 'employee_id': - cell.value = int(attendance_record.employee_id) or '' + cell.value = format_employee_id_for_excel(attendance_record.employee_id) elif column_key == 'employee_name': # NEW: Handle employee name from joined Employee table if employee_record: - cell.value = f"{employee_record.firstName} {employee_record.lastName}" + cell.value = f"{employee_record.firstName}, {employee_record.lastName}" else: cell.value = f"Unknown (ID: {attendance_record.employee_id})" elif column_key == 'location_name': @@ -5757,6 +5757,15 @@ def create_excel_export(selected_columns, column_names, filters): return None +def format_employee_id_for_excel(employee_id): + if not employee_id: + return '' + emp_id_str = str(employee_id).strip() + if emp_id_str.isdigit(): + return int(emp_id_str) + else: + return emp_id_str + def create_excel_export_ordered(selected_columns, column_names, filters): """Create Excel file with selected attendance data in specified column order""" try: @@ -5857,11 +5866,11 @@ def create_excel_export_ordered(selected_columns, column_names, filters): try: # Handle each column type if column_key == 'employee_id': - cell.value = int(attendance_record.employee_id) or '' + cell.value = format_employee_id_for_excel(attendance_record.employee_id) elif column_key == 'employee_name': # NEW: Handle employee name from joined Employee table if employee_record: - cell.value = f"{employee_record.firstName} {employee_record.lastName}" + cell.value = f"{employee_record.firstName}, {employee_record.lastName}" else: cell.value = f"Unknown (ID: {attendance_record.employee_id})" elif column_key == 'location_name':