Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ describe('TimeEntriesComponent', () => {
});

it('should dispatch an action when entry is going to be saved', () => {
component.entry = { start_date: new Date(), id: '1234', technologies: []};
const newEntry = {
entry: {
project_id: 'p-id',
Expand Down Expand Up @@ -308,6 +309,7 @@ describe('TimeEntriesComponent', () => {
}));

it('when event contains should restart as true, then a restart Entry action should be triggered', () => {
component.entry = { start_date: new Date(), id: '1234', technologies: []};
const entryToSave = {
entry: {
id: '123',
Expand Down
28 changes: 24 additions & 4 deletions src/app/modules/time-entries/pages/time-entries.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,31 @@ export class TimeEntriesComponent implements OnInit {
}

doSave(event: SaveEntryEvent) {
event.entry.start_date = new Date(event.entry.start_date).toISOString();
if (event.entry.end_date !== null && event.entry.end_date !== undefined) {
event.entry.end_date = new Date(event.entry.end_date).toISOString();
}
const endDateIsDefined = event.entry.end_date !== null && event.entry.end_date !== undefined;
if (this.entryId) {
const startDateChanged = this.entry.start_date !== event.entry.start_date;
if (startDateChanged) {
event.entry.start_date = this.adjustDateSecs(event.entry.start_date, 1);
}

if (endDateIsDefined) {
const endDateChanged = this.entry.end_date !== event.entry.end_date;
if (endDateChanged) {
event.entry.end_date = this.adjustDateSecs(event.entry.end_date, 0);
}
}

event.entry.id = this.entryId;
this.store.dispatch(new entryActions.UpdateEntry(event.entry));
if (event.shouldRestartEntry) {
this.store.dispatch(new entryActions.RestartEntry(event.entry));
}
} else {
event.entry.start_date = this.adjustDateSecs(event.entry.start_date, 1);
if (endDateIsDefined) {
event.entry.end_date = this.adjustDateSecs(event.entry.end_date, 0);
}

this.store.dispatch(new entryActions.CreateEntry(event.entry));
}
}
Expand Down Expand Up @@ -100,4 +114,10 @@ export class TimeEntriesComponent implements OnInit {
this.message = `Are you sure you want to delete ${item.activity_name}?`;
this.showModal = true;
}

adjustDateSecs(date: string, sec: number): string {
const newDate = new Date(date);
newDate.setSeconds(sec, 0);
return newDate.toISOString();
}
}