From 3390b5b003894255903b9d47020d71f61b497199 Mon Sep 17 00:00:00 2001 From: iHackN3WTON Date: Tue, 15 Mar 2022 14:56:51 -0600 Subject: [PATCH 1/2] feat: TT-576 Improve grids visual presentation and function --- .../customer-list.component.scss | 25 +++++++++++++++++++ .../customer-list/customer-list.component.ts | 4 ++- .../time-entries-table.component.scss | 25 +++++++++++++++++++ .../month-picker/month-picker.component.html | 2 +- .../month-picker/month-picker.component.scss | 4 +++ .../pages/time-entries.component.scss | 25 +++++++++++++++++++ .../pages/time-entries.component.ts | 1 + .../users-list/users-list.component.css | 25 +++++++++++++++++++ .../users-list/users-list.component.ts | 4 ++- 9 files changed, 112 insertions(+), 3 deletions(-) diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss index e69de29bb..f250ffb44 100644 --- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss +++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss @@ -0,0 +1,25 @@ +table.dataTable thead th { + position: relative; +} + +table.dataTable thead th.sorting:after, +table.dataTable thead th.sorting_asc:after, +table.dataTable thead th.sorting_desc:after { + position: absolute; + top: 10px; + right: 3px; + display: block; + font-family: Arial, Helvetica, sans-serif; +} + +table.dataTable thead .sorting_asc::after { + content: "▲"; +} +table.dataTable thead .sorting_desc::after { + content: "▼"; +} + +table.dataTable thead .sorting_asc, +table.dataTable thead .sorting_desc { + background-image: none; +} diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts index 7e39b78fd..dbb0d79af 100644 --- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts +++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts @@ -30,7 +30,9 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit { @Output() changeValueShowCustomerForm = new EventEmitter(); @Input() customers: CustomerUI[] = []; - dtOptions: any = {}; + dtOptions: any = { + columnDefs: [{orderable: false, targets: [2]}] + }; dtTrigger: Subject = new Subject(); @ViewChild(DataTableDirective, { static: false }) dtElement: DataTableDirective; 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 82fab2e2a..9a71bb9d7 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 @@ -55,3 +55,28 @@ $url-hover-color: darken($url-base-color, 20); } } +table.dataTable thead th { + position: relative; +} + +table.dataTable thead th.sorting:after, +table.dataTable thead th.sorting_asc:after, +table.dataTable thead th.sorting_desc:after { + position: absolute; + top: 10px; + right: 3px; + display: block; + font-family: Arial, Helvetica, sans-serif; +} + +table.dataTable thead .sorting_asc::after { + content: "▲"; +} +table.dataTable thead .sorting_desc::after { + content: "▼"; +} + +table.dataTable thead .sorting_asc, +table.dataTable thead .sorting_desc { + background-image: none; +} diff --git a/src/app/modules/shared/components/month-picker/month-picker.component.html b/src/app/modules/shared/components/month-picker/month-picker.component.html index 431d75ffc..4229aa45b 100644 --- a/src/app/modules/shared/components/month-picker/month-picker.component.html +++ b/src/app/modules/shared/components/month-picker/month-picker.component.html @@ -22,7 +22,7 @@