diff --git a/src/app/ui/permissions/permissions.component.ts b/src/app/ui/permissions/permissions.component.ts index 791f3d0..ecb1788 100644 --- a/src/app/ui/permissions/permissions.component.ts +++ b/src/app/ui/permissions/permissions.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { Sort } from '@angular/material/sort'; -import { I18nService } from './../../services/i18n.service'; +import {Component, OnInit, Input} from '@angular/core'; +import {Sort} from '@angular/material/sort'; +import {I18nService} from './../../services/i18n.service'; @Component({ selector: 'app-permissions', @@ -13,23 +13,23 @@ export class PermissionsComponent implements OnInit { @Input() permissions; permissionColumns = ["name", "starts", "expires"]; - constructor(private i18n: I18nService) { } + constructor(private i18n: I18nService) {} ngOnInit(): void { - this.datetimeformat = this.i18n.get('date-time-format',[]); + this.datetimeformat = this.i18n.get('date-time-format', []); } sortData(sort: Sort) { const data = this.permissions.slice(); - if (!sort.active || sort.direction === '') { + if(!sort.active || sort.direction === '') { this.permissions = data; return; } this.permissions = data.sort((a, b) => { const isAsc = sort.direction === 'asc'; - switch (sort.active) { - case 'name': return this.compare(this.i18n.get('permissions.' + a.name, []), this.i18n.get('permissions.' + b.name, []), isAsc); + switch(sort.active) { + case 'name': return this.compare(this.i18n.get('apps.' + a.name + '.title', []), this.i18n.get('apps.' + b.name + '.title', []), isAsc); case 'starts': return this.compare(a.starts, b.starts, isAsc); case 'expires': return this.compare(a.expires, b.expires, isAsc); default: return 0; diff --git a/src/app/ui/quotas/quotas.component.ts b/src/app/ui/quotas/quotas.component.ts index e9fafdd..96ae487 100644 --- a/src/app/ui/quotas/quotas.component.ts +++ b/src/app/ui/quotas/quotas.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { Sort } from '@angular/material/sort'; -import { I18nService } from './../../services/i18n.service'; +import {Component, OnInit, Input} from '@angular/core'; +import {Sort} from '@angular/material/sort'; +import {I18nService} from './../../services/i18n.service'; @Component({ selector: 'app-quotas', @@ -13,22 +13,22 @@ export class QuotasComponent implements OnInit { @Input() quotas; quotaColumns = ["name", "quota", "quotaUnit"]; - constructor(private i18n: I18nService) { } + constructor(private i18n: I18nService) {} ngOnInit(): void { } sortData(sort: Sort) { const data = this.quotas.slice(); - if (!sort.active || sort.direction === '') { + if(!sort.active || sort.direction === '') { this.quotas = data; return; } this.quotas = data.sort((a, b) => { const isAsc = sort.direction === 'asc'; - switch (sort.active) { - case 'name': return this.compare(this.i18n.get('quotas.' + a.name, []), this.i18n.get('quotas.' + b.name,[]), isAsc); + switch(sort.active) { + case 'name': return this.compare(this.i18n.get('apps.' + a.name + '.title', []), this.i18n.get('apps.' + b.name + '.title', []), isAsc); case 'value': return this.compare(a.value, b.value, isAsc); default: return 0; }