Skip to content

Commit 429c008

Browse files
authored
feat: TT-576 Improve grids visual presentation and function (#826)
* feat: TT-576 Improve grids visual presentation and function
1 parent 3e614fd commit 429c008

File tree

9 files changed

+124
-3
lines changed

9 files changed

+124
-3
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
table.dataTable thead th {
2+
position: relative;
3+
}
4+
5+
table.dataTable thead th.sorting:after,
6+
table.dataTable thead th.sorting_asc:after,
7+
table.dataTable thead th.sorting_desc:after {
8+
position: absolute;
9+
top: 10px;
10+
right: 3px;
11+
display: block;
12+
font-family: Arial, Helvetica, sans-serif;
13+
color: #ff5e0a;
14+
-webkit-text-stroke: 2px white;
15+
}
16+
17+
table.dataTable thead .sorting_asc::after {
18+
content: "";
19+
}
20+
21+
table.dataTable thead .sorting_desc::after {
22+
content: "";
23+
}
24+
25+
table.dataTable thead .sorting_asc,
26+
table.dataTable thead .sorting_desc {
27+
background-image: none;
28+
}

src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
3030
@Output() changeValueShowCustomerForm = new EventEmitter<boolean>();
3131
@Input()
3232
customers: CustomerUI[] = [];
33-
dtOptions: any = {};
33+
dtOptions: any = {
34+
columnDefs: [{orderable: false, targets: [2]}]
35+
};
3436
dtTrigger: Subject<any> = new Subject();
3537
@ViewChild(DataTableDirective, { static: false })
3638
dtElement: DataTableDirective;

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,31 @@ $url-hover-color: darken($url-base-color, 20);
5555
}
5656
}
5757

58+
table.dataTable thead th {
59+
position: relative;
60+
}
61+
62+
table.dataTable thead th.sorting:after,
63+
table.dataTable thead th.sorting_asc:after,
64+
table.dataTable thead th.sorting_desc:after {
65+
position: absolute;
66+
top: 10px;
67+
right: 3px;
68+
display: block;
69+
font-family: Arial, Helvetica, sans-serif;
70+
color: #ff5e0a;
71+
-webkit-text-stroke: 2px white;
72+
}
73+
74+
table.dataTable thead .sorting_asc::after {
75+
content: "";
76+
}
77+
78+
table.dataTable thead .sorting_desc::after {
79+
content: "";
80+
}
81+
82+
table.dataTable thead .sorting_asc,
83+
table.dataTable thead .sorting_desc {
84+
background-image: none;
85+
}

src/app/modules/shared/components/month-picker/month-picker.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="row content-months">
2323
<div class="spacing col-xl-1 col-lg-1 col-md-2 col-2" *ngFor="let month of months; let i = index">
2424
<button class="btn btn-light btn-block"
25-
[ngClass]="{'btn-primary': isSelectedMonth(i)}"
25+
[ngClass]="{'btn-primary selected-month': isSelectedMonth(i)}"
2626
(click)="selectMonth(i)"
2727
[disabled]="monthEnable(i)">
2828
<small>{{ month.slice(0, 3) }}</small>

src/app/modules/shared/components/month-picker/month-picker.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
}
2525
}
2626

27+
.selected-month {
28+
color: white;
29+
}
30+
2731
.align-item {
2832
display: flex;
2933
justify-content: center;
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
table.dataTable thead th {
2+
position: relative;
3+
}
4+
5+
table.dataTable thead th.sorting:after,
6+
table.dataTable thead th.sorting_asc:after,
7+
table.dataTable thead th.sorting_desc:after {
8+
position: absolute;
9+
top: 10px;
10+
right: 3px;
11+
display: block;
12+
font-family: Arial, Helvetica, sans-serif;
13+
color: #ff5e0a;
14+
-webkit-text-stroke: 2px white;
15+
}
16+
17+
table.dataTable thead .sorting_asc::after {
18+
content: "";
19+
}
20+
21+
table.dataTable thead .sorting_desc::after {
22+
content: "";
23+
}
24+
25+
table.dataTable thead .sorting_asc,
26+
table.dataTable thead .sorting_desc {
27+
background-image: none;
28+
}

src/app/modules/time-entries/pages/time-entries.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { CalendarView } from 'angular-calendar';
2424
export class TimeEntriesComponent implements OnInit, OnDestroy, AfterViewInit {
2525
dtOptions: any = {
2626
order: [[ 0, 'desc' ]],
27+
columnDefs: [{orderable: false, targets: [6]}],
2728
destroy: true,
2829
};
2930
dtTrigger: Subject<any> = new Subject();
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
table.dataTable thead th {
2+
position: relative;
3+
}
4+
5+
table.dataTable thead th.sorting:after,
6+
table.dataTable thead th.sorting_asc:after,
7+
table.dataTable thead th.sorting_desc:after {
8+
position: absolute;
9+
top: 10px;
10+
right: 3px;
11+
display: block;
12+
font-family: Arial, Helvetica, sans-serif;
13+
color: #ff5e0a;
14+
-webkit-text-stroke: 2px white;
15+
}
16+
17+
table.dataTable thead .sorting_asc::after {
18+
content: "▲";
19+
}
20+
21+
table.dataTable thead .sorting_desc::after {
22+
content: "▼";
23+
}
24+
25+
table.dataTable thead .sorting_asc,
26+
table.dataTable thead .sorting_desc {
27+
background-image: none;
28+
}

src/app/modules/users/components/users-list/users-list.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
2222
dtTrigger: Subject<any> = new Subject();
2323
@ViewChild(DataTableDirective, { static: false })
2424
dtElement: DataTableDirective;
25-
dtOptions: any = {};
25+
dtOptions: any = {
26+
columnDefs: [{ orderable: false, targets: [2]}]
27+
};
2628
switchGroupsSubscription: Subscription;
2729
isDevelopment = true;
2830

0 commit comments

Comments
 (0)