Skip to content

TT-117 fix: Two entries in progress #615

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

Closed
wants to merge 1 commit into from
Closed

TT-117 fix: Two entries in progress #615

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
TT-117 fix: Two entries in progress
  • Loading branch information
@scastillo-jp
scastillo-jp committed Jan 15, 2021
commit a107400f8b6ba42f307c2fe33d509313d141c940
28 changes: 18 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 @@ -32,6 +32,14 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
selectedYear: number;
selectedMonthAsText: string;

startDateAsLocalDate: Date;
endDateAsLocalDate: Date;
activeEntryAsLocalDate: Date;
isEditingEntryEqualToActiveEntry;
isStartDateGreaterThanActiveEntry;
isEndDateGreaterThanActiveEntry;
isTimeEntryOverlapping;

constructor(private store: Store<EntryState>, private toastrService: ToastrService, private actionsSubject$: ActionsSubject) {
this.timeEntriesDataSource$ = this.store.pipe(delay(0), select(getTimeEntriesDataSource));
}
Expand Down Expand Up @@ -105,17 +113,17 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {

saveEntry(event: SaveEntryEvent): void {
if (this.activeTimeEntry) {
const startDateAsLocalDate = new Date(event.entry.start_date);
const endDateAsLocalDate = new Date(event.entry.end_date);
const activeEntryAsLocalDate = new Date(this.activeTimeEntry.start_date);
const isEditingEntryEqualToActiveEntry = this.entryId === this.activeTimeEntry.id;
const isStartDateGreaterThanActiveEntry = startDateAsLocalDate > activeEntryAsLocalDate;
const isEndDateGreaterThanActiveEntry = endDateAsLocalDate > activeEntryAsLocalDate;
const isTimeEntryOverlapping = isStartDateGreaterThanActiveEntry || isEndDateGreaterThanActiveEntry;
if (!isEditingEntryEqualToActiveEntry && isTimeEntryOverlapping) {
this.toastrService.error('You are on the clock and this entry overlaps it, try with earlier times.');
} else {
this.startDateAsLocalDate = new Date(event.entry.start_date);
this.endDateAsLocalDate = new Date(event.entry.end_date);
this.activeEntryAsLocalDate = new Date(this.activeTimeEntry.start_date);
this.isEditingEntryEqualToActiveEntry = this.entryId === this.activeTimeEntry.id;
this.isStartDateGreaterThanActiveEntry = this.startDateAsLocalDate > this.activeEntryAsLocalDate;
this.isEndDateGreaterThanActiveEntry = this.endDateAsLocalDate > this.activeEntryAsLocalDate;
this.isTimeEntryOverlapping = this.isStartDateGreaterThanActiveEntry || this.isEndDateGreaterThanActiveEntry;
if (this.isEditingEntryEqualToActiveEntry && !this.isTimeEntryOverlapping) {
this.doSave(event);
} else {
this.toastrService.error('You are on the clock and this entry overlaps it, try with earlier times.');
}
} else {
this.doSave(event);
Expand Down