Skip to content

fix: TT-529 sort by date not working correctly on reports #805

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
Feb 2, 2022
Merged

fix: TT-529 sort by date not working correctly on reports #805

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: TT-529 sort by date not working correctly on reports
  • Loading branch information
@mikevillarruel
mikevillarruel committed Feb 2, 2022
commit ba0b01798c07b914698572ebfa3e70fae5578b58
3 changes: 2 additions & 1 deletion src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
text: 'CSV',
filename: `time-entries-${formatDate(new Date(), 'MM_dd_yyyy-HH_mm', 'en')}`
},
]
],
columnDefs: [{ type: 'date', targets: 2 }]
};
dtTrigger: Subject<any> = new Subject();
@ViewChild(DataTableDirective, { static: false })
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 @@ -143,7 +143,7 @@ export class EntryEffects {
if (error.status === 404) {
return of(new actions.CreateEntry(entry));
} else {
this.toastrService.error('We could not clock in you, try again later.');
this.toastrService.error('We could not clock you in, try again later.');
return of(new actions.CreateEntryFail('Error'));
}
})
Expand Down