Skip to content

Commit 775474c

Browse files
fix: TT-529 sort by date not working correctly on reports (#805)
1 parent 3aff2e5 commit 775474c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
5050
text: 'CSV',
5151
filename: `time-entries-${formatDate(new Date(), 'MM_dd_yyyy-HH_mm', 'en')}`
5252
},
53-
]
53+
],
54+
columnDefs: [{ type: 'date', targets: 2 }]
5455
};
5556
dtTrigger: Subject<any> = new Subject();
5657
@ViewChild(DataTableDirective, { static: false })

src/app/modules/time-clock/store/entry.effects.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export class EntryEffects {
143143
if (error.status === 404) {
144144
return of(new actions.CreateEntry(entry));
145145
} else {
146-
this.toastrService.error('We could not clock in you, try again later.');
146+
this.toastrService.error('We could not clock you in, try again later.');
147147
return of(new actions.CreateEntryFail('Error'));
148148
}
149149
})

0 commit comments

Comments
 (0)