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

FEAT #14454 TIME 0:10 save filters notif admin

parent 0228deb3
No related branches found
No related tags found
No related merge requests found
......@@ -83,6 +83,12 @@ export class AdministrationService {
page: 0,
field: ''
},
admin_status: {
sort: 'label_status',
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,8 +40,7 @@
</mat-paginator>
</div>
</div>
<mat-table #table [dataSource]="dataSource" matSort matSortActive="label_status"
matSortDirection="asc">
<mat-table #table [dataSource]="adminService.getDataSource()" matSort matSortDisableClear>
<ng-container matColumnDef="img_filename">
<mat-header-cell *matHeaderCellDef>{{lang.imgRelated}}</mat-header-cell>
<mat-cell *matCellDef="let element" color="primary">
......
......@@ -3,11 +3,11 @@ import { HttpClient } from '@angular/common/http';
import { LANG } from '../../translate.component';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { NotificationService } from '../../../service/notification/notification.service';
import { HeaderService } from '../../../service/header.service';
import { AppService } from '../../../service/app.service';
import { FunctionsService } from '../../../service/functions.service';
import { AdministrationService } from '../administration.service';
@Component({
templateUrl: 'statuses-administration.component.html'
......@@ -22,18 +22,10 @@ export class StatusesAdministrationComponent implements OnInit {
statuses: Status[] = [];
displayedColumns = ['img_filename', 'id', 'label_status', 'identifier'];
dataSource = new MatTableDataSource(this.statuses);
filterColumns = ['id', 'label_status'];
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
@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, filter: string) => {
return this.functions.filterUnSensitive(template, filter, ['id', 'label_status']);
};
}
constructor(
public http: HttpClient,
......@@ -41,6 +33,7 @@ export class StatusesAdministrationComponent implements OnInit {
private headerService: HeaderService,
public appService: AppService,
public functions: FunctionsService,
public adminService: AdministrationService,
private viewContainerRef: ViewContainerRef
) { }
......@@ -56,12 +49,7 @@ export class StatusesAdministrationComponent implements OnInit {
this.statuses = data.statuses;
this.loading = false;
setTimeout(() => {
this.dataSource = new MatTableDataSource(this.statuses);
this.dataSource.paginator = this.paginator;
this.dataSource.sortingDataAccessor = this.functions.listSortingDataAccessor;
this.sort.active = 'label_status';
this.sort.direction = 'asc';
this.dataSource.sort = this.sort;
this.adminService.setDataSource('admin_status', this.statuses, this.sort, this.paginator, this.filterColumns);
}, 0);
}, (err: any) => {
......@@ -75,9 +63,7 @@ export class StatusesAdministrationComponent implements OnInit {
this.http.delete('../rest/statuses/' + status.identifier)
.subscribe((data: any) => {
this.statuses = data.statuses;
this.dataSource = new MatTableDataSource(this.statuses);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
this.adminService.setDataSource('admin_status', this.statuses, this.sort, this.paginator, this.filterColumns);
this.notify.success(this.lang.statusDeleted);
}, (err) => {
......
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