added maps
This commit is contained in:
@@ -2,12 +2,11 @@ from flask import jsonify
|
||||
from datetime import date, timedelta
|
||||
from app.delivery_status import deliverystatus
|
||||
from app import db
|
||||
from sqlalchemy import or_
|
||||
|
||||
from app.classes.delivery import (Delivery_Delivery,
|
||||
Delivery_Delivery_schema,
|
||||
)
|
||||
|
||||
from app.classes.auto import Auto_Delivery
|
||||
|
||||
@deliverystatus.route("/delivered", methods=["GET"])
|
||||
def delivered_delivery():
|
||||
@@ -87,11 +86,11 @@ def get_deliveries_driver_tommorrow(user_id):
|
||||
return jsonify(delivery_schema.dump(get_delivery))
|
||||
|
||||
|
||||
|
||||
@deliverystatus.route("/count/tommorrow", methods=["GET"])
|
||||
def get_deliveries_driver_tommorrow_count():
|
||||
"""
|
||||
"""
|
||||
tomm = date.today() + timedelta(days=1)
|
||||
get_delivery = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.delivery_status == 3)
|
||||
@@ -109,7 +108,6 @@ def get_deliveries_driver_waiting(user_id):
|
||||
"""
|
||||
waiting deliveries scheduled out
|
||||
"""
|
||||
tomm = date.today() + timedelta(days=1)
|
||||
get_delivery = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.driver_employee_id == user_id)
|
||||
@@ -120,6 +118,26 @@ def get_deliveries_driver_waiting(user_id):
|
||||
return jsonify(delivery_schema.dump(get_delivery))
|
||||
|
||||
|
||||
|
||||
@deliverystatus.route("/count/automatic", methods=["GET"])
|
||||
def get_deliveries_automatic_count():
|
||||
"""
|
||||
|
||||
"""
|
||||
|
||||
autos = (db.session
|
||||
.query(Auto_Delivery)
|
||||
.filter(Auto_Delivery.estimated_gallons_left <= 80)
|
||||
.count())
|
||||
|
||||
|
||||
return jsonify({
|
||||
"ok": True,
|
||||
'count':autos,
|
||||
}), 200
|
||||
|
||||
|
||||
|
||||
@deliverystatus.route("/count/waiting", methods=["GET"])
|
||||
def get_deliveries_waiting_count():
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user