working auto
This commit is contained in:
@@ -10,6 +10,7 @@ from app.classes.service import Service_Service
|
||||
from app.classes.auto import Auto_Delivery
|
||||
from app.classes.transactions import Transaction
|
||||
from datetime import date, timedelta, datetime
|
||||
from zoneinfo import ZoneInfo
|
||||
|
||||
|
||||
# --- NEW EFFICIENT ENDPOINT ---
|
||||
@@ -20,8 +21,9 @@ def get_sidebar_counts():
|
||||
This combines logic from all the individual /count/* endpoints.
|
||||
"""
|
||||
try:
|
||||
now = datetime.now()
|
||||
today_date = date.today()
|
||||
eastern = ZoneInfo("America/New_York")
|
||||
now_local = datetime.now(eastern).replace(tzinfo=None) # naive local time
|
||||
today_date = datetime.now(eastern).date() # local date
|
||||
|
||||
# Replicate the logic from each of your /count/* endpoints
|
||||
today_count = db.session.query(Delivery_Delivery).filter(Delivery_Delivery.delivery_status == 2).count()
|
||||
@@ -34,7 +36,7 @@ def get_sidebar_counts():
|
||||
|
||||
automatic_count = db.session.query(Auto_Delivery).filter(Auto_Delivery.estimated_gallons_left <= 80).count()
|
||||
|
||||
upcoming_service_count = db.session.query(Service_Service).filter(Service_Service.scheduled_date >= now).count()
|
||||
upcoming_service_count = db.session.query(Service_Service).filter(Service_Service.scheduled_date >= now_local).count()
|
||||
|
||||
start_of_today = datetime.combine(today_date, datetime.min.time())
|
||||
start_of_tomorrow = datetime.combine(today_date + timedelta(days=1), datetime.min.time())
|
||||
|
||||
Reference in New Issue
Block a user