From 237ae94f1032509152af55729d5ac454cf0c2734 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Tue, 25 Jun 2019 18:16:31 +0300
Subject: [PATCH] Fixes status on DMP and Dataset Listing Items

---
 .../src/app/core/model/dataset/dataset-listing.ts |  2 +-
 .../src/app/core/model/dmp/dmp-listing.ts         |  4 +++-
 .../dataset-listing-item.component.html           |  2 +-
 .../listing-item/dmp-listing-item.component.html  |  3 ++-
 .../listing-item/dmp-listing-item.component.ts    | 15 +++++++++++++--
 dmp-frontend/src/assets/i18n/en.json              |  1 +
 6 files changed, 21 insertions(+), 6 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 bf7332623..928161ccc 100644
--- a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
+++ b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
@@ -14,5 +14,5 @@ export interface DatasetListingModel {
 	status: Number;
 	created: Date;
 	modified: Date;
-	finalizedDat: Date;
+	finalizedAt: 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 6cc2e8dee..9a400f1fd 100644
--- a/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts
+++ b/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts
@@ -11,11 +11,13 @@ export interface DmpListingModel {
 	profile: String;
 	creationTime: String;
 	modifiedTime: String;
-	finalizedDat: Date;
+	publishedAt: Date;
+	finalizedAt: Date;
 	organisations: String;
 	groupId: string;
 	version: number;
 	datasets: any[];
 	associatedProfiles: any[];
 	users: any[];
+	public: boolean;
 }
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 92732c6f7..8301abcf4 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
@@ -37,7 +37,7 @@
 					<div matTooltip="{{ dataset.profile }}" class="chip ml-2 mr-2">{{ dataset.profile }}</div>
 				</div>
 				<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>
+				<p *ngIf="!isDraft">{{'DATASET-LISTING.COLUMNS.FINALIZED' | translate}} {{ dataset.finalizedAt | 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 c35bc2ac3..9be457350 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
@@ -57,7 +57,8 @@
 					<div matTooltip="{{profile.label}}" class="chip ml-2 mr-2">{{profile.label}}</div>
 				</div>
 				<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>
+				<p *ngIf="isFinalized && !isPublished">{{'TYPES.DMP.FINALISED' | translate}} {{dmp.finalizedAt | date: "shortDate"}}</p>
+				<p *ngIf="isPublished">{{'DMP-PROFILE-LISTING.COLUMNS.PUBLISHED' | translate}} {{dmp.publishedAt | date: "shortDate"}}</p>
 			</div>
 		</div>
 		<!-- <div class="row d-flex align-items-center my-1">
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
index f07a612ed..6ce67dd58 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
@@ -28,6 +28,8 @@ export class DmpListingItemComponent implements OnInit {
 	@Output() onClick: EventEmitter<DmpListingModel> = new EventEmitter();
 
 	isDraft: boolean;
+	isFinalized: boolean;
+	isPublished: boolean;
 
 	constructor(
 		private router: Router,
@@ -38,8 +40,17 @@ export class DmpListingItemComponent implements OnInit {
 		private translate: TranslateService) { }
 
 	ngOnInit() {
-		if (this.dmp.status == DmpStatus.Draft) { this.isDraft = true }
-		else { this.isDraft = false }
+		if (this.dmp.status == DmpStatus.Draft) {
+			this.isDraft = true;
+			this.isFinalized = false;
+			this.isPublished = false;
+		}
+		else if (this.dmp.status == DmpStatus.Finalized) {
+			this.isDraft = false;
+			this.isFinalized = true;
+			this.isPublished = false;
+			if (this.dmp.public == true) { this.isPublished = true }
+		}
 	}
 
 	openShareDialog(rowId: any, rowName: any) {
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 166f431f5..06ce53f9a 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -360,6 +360,7 @@
 			"DESCRIPTION": "Description",
 			"CREATED": "Created",
 			"PUBLISHED": "Published",
+			"FINALIZED": "Finalized",
 			"LAST-EDITED": "Last Edited",
 			"ACTIONS": "Actions",
 			"DMP": "DMP",