Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

order decision maker drop down by name #2398

Merged
merged 1 commit into from
Aug 30, 2024
Merged

order decision maker drop down by name #2398

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions epictrack-api/src/api/models/staff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

from typing import List

from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, func, DateTime
from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, asc, func, DateTime
from sqlalchemy.orm import column_property, relationship

from api.models.base_model import BaseModelVersioned
Expand Down Expand Up @@ -69,7 +69,7 @@ def find_active_staff_by_positions(cls, position_ids: List[int]):
"""Return active staffs by position ids."""
return cls.query.filter(
Staff.position_id.in_(position_ids), Staff.is_active.is_(True)
)
).order_by(asc(Staff.first_name), asc(Staff.last_name))

@classmethod
def find_all_active_staff(cls):
Expand Down
Loading