From dc600c2a8d6ed01c6477015f89352c4dae0f0c1c Mon Sep 17 00:00:00 2001 From: Nguyen Ngo Date: Wed, 20 Aug 2025 21:10:14 -0400 Subject: [PATCH] Fix project filter has not been applied when export data --- app.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app.py b/app.py index 112cb82..a84806d 100644 --- a/app.py +++ b/app.py @@ -3859,7 +3859,8 @@ def generate_excel_export(): 'date_from': request.form.get('date_from'), 'date_to': request.form.get('date_to'), 'location_filter': request.form.get('location_filter'), - 'employee_filter': request.form.get('employee_filter') + 'employee_filter': request.form.get('employee_filter'), + 'project_filter': request.form.get('project_filter') } print(f"📊 Export filters: {filters}") @@ -4124,6 +4125,11 @@ def create_excel_export_ordered(selected_columns, column_names, filters): query = query.filter(AttendanceData.employee_id.like(f"%{filters['employee_filter']}%")) print(f"📊 Applied employee filter: {filters['employee_filter']}") + # Apply project filter + if filters.get('project_filter'): + query = query.filter(QRCode.project_id == int(filters['project_filter'])) + print(f"📊 Applied project filter to export: {filters['project_filter']}") + # Execute query and get results results = query.order_by(AttendanceData.check_in_date.desc(), AttendanceData.check_in_time.desc()).all() print(f"📊 Found {len(results)} records for export")