Skip to content

fix: TT-91 Time out of the penultimate entry overlaps the entry that is running #695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 7, 2021
Merged

fix: TT-91 Time out of the penultimate entry overlaps the entry that is running #695

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48246a4
fix: TT-91 The time out of the penultimate time entry overlaps the ti…
lenshinoda Jun 3, 2021
8fe9384
fix: TT-91 Small code corrections
lenshinoda Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: TT-91 Small code corrections
  • Loading branch information
@lenshinoda
lenshinoda committed Jun 4, 2021
commit 8fe9384b016ba844fa272d762a244fb4b0e10f9b
23 changes: 13 additions & 10 deletions src/app/modules/time-entries/pages/time-entries.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
const isStartDateGreaterThanActiveEntry = startDateAsLocalDate > activeEntryAsLocalDate;
const isEndDateGreaterThanActiveEntry = endDateAsLocalDate > activeEntryAsLocalDate;
const isTimeEntryOverlapping = isStartDateGreaterThanActiveEntry || isEndDateGreaterThanActiveEntry;

if (isEditingEntryEqualToActiveEntry) {
this.store.pipe(select(getTimeEntriesDataSource)).subscribe(ds => {
const overlappingEntry = ds.data.find((item) => {
const itemEndDate = new Date(item.end_date);
return startDateAsLocalDate < itemEndDate;
});
this.isActiveEntryOverlapping = overlappingEntry ? true : false;
});
}
this.checkIfActiveEntryOverlapping(isEditingEntryEqualToActiveEntry, startDateAsLocalDate);
if (!isEditingEntryEqualToActiveEntry && isTimeEntryOverlapping || this.isActiveEntryOverlapping ) {
const message = this.isActiveEntryOverlapping ? 'try another "Time in"' : 'try with earlier times';
this.toastrService.error(`You are on the clock and this entry overlaps it, ${message}.`);
Expand Down Expand Up @@ -183,4 +174,16 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
resetDraggablePosition(event: any): void {
event.source._dragRef.reset();
}

checkIfActiveEntryOverlapping(isEditingEntryEqualToActiveEntry: boolean, startDateAsLocalDate: Date) {
if (isEditingEntryEqualToActiveEntry) {
this.store.pipe(select(getTimeEntriesDataSource)).subscribe(ds => {
const overlappingEntry = ds.data.find((item) => {
const itemEndDate = new Date(item.end_date);
return startDateAsLocalDate < itemEndDate;
});
this.isActiveEntryOverlapping = overlappingEntry ? true : false;
});
}
}
}