fix(shifts): fix issue where end time for paid time off shifts was not being calculated correctly.
This commit is contained in:
parent
ef969d3c42
commit
aa6109ff09
|
|
@ -145,8 +145,14 @@ export class ShiftsCreateService {
|
||||||
if (!result.success) return { success: false, error: result.error };
|
if (!result.success) return { success: false, error: result.error };
|
||||||
|
|
||||||
const valid_hours = result.data;
|
const valid_hours = result.data;
|
||||||
|
const valid_hour_amount = Math.floor(result.data);
|
||||||
|
const valid_minute_amount = Math.round(60 * (valid_hours - valid_hour_amount));
|
||||||
|
|
||||||
adjusted_end_time = new Date(normed_shift.data.start_time);
|
adjusted_end_time = new Date(normed_shift.data.start_time);
|
||||||
adjusted_end_time.setHours(adjusted_end_time.getHours() + valid_hours);
|
adjusted_end_time.setHours(
|
||||||
|
adjusted_end_time.getHours() + valid_hour_amount,
|
||||||
|
adjusted_end_time.getMinutes() + valid_minute_amount,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
//sends data for creation of a shift in db
|
//sends data for creation of a shift in db
|
||||||
|
|
|
||||||
|
|
@ -70,6 +70,7 @@ export class GetTimesheetsOverviewService {
|
||||||
|
|
||||||
return { success: true, data: { has_preset_schedule, employee_fullname, timesheets } };
|
return { success: true, data: { has_preset_schedule, employee_fullname, timesheets } };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error(error);
|
||||||
return { success: false, error: 'TIMESHEET_NOT_FOUND' }
|
return { success: false, error: 'TIMESHEET_NOT_FOUND' }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user