fix(shifts): small error typing fix
This commit is contained in:
parent
6aa464a76e
commit
214d6aa370
|
|
@ -1,4 +1,4 @@
|
|||
import { toDateFromString, toHHmmFromString, toStringFromHHmm, toStringFromDate, overlaps } from "src/time-and-attendance/utils/date-time.utils";
|
||||
import { toDateFromString, toHHmmFromString, toStringFromHHmm, toStringFromDate, overlaps, toUTCDateFromString } from "src/time-and-attendance/utils/date-time.utils";
|
||||
import { BankCodesResolver } from "src/time-and-attendance/utils/resolve-bank-type-id.utils";
|
||||
import { PrismaService } from "src/prisma/prisma.service";
|
||||
import { shift_select } from "src/time-and-attendance/utils/selects.utils";
|
||||
|
|
@ -56,17 +56,17 @@ export class ShiftsUpdateDeleteService {
|
|||
//_________________________________________________________________
|
||||
// UPDATE
|
||||
//_________________________________________________________________
|
||||
async updateShift(dto: ShiftDto, email): Promise<Result<ShiftDto, string>> {
|
||||
async updateShift(dto: ShiftDto, email: string): Promise<Result<ShiftDto, string>> {
|
||||
try {
|
||||
const timesheet = await this.timesheetResolver.findTimesheetIdByEmail(email, toDateFromString(dto.date));
|
||||
if (!timesheet.success) return { success: false, error: ' timesheet not found' }
|
||||
if (!timesheet.success) return { success: false, error: timesheet.error }
|
||||
|
||||
//finds original shift
|
||||
const original = await this.prisma.shifts.findFirst({
|
||||
where: { id: dto.id, timesheet_id: timesheet.data.id },
|
||||
select: shift_select,
|
||||
});
|
||||
if (!original) return { success: false, error: `Shift with id: ${dto.id} not found` };
|
||||
if (!original) return { success: false, error: `Shift with id: ${dto.id} not found` };
|
||||
|
||||
//transform string format to date and HHmm
|
||||
const normed_shift = await this.normalizeShiftDto(dto);
|
||||
|
|
@ -162,7 +162,7 @@ export class ShiftsUpdateDeleteService {
|
|||
for (let j = i + 1; j < shifts.length; j++) {
|
||||
const shift_a = shifts[i];
|
||||
const shift_b = shifts[j];
|
||||
|
||||
|
||||
if (shift_a.date !== shift_b.date) continue;
|
||||
if (shift_a.id === shift_b.id) continue;
|
||||
const has_overlap = overlaps(
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user