From b02a465f27c0c39fc8bedf69daab24b590049ae5 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Mon, 4 Jul 2016 17:56:52 +0100
Subject: [PATCH] Date format support for datatable columns

---
 .../src/components/datatable.component.html     | 12 ++++++++----
 .../src/data/datatable-adapter.ts               |  5 +++--
 .../src/data/object-datatable-adapter.ts        | 17 ++++++++++++++++-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable.component.html
index 6bee3e7145..7554a3e7e0 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable.component.html
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable.component.html
@@ -41,15 +41,19 @@
         </td>
         <td *ngFor="let col of data.getColumns()" [ngSwitch]="col.type"
             class="mdl-data-table__cell--non-numeric non-selectable data-cell {{col.cssClass}}"
-            (click)="onRowClick(row, $event)" (dblclick)="onRowDblClick(row, $event)">
-            <div *ngSwitchCase="'image'">
+            (click)="onRowClick(row, $event)"
+            (dblclick)="onRowDblClick(row, $event)">
+            <div *ngSwitchCase="'image'" class="cell-value">
                 <i *ngIf="isIconValue(row, col)" class="material-icons icon-cell">{{asIconValue(row, col)}}</i>
                 <img *ngIf="!isIconValue(row, col)" class="image-cell" alt="" src="{{data.getValue(row, col)}}">
             </div>
-            <div *ngSwitchCase="'text'">
+            <div *ngSwitchCase="'date'" class="cell-value">
                 {{data.getValue(row, col)}}
             </div>
-            <span *ngSwitchDefault>
+            <div *ngSwitchCase="'text'" class="cell-value">
+                {{data.getValue(row, col)}}
+            </div>
+            <span *ngSwitchDefault class="cell-value">
                <!-- empty cell for unknown column type -->
             </span>
 
diff --git a/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts b/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts
index cec755921f..9ba0a0c716 100644
--- a/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/data/datatable-adapter.ts
@@ -25,7 +25,7 @@ export interface DataTableAdapter {
     getSorting(): DataSorting;
     setSorting(sorting: DataSorting): void;
     sort(key?: string, direction?: string): void;
-
+    
 }
 
 export interface DataRow {
@@ -39,7 +39,8 @@ export interface DataRow {
 export interface DataColumn {
 
     key: string;
-    type: string; // text|image
+    type: string; // text|image|date
+    format?: string;
     sortable?: boolean;
     title?: string;
     srTitle?: string;
diff --git a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts
index 16cf6ad0f7..b5677e0b71 100644
--- a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import { DatePipe } from '@angular/common';
+
 import {
     DataTableAdapter,
     DataRow,
@@ -78,7 +80,20 @@ export class ObjectDataTableAdapter implements DataTableAdapter {
         if (!col) {
             throw new Error('Column not found');
         }
-        return row.getValue(col.key);
+
+        let value = row.getValue(col.key);
+
+        if (col.type === 'date') {
+            let datePipe = new DatePipe();
+            let format = col.format || 'medium';
+            try {
+                return datePipe.transform(value, format);
+            } catch (err) {
+                console.error(`DocumentList: error parsing date ${value} to format ${format}`);
+            }
+        }
+
+        return value;
     }
 
     getSorting(): DataSorting {