From 978e2d67d0ef50f0566c8d8ec971e0985d682914 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Tue, 4 Jun 2019 12:53:35 +0300
Subject: [PATCH] Shows finalized Date on Dmp and Dataset listing

---
 dmp-frontend/src/app/core/model/dataset/dataset-listing.ts    | 1 +
 dmp-frontend/src/app/core/model/dmp/dmp-listing.ts            | 1 +
 .../listing/listing-item/dataset-listing-item.component.html  | 3 ++-
 .../dmp/listing/listing-item/dmp-listing-item.component.html  | 3 ++-
 dmp-frontend/src/assets/i18n/en.json                          | 4 +++-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
index 18c01f4ad..bf7332623 100644
--- a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
+++ b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
@@ -14,4 +14,5 @@ export interface DatasetListingModel {
 	status: Number;
 	created: Date;
 	modified: Date;
+	finalizedDat: Date;
 }
diff --git a/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts b/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts
index 105b2c388..060198a5c 100644
--- a/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts
+++ b/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts
@@ -11,6 +11,7 @@ export interface DmpListingModel {
 	profile: String;
 	creationTime: String;
 	modifiedTime: String;
+	finalizedDat: Date;
 	organisations: String;
 	groupId: string;
 	version: number;
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
index 9011a700c..92732c6f7 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
@@ -36,7 +36,8 @@
 				<div class="pt-1">
 					<div matTooltip="{{ dataset.profile }}" class="chip ml-2 mr-2">{{ dataset.profile }}</div>
 				</div>
-				<p>{{'DATASET-LISTING.COLUMNS.PUBLISHED' | translate}} {{ dataset.created | date: "shortDate"}}</p>
+				<p *ngIf="isDraft">{{'DATASET-LISTING.COLUMNS.LAST-EDITED' | translate}} {{ dataset.modified | date: "shortDate"}}</p>
+				<p *ngIf="!isDraft">{{'DATASET-LISTING.COLUMNS.PUBLISHED' | translate}} {{ dataset.finalizedDat | date: "shortDate"}}</p>
 			</div>
 		</div>
 		<!-- <div class="info">
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
index ffd7aeafb..01bbf39c6 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html
@@ -56,7 +56,8 @@
 				<div *ngFor="let profile of dmp.associatedProfiles" class="pt-1">
 					<div matTooltip="{{profile.label}}" class="chip ml-2 mr-2">{{profile.label}}</div>
 				</div>
-				<p>{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.creationTime | date: "shortDate"}}</p>
+				<p *ngIf="isDraft">{{'DMP-PROFILE-LISTING.COLUMNS.LAST-EDITED' | translate}} {{dmp.modifiedTime | date: "shortDate"}}</p>
+				<p *ngIf="!isDraft">{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.finalizedDat | date: "shortDate"}}</p>
 			</div>
 		</div>
 		<!-- <div class="row d-flex align-items-center my-1">
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 254dbaae0..f7ce596f3 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -339,6 +339,7 @@
 			"DESCRIPTION": "Description",
 			"CREATED": "Created",
 			"PUBLISHED": "Published",
+			"LAST-EDITED": "Last Edited",
 			"ACTIONS": "Actions",
 			"DMP": "Dmp",
 			"PROFILE": "Profile",
@@ -479,7 +480,8 @@
 			"NAME": "Name",
 			"STATUS": "Status",
 			"CREATED": "Created",
-			"PUBLISHED": "Published"
+			"PUBLISHED": "Published",
+			"LAST-EDITED": "Last Edited"
 		},
 		"UPLOAD": {
 			"UPLOAD-XML": "Import",