diff --git a/py_app/app/__pycache__/routes.cpython-311.pyc b/py_app/app/__pycache__/routes.cpython-311.pyc index ceec01e..8e1e188 100644 Binary files a/py_app/app/__pycache__/routes.cpython-311.pyc and b/py_app/app/__pycache__/routes.cpython-311.pyc differ diff --git a/py_app/app/routes.py b/py_app/app/routes.py index 86c536a..7913e20 100644 --- a/py_app/app/routes.py +++ b/py_app/app/routes.py @@ -312,7 +312,18 @@ def get_report_data(): """, (five_days_ago.strftime('%Y-%m-%d'),)) rows = cursor.fetchall() print("Fetched rows for report 4 (non-zero quality_code, last 5 days):", rows) - data["headers"] = ["Id", "Operator Code", "CP Full Code", "OC1 Code", "OC2 Code", "Quality Code", "Date", "Time", "Approved Quantity", "Rejected Quantity"] + data["headers"] = ["Id", "Operator Code", "CP Base Code", "OC1 Code", "OC2 Code", "Quality Code", "Date", "Time", "Approved Quantity", "Rejected Quantity"] + data["rows"] = [[str(cell) if isinstance(cell, (datetime, timedelta)) else cell for cell in row] for row in rows] + + elif report == "5": # Logic for the 5-ft report (all rows) + cursor.execute(""" + SELECT Id, operator_code, CP_base_code, CP_full_code, OC1_code, OC2_code, quality_code, date, time, approved_quantity, rejected_quantity + FROM scan1_orders + ORDER BY date DESC, time DESC + """) + rows = cursor.fetchall() + print("Fetched rows for report 5 (all rows):", rows) + data["headers"] = ["Id", "Operator Code", "CP Base Code", "CP Full Code", "OC1 Code", "OC2 Code", "Quality Code", "Date", "Time", "Approved Quantity", "Rejected Quantity"] data["rows"] = [[str(cell) if isinstance(cell, (datetime, timedelta)) else cell for cell in row] for row in rows] conn.close() diff --git a/py_app/app/templates/quality.html b/py_app/app/templates/quality.html index 6704b93..c29cca9 100644 --- a/py_app/app/templates/quality.html +++ b/py_app/app/templates/quality.html @@ -22,8 +22,8 @@