[ADF-3494] fix formatting for date columns (#3733)

* fix date formats for columns

* fix date formatting for columns
This commit is contained in:
Denys Vuika
2018-09-04 10:27:32 +01:00
committed by Eugenio Romano
parent ef9b130d4e
commit db0b9ae2e0
2 changed files with 61 additions and 10 deletions

View File

@@ -0,0 +1,37 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { DateCellComponent } from './date-cell.component';
describe('DataTableCellComponent', () => {
it('should use medium format by default', () => {
const component = new DateCellComponent(null);
expect(component.format).toBe('medium');
});
it('should use column format', () => {
const component = new DateCellComponent(null);
component.column = {
key: 'created',
type: 'date',
format: 'longTime'
};
component.ngOnInit();
expect(component.format).toBe('longTime');
});
});

View File

@@ -15,38 +15,52 @@
* limitations under the License. * limitations under the License.
*/ */
import { Component, ViewEncapsulation } from '@angular/core'; import { Component, ViewEncapsulation, OnInit } from '@angular/core';
import { DataTableCellComponent } from './datatable-cell.component'; import { DataTableCellComponent } from './datatable-cell.component';
import { UserPreferencesService, UserPreferenceValues } from '../../../services/user-preferences.service'; import {
UserPreferencesService,
UserPreferenceValues
} from '../../../services/user-preferences.service';
@Component({ @Component({
selector: 'adf-date-cell', selector: 'adf-date-cell',
template: ` template: `
<ng-container> <ng-container>
<span title="{{ tooltip | date:'medium' }}" *ngIf="column?.format === 'timeAgo' else standard_date"> <span title="{{ tooltip | date:'medium' }}" *ngIf="format === 'timeAgo' else standard_date">
{{ value | adfTimeAgo: currentLocale }} {{ value | adfTimeAgo: currentLocale }}
</span> </span>
</ng-container> </ng-container>
<ng-template #standard_date> <ng-template #standard_date>
<span title="{{ tooltip | date:'medium' }}"> <span title="{{ tooltip | date:format }}">
{{ value | date:'medium' }} {{ value | date:format }}
</span> </span>
</ng-template> </ng-template>
`, `,
encapsulation: ViewEncapsulation.None, encapsulation: ViewEncapsulation.None,
host: { class: 'adf-date-cell' } host: { class: 'adf-date-cell' }
}) })
export class DateCellComponent extends DataTableCellComponent { export class DateCellComponent extends DataTableCellComponent implements OnInit {
currentLocale; currentLocale;
format = 'medium';
constructor(userPreferenceService: UserPreferencesService) { constructor(userPreferenceService: UserPreferencesService) {
super(); super();
userPreferenceService.select(UserPreferenceValues.Locale).subscribe((locale) => { if (userPreferenceService) {
this.currentLocale = locale; userPreferenceService
}); .select(UserPreferenceValues.Locale)
.subscribe(locale => {
this.currentLocale = locale;
});
}
} }
ngOnInit() {
super.ngOnInit();
if (this.column) {
this.format = this.column.format || 'medium';
}
}
} }