Updated time
This commit is contained in:
@@ -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
|
||||
return jsonify({"error": str(e)}), 500
|
||||
|
||||
Reference in New Issue
Block a user