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

Fix project filter has not been applied when export data

Browse Source
This commit is contained in:
nngo
2025-08-20 21:10:14 -04:00
parent 206471dad5
commit dc600c2a8d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.py
+7 -1
View File
@@ -3859,7 +3859,8 @@ def generate_excel_export():
'date_from': request.form.get('date_from'), 'date_from': request.form.get('date_from'),
'date_to': request.form.get('date_to'), 'date_to': request.form.get('date_to'),
'location_filter': request.form.get('location_filter'), '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}") 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']}%")) query = query.filter(AttendanceData.employee_id.like(f"%{filters['employee_filter']}%"))
print(f"📊 Applied employee filter: {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 # Execute query and get results
results = query.order_by(AttendanceData.check_in_date.desc(), AttendanceData.check_in_time.desc()).all() results = query.order_by(AttendanceData.check_in_date.desc(), AttendanceData.check_in_time.desc()).all()
print(f"📊 Found {len(results)} records for export") print(f"📊 Found {len(results)} records for export")