Skip to content

TT-69 Overlap Hours #584

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
Dec 11, 2020
Merged

TT-69 Overlap Hours #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffb67e5
TT-69 fix: adding or editing an entry must not overlap the date of an…
Dec 10, 2020
2540f9c
TT-69 fix: refactor variables and conidtions
Dec 10, 2020
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
23 changes: 22 additions & 1 deletion src/app/modules/time-entries/pages/time-entries.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,33 @@ describe('TimeEntriesComponent', () => {
expect(component.canMarkEntryAsWIP).toBe(true);
});

it('displays an error when start date of entry is > than active entry start date', async () => {
it('displays an error when start date of entry is greater than active entry start date', async () => {
component.activeTimeEntry = entry;
const newEntry = {
entry: {
project_id: 'p-id',
start_date: '2020-05-05T10:04',
end_date: '2020-05-05T11:04',
description: 'description',
technologies: [],
uri: 'abc',
}, shouldRestartEntry: false
};
component.entryId = 'new-entry';
spyOn(injectedToastrService, 'error');

component.saveEntry(newEntry);

expect(injectedToastrService.error).toHaveBeenCalled();
});

it('displays an error when end date of entry is greater than active entry start date', async () => {
component.activeTimeEntry = entry;
const newEntry = {
entry: {
project_id: 'p-id',
start_date: '2020-01-05T10:04',
end_date: '2020-03-05T11:04',
description: 'description',
technologies: [],
uri: 'abc',
Expand Down
16 changes: 9 additions & 7 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 @@ -100,15 +100,17 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
}

saveEntry(event: SaveEntryEvent): void {
if (this.activeTimeEntry !== null && this.activeTimeEntry !== undefined) {
const entryDateAsIso = new Date(event.entry.start_date).toISOString();
const entryDateAsLocalDate = new Date(entryDateAsIso);
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 isEditingActiveEntry = this.entryId === this.activeTimeEntry.id;
if (!isEditingActiveEntry && entryDateAsLocalDate > activeEntryAsLocalDate) {
this.toastrService.error('You are on the clock and this entry overlaps it, try with earlier times.');
} else {
const isEditingEntryEqualToActiveEntry = this.entryId === this.activeTimeEntry.id;
const isStartDateLowerThanActiveEntry = startDateAsLocalDate < activeEntryAsLocalDate;
const isEndDateLowerThanActiveEntry = endDateAsLocalDate < activeEntryAsLocalDate;
if(isEditingEntryEqualToActiveEntry && (isStartDateLowerThanActiveEntry || isEndDateLowerThanActiveEntry)){
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