From 6158076c4489300fb141a9d89dea04299428e01c Mon Sep 17 00:00:00 2001 From: _Bastler <_Bastler@bstly.de> Date: Wed, 15 Dec 2021 13:11:20 +0100 Subject: [PATCH] fix date, init order --- src/app/ui/permissions/permissions.component.ts | 1 + src/app/ui/quotas/quotas.component.ts | 1 + src/app/utils/moment.pipe.ts | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/ui/permissions/permissions.component.ts b/src/app/ui/permissions/permissions.component.ts index 1b3acaf..3ce2f1d 100644 --- a/src/app/ui/permissions/permissions.component.ts +++ b/src/app/ui/permissions/permissions.component.ts @@ -17,6 +17,7 @@ export class PermissionsComponent implements OnInit { ngOnInit(): void { this.datetimeformat = this.i18n.get('format.datetime', []); + this.sortData({ "active": "name", "direction": "asc" }); } sortData(sort: Sort) { diff --git a/src/app/ui/quotas/quotas.component.ts b/src/app/ui/quotas/quotas.component.ts index 21223a7..f81532f 100644 --- a/src/app/ui/quotas/quotas.component.ts +++ b/src/app/ui/quotas/quotas.component.ts @@ -16,6 +16,7 @@ export class QuotasComponent implements OnInit { constructor(private i18n: I18nService) {} ngOnInit(): void { + this.sortData({ "active": "name", "direction": "asc" }); } sortData(sort: Sort) { diff --git a/src/app/utils/moment.pipe.ts b/src/app/utils/moment.pipe.ts index 956b1c1..302e636 100644 --- a/src/app/utils/moment.pipe.ts +++ b/src/app/utils/moment.pipe.ts @@ -4,10 +4,14 @@ import * as moment from 'moment'; @Pipe({ name: 'datef' }) export class MomentPipe implements PipeTransform { transform(value: Date | moment.Moment, dateFormat: string): any { + if (!value) { + return ""; + } + if (!dateFormat) { return moment(value).fromNow(); } - + return moment(value).format(dateFormat); } } \ No newline at end of file