inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4677] Make time ago use Angular Date formats (#4856)

Browse Source
This commit is contained in:
davidcanonieto
2019-06-17 14:16:48 +01:00
committed by Eugenio Romano
parent 73b871a233
commit 5f1caca5da
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/core/pipes/time-ago.pipe.ts
View File

@@ -19,6 +19,7 @@ import moment from 'moment-es6';
import { Pipe, PipeTransform } from '@angular/core'; import { Pipe, PipeTransform } from '@angular/core';
import { AppConfigService } from '../app-config/app-config.service'; import { AppConfigService } from '../app-config/app-config.service';
import { UserPreferenceValues, UserPreferencesService } from '../services/user-preferences.service'; import { UserPreferenceValues, UserPreferencesService } from '../services/user-preferences.service';
import { DatePipe } from '@angular/common';
@Pipe({ @Pipe({
name: 'adfTimeAgo' name: 'adfTimeAgo'
@@ -26,7 +27,7 @@ import { UserPreferenceValues, UserPreferencesService } from '../services/user-p
export class TimeAgoPipe implements PipeTransform { export class TimeAgoPipe implements PipeTransform {
static DEFAULT_LOCALE = 'en-US'; static DEFAULT_LOCALE = 'en-US';
static DEFAULT_DATE_TIME_FORMAT = 'DD/MM/YYYY HH:mm'; static DEFAULT_DATE_TIME_FORMAT = 'dd/MM/yyyy HH:mm';
defaultLocale: string; defaultLocale: string;
defaultDateTimeFormat: string; defaultDateTimeFormat: string;
@@ -44,7 +45,12 @@ export class TimeAgoPipe implements PipeTransform {
const actualLocale = locale || this.defaultLocale; const actualLocale = locale || this.defaultLocale;
const then = moment(value); const then = moment(value);
const diff = moment().locale(actualLocale).diff(then, 'days'); const diff = moment().locale(actualLocale).diff(then, 'days');
return diff > 7 ? then.locale(actualLocale).format(this.defaultDateTimeFormat) : then.locale(actualLocale).fromNow(); if ( diff > 7) {
const datePipe: DatePipe = new DatePipe(actualLocale);
return datePipe.transform(value, this.defaultDateTimeFormat);
} else {
return then.locale(actualLocale).fromNow();
}
} }
return ''; return '';
} }