Eamco/eamco_office_api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added pending waiting

Browse Source
This commit is contained in:
Edwin Eames
2024-10-30 17:04:58 -04:00
parent b3f0e85574
commit 5e5b9274e1
8 changed files with 144 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/delivery_status/views.py
View File

@@ -17,8 +17,7 @@ def delivered_delivery():
delivery_ticket = (db.session
.query(Delivery_Delivery)
.filter(or_(Delivery_Delivery.delivery_status == 1,
Delivery_Delivery.delivery_status == 10))
.filter(Delivery_Delivery.delivery_status == 10)
.all())
@@ -30,8 +29,7 @@ def delivered_delivery_count():
delivery_ticket = (db.session
.query(Delivery_Delivery)
.filter(or_(Delivery_Delivery.delivery_status == 1,
Delivery_Delivery.delivery_status == 10))
.filter(Delivery_Delivery.delivery_status == 10)
.count())
return jsonify({
@@ -39,6 +37,7 @@ def delivered_delivery_count():
'count':delivery_ticket,
}), 200
@deliverystatus.route("/today/driver/<int:user_id>", methods=["GET"])
def get_deliveries_driver_today(user_id):
"""
@@ -56,17 +55,13 @@ def get_deliveries_driver_today(user_id):
@deliverystatus.route("/count/today", methods=["GET"])
def get_deliveries_driver_today_count():
def get_deliveries_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())
.filter(Delivery_Delivery.delivery_status == 2)
.count())
return jsonify({
@@ -85,7 +80,7 @@ def get_deliveries_driver_tommorrow(user_id):
get_delivery = (db.session
.query(Delivery_Delivery)
.filter(Delivery_Delivery.driver_employee_id == user_id)
.filter(Delivery_Delivery.expected_delivery_date == tomm)
.filter(Delivery_Delivery.delivery_status == 3)
.all())
delivery_schema = Delivery_Delivery_schema(many=True)
@@ -99,7 +94,7 @@ 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)
.filter(Delivery_Delivery.delivery_status == 3)
.count())
return jsonify({
@@ -119,8 +114,6 @@ def get_deliveries_driver_waiting(user_id):
.query(Delivery_Delivery)
.filter(Delivery_Delivery.driver_employee_id == user_id)
.filter(Delivery_Delivery.delivery_status == 0)
.filter(Delivery_Delivery.expected_delivery_date != tomm)
.filter(Delivery_Delivery.expected_delivery_date != date.today())
.all())
delivery_schema = Delivery_Delivery_schema(many=True)
@@ -128,17 +121,32 @@ def get_deliveries_driver_waiting(user_id):
@deliverystatus.route("/count/waiting", methods=["GET"])
def get_deliveries_driver_waiting_count():
def get_deliveries_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
@deliverystatus.route("/count/pending", methods=["GET"])
def get_deliveries_pending_count():
"""
"""
get_delivery = (db.session
.query(Delivery_Delivery)
.filter(Delivery_Delivery.delivery_status == 9)
.count())