diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html index fe6ab8f6a..04bb29cc8 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html @@ -19,7 +19,7 @@ *ngFor="let entry of data" > {{ entry.owner_email }} - {{ entry.start_date | date: 'dd/MM/yyyy' }} + {{ entry.start_date | date: 'MM/dd/yyyy' }} {{ entry.end_date | substractDate: entry.start_date }} {{ entry.project_name }} {{ entry.activity_name }} diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts index 902ebbec6..51152ef39 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts @@ -12,9 +12,7 @@ import {DataTableDirective} from 'angular-datatables'; styleUrls: ['./time-entries-table.component.scss'] }) export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewInit { - data = []; - const; dtOptions: any = { scrollY: '600px', paging: false, @@ -25,12 +23,12 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn { extend: 'excel', text: 'Excel', - filename: `time-entries-${ formatDate(new Date(), 'yyyy_MM_dd-hh_mm', 'en') }` + filename: `time-entries-${ formatDate(new Date(), 'MM_dd_yyyy-HH_mm', 'en') }` }, { extend: 'csv', text: 'CSV', - filename: `time-entries-${ formatDate(new Date(), 'yyyy_MM_dd-hh_mm', 'en') }` + filename: `time-entries-${formatDate(new Date(), 'MM_dd_yyyy-HH_mm', 'en') }` } ] };