Skip to content

fix: #429 set duration column as duration format in xls #473

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

Closed
wants to merge 2 commits into from
Closed

fix: #429 set duration column as duration format in xls #473

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c68073
fix: #429 set duration column as duration format in xls
enriquezrene Jul 21, 2020
16dd5a2
fix: #429 closes #474
enriquezrene Jul 22, 2020
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
Prev Previous commit
fix: #429 closes #474
  • Loading branch information
@enriquezrene
enriquezrene committed Jul 22, 2020
commit 16dd5a218c1649e7576ccf310e1800df45298a55
4 changes: 3 additions & 1 deletion src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -27,7 +27,7 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
exportOptions: {
format: {
body: ( data, row, column, node ) => {
return column === 2 ?
return column === 3 ?
moment.duration(data).asHours().toFixed(4).slice(0, -1) :
data;
}
Expand All @@ -40,7 +40,7 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
exportOptions: {
format: {
body: ( data, row, column, node ) => {
return column === 2 ?
return column === 3 ?
moment.duration(data).asHours().toFixed(4).slice(0, -1) :
data;
}
Expand Down