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 0938cfb21..9e3e74db3 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 @@ -9,16 +9,16 @@ > - ID + ID User email Date - Duration (hours) - Time in - Time out + Duration (hours) + Time in + Time out Project - Project ID + Project ID Customer - Customer ID + Customer ID Activity Ticket Description @@ -33,24 +33,24 @@ class="d-flex" *ngFor="let entry of dataSource.data" > - {{ entry.id }} - {{ entry.owner_email }} + {{ entry.id }} + {{ entry.owner_email }} {{ entry.start_date | date: 'MM/dd/yyyy' }} - + {{ entry.end_date | substractDate: entry.start_date }} - {{ entry.start_date | date: 'HH:mm' }} - {{ entry.end_date | date: 'HH:mm' }} + {{ entry.start_date | date: 'HH:mm' }} + {{ entry.end_date | date: 'HH:mm' }} {{ entry.project_name }} - {{ entry.project_id }} + {{ entry.project_id }} {{ entry.customer_name }} - {{ entry.customer_id }} + {{ entry.customer_id }} {{ entry.activity_name }} {{ entry.uri }} - {{ entry.description }} - {{ entry.technologies }} + {{ entry.description }} + {{ entry.technologies }} diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss index c97b3822e..8246f2e3b 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss @@ -2,12 +2,18 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: small; +} +.x-sm-col{ + width: 5em; + max-width: 7em; } .sm-col{ width: 6em; max-width: 8em; } + .md-col{ width: 9em; } @@ -17,3 +23,6 @@ overflow: hidden; white-space: normal; } +.hidden-col{ + display: none; +} 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 29ac9bb40..bb22df58b 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 @@ -6,6 +6,7 @@ import * as moment from 'moment'; import { Observable, Subject } from 'rxjs'; import { Entry } from 'src/app/modules/shared/models'; import { DataSource } from 'src/app/modules/shared/models/data-source.model'; + import { EntryState } from '../../../time-clock/store/entry.reducer'; import { getReportDataSource } from '../../../time-clock/store/entry.selectors'; @@ -20,7 +21,11 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn paging: false, dom: 'Bfrtip', buttons: [ - 'colvis', + { + extend: 'colvis', + columns: ':not(.hidden-col)', + + }, 'print', { extend: 'excel', diff --git a/src/app/modules/reports/components/time-range-form/time-range-form.component.html b/src/app/modules/reports/components/time-range-form/time-range-form.component.html index f24d2c2ff..4f5b69b2a 100644 --- a/src/app/modules/reports/components/time-range-form/time-range-form.component.html +++ b/src/app/modules/reports/components/time-range-form/time-range-form.component.html @@ -1,21 +1,29 @@
-
+
- +
-
+
- +
-
- +
+
+
+
- -