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

FEAT #14454 TIME 0:10 save filters param admin

parent 8c500ec4
No related branches found
No related tags found
No related merge requests found
......@@ -65,6 +65,12 @@ export class AdministrationService {
page: 0,
field: ''
},
admin_parameters: {
sort: 'id',
sortDirection: 'asc',
page: 0,
field: ''
},
};
dataSource: MatTableDataSource<any>;
filterColumns: string[];
......
......@@ -32,8 +32,7 @@
<div class="row">
<div class="col-md-6 col-xs-6">
<mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)"
placeholder="{{lang.filterBy}}">
<input matInput [formControl]="adminService.getFilterField()" placeholder="{{lang.filterBy}}">
</mat-form-field>
</div>
<div class="col-md-6 col-xs-6">
......@@ -41,7 +40,7 @@
</mat-paginator>
</div>
</div>
<mat-table #table [dataSource]="dataSource" matSort matSortActive="id" matSortDirection="asc">
<mat-table #table [dataSource]="adminService.getDataSource()" matSort matSortDisableClear>
<ng-container matColumnDef="id">
<mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.id}}</mat-header-cell>
<mat-cell *matCellDef="let element">
......
......@@ -5,9 +5,9 @@ import { NotificationService } from '../../../service/notification/notification.
import { HeaderService } from '../../../service/header.service';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { AppService } from '../../../service/app.service';
import { FunctionsService } from '../../../service/functions.service';
import { AdministrationService } from '../administration.service';
@Component({
templateUrl: 'parameters-administration.component.html'
......@@ -23,29 +23,21 @@ export class ParametersAdministrationComponent implements OnInit {
loading: boolean = false;
displayedColumns = ['id', 'description', 'value', 'actions'];
dataSource: any;
filterColumns = ['id', 'description', 'value'];
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
@ViewChild(MatSort, { static: false }) sort: MatSort;
constructor(
public http: HttpClient,
private notify: NotificationService,
private headerService: HeaderService,
public appService: AppService,
public functions: FunctionsService,
public adminService: AdministrationService,
private viewContainerRef: ViewContainerRef
) { }
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', 'description', 'value']);
};
}
ngOnInit(): void {
this.headerService.setHeader(this.lang.administration + ' ' + this.lang.parameters);
......@@ -56,15 +48,10 @@ export class ParametersAdministrationComponent implements OnInit {
this.http.get('../rest/parameters')
.subscribe((data: any) => {
this.parameters = data.parameters;
this.loading = false;
setTimeout(() => {
this.dataSource = new MatTableDataSource(this.parameters);
this.dataSource.sortingDataAccessor = this.functions.listSortingDataAccessor;
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
this.adminService.setDataSource('admin_parameters', this.parameters, this.sort, this.paginator, this.filterColumns);
}, 0);
this.loading = false;
});
}
......@@ -75,9 +62,7 @@ export class ParametersAdministrationComponent implements OnInit {
this.http.delete('../rest/parameters/' + paramId)
.subscribe((data: any) => {
this.parameters = data.parameters;
this.dataSource = new MatTableDataSource(this.parameters);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
this.adminService.setDataSource('admin_parameters', this.parameters, this.sort, this.paginator, this.filterColumns);
this.notify.success(this.lang.parameterDeleted);
}, (err) => {
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