Skip to content

TT-108 fix: edit the first running entry of the month after one hour #601

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
Jan 5, 2021
Merged

TT-108 fix: edit the first running entry of the month after one hour #601

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1ed978
TT-108 fix: edit the first running entry of the month after one hour
Jan 4, 2021
c12decf
TT-108 fix: selectMonth should call selectDate test
Jan 5, 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
2 changes: 1 addition & 1 deletion src/app/modules/shared/components/month-picker/month-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('MonthPickerComponent', () => {
it('selectMonth should call selectDate', () => {
spyOn(component, 'selectDate');
component.selectMonth(10);
expect(component.selectDate).toHaveBeenCalledWith(10, 2020);
expect(component.selectDate).toHaveBeenCalledWith(10, 2021);
});

});
2 changes: 1 addition & 1 deletion src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export class EntryFieldsComponent implements OnInit {
return;
}

const lastEntryStartDate = get(this.lastEntry, 'start_date', moment().subtract(1, 'hours'));
const lastEntryStartDate = get(this.lastEntry, 'start_date', moment(newHourEntered).subtract(1, 'minutes'));
const isEntryDateInLastStartDate = moment(newHourEntered).isSameOrBefore(lastEntryStartDate);
if (isEntryDateInLastStartDate) {
this.toastrService.error('There is another time entry registered in this time range');
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/time-clock/store/entry.effects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export class EntryEffects {
}).pipe(
map((entries) => {
const lastEntry = entries[1];
const isStartTimeInLastEntry = moment(entry.start_date).isBefore(lastEntry.end_date);
const isStartTimeInLastEntry = lastEntry && moment(entry.start_date).isBefore(lastEntry.end_date);
if (isStartTimeInLastEntry) {
return new actions.UpdateEntry({ id: lastEntry.id, end_date: entry.start_date });
} else {
Expand Down