Merge pull request #476 from ioet/429-set-duration-column

closes #429 set duration column

Author: enriquezrene

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

@@ -3,9 +3,10 @@
     <table class="table table-sm table-striped" datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions">
       <thead class="thead-blue">
       <tr class="d-flex">
+        <th class="col md-col">ID</th>
         <th class="col md-col">User email</th>
         <th class="col sm-col">Date</th>
-        <th class="col sm-col">Duration</th>
+        <th class="col sm-col">Duration (hours)</th>
         <th class="col md-col">Project</th>
         <th class="col lg-col">Project ID</th>
         <th class="col md-col">Customer</th>
@@ -21,6 +22,7 @@
         class="d-flex"
         *ngFor="let entry of data"
       >
+        <td class="col md-col multiline-col"> {{ entry.id }} </td>
         <td class="col md-col multiline-col"> {{ entry.owner_email }} </td>
         <td class="col sm-col"> {{ entry.start_date | date: 'MM/dd/yyyy' }} </td>
         <td class="col sm-col"> {{ entry.end_date | substractDate: entry.start_date }} </td>

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') }`
       }