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