Updated functionalities

app/routes/reports.py

@@ -3,7 +3,7 @@ import io
 from datetime import datetime, timedelta
 from app.utils.time_utils import now_eastern
 from flask import (Blueprint, render_template, request,
-                   Response, stream_with_context)
+                   Response, stream_with_context, abort)
 from flask_login import login_required, current_user
 from sqlalchemy import func
 from app import db
@@ -183,7 +183,9 @@ def facility_report(facility_id):
         from flask import flash, redirect, url_for
         flash('Access denied.', 'danger')
         return redirect(url_for('dashboard.index'))
-    facility    = Facility.query.get_or_404(facility_id)
+    facility    = db.session.get(Facility, facility_id)
+    if facility is None:
+        abort(404)
     if current_user.role == 'customer':
         cids = get_customer_scope(current_user) or []
         if facility_id not in cids:
@@ -233,7 +235,9 @@ def facility_scorecard(facility_id):
         flash('Access denied.', 'danger')
         return redirect(url_for('dashboard.index'))
 
-    facility = Facility.query.get_or_404(facility_id)
+    facility = db.session.get(Facility, facility_id)
+    if facility is None:
+        abort(404)
 
     if current_user.role == 'customer':
         cids = get_customer_scope(current_user) or []