From 66f00aa7b577cd99d57424c193c58e375d1c7e87 Mon Sep 17 00:00:00 2001
From: Edwin Eames <eddwinn@gmail.com>
Date: Fri, 5 Sep 2025 11:39:49 -0400
Subject: [PATCH] Updated time

---
 app/delivery_status/views.py | 10 ++++++++-
 app/service/views.py         | 39 +++++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/app/delivery_status/views.py b/app/delivery_status/views.py
index d1e3be8..fb95f3a 100755
--- a/app/delivery_status/views.py
+++ b/app/delivery_status/views.py
@@ -35,6 +35,13 @@ def get_sidebar_counts():
         
         upcoming_service_count = db.session.query(Service_Service).filter(Service_Service.scheduled_date >= now).count()
 
+        start_of_today = datetime.combine(today_date, datetime.min.time())
+        start_of_tomorrow = datetime.combine(today_date + timedelta(days=1), datetime.min.time())
+        today_service_count = db.session.query(Service_Service).filter(
+            Service_Service.scheduled_date >= start_of_today,
+            Service_Service.scheduled_date < start_of_tomorrow
+        ).count()
+
         return jsonify({
             "ok": True,
             "counts": {
@@ -44,9 +51,10 @@ def get_sidebar_counts():
                 "pending": pending_count,
                 "automatic": automatic_count,
                 "upcoming_service": upcoming_service_count,
+                "today_service": today_service_count,
             }
         }), 200
 
     except Exception as e:
         # Basic error handling
-        return jsonify({"ok": False, "error": str(e)}), 500
\ No newline at end of file
+        return jsonify({"ok": False, "error": str(e)}), 500
diff --git a/app/service/views.py b/app/service/views.py
index 5d75878..cd33954 100644
--- a/app/service/views.py
+++ b/app/service/views.py
@@ -1,7 +1,7 @@
 from flask import request, jsonify
 from app.service import service
 from app import db
-from datetime import datetime, date
+from datetime import datetime, date, timedelta
 from app.classes.customer import (Customer_Customer)
 from app.classes.service import (Service_Service,
                                   Service_Service_schema, Service_Parts, Service_Parts_schema
@@ -79,20 +79,41 @@ def get_upcoming_service_calls():
 @service.route("/past", methods=["GET"])
 def get_past_service_calls():
     """
-    Fetches a list of all future service calls from today onwards.
+    Fetches a list of all past service calls before today.
     """
-    now = datetime.now()
-    upcoming_services = (
+    past_services = (
         Service_Service.query
-        .filter(Service_Service.scheduled_date <= now)
+        .filter(Service_Service.scheduled_date < datetime.combine(date.today(), datetime.min.time()))
         .order_by(Service_Service.scheduled_date.asc())
         .limit(100)
         .all()
     )
-    
+
     service_schema = Service_Service_schema(many=True)
-    result = service_schema.dump(upcoming_services)
- 
+    result = service_schema.dump(past_services)
+
+    return jsonify(result), 200
+
+
+@service.route("/today", methods=["GET"])
+def get_today_service_calls():
+    """
+    Fetches a list of all service calls for today.
+    """
+    start_of_today = datetime.combine(date.today(), datetime.min.time())
+    start_of_tomorrow = datetime.combine(date.today() + timedelta(days=1), datetime.min.time())
+    today_services = (
+        Service_Service.query
+        .filter(Service_Service.scheduled_date >= start_of_today)
+        .filter(Service_Service.scheduled_date < start_of_tomorrow)
+        .order_by(Service_Service.scheduled_date.asc())
+        .limit(100)
+        .all()
+    )
+
+    service_schema = Service_Service_schema(many=True)
+    result = service_schema.dump(today_services)
+
     return jsonify(result), 200
 
 
@@ -193,4 +214,4 @@ def update_service_parts(customer_id):
         return jsonify({"ok": True, "message": "Service parts updated successfully"}), 200
     except Exception as e:
         db.session.rollback()
-        return jsonify({"error": str(e)}), 500
\ No newline at end of file
+        return jsonify({"error": str(e)}), 500