Skip to content

feat: TTL-925 update overlap message #1002

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 1 commit into from
Aug 4, 2023
Merged

feat: TTL-925 update overlap message #1002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 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 @@ -146,7 +146,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy, AfterViewInit {
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}.`);
this.toastrService.error(`There is an overlap with another time entry, please modify the time.`);
this.isActiveEntryOverlapping = false;
} else {
this.doSave(event);
Expand Down