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 3d8252e0a..031973eb8 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 @@ -3,9 +3,10 @@
ID | User email | Date | -Duration | +Duration (hours) | Project | Project ID | Customer | @@ -21,6 +22,7 @@ class="d-flex" *ngFor="let entry of data" > +{{ entry.id }} | {{ entry.owner_email }} | {{ entry.start_date | date: 'MM/dd/yyyy' }} | {{ entry.end_date | substractDate: entry.start_date }} | 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 51152ef39..3a9d705be 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 @@ -5,6 +5,7 @@ import {EntryState} from '../../../time-clock/store/entry.reducer'; import {entriesForReport} from '../../../time-clock/store/entry.selectors'; import {Subject} from 'rxjs'; import {DataTableDirective} from 'angular-datatables'; +import * as moment from 'moment'; @Component({ selector: 'app-time-entries-table', @@ -13,6 +14,7 @@ import {DataTableDirective} from 'angular-datatables'; }) export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewInit { data = []; + dtOptions: any = { scrollY: '600px', paging: false, @@ -22,11 +24,27 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn 'print', { extend: 'excel', + exportOptions: { + format: { + body: ( data, row, column, node ) => { + return column === 3 ? + moment.duration(data).asHours().toFixed(4).slice(0, -1) : + data; + } + }}, text: 'Excel', filename: `time-entries-${ formatDate(new Date(), 'MM_dd_yyyy-HH_mm', 'en') }` }, { extend: 'csv', + exportOptions: { + format: { + body: ( data, row, column, node ) => { + return column === 3 ? + moment.duration(data).asHours().toFixed(4).slice(0, -1) : + data; + } + }}, text: 'CSV', filename: `time-entries-${formatDate(new Date(), 'MM_dd_yyyy-HH_mm', 'en') }` }
---|