Skip to content
Snippets Groups Projects
Commit 5cf62b0f authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #14454 TIME 0:10 save filters priorities admin

parent 7def306e
No related branches found
No related tags found
No related merge requests found
...@@ -71,6 +71,12 @@ export class AdministrationService { ...@@ -71,6 +71,12 @@ export class AdministrationService {
page: 0, page: 0,
field: '' field: ''
}, },
admin_priorities: {
sort: 'label',
sortDirection: 'asc',
page: 0,
field: ''
},
}; };
dataSource: MatTableDataSource<any>; dataSource: MatTableDataSource<any>;
filterColumns: string[]; filterColumns: string[];
......
...@@ -38,8 +38,7 @@ ...@@ -38,8 +38,7 @@
<div class="row"> <div class="row">
<div class="col-md-6 col-xs-6"> <div class="col-md-6 col-xs-6">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" <input matInput [formControl]="adminService.getFilterField()" placeholder="{{lang.filterBy}}">
placeholder="{{lang.filterBy}}">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="col-md-6 col-xs-6"> <div class="col-md-6 col-xs-6">
...@@ -47,7 +46,7 @@ ...@@ -47,7 +46,7 @@
</mat-paginator> </mat-paginator>
</div> </div>
</div> </div>
<mat-table #table [dataSource]="dataSource" matSort matSortActive="label" matSortDirection="asc"> <mat-table #table [dataSource]="adminService.getDataSource()" matSort matSortDisableClear>
<ng-container matColumnDef="id"> <ng-container matColumnDef="id">
<mat-header-cell *matHeaderCellDef mat-sort-header style="flex:2;">{{lang.technicalId}} <mat-header-cell *matHeaderCellDef mat-sort-header style="flex:2;">{{lang.technicalId}}
</mat-header-cell> </mat-header-cell>
......
...@@ -5,10 +5,10 @@ import { NotificationService } from '../../../service/notification/notification. ...@@ -5,10 +5,10 @@ import { NotificationService } from '../../../service/notification/notification.
import { MatPaginator } from '@angular/material/paginator'; import { MatPaginator } from '@angular/material/paginator';
import { MatSidenav } from '@angular/material/sidenav'; import { MatSidenav } from '@angular/material/sidenav';
import { MatSort } from '@angular/material/sort'; import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { HeaderService } from '../../../service/header.service'; import { HeaderService } from '../../../service/header.service';
import { AppService } from '../../../service/app.service'; import { AppService } from '../../../service/app.service';
import { FunctionsService } from '../../../service/functions.service'; import { FunctionsService } from '../../../service/functions.service';
import { AdministrationService } from '../administration.service';
@Component({ @Component({
templateUrl: 'priorities-administration.component.html' templateUrl: 'priorities-administration.component.html'
...@@ -23,20 +23,12 @@ export class PrioritiesAdministrationComponent implements OnInit { ...@@ -23,20 +23,12 @@ export class PrioritiesAdministrationComponent implements OnInit {
priorities: any[] = []; priorities: any[] = [];
prioritiesOrder: any[] = []; prioritiesOrder: any[] = [];
dataSource: any;
displayedColumns = ['id', 'label', 'delays', 'actions']; displayedColumns = ['id', 'label', 'delays', 'actions'];
filterColumns = ['id', 'label', 'delays'];
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
@ViewChild(MatSort, { static: false }) sort: MatSort; @ViewChild(MatSort, { static: false }) sort: MatSort;
applyFilter(filterValue: string) {
filterValue = filterValue.trim(); // Remove whitespace
filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
this.dataSource.filter = filterValue;
this.dataSource.filterPredicate = (template: any, filter: string) => {
return this.functions.filterUnSensitive(template, filter, ['id', 'label', 'delays']);
};
}
constructor( constructor(
public http: HttpClient, public http: HttpClient,
...@@ -44,6 +36,7 @@ export class PrioritiesAdministrationComponent implements OnInit { ...@@ -44,6 +36,7 @@ export class PrioritiesAdministrationComponent implements OnInit {
private headerService: HeaderService, private headerService: HeaderService,
public appService: AppService, public appService: AppService,
public functions: FunctionsService, public functions: FunctionsService,
public adminService: AdministrationService,
private viewContainerRef: ViewContainerRef private viewContainerRef: ViewContainerRef
) { } ) { }
...@@ -64,14 +57,9 @@ export class PrioritiesAdministrationComponent implements OnInit { ...@@ -64,14 +57,9 @@ export class PrioritiesAdministrationComponent implements OnInit {
}, (err) => { }, (err) => {
this.notify.handleErrors(err); this.notify.handleErrors(err);
}); });
setTimeout(() => { setTimeout(() => {
this.dataSource = new MatTableDataSource(this.priorities); this.adminService.setDataSource('admin_priorities', this.priorities, this.sort, this.paginator, this.filterColumns);
this.dataSource.paginator = this.paginator; }, 0);
this.dataSource.sortingDataAccessor = this.functions.listSortingDataAccessor;
this.sort.active = 'label';
this.sort.direction = 'asc';
this.dataSource.sort = this.sort;
}, 0);
}, (err) => { }, (err) => {
this.notify.handleErrors(err); this.notify.handleErrors(err);
}); });
...@@ -84,9 +72,7 @@ export class PrioritiesAdministrationComponent implements OnInit { ...@@ -84,9 +72,7 @@ export class PrioritiesAdministrationComponent implements OnInit {
this.http.delete('../rest/priorities/' + id) this.http.delete('../rest/priorities/' + id)
.subscribe((data: any) => { .subscribe((data: any) => {
this.priorities = data['priorities']; this.priorities = data['priorities'];
this.dataSource = new MatTableDataSource(this.priorities); this.adminService.setDataSource('admin_priorities', this.priorities, this.sort, this.paginator, this.filterColumns);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
this.notify.success(this.lang.priorityDeleted); this.notify.success(this.lang.priorityDeleted);
}, (err) => { }, (err) => {
this.notify.error(err.error.errors); this.notify.error(err.error.errors);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment