update pages
This commit is contained in:
@@ -338,7 +338,7 @@ def get_report_data():
|
||||
""")
|
||||
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["headers"] = ["Id", "Operator Code", "CP Base Code", "CP Full Code", "OC1 Code", "OC2 Code", "Quality Code", "Date", "Time", "Approved Quantity of order", "Rejected Quantity of order"]
|
||||
data["rows"] = [[str(cell) if isinstance(cell, (datetime, timedelta)) else cell for cell in row] for row in rows]
|
||||
|
||||
conn.close()
|
||||
@@ -349,6 +349,37 @@ def get_report_data():
|
||||
print("Data being returned:", data)
|
||||
return jsonify(data)
|
||||
|
||||
@bp.route('/generate_report', methods=['GET'])
|
||||
def generate_report():
|
||||
"""Generate report for specific date (calendar-based report)"""
|
||||
report = request.args.get('report')
|
||||
selected_date = request.args.get('date')
|
||||
data = {"headers": [], "rows": []}
|
||||
|
||||
try:
|
||||
conn = get_db_connection()
|
||||
cursor = conn.cursor()
|
||||
|
||||
if report == "6" and selected_date: # Custom date report
|
||||
cursor.execute("""
|
||||
SELECT Id, operator_code, CP_base_code, OC1_code, OC2_code, quality_code, date, time, approved_quantity, rejected_quantity
|
||||
FROM scan1_orders
|
||||
WHERE date = ?
|
||||
ORDER BY time DESC
|
||||
""", (selected_date,))
|
||||
rows = cursor.fetchall()
|
||||
print(f"Fetched rows for report 6 (custom date {selected_date}):", rows)
|
||||
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]
|
||||
|
||||
conn.close()
|
||||
except mariadb.Error as e:
|
||||
print(f"Error fetching custom date report: {e}")
|
||||
data["error"] = f"Error fetching report data for {selected_date}."
|
||||
|
||||
print("Custom date report data being returned:", data)
|
||||
return jsonify(data)
|
||||
|
||||
@bp.route('/etichete')
|
||||
def etichete():
|
||||
if 'role' not in session or session['role'] not in ['superadmin', 'etichete']:
|
||||
|
||||
Reference in New Issue
Block a user