fakz9/Fulfillment-Backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: time tracking in minutes

Browse Source
This commit is contained in:
AlexSserb
2024-11-22 21:34:17 +04:00
parent 8652d31f6d
commit 42a193dae7
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/payroll.py
View File

@@ -170,7 +170,7 @@ class PayrollService(BaseService):
def get_amount(
self,
user: User,
work_units: int
work_units: float
):
pay_rate: PayRate = user.pay_rate
overtime_threshold = 0
@@ -185,7 +185,7 @@ class PayrollService(BaseService):
base_units = work_units
overtime_units = 0
else:
overtime_units = max(0, work_units - overtime_threshold)
overtime_units = max(0.0, work_units - overtime_threshold)
base_units = work_units - overtime_units
return pay_rate.base_rate * base_units + overtime_rate * overtime_units

11
services/work_shifts.py
View File

@@ -10,6 +10,7 @@ from schemas.work_shifts import StartShiftResponse, FinishShiftResponse, ActiveW
FinishShiftByIdResponse
from services.base import BaseService
from services.time_tracking import TimeTrackingService
from utils.work_time import hours_to_hours_and_minutes
class WorkShiftsService(BaseService):
@@ -59,7 +60,7 @@ class WorkShiftsService(BaseService):
await self.session.commit()
diff: timedelta = work_shift.finished_at - work_shift.started_at
hours = int(diff.total_seconds() // 3600)
hours = diff.total_seconds() / 3600
data = UpdateTimeTrackingRecordRequest(
user_id=user_id,
@@ -68,7 +69,8 @@ class WorkShiftsService(BaseService):
)
await TimeTrackingService(self.session).update_record(user, data)
return FinishShiftResponse(ok=True, message=f"Смена закончена. Отработано {hours} ч.")
hours, minutes = hours_to_hours_and_minutes(hours)
return FinishShiftResponse(ok=True, message=f"Смена закончена. Отработано {hours} ч. {minutes} мин.")
async def finish_shift_by_id(self, user: User, shift_id: int) -> FinishShiftByIdResponse:
work_shift = await self.session.get(WorkShift, shift_id)
@@ -80,7 +82,7 @@ class WorkShiftsService(BaseService):
await self.session.commit()
diff: timedelta = work_shift.finished_at - work_shift.started_at
hours = int(diff.total_seconds() // 3600)
hours = diff.total_seconds() / 3600
data = UpdateTimeTrackingRecordRequest(
user_id=work_shift.user_id,
@@ -89,7 +91,8 @@ class WorkShiftsService(BaseService):
)
await TimeTrackingService(self.session).update_record(user, data)
return FinishShiftByIdResponse(ok=True, message=f"Смена закончена. Отработано {hours} ч.")
hours, minutes = hours_to_hours_and_minutes(hours)
return FinishShiftByIdResponse(ok=True, message=f"Смена закончена. Отработано {hours} ч. {minutes} мин.")
async def get_active_shifts(self) -> ActiveWorkShiftsResponse:
stmt = (