06/12 Redesign Reports page

This commit is contained in:
2026-06-12 12:47:56 -04:00
parent f1413e0a5d
commit 8cc1770c10
9 changed files with 1329 additions and 27 deletions
+616 -1
View File
@@ -1003,4 +1003,619 @@ def export_inspector_performance():
buf.read(),
mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
headers={'Content-Disposition': f'attachment; filename="{filename}"'},
)
)
# ── Issues Aging ──────────────────────────────────────────────────────────────
def _age_bucket(age_h):
if age_h < 24: return '<24h'
if age_h < 72: return '13 days'
if age_h < 168: return '37 days'
if age_h < 720: return '14 weeks'
return '>4 weeks'
AGING_BUCKETS = ['<24h', '13 days', '37 days', '14 weeks', '>4 weeks']
def _load_open_issues_scoped(customer_facility_ids, severity_filter, facility_id_filter):
"""Return open issues with area+facility+assigned_user loaded, filters applied."""
q = Issue.query.options(
joinedload(Issue.area).joinedload(Area.facility),
joinedload(Issue.assigned_user),
).filter(Issue.status != 'resolved')
if customer_facility_ids is not None:
if not customer_facility_ids:
return []
q = 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))
)
if severity_filter:
q = q.filter(Issue.severity == severity_filter)
issues = q.order_by(Issue.reported_at).all()
if facility_id_filter:
issues = [i for i in issues if
(i.facility_id == facility_id_filter) or
(i.area and i.area.facility_id == facility_id_filter)]
return issues
@bp.route('/issues-aging')
@login_required
def issues_aging():
from app.utils.sla import sla_status
now = now_eastern()
customer_facility_ids = get_customer_scope(current_user)
severity_filter = request.args.get('severity', '')
facility_id_filter = request.args.get('facility_id', type=int)
issues = _load_open_issues_scoped(customer_facility_ids, severity_filter, facility_id_filter)
buckets = {b: [] for b in AGING_BUCKETS}
for issue in issues:
age_h = (now - issue.reported_at).total_seconds() / 3600
buckets[_age_bucket(age_h)].append({
'issue': issue,
'age_h': round(age_h, 1),
'sla': sla_status(issue),
})
sla_breached = sum(1 for i in issues if sla_status(i) == 'breached')
sla_at_risk = sum(1 for i in issues if sla_status(i) == 'at_risk')
if customer_facility_ids is not None:
facilities = (Facility.query.filter(Facility.id.in_(customer_facility_ids), Facility.active == True)
.order_by(Facility.name).all()) if customer_facility_ids else []
else:
facilities = Facility.query.filter_by(active=True).order_by(Facility.name).all()
return render_template('reports/issues_aging.html',
now=now,
buckets=buckets,
bucket_labels=AGING_BUCKETS,
total=len(issues),
sla_breached=sla_breached,
sla_at_risk=sla_at_risk,
severity_filter=severity_filter,
facility_id_filter=facility_id_filter,
facilities=facilities,
)
@bp.route('/export/issues-aging')
@login_required
def export_issues_aging():
try:
from openpyxl import Workbook
from openpyxl.styles import Font, PatternFill, Alignment, Border, Side
from openpyxl.utils import get_column_letter
except ImportError:
abort(501)
from app.utils.sla import sla_status
now = now_eastern()
customer_facility_ids = get_customer_scope(current_user)
severity_filter = request.args.get('severity', '')
facility_id_filter = request.args.get('facility_id', type=int)
issues = _load_open_issues_scoped(customer_facility_ids, severity_filter, facility_id_filter)
log_action(ACTION_EXPORT, 'Issue', None, 'Issues Aging Excel',
f'severity={severity_filter or "all"} facility={facility_id_filter or "all"}')
wb = Workbook()
ws = wb.active
ws.title = 'Issues Aging'
ws.freeze_panes = 'A2'
hdr_font = Font(bold=True, color='FFFFFF', size=11)
hdr_fill = PatternFill('solid', fgColor='DC2626')
good_fill = PatternFill('solid', fgColor='D1FAE5')
warn_fill = PatternFill('solid', fgColor='FEF3C7')
bad_fill = PatternFill('solid', fgColor='FEE2E2')
sub_fill = PatternFill('solid', fgColor='FFF5F5')
thin = Side(style='thin', color='D1D5DB')
bdr = Border(left=thin, right=thin, top=thin, bottom=thin)
ctr = Alignment(horizontal='center', vertical='center')
lft = Alignment(horizontal='left', vertical='center')
hdrs = ['#', 'Reported', 'Age (h)', 'Age Bucket', 'Facility', 'Area',
'Severity', 'Description', 'Status', 'SLA', 'Assigned To']
widths = [6, 18, 10, 14, 28, 20, 12, 45, 20, 14, 22]
for ci, (h, w) in enumerate(zip(hdrs, widths), 1):
cell = ws.cell(row=1, column=ci, value=h)
cell.font = hdr_font; cell.fill = hdr_fill; cell.border = bdr
cell.alignment = Alignment(horizontal='center', vertical='center', wrap_text=True)
ws.column_dimensions[get_column_letter(ci)].width = w
ws.row_dimensions[1].height = 22
sev_fill = {'critical': bad_fill, 'high': bad_fill, 'medium': warn_fill, 'low': sub_fill}
sla_fill = {'breached': bad_fill, 'at_risk': warn_fill, 'ok': good_fill}
for ri, issue in enumerate(issues, 2):
age_h = (now - issue.reported_at).total_seconds() / 3600
sla = sla_status(issue)
fac = issue.resolved_facility
stripe = sub_fill if ri % 2 == 0 else None
row = [issue.id,
issue.reported_at.strftime('%Y-%m-%d %H:%M'),
round(age_h, 1),
_age_bucket(age_h),
fac.name if fac else '',
issue.area.name if issue.area else '',
issue.severity.title() if issue.severity else '',
issue.description,
issue.status.replace('_', ' ').title(),
(sla or '').replace('_', ' ').title(),
issue.assigned_user.display_name if issue.assigned_user else '']
for ci, val in enumerate(row, 1):
cell = ws.cell(row=ri, column=ci, value=val)
cell.border = bdr
cell.alignment = lft if ci in (5, 6, 8, 11) else ctr
if ci not in (7, 10) and stripe:
cell.fill = stripe
sf = sev_fill.get(issue.severity)
if sf: ws.cell(row=ri, column=7).fill = sf
slaf = sla_fill.get(sla)
if slaf: ws.cell(row=ri, column=10).fill = slaf
ws.row_dimensions[ri].height = 16
buf = io.BytesIO(); wb.save(buf); buf.seek(0)
fname = f'issues_aging_{now.strftime("%Y%m%d")}.xlsx'
return Response(buf.read(),
mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
headers={'Content-Disposition': f'attachment; filename="{fname}"'})
# ── SLA Compliance Summary ────────────────────────────────────────────────────
def _sla_within(issue):
from app.utils.sla import SLA_HOURS
if not issue.resolved_at or not issue.reported_at:
return False
elapsed_h = (issue.resolved_at - issue.reported_at).total_seconds() / 3600
return elapsed_h <= SLA_HOURS.get(issue.severity, 9999)
@bp.route('/sla-compliance')
@login_required
def sla_compliance():
from app.utils.sla import SLA_HOURS
start, end = _date_range()
customer_facility_ids = get_customer_scope(current_user)
facility_id_filter = request.args.get('facility_id', type=int)
q = Issue.query.options(
joinedload(Issue.area).joinedload(Area.facility),
).filter(
Issue.status == 'resolved',
Issue.reported_at >= start,
Issue.reported_at <= end,
)
if customer_facility_ids is not None:
if not customer_facility_ids:
q = q.filter(False)
else:
q = 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))
)
issues = q.all()
if facility_id_filter:
issues = [i for i in issues if
(i.facility_id == facility_id_filter) or
(i.area and i.area.facility_id == facility_id_filter)]
total = len(issues)
met = sum(1 for i in issues if _sla_within(i))
overall_pct = round(met / total * 100, 1) if total else None
by_severity = {}
for sev in ('critical', 'high', 'medium', 'low'):
sub = [i for i in issues if i.severity == sev]
n = len(sub)
m = sum(1 for i in sub if _sla_within(i))
by_severity[sev] = {
'total': n, 'met': m,
'pct': round(m / n * 100, 1) if n else None,
'sla_hours': SLA_HOURS.get(sev, 0),
}
fac_map = {}
for issue in issues:
fac = issue.resolved_facility
if not fac:
continue
fid = fac.id
if fid not in fac_map:
fac_map[fid] = {'name': fac.name, 'total': 0, 'met': 0}
fac_map[fid]['total'] += 1
if _sla_within(issue):
fac_map[fid]['met'] += 1
by_facility = sorted([
{'name': d['name'], 'total': d['total'], 'met': d['met'],
'pct': round(d['met'] / d['total'] * 100, 1) if d['total'] else None}
for d in fac_map.values()
], key=lambda x: (x['pct'] is None, -(x['pct'] or 0)))
if customer_facility_ids is not None:
facilities = (Facility.query.filter(Facility.id.in_(customer_facility_ids), Facility.active == True)
.order_by(Facility.name).all()) if customer_facility_ids else []
else:
facilities = Facility.query.filter_by(active=True).order_by(Facility.name).all()
return render_template('reports/sla_compliance.html',
start=start, end=end,
total=total, met=met, overall_pct=overall_pct,
by_severity=by_severity,
by_facility=by_facility,
facility_id_filter=facility_id_filter,
facilities=facilities,
)
@bp.route('/export/sla-compliance')
@login_required
def export_sla_compliance():
try:
from openpyxl import Workbook
from openpyxl.styles import Font, PatternFill, Alignment, Border, Side
from openpyxl.utils import get_column_letter
except ImportError:
abort(501)
from app.utils.sla import SLA_HOURS
start, end = _date_range()
customer_facility_ids = get_customer_scope(current_user)
facility_id_filter = request.args.get('facility_id', type=int)
q = Issue.query.options(
joinedload(Issue.area).joinedload(Area.facility),
).filter(Issue.status == 'resolved', Issue.reported_at >= start, Issue.reported_at <= end)
if customer_facility_ids is not None:
if not customer_facility_ids:
q = q.filter(False)
else:
q = 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))
)
issues = q.all()
if facility_id_filter:
issues = [i for i in issues if
(i.facility_id == facility_id_filter) or
(i.area and i.area.facility_id == facility_id_filter)]
log_action(ACTION_EXPORT, 'Issue', None, 'SLA Compliance Excel',
f'range={start.strftime("%Y-%m-%d")} to {end.strftime("%Y-%m-%d")}')
wb = Workbook()
thin = Side(style='thin', color='D1D5DB')
bdr = Border(left=thin, right=thin, top=thin, bottom=thin)
hdr_font = Font(bold=True, color='FFFFFF', size=11)
hdr_fill = PatternFill('solid', fgColor='1A56DB')
good_fill = PatternFill('solid', fgColor='D1FAE5')
warn_fill = PatternFill('solid', fgColor='FEF3C7')
bad_fill = PatternFill('solid', fgColor='FEE2E2')
sub_fill = PatternFill('solid', fgColor='EFF6FF')
ctr = Alignment(horizontal='center', vertical='center')
lft = Alignment(horizontal='left', vertical='center')
def _pct_fill(pct):
if pct is None: return None
return good_fill if pct >= 90 else warn_fill if pct >= 70 else bad_fill
def _hdr(ws, row, headers, widths, fill=None):
fill = fill or hdr_fill
for ci, (h, w) in enumerate(zip(headers, widths), 1):
cell = ws.cell(row=row, column=ci, value=h)
cell.font = hdr_font; cell.fill = fill; cell.border = bdr
cell.alignment = Alignment(horizontal='center', vertical='center', wrap_text=True)
ws.column_dimensions[get_column_letter(ci)].width = w
ws.row_dimensions[row].height = 22
# ── Sheet 1: Severity Summary ────────────────────────────────────────
ws1 = wb.active
ws1.title = 'By Severity'
ws1.freeze_panes = 'A2'
_hdr(ws1, 1, ['Severity', 'SLA Window', 'Total Resolved', 'Met SLA', 'Compliance %'],
[14, 14, 16, 12, 16])
for ri, sev in enumerate(['critical', 'high', 'medium', 'low'], 2):
sub = [i for i in issues if i.severity == sev]
n = len(sub)
m = sum(1 for i in sub if _sla_within(i))
pct = round(m / n * 100, 1) if n else None
row = [sev.title(), f'{SLA_HOURS.get(sev)}h', n, m,
f'{pct}%' if pct is not None else '']
for ci, val in enumerate(row, 1):
cell = ws1.cell(row=ri, column=ci, value=val)
cell.border = bdr; cell.alignment = lft if ci == 1 else ctr
if ri % 2 == 0: cell.fill = sub_fill
pf = _pct_fill(pct)
if pf: ws1.cell(row=ri, column=5).fill = pf
# Overall totals row
tr = 6
total = len(issues); met = sum(1 for i in issues if _sla_within(i))
op = round(met / total * 100, 1) if total else None
for ci, val in enumerate(['OVERALL', '', total, met,
f'{op}%' if op is not None else ''], 1):
cell = ws1.cell(row=tr, column=ci, value=val)
cell.font = Font(bold=True); cell.border = bdr; cell.alignment = lft if ci == 1 else ctr
cell.fill = PatternFill('solid', fgColor='DBEAFE')
pf = _pct_fill(op)
if pf: ws1.cell(row=tr, column=5).fill = pf
# ── Sheet 2: Facility Breakdown ──────────────────────────────────────
ws2 = wb.create_sheet('By Facility')
ws2.freeze_panes = 'A2'
_hdr(ws2, 1, ['Facility', 'Total Resolved', 'Met SLA', 'Compliance %'], [30, 16, 12, 16])
fac_map = {}
for issue in issues:
fac = issue.resolved_facility
if not fac: continue
fid = fac.id
if fid not in fac_map:
fac_map[fid] = {'name': fac.name, 'total': 0, 'met': 0}
fac_map[fid]['total'] += 1
if _sla_within(issue): fac_map[fid]['met'] += 1
rows_sorted = sorted(fac_map.values(), key=lambda x: (
(round(x['met']/x['total']*100,1) if x['total'] else None) is None,
-(round(x['met']/x['total']*100,1) if x['total'] else 0)
))
for ri, d in enumerate(rows_sorted, 2):
pct = round(d['met'] / d['total'] * 100, 1) if d['total'] else None
row = [d['name'], d['total'], d['met'], f'{pct}%' if pct is not None else '']
for ci, val in enumerate(row, 1):
cell = ws2.cell(row=ri, column=ci, value=val)
cell.border = bdr; cell.alignment = lft if ci == 1 else ctr
if ri % 2 == 0: cell.fill = sub_fill
pf = _pct_fill(pct)
if pf: ws2.cell(row=ri, column=4).fill = pf
buf = io.BytesIO(); wb.save(buf); buf.seek(0)
fname = f'sla_compliance_{start.strftime("%Y%m%d")}_{end.strftime("%Y%m%d")}.xlsx'
return Response(buf.read(),
mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
headers={'Content-Disposition': f'attachment; filename="{fname}"'})
# ── Follow-up Closure Rate ────────────────────────────────────────────────────
@bp.route('/followup-closure')
@login_required
@supervisor_required
def followup_closure():
start, end = _date_range()
flagged = Inspection.query.options(
joinedload(Inspection.facility),
joinedload(Inspection.inspector),
joinedload(Inspection.template),
).filter(
Inspection.follow_up_required == True,
Inspection.inspection_date >= start,
Inspection.inspection_date <= end,
).order_by(Inspection.inspection_date.desc()).all()
flagged_ids = [i.id for i in flagged]
followed_up_ids = set()
if flagged_ids:
followed_up_ids = {
row[0] for row in
db.session.query(Inspection.parent_inspection_id)
.filter(Inspection.parent_inspection_id.in_(flagged_ids))
.distinct()
if row[0] is not None
}
for insp in flagged:
insp._has_followup = insp.id in followed_up_ids
total = len(flagged)
closed = sum(1 for i in flagged if i._has_followup)
rate = round(closed / total * 100, 1) if total else None
fac_map = {}
for insp in flagged:
fac = insp.facility
if not fac: continue
fid = fac.id
if fid not in fac_map:
fac_map[fid] = {'name': fac.name, 'total': 0, 'closed': 0}
fac_map[fid]['total'] += 1
if insp._has_followup:
fac_map[fid]['closed'] += 1
by_facility = sorted([
{'name': d['name'], 'total': d['total'], 'closed': d['closed'],
'rate': round(d['closed'] / d['total'] * 100, 1) if d['total'] else 0}
for d in fac_map.values()
], key=lambda x: -x['total'])
return render_template('reports/followup_closure.html',
start=start, end=end,
flagged=flagged,
total=total, closed=closed, rate=rate,
by_facility=by_facility,
followed_up_ids=followed_up_ids,
)
@bp.route('/export/followup-closure')
@login_required
@supervisor_required
def export_followup_closure():
try:
from openpyxl import Workbook
from openpyxl.styles import Font, PatternFill, Alignment, Border, Side
from openpyxl.utils import get_column_letter
except ImportError:
abort(501)
start, end = _date_range()
flagged = Inspection.query.options(
joinedload(Inspection.facility),
joinedload(Inspection.inspector),
joinedload(Inspection.template),
).filter(
Inspection.follow_up_required == True,
Inspection.inspection_date >= start,
Inspection.inspection_date <= end,
).order_by(Inspection.inspection_date.desc()).all()
flagged_ids = [i.id for i in flagged]
followed_up_ids = set()
if flagged_ids:
followed_up_ids = {
row[0] for row in
db.session.query(Inspection.parent_inspection_id)
.filter(Inspection.parent_inspection_id.in_(flagged_ids))
.distinct()
if row[0] is not None
}
for insp in flagged:
insp._has_followup = insp.id in followed_up_ids
log_action(ACTION_EXPORT, 'Inspection', None, 'Follow-up Closure Excel',
f'range={start.strftime("%Y-%m-%d")} to {end.strftime("%Y-%m-%d")}')
wb = Workbook()
ws = wb.active
ws.title = 'Follow-up Detail'
ws.freeze_panes = 'A2'
thin = Side(style='thin', color='D1D5DB')
bdr = Border(left=thin, right=thin, top=thin, bottom=thin)
hdr_font = Font(bold=True, color='FFFFFF', size=11)
hdr_fill = PatternFill('solid', fgColor='7C3AED')
good_fill = PatternFill('solid', fgColor='D1FAE5')
bad_fill = PatternFill('solid', fgColor='FEE2E2')
sub_fill = PatternFill('solid', fgColor='F5F3FF')
ctr = Alignment(horizontal='center', vertical='center')
lft = Alignment(horizontal='left', vertical='center')
hdrs = ['Inspection ID', 'Date', 'Facility', 'Area', 'Template', 'Inspector',
'Score (%)', 'Follow-up Note', 'Followed Up?']
widths = [14, 18, 28, 20, 24, 22, 12, 40, 14]
for ci, (h, w) in enumerate(zip(hdrs, widths), 1):
cell = ws.cell(row=1, column=ci, value=h)
cell.font = hdr_font; cell.fill = hdr_fill; cell.border = bdr
cell.alignment = Alignment(horizontal='center', vertical='center', wrap_text=True)
ws.column_dimensions[get_column_letter(ci)].width = w
ws.row_dimensions[1].height = 22
for ri, insp in enumerate(flagged, 2):
stripe = sub_fill if ri % 2 == 0 else None
insp_name = insp.inspector.display_name if insp.inspector else ''
row = [insp.id,
insp.inspection_date.strftime('%Y-%m-%d') if insp.inspection_date else '',
insp.facility.name if insp.facility else '',
insp.area.name if insp.area else '',
insp.template.name if insp.template else '',
insp_name,
insp.overall_score,
insp.follow_up_note or '',
'Yes' if insp._has_followup else 'No']
for ci, val in enumerate(row, 1):
cell = ws.cell(row=ri, column=ci, value=val)
cell.border = bdr
cell.alignment = lft if ci in (3, 4, 5, 6, 8) else ctr
if stripe and ci != 9: cell.fill = stripe
# Colour the Follow-up column
fu_cell = ws.cell(row=ri, column=9)
fu_cell.fill = good_fill if insp._has_followup else bad_fill
fu_cell.font = Font(bold=True)
ws.row_dimensions[ri].height = 16
buf = io.BytesIO(); wb.save(buf); buf.seek(0)
fname = f'followup_closure_{start.strftime("%Y%m%d")}_{end.strftime("%Y%m%d")}.xlsx'
return Response(buf.read(),
mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
headers={'Content-Disposition': f'attachment; filename="{fname}"'})
# ── Customer Facility Summary PDF ────────────────────────────────────────────
@bp.route('/facility/<int:facility_id>/summary-pdf')
@login_required
def facility_summary_pdf(facility_id):
"""One-click customer-facing PDF summary for a facility."""
from app.utils.pdf_export import generate_facility_summary_pdf
from app.utils.sla import SLA_HOURS
facility = db.session.get(Facility, facility_id)
if facility is None:
abort(404)
# Access control
if current_user.role == 'customer':
cids = get_customer_scope(current_user) or []
if facility_id not in cids:
abort(403)
elif current_user.role == 'inspector':
has = Inspection.query.filter_by(facility_id=facility_id,
inspector_id=current_user.id).first()
if not has:
abort(403)
days = request.args.get('days', 90, type=int)
if days not in (30, 60, 90, 180, 365):
days = 90
now = now_eastern()
start = now - timedelta(days=days)
completed_insp = Inspection.query.filter(
Inspection.facility_id == facility_id,
Inspection.inspection_date >= start,
Inspection.status == 'completed',
).order_by(Inspection.inspection_date.desc()).all()
area_scores = db.session.query(
Area.name,
func.avg(Inspection.overall_score).label('avg'),
func.count(Inspection.id).label('count'),
).join(Inspection, Area.id == Inspection.area_id).filter(
Inspection.facility_id == facility_id,
Inspection.inspection_date >= start,
Inspection.status == 'completed',
Inspection.overall_score.isnot(None),
).group_by(Area.id, Area.name).order_by(func.avg(Inspection.overall_score).desc()).all()
open_issues = Issue.query.join(Area).filter(
Area.facility_id == facility_id,
Issue.status != 'resolved',
).options(joinedload(Issue.area)).order_by(Issue.severity, Issue.reported_at).all()
resolved_count = Issue.query.join(Area).filter(
Area.facility_id == facility_id,
Issue.status == 'resolved',
Issue.resolved_at >= start,
).count()
scores = [float(i.overall_score) for i in completed_insp if i.overall_score is not None]
avg_score = round(sum(scores) / len(scores), 1) if scores else None
log_action(ACTION_EXPORT, 'Facility', facility_id, facility.name,
f'Customer Summary PDF days={days}')
pdf_bytes = generate_facility_summary_pdf(
facility=facility,
days=days,
start=start,
now=now,
total_inspections=len(completed_insp),
avg_score=avg_score,
area_scores=area_scores,
open_issues=open_issues,
resolved_count=resolved_count,
)
fname = f'{facility.name.replace(" ", "_")}_summary_{now.strftime("%Y%m%d")}.pdf'
return Response(pdf_bytes,
mimetype='application/pdf',
headers={'Content-Disposition': f'attachment; filename="{fname}"'})