tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix: Incentives was not working

Browse Source
This commit is contained in:
Amritanshu Agrawal 2021-09-26 09:34:16 +05:30
parent c3bd22fc9f
commit 4f907e965b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
brewman/brewman/routers/incentive.py
View File

@ -221,10 +221,13 @@ def get_employees(
db: Session, db: Session,
) -> List[schema_in.IncentiveEmployee]: ) -> List[schema_in.IncentiveEmployee]:
details = [] details = []
employees = db.execute( employees = (
db.execute(
select(Employee) select(Employee)
.where(Employee.joining_date <= finish_date, or_(Employee.is_active, Employee.leaving_date >= start_date)) .where(Employee.joining_date <= finish_date, or_(Employee.is_active, Employee.leaving_date >= start_date))
.order_by(Employee.cost_centre_id, Employee.designation, Employee.name) .order_by(Employee.cost_centre_id, Employee.designation, Employee.name)
)
.scalars()
.all() .all()
) )