Stats working
This commit is contained in:
@@ -16,7 +16,8 @@ class Stats_Employee_Oil(db.Model):
|
|||||||
total_deliveries = db.Column(db.INTEGER)
|
total_deliveries = db.Column(db.INTEGER)
|
||||||
total_gallons_delivered = db.Column(db.INTEGER)
|
total_gallons_delivered = db.Column(db.INTEGER)
|
||||||
total_primes = 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 Stats_Employee_Oil_schema(ma.SQLAlchemyAutoSchema):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|||||||
@@ -127,6 +127,8 @@ def driver_finalize_delivery(delivery_id):
|
|||||||
)
|
)
|
||||||
db.session.add(create_stats)
|
db.session.add(create_stats)
|
||||||
db.session.flush()
|
db.session.flush()
|
||||||
|
|
||||||
|
|
||||||
get_stats = (db.session
|
get_stats = (db.session
|
||||||
.query(Stats_Employee_Oil)
|
.query(Stats_Employee_Oil)
|
||||||
.filter(Stats_Employee_Oil.employee_id == get_delivery.driver_employee_id)
|
.filter(Stats_Employee_Oil.employee_id == get_delivery.driver_employee_id)
|
||||||
@@ -212,10 +214,16 @@ def driver_finalize_delivery(delivery_id):
|
|||||||
else:
|
else:
|
||||||
get_delivery.delivery_status = 1
|
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_stats)
|
||||||
db.session.add(get_delivery)
|
db.session.add(get_delivery)
|
||||||
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
|
|
||||||
return jsonify({
|
return jsonify({
|
||||||
"ok": True,
|
"ok": True,
|
||||||
'delivery': {
|
'delivery': {
|
||||||
|
|||||||
@@ -35,6 +35,19 @@ def total_deliveries_driver(driver_id):
|
|||||||
}), 200
|
}), 200
|
||||||
|
|
||||||
|
|
||||||
|
@stats.route("/primes/total/<int:driver_id>", 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"])
|
@stats.route("/delivery/count/today", methods=["GET"])
|
||||||
def total_deliveries_today():
|
def total_deliveries_today():
|
||||||
total_stops = (db.session
|
total_stops = (db.session
|
||||||
|
|||||||
Reference in New Issue
Block a user