Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
feat: TT-576 Improve grids visual presentation and function
  • Loading branch information
iHackN3WTON committed Mar 15, 2022
commit 3390b5b003894255903b9d47020d71f61b497199
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
@Output() changeValueShowCustomerForm = new EventEmitter<boolean>();
@Input()
customers: CustomerUI[] = [];
dtOptions: any = {};
dtOptions: any = {
columnDefs: [{orderable: false, targets: [2]}]
};
dtTrigger: Subject<any> = new Subject();
@ViewChild(DataTableDirective, { static: false })
dtElement: DataTableDirective;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="row content-months">
<div class="spacing col-xl-1 col-lg-1 col-md-2 col-2" *ngFor="let month of months; let i = index">
<button class="btn btn-light btn-block"
[ngClass]="{'btn-primary': isSelectedMonth(i)}"
[ngClass]="{'btn-primary selected-month': isSelectedMonth(i)}"
(click)="selectMonth(i)"
[disabled]="monthEnable(i)">
<small>{{ month.slice(0, 3) }}</small>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
}
}

.selected-month {
color: white;
}

.align-item {
display: flex;
justify-content: center;
Expand Down
25 changes: 25 additions & 0 deletions src/app/modules/time-entries/pages/time-entries.component.scss
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { CalendarView } from 'angular-calendar';
export class TimeEntriesComponent implements OnInit, OnDestroy, AfterViewInit {
dtOptions: any = {
order: [[ 0, 'desc' ]],
columnDefs: [{orderable: false, targets: [6]}],
destroy: true,
};
dtTrigger: Subject<any> = new Subject();
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
dtTrigger: Subject<any> = new Subject();
@ViewChild(DataTableDirective, { static: false })
dtElement: DataTableDirective;
dtOptions: any = {};
dtOptions: any = {
columnDefs: [{ orderable: false, targets: [2]}]
};
switchGroupsSubscription: Subscription;
isDevelopment = true;

Expand Down