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

05/04 Update code to replace Area related to Facility

Browse Source
This commit is contained in:
nngo
2026-05-04 13:46:37 -04:00
parent 2bdd6c1a26
commit a0136bd99b
17 changed files with 174 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/routes/reports.py
+10 -4
View File
@@ -64,8 +64,11 @@ def index():
if customer_facility_ids is not None:
if not customer_facility_ids:
return q.filter(False)
return q.join(Area, Issue.area_id == Area.id).filter(
Area.facility_id.in_(customer_facility_ids)
return q.outerjoin(Area, Issue.area_id == Area.id).filter(
db.or_(
Issue.facility_id.in_(customer_facility_ids),
Area.facility_id.in_(customer_facility_ids)
)
)
return q
@@ -450,8 +453,11 @@ def export_issues():
Issue.status,
Issue.resolved_at,
User.username.label('assigned_to'),
).join(Area, Issue.area_id == Area.id)\
.join(Facility, Area.facility_id == Facility.id)\
).outerjoin(Area, Issue.area_id == Area.id)\
.outerjoin(Facility, db.or_(
Facility.id == Area.facility_id,
Facility.id == Issue.facility_id
))\
.outerjoin(User, Issue.assigned_to == User.id)\
.filter(
Issue.reported_at >= start,