From 14206f50f50d10a2ecc22361094471d8f5822a97 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 6 Aug 2020 15:37:10 +0200
Subject: [PATCH] FEAT #14454 TIME 0:10 save filters groups admin
---
.../administration/administration.service.ts | 6 +++++
.../groups-administration.component.html | 6 ++---
.../group/groups-administration.component.ts | 25 ++++---------------
3 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/src/frontend/app/administration/administration.service.ts b/src/frontend/app/administration/administration.service.ts
index 881b005c526..e1f5db2f4e8 100644
--- a/src/frontend/app/administration/administration.service.ts
+++ b/src/frontend/app/administration/administration.service.ts
@@ -47,6 +47,12 @@ export class AdministrationService {
page: 0,
field: ''
},
+ admin_groups: {
+ sort: 'group_desc',
+ sortDirection: 'asc',
+ page: 0,
+ field: ''
+ },
};
dataSource: MatTableDataSource<any>;
filterColumns: string[];
diff --git a/src/frontend/app/administration/group/groups-administration.component.html b/src/frontend/app/administration/group/groups-administration.component.html
index 404d66429e2..432bd8a3c0c 100755
--- a/src/frontend/app/administration/group/groups-administration.component.html
+++ b/src/frontend/app/administration/group/groups-administration.component.html
@@ -32,8 +32,7 @@
<div class="row" style="margin:0px;">
<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="group_desc"
- matSortDirection="asc">
+ <mat-table #table [dataSource]="adminService.getDataSource()" [matSortActive]="adminService.getFilter('sort')" [matSortDirection]="adminService.getFilter('sortDirection')" matSort>
<ng-container matColumnDef="group_id">
<mat-header-cell *matHeaderCellDef mat-sort-header
[class.hide-for-mobile]="appService.getViewMode()">{{lang.id}}</mat-header-cell>
diff --git a/src/frontend/app/administration/group/groups-administration.component.ts b/src/frontend/app/administration/group/groups-administration.component.ts
index c8224cadf95..a480dbf144a 100755
--- a/src/frontend/app/administration/group/groups-administration.component.ts
+++ b/src/frontend/app/administration/group/groups-administration.component.ts
@@ -6,10 +6,10 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial
import { MatPaginator } from '@angular/material/paginator';
import { MatSidenav } from '@angular/material/sidenav';
import { MatSort } from '@angular/material/sort';
-import { MatTableDataSource } from '@angular/material/table';
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: 'groups-administration.component.html'
@@ -30,19 +30,10 @@ export class GroupsAdministrationComponent implements OnInit {
displayedColumns = ['group_id', 'group_desc', 'actions'];
- dataSource = new MatTableDataSource(this.groups);
-
+ filterColumns = ['group_id', 'group_desc'];
@ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
@ViewChild(MatSort, { static: false }) sort: MatSort;
- applyFilter(filterValue: string) {
- filterValue = filterValue.trim();
- filterValue = filterValue.toLowerCase();
- this.dataSource.filter = filterValue;
- this.dataSource.filterPredicate = (template, filter: string) => {
- return this.functions.filterUnSensitive(template, filter, ['group_id', 'group_desc']);
- };
- }
constructor(
public http: HttpClient,
@@ -51,6 +42,7 @@ export class GroupsAdministrationComponent implements OnInit {
private headerService: HeaderService,
public appService: AppService,
public functions: FunctionsService,
+ public adminService: AdministrationService,
private viewContainerRef: ViewContainerRef
) { }
@@ -66,12 +58,7 @@ export class GroupsAdministrationComponent implements OnInit {
this.groups = data['groups'];
this.loading = false;
setTimeout(() => {
- this.dataSource = new MatTableDataSource(this.groups);
- this.dataSource.paginator = this.paginator;
- this.dataSource.sortingDataAccessor = this.functions.listSortingDataAccessor;
- this.sort.active = 'group_desc';
- this.sort.direction = 'asc';
- this.dataSource.sort = this.sort;
+ this.adminService.setDataSource('admin_groups', this.groups, this.sort, this.paginator, this.filterColumns);
}, 0);
}, (err) => {
this.notify.handleErrors(err);
@@ -118,9 +105,7 @@ export class GroupsAdministrationComponent implements OnInit {
.subscribe((data: any) => {
setTimeout(() => {
this.groups = data['groups'];
- this.dataSource = new MatTableDataSource(this.groups);
- this.dataSource.paginator = this.paginator;
- this.dataSource.sort = this.sort;
+ this.adminService.setDataSource('admin_groups', this.groups, this.sort, this.paginator, this.filterColumns);
}, 0);
this.notify.success(this.lang.groupDeleted);
--
GitLab