05/25 Update inspectors contract assignment
This commit is contained in:
+74
-19
@@ -7,7 +7,7 @@ from app.models.facility import Facility
|
||||
from app.models.issue import Issue
|
||||
from app.models.user import User
|
||||
from app.utils.sla import sla_status, SLA_HOURS
|
||||
from app.utils.scope import get_customer_scope
|
||||
from app.utils.scope import get_customer_scope, get_inspector_scope
|
||||
from sqlalchemy import func
|
||||
from datetime import datetime, timedelta
|
||||
from app.utils.time_utils import now_eastern
|
||||
@@ -31,13 +31,20 @@ def index():
|
||||
is_customer = current_user.role == 'customer'
|
||||
is_project_manager = current_user.role == 'project_manager'
|
||||
|
||||
# Resolve facility scope for customer users
|
||||
customer_facility_ids = get_customer_scope(current_user) # None for non-customers
|
||||
# Resolve facility scope
|
||||
customer_facility_ids = get_customer_scope(current_user) # None for non-customers
|
||||
inspector_facility_ids = get_inspector_scope(current_user) # None for non-inspectors
|
||||
|
||||
# ── Today's stats ─────────────────────────────────────────────────────
|
||||
# ── Today's stats (inspector: own work within contracted facilities) ───
|
||||
base_q = Inspection.query
|
||||
if is_inspector:
|
||||
base_q = base_q.filter(Inspection.inspector_id == current_user.id)
|
||||
if not inspector_facility_ids:
|
||||
base_q = base_q.filter(False)
|
||||
else:
|
||||
base_q = base_q.filter(
|
||||
Inspection.facility_id.in_(inspector_facility_ids),
|
||||
Inspection.inspector_id == current_user.id,
|
||||
)
|
||||
elif is_customer:
|
||||
if not customer_facility_ids:
|
||||
base_q = base_q.filter(False) # no access
|
||||
@@ -55,12 +62,19 @@ def index():
|
||||
Inspection.inspection_date < today_end,
|
||||
).count()
|
||||
|
||||
# ── Open issues ────────────────────────────────────────────────────────
|
||||
# ── Open issues (inspector: all issues in contracted facilities) ───────
|
||||
open_issues_q = Issue.query.filter(Issue.status.in_(['open', 'in_progress']))
|
||||
if is_inspector:
|
||||
open_issues_q = open_issues_q.join(
|
||||
Inspection, Issue.inspection_id == Inspection.id
|
||||
).filter(Inspection.inspector_id == current_user.id)
|
||||
if not inspector_facility_ids:
|
||||
open_issues_q = open_issues_q.filter(False)
|
||||
else:
|
||||
from app.models.facility import Area
|
||||
open_issues_q = open_issues_q.outerjoin(
|
||||
Area, Issue.area_id == Area.id
|
||||
).filter(db.or_(
|
||||
Issue.facility_id.in_(inspector_facility_ids),
|
||||
Area.facility_id.in_(inspector_facility_ids)
|
||||
))
|
||||
elif is_customer:
|
||||
if not customer_facility_ids:
|
||||
open_issues_q = open_issues_q.filter(False)
|
||||
@@ -83,14 +97,20 @@ def index():
|
||||
'low': sum(1 for i in open_issues_all if i.severity == 'low'),
|
||||
}
|
||||
|
||||
# ── Average score (last 30 days) ───────────────────────────────────────
|
||||
# ── Average score (last 30 days, inspector: own work in contracted facilities)
|
||||
score_q = db.session.query(func.avg(Inspection.overall_score)).filter(
|
||||
Inspection.status == 'completed',
|
||||
Inspection.overall_score.isnot(None),
|
||||
Inspection.inspection_date >= thirty_days_ago,
|
||||
)
|
||||
if is_inspector:
|
||||
score_q = score_q.filter(Inspection.inspector_id == current_user.id)
|
||||
if not inspector_facility_ids:
|
||||
score_q = score_q.filter(False)
|
||||
else:
|
||||
score_q = score_q.filter(
|
||||
Inspection.facility_id.in_(inspector_facility_ids),
|
||||
Inspection.inspector_id == current_user.id,
|
||||
)
|
||||
elif is_customer:
|
||||
if customer_facility_ids:
|
||||
score_q = score_q.filter(Inspection.facility_id.in_(customer_facility_ids))
|
||||
@@ -101,7 +121,13 @@ def index():
|
||||
# ── Recent inspections ─────────────────────────────────────────────────
|
||||
recent_q = Inspection.query.order_by(Inspection.inspection_date.desc())
|
||||
if is_inspector:
|
||||
recent_q = recent_q.filter(Inspection.inspector_id == current_user.id)
|
||||
if not inspector_facility_ids:
|
||||
recent_q = recent_q.filter(False)
|
||||
else:
|
||||
recent_q = recent_q.filter(
|
||||
Inspection.facility_id.in_(inspector_facility_ids),
|
||||
Inspection.inspector_id == current_user.id,
|
||||
)
|
||||
elif is_customer:
|
||||
if customer_facility_ids:
|
||||
recent_q = recent_q.filter(Inspection.facility_id.in_(customer_facility_ids))
|
||||
@@ -119,7 +145,13 @@ def index():
|
||||
follow_up_required=True, status='completed'
|
||||
).filter(~Inspection.follow_ups.any())
|
||||
if is_inspector:
|
||||
followup_q = followup_q.filter(Inspection.inspector_id == current_user.id)
|
||||
if not inspector_facility_ids:
|
||||
followup_q = followup_q.filter(False)
|
||||
else:
|
||||
followup_q = followup_q.filter(
|
||||
Inspection.facility_id.in_(inspector_facility_ids),
|
||||
Inspection.inspector_id == current_user.id,
|
||||
)
|
||||
elif is_customer:
|
||||
if customer_facility_ids:
|
||||
followup_q = followup_q.filter(Inspection.facility_id.in_(customer_facility_ids))
|
||||
@@ -140,9 +172,17 @@ def index():
|
||||
Facility.active == True,
|
||||
).order_by(Facility.name).all()
|
||||
|
||||
# ── SLA summary (open + in_progress issues only) ──────────────────────
|
||||
# ── SLA summary (open + in_progress issues, scoped) ───────────────────
|
||||
sla_q = Issue.query.filter(Issue.status.in_(['open', 'in_progress']))
|
||||
if is_customer and customer_facility_ids:
|
||||
if is_inspector and inspector_facility_ids:
|
||||
from app.models.facility import Area
|
||||
sla_q = sla_q.outerjoin(Area, Issue.area_id == Area.id).filter(
|
||||
db.or_(
|
||||
Issue.facility_id.in_(inspector_facility_ids),
|
||||
Area.facility_id.in_(inspector_facility_ids)
|
||||
)
|
||||
)
|
||||
elif is_customer and customer_facility_ids:
|
||||
from app.models.facility import Area
|
||||
sla_q = sla_q.outerjoin(Area, Issue.area_id == Area.id).filter(
|
||||
db.or_(
|
||||
@@ -150,9 +190,14 @@ def index():
|
||||
Area.facility_id.in_(customer_facility_ids)
|
||||
)
|
||||
)
|
||||
all_open_issues = sla_q.all() if not is_customer or customer_facility_ids else []
|
||||
sla_breached = sum(1 for i in all_open_issues if sla_status(i) == 'breached')
|
||||
sla_at_risk = sum(1 for i in all_open_issues if sla_status(i) == 'at_risk')
|
||||
if is_inspector and not inspector_facility_ids:
|
||||
all_open_issues = []
|
||||
elif is_customer and not customer_facility_ids:
|
||||
all_open_issues = []
|
||||
else:
|
||||
all_open_issues = sla_q.all()
|
||||
sla_breached = sum(1 for i in all_open_issues if sla_status(i) == 'breached')
|
||||
sla_at_risk = sum(1 for i in all_open_issues if sla_status(i) == 'at_risk')
|
||||
|
||||
# ── Score trend (last 30 days, grouped by day) ────────────────────────
|
||||
trend_q = (
|
||||
@@ -167,7 +212,13 @@ def index():
|
||||
)
|
||||
)
|
||||
if is_inspector:
|
||||
trend_q = trend_q.filter(Inspection.inspector_id == current_user.id)
|
||||
if not inspector_facility_ids:
|
||||
trend_q = trend_q.filter(False)
|
||||
else:
|
||||
trend_q = trend_q.filter(
|
||||
Inspection.facility_id.in_(inspector_facility_ids),
|
||||
Inspection.inspector_id == current_user.id,
|
||||
)
|
||||
elif is_customer:
|
||||
if customer_facility_ids:
|
||||
trend_q = trend_q.filter(Inspection.facility_id.in_(customer_facility_ids))
|
||||
@@ -222,6 +273,10 @@ def index():
|
||||
# ── Facilities list for the trend-by-facility chart selector ────────────
|
||||
if is_privileged or is_project_manager:
|
||||
all_facilities = Facility.query.filter_by(active=True).order_by(Facility.name).all()
|
||||
elif is_inspector and inspector_facility_ids:
|
||||
all_facilities = Facility.query.filter(
|
||||
Facility.id.in_(inspector_facility_ids), Facility.active == True
|
||||
).order_by(Facility.name).all()
|
||||
elif is_customer and customer_facility_ids:
|
||||
all_facilities = Facility.query.filter(
|
||||
Facility.id.in_(customer_facility_ids), Facility.active == True
|
||||
|
||||
Reference in New Issue
Block a user