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

Updated attendance report export file

Browse Source
This commit is contained in:
nngo
2025-12-05 15:09:11 -05:00
parent 7ae7baba10
commit a731935a20
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.py
+13 -4
View File
@@ -5620,11 +5620,11 @@ def create_excel_export(selected_columns, column_names, filters):
try: try:
# Handle each column type # Handle each column type
if column_key == 'employee_id': 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': elif column_key == 'employee_name':
# NEW: Handle employee name from joined Employee table # NEW: Handle employee name from joined Employee table
if employee_record: if employee_record:
cell.value = f"{employee_record.firstName} {employee_record.lastName}" cell.value = f"{employee_record.firstName}, {employee_record.lastName}"
else: else:
cell.value = f"Unknown (ID: {attendance_record.employee_id})" cell.value = f"Unknown (ID: {attendance_record.employee_id})"
elif column_key == 'location_name': elif column_key == 'location_name':
@@ -5757,6 +5757,15 @@ def create_excel_export(selected_columns, column_names, filters):
return None 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): def create_excel_export_ordered(selected_columns, column_names, filters):
"""Create Excel file with selected attendance data in specified column order""" """Create Excel file with selected attendance data in specified column order"""
try: try:
@@ -5857,11 +5866,11 @@ def create_excel_export_ordered(selected_columns, column_names, filters):
try: try:
# Handle each column type # Handle each column type
if column_key == 'employee_id': 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': elif column_key == 'employee_name':
# NEW: Handle employee name from joined Employee table # NEW: Handle employee name from joined Employee table
if employee_record: if employee_record:
cell.value = f"{employee_record.firstName} {employee_record.lastName}" cell.value = f"{employee_record.firstName}, {employee_record.lastName}"
else: else:
cell.value = f"Unknown (ID: {attendance_record.employee_id})" cell.value = f"Unknown (ID: {attendance_record.employee_id})"
elif column_key == 'location_name': elif column_key == 'location_name':