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

fix():fix merge

Browse Source
This commit is contained in:
Matthieu Haineault 2025-11-13 13:54:01 -05:00
parent e72b63116c
commit 30cc41955b
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/time-and-attendance/time-tracker/shifts/services/shifts-update-delete.service.ts
View File

@ -163,14 +163,8 @@ export class ShiftsUpdateDeleteService {
for (let j = i + 1; j < shifts.length; j++) { for (let j = i + 1; j < shifts.length; j++) {
const shift_a = shifts[i]; const shift_a = shifts[i];
const shift_b = shifts[j]; const shift_b = shifts[j];
<<<<<<< HEAD
if (shift_a.date !== shift_b.date) continue;
if (shift_a.id === shift_b.id) continue;
=======
if (shift_a.date !== shift_b.date || shift_a.id === shift_b.id) continue; if (shift_a.date !== shift_b.date || shift_a.id === shift_b.id) continue;
>>>>>>> 37b150d87c98746a3cb23bbe36ee9e364c6a613d
const has_overlap = overlaps( const has_overlap = overlaps(
{ start: toHHmmFromString(shift_a.start_time), end: toHHmmFromString(shift_a.end_time) }, { start: toHHmmFromString(shift_a.start_time), end: toHHmmFromString(shift_a.end_time) },
{ start: toHHmmFromString(shift_b.start_time), end: toHHmmFromString(shift_b.end_time) }, { start: toHHmmFromString(shift_b.start_time), end: toHHmmFromString(shift_b.end_time) },