From 86e4f801233b2d018ba039e51ad0026b17ed2cdf Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 6 Aug 2020 18:40:09 +0200
Subject: [PATCH] FEAT #14454 TIME 0:10 save filters notif admin
---
.../administration/administration.service.ts | 6 +++++
.../statuses-administration.component.html | 6 ++---
.../statuses-administration.component.ts | 24 ++++---------------
3 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/frontend/app/administration/administration.service.ts b/src/frontend/app/administration/administration.service.ts
index 56b9cf53fae..25c616e4f4e 100644
--- a/src/frontend/app/administration/administration.service.ts
+++ b/src/frontend/app/administration/administration.service.ts
@@ -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[];
diff --git a/src/frontend/app/administration/status/statuses-administration.component.html b/src/frontend/app/administration/status/statuses-administration.component.html
index 1a39b470ee3..0a7c7b66eb8 100755
--- a/src/frontend/app/administration/status/statuses-administration.component.html
+++ b/src/frontend/app/administration/status/statuses-administration.component.html
@@ -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">
diff --git a/src/frontend/app/administration/status/statuses-administration.component.ts b/src/frontend/app/administration/status/statuses-administration.component.ts
index 5d2a17cbe89..8878ab9ca68 100755
--- a/src/frontend/app/administration/status/statuses-administration.component.ts
+++ b/src/frontend/app/administration/status/statuses-administration.component.ts
@@ -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) => {
--
GitLab