From d77c4e24783a1361fec0301ecca42ed94b0ec05a Mon Sep 17 00:00:00 2001 From: Edwin Eames Date: Tue, 6 Aug 2024 11:08:29 -0400 Subject: [PATCH] Stats working --- app/classes/stats_employee.py | 3 ++- app/delivery_data/views.py | 8 ++++++++ app/stats/views.py | 13 +++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/classes/stats_employee.py b/app/classes/stats_employee.py index e49b8d4..f336c49 100755 --- a/app/classes/stats_employee.py +++ b/app/classes/stats_employee.py @@ -16,7 +16,8 @@ class Stats_Employee_Oil(db.Model): total_deliveries = db.Column(db.INTEGER) total_gallons_delivered = db.Column(db.INTEGER) total_primes = db.Column(db.INTEGER) - oil_total_profit_delivered = db.Column(db.DECIMAL(50, 2)) + oil_total_profit_delivered = db.Column(db.DECIMAL(6, 2)) + oil_total_money_delivered = db.Column(db.DECIMAL(6, 2)) class Stats_Employee_Oil_schema(ma.SQLAlchemyAutoSchema): class Meta: diff --git a/app/delivery_data/views.py b/app/delivery_data/views.py index 1faea0a..6852e4b 100755 --- a/app/delivery_data/views.py +++ b/app/delivery_data/views.py @@ -127,6 +127,8 @@ def driver_finalize_delivery(delivery_id): ) db.session.add(create_stats) db.session.flush() + + get_stats = (db.session .query(Stats_Employee_Oil) .filter(Stats_Employee_Oil.employee_id == get_delivery.driver_employee_id) @@ -212,10 +214,16 @@ def driver_finalize_delivery(delivery_id): else: get_delivery.delivery_status = 1 + print(get_stats.id) + print(get_stats.total_gallons_delivered) + print(get_stats.total_deliveries) + db.session.add(get_stats) db.session.add(get_delivery) db.session.commit() + + return jsonify({ "ok": True, 'delivery': { diff --git a/app/stats/views.py b/app/stats/views.py index 054d613..09d0d20 100755 --- a/app/stats/views.py +++ b/app/stats/views.py @@ -35,6 +35,19 @@ def total_deliveries_driver(driver_id): }), 200 +@stats.route("/primes/total/", methods=["GET"]) +def total_primes_driver(driver_id): + total_stops = (db.session + .query(Delivery_Delivery) + .filter(Delivery_Delivery.driver_employee_id == driver_id) + .filter(Delivery_Delivery.prime == 1) + .count()) + + + return jsonify({"ok": True, + 'data': total_stops, + }), 200 + @stats.route("/delivery/count/today", methods=["GET"]) def total_deliveries_today(): total_stops = (db.session