updated forms
This commit is contained in:
@@ -25,6 +25,19 @@ def delivered_delivery():
|
||||
delivery_schema = Delivery_Delivery_schema(many=True)
|
||||
return jsonify(delivery_schema.dump(delivery_ticket))
|
||||
|
||||
@deliverystatus.route("/count/delivered", methods=["GET"])
|
||||
def delivered_delivery_count():
|
||||
|
||||
delivery_ticket = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
.filter(or_(Delivery_Delivery.delivery_status == 1,
|
||||
Delivery_Delivery.delivery_status == 10))
|
||||
.count())
|
||||
|
||||
return jsonify({
|
||||
"ok": True,
|
||||
'count':delivery_ticket,
|
||||
}), 200
|
||||
|
||||
@deliverystatus.route("/today/driver/<int:user_id>", methods=["GET"])
|
||||
def get_deliveries_driver_today(user_id):
|
||||
@@ -41,6 +54,28 @@ def get_deliveries_driver_today(user_id):
|
||||
return jsonify(delivery_schema.dump(get_delivery))
|
||||
|
||||
|
||||
|
||||
@deliverystatus.route("/count/today", methods=["GET"])
|
||||
def get_deliveries_driver_today_count():
|
||||
"""
|
||||
Get deliveries for driver that day
|
||||
"""
|
||||
get_delivery = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
.filter(Delivery_Delivery.delivery_status != 10)
|
||||
.filter(Delivery_Delivery.delivery_status != 5)
|
||||
.filter(Delivery_Delivery.delivery_status != 3)
|
||||
.filter(Delivery_Delivery.delivery_status != 1)
|
||||
.filter(Delivery_Delivery.expected_delivery_date == date.today())
|
||||
.count())
|
||||
|
||||
return jsonify({
|
||||
"ok": True,
|
||||
'count':get_delivery,
|
||||
}), 200
|
||||
|
||||
|
||||
|
||||
@deliverystatus.route("/tommorrow/driver/<int:user_id>", methods=["GET"])
|
||||
def get_deliveries_driver_tommorrow(user_id):
|
||||
"""
|
||||
@@ -57,6 +92,23 @@ 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.expected_delivery_date == tomm)
|
||||
.count())
|
||||
|
||||
return jsonify({
|
||||
"ok": True,
|
||||
'count':get_delivery,
|
||||
}), 200
|
||||
|
||||
|
||||
|
||||
@deliverystatus.route("/waiting/driver/<int:user_id>", methods=["GET"])
|
||||
def get_deliveries_driver_waiting(user_id):
|
||||
"""
|
||||
@@ -73,3 +125,24 @@ def get_deliveries_driver_waiting(user_id):
|
||||
|
||||
delivery_schema = Delivery_Delivery_schema(many=True)
|
||||
return jsonify(delivery_schema.dump(get_delivery))
|
||||
|
||||
|
||||
@deliverystatus.route("/count/waiting", methods=["GET"])
|
||||
def get_deliveries_driver_waiting_count():
|
||||
"""
|
||||
waiting deliveries scheduled out
|
||||
"""
|
||||
tomm = date.today() + timedelta(days=1)
|
||||
get_delivery = (db.session
|
||||
.query(Delivery_Delivery)
|
||||
|
||||
.filter(Delivery_Delivery.delivery_status == 0)
|
||||
.filter(Delivery_Delivery.expected_delivery_date != tomm)
|
||||
.filter(Delivery_Delivery.expected_delivery_date != date.today())
|
||||
.count())
|
||||
|
||||
|
||||
return jsonify({
|
||||
"ok": True,
|
||||
'count':get_delivery,
|
||||
}), 200
|
||||
|
||||
Reference in New Issue
Block a user