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 4b509a983..19c976d55 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 @@ -1,6 +1,5 @@
- @@ -23,26 +22,26 @@ - - - + + - + - - - - - - - - + + + + + + + + @@ -55,6 +54,6 @@ -
{{ entry.id }}{{ entry.owner_email }} + {{ entry.id }}{{ entry.owner_email }} {{ entry.start_date | date: 'MM/dd/yyyy' }} - + {{ entry.end_date | substractDate: entry.start_date }} - {{ dateTimeOffset.parseDateTimeOffset(entry.start_date,entry.timezone_offset) }}{{ dateTimeOffset.parseDateTimeOffset(entry.end_date , entry.timezone_offset) }}{{ entry.project_name }}{{ entry.project_id }}{{ entry.customer_name }}{{ entry.customer_id }}{{ entry.activity_name }} + {{ dateTimeOffset.parseDateTimeOffset(entry.start_date,entry.timezone_offset) }}{{ dateTimeOffset.parseDateTimeOffset(entry.end_date , entry.timezone_offset) }}{{ entry.project_name }}{{ entry.project_id }}{{ entry.customer_name }}{{ entry.customer_id }}{{ entry.activity_name }} - {{ entry.uri }} - + {{ entry.uri }} + {{ entry.description }}
+
Total: {{this.resultSum.hours}} hours, {{this.resultSum.minutes}} minutes
\ No newline at end of file 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 cfa6f98ee..c68013bf8 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 @@ -26,18 +26,19 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn selectOptionNames = [15, 30, 50, 100, 'All']; users: User[] = []; dtOptions: any = { - scrollY: '590px', - dom: '<"d-flex justify-content-between"B<"d-flex"<"mr-5"l>f>>rtip', + bScrollCollapse: true, pageLength: 30, lengthMenu: [this.selectOptionValues, this.selectOptionNames], buttons: [ { text: 'Column Visibility' + ' ▼', - extend: 'colvis', - columns: ':not(.hidden-col)' + extend: 'colvis' }, { - extend: 'print' + extend: 'print', + exportOptions: { + columns: ':visible' + } }, { extend: 'excel', @@ -88,7 +89,6 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn ngOnInit(): void { this.rerenderTableSubscription = this.reportDataSource$.subscribe((ds) => { this.sumDates(ds.data); - this.rerenderDataTable(); }); this.uploadUsers(); } @@ -102,7 +102,7 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn this.dtTrigger.unsubscribe(); } - private rerenderDataTable(): void { + private rerenderDataTable(): any { if (this.dtElement && this.dtElement.dtInstance) { this.dtElement.dtInstance.then((dtInstance: DataTables.Api) => { dtInstance.destroy(); @@ -110,6 +110,7 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn }); } else { this.dtTrigger.next(); + return; } } @@ -151,6 +152,4 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn user(userId: string){ this.selectedUserId.emit(userId); } - -} - +} \ No newline at end of file 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 7ec08598c..fca69aad7 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 @@ -8,7 +8,6 @@ required="true" > -
-
diff --git a/src/app/modules/time-entries/pages/time-entries.component.html b/src/app/modules/time-entries/pages/time-entries.component.html index 87f2da3c6..0025c46e0 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.html +++ b/src/app/modules/time-entries/pages/time-entries.component.html @@ -1,18 +1,16 @@
- + Add new entry + +
- -
@@ -21,9 +19,8 @@
-
- +
@@ -47,18 +44,17 @@ -
{{ entry.activity_name }} + + + +
+
- - \ No newline at end of file diff --git a/src/app/modules/time-entries/pages/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts index 6cdb0607c..a6b931ffb 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.ts +++ b/src/app/modules/time-entries/pages/time-entries.component.ts @@ -255,4 +255,4 @@ export class TimeEntriesComponent implements OnInit, OnDestroy, AfterViewInit { }); } } -} +} \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index cec890c17..20f9e48b3 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -68,6 +68,11 @@ Overwritten calendar style border: 0.1px solid lighten($primary-text, 30%); } +.buttons-columnVisibility +{ + background: $primary-disable !important; +} + @media (max-width: 640px) { div.dt-buttons { text-align: start !important; diff --git a/src/styles/colors.scss b/src/styles/colors.scss index 43c004314..d4f0a2492 100644 --- a/src/styles/colors.scss +++ b/src/styles/colors.scss @@ -2,6 +2,7 @@ $font-size-base: 0.9rem; $dark: #5c4e63; $primary: #00baee; +$primary-disable: #9ecedbe7; $secondary: #555164; $success: #00cc6c; $warning: #ff5e0a;