From cace63fd1c1aea925e923bab4c94ea574d9fabb2 Mon Sep 17 00:00:00 2001 From: Yaro Kasear Date: Tue, 8 Jul 2025 15:30:17 -0500 Subject: [PATCH] Sort users by first and last name in inventory item routes --- inventory/routes/inventory.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inventory/routes/inventory.py b/inventory/routes/inventory.py index 95ba6bf..3f1fa2b 100644 --- a/inventory/routes/inventory.py +++ b/inventory/routes/inventory.py @@ -90,7 +90,7 @@ def inventory_item(id): inventory_query = db.session.query(Inventory) item = eager_load_inventory_relationships(inventory_query).filter(Inventory.id == id).first() brands = db.session.query(Brand).order_by(Brand.name).all() - users = eager_load_user_relationships(db.session.query(User).order_by(User.first_name)).all() + users = eager_load_user_relationships(db.session.query(User).order_by(User.first_name, User.last_name)).all() rooms = eager_load_room_relationships(db.session.query(Room).order_by(Room.name)).all() worklog_query = db.session.query(WorkLog).filter(WorkLog.work_item_id == id) worklog = eager_load_worklog_relationships(worklog_query).all() @@ -117,10 +117,10 @@ def inventory_item(id): @main.route("/inventory_item/new", methods=["GET"]) def new_inventory_item(): - brands = db.session.query(Brand).all() - users = eager_load_user_relationships(db.session.query(User)).all() - rooms = eager_load_room_relationships(db.session.query(Room)).all() - types = db.session.query(Item).all() + brands = db.session.query(Brand).order_by(Brand.name).all() + users = eager_load_user_relationships(db.session.query(User).order_by(User.first_name, User.last_name)).all() + rooms = eager_load_room_relationships(db.session.query(Room).order_by(Room.name)).all() + types = db.session.query(Item).order_by(Item.description).all() item = Inventory( timestamp=datetime.datetime.now(),