Skip to content

fix: #336 include seconds on time-entries list #339

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 1 commit into from
Jun 3, 2020
Merged

fix: #336 include seconds on time-entries list #339

Show file tree
Hide file tree
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
fix: #336 include seconds on time-entries list
  • Loading branch information
@enriquezrene
enriquezrene committed Jun 3, 2020
commit 3fda35f4da1832ddfb0b116052f7b45db64be667
4 changes: 2 additions & 2 deletions src/app/modules/shared/pipes/substract-date/substract-date.pipe.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ describe('SubstractDatePipe', () => {
});

it('returns the date diff', () => {
const fromDate = new Date('2011-04-11T10:20:30Z');
const fromDate = new Date('2011-04-11T10:20:40Z');
const substractDate = new Date('2011-04-11T08:00:30Z');

const diff = new SubstractDatePipe().transform(fromDate, substractDate);

expect(diff).toBe('02:20');
expect(diff).toBe('02:20:10');
});

it('returns --:-- if fromDate is null', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/shared/pipes/substract-date/substract-date.pipe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class SubstractDatePipe implements PipeTransform {
const startDate = moment(substractDate, 'YYYY-MM-DD HH:mm:ss');
const endDate = moment(fromDate, 'YYYY-MM-DD HH:mm:ss');
const duration: any = moment.duration(endDate.diff(startDate));
return `${this.formatTime(duration._data.hours)}:${this.formatTime(duration._data.minutes)}`;
return `${this.formatTime(duration._data.hours)}:${this.formatTime(duration._data.minutes)}:${this.formatTime(duration._data.seconds)}`;
}

formatTime(time: number): string {
Expand Down