Skip to content

Allowing users to restart time entries #412

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 3 commits into from
Jun 23, 2020
Merged

Allowing users to restart time entries #412

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3c5b4f
feat: #385 Allowing restart entries
Jun 22, 2020
d6ce982
refactor: #385 Renaming variable name
Jun 23, 2020
c9edc24
test: #385 Adding unit tests for restarting entry related actions
Jun 23, 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
Prev Previous commit
Next Next commit
refactor: #385 Renaming variable name
  • Loading branch information
Juan Gabriel Guzman committed Jun 23, 2020
commit d6ce9828430b0c86f82e422a9c99c2773f4c7b6a
4 changes: 2 additions & 2 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 @@ -48,9 +48,9 @@ export class TimeEntriesComponent implements OnInit {
if (this.activeTimeEntry !== null && this.activeTimeEntry !== undefined) {
const entryDateAsIso = new Date(event.entry.start_date).toISOString();
const entryDateAsLocalDate = new Date(entryDateAsIso);
const activeEntryAsLocaldate = new Date(this.activeTimeEntry.start_date);
const activeEntryAsLocalDate = new Date(this.activeTimeEntry.start_date);
const isEditingActiveEntry = this.entryId === this.activeTimeEntry.id;
if (!isEditingActiveEntry && entryDateAsLocalDate > activeEntryAsLocaldate) {
if (!isEditingActiveEntry && entryDateAsLocalDate > activeEntryAsLocalDate) {
this.toastrService.error('You are on the clock and this entry overlaps it, try with earlier times.');
} else {
this.doSave(event);
Expand Down