louis/targo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'release/nicolas/v1.1' (#12) from release/nicolas/v1.1 into main

Browse Source 
Reviewed-on: Targo/targo_backend#12
This commit is contained in:
Nicolas 2026-02-06 14:02:55 -05:00
commit 0fcbe93ae4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/time-and-attendance/domains/services/sick-leave.service.ts
View File

@ -122,7 +122,7 @@ export class SickLeaveService {
id: true,
paid_time_off: {
select: {
banked_hours: true
sick_hours: true
},
},
},
@ -134,7 +134,7 @@ export class SickLeaveService {
if (!employee.paid_time_off) {
return { success: false, error: 'SICK_HOURS_BANK_NOT_FOUND' } as Result<number, string>;
}
const sick_bank = (employee.paid_time_off.banked_hours).toNumber();
const sick_bank = (employee.paid_time_off.sick_hours).toNumber();
if (sick_bank <= 0) return { success: false, error: 'EMPTY_SICK_HOURS_BANK' } as Result<number, string>;
if (asked_hours > sick_bank) {

3
src/time-and-attendance/shifts/services/shifts-create.service.ts
View File

@ -144,7 +144,8 @@ export class ShiftsCreateService {
}
if (!result.success) return { success: false, error: result.error };
const valid_hours = result.data / 1.5;
const valid_hours = result.data;
adjusted_end_time = new Date(normed_shift.data.start_time);
adjusted_end_time.setHours(adjusted_end_time.getHours() + valid_hours);
}