From 8a653ec198b34a03b97e0860754ed776bda3c846 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Mon, 23 Sep 2019 16:39:13 +0300
Subject: [PATCH] Fixes Dashboard bug on column status. (Issue #164)

---
 .../recent-edited-activity.component.html     | 24 ++++++++++---------
 .../recent-edited-activity.component.ts       | 16 ++++++-------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
index fbadad74e..d509a1c6e 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -24,30 +24,32 @@
 				<th></th>
 			</thead>
 			<tbody *ngIf="dmpActivities != null">
-				<tr (click)="redirect(activity.id, recentActivityTypeEnum.Dmp)" *ngFor="let activity of dmpActivities"
-					style="cursor: pointer;">
+				<tr (click)="redirect(activity.id, recentActivityTypeEnum.Dmp)" *ngFor="let activity of dmpActivities" style="cursor: pointer;">
 					<td>{{ activity.label }}</td>
 					<td>
-						<div matTooltip="{{ dmpProfileDisplay(activity.profile) }}" class="template-name">
-							{{ dmpProfileDisplay(activity.profile) }}
+						<div *ngIf="activity.profile" matTooltip="{{ activity.profile }}" class="template-name">
+							{{ activity.profile }}
 						</div>
+						<div *ngIf="!(activity.profile)" class="template-name">--</div>
 					</td>
 					<td>{{ activity.grant }}</td>
-					<td>{{roleDisplay(activity.users)}}</td>
+					<td>{{ roleDisplay(activity.users)}}</td>
 					<td>{{ activity.organisations }}</td>
-					<td *ngIf="activity.status === 1">
+					<td *ngIf="activity.status === 1 && activity.public === true">
 						<div class="is-public">
-							{{ enumUtils.toDmpStatusString(activity.status) }}
+							{{'TYPES.DMP-VISIBILITY.PUBLIC' | translate}}
 						</div>
 					</td>
-					<td *ngIf="activity.status === 0" style="padding-left: 12px">
+					<td *ngIf="activity.status === 1 && activity.public === false" class="text-center">
 						{{ enumUtils.toDmpStatusString(activity.status) }}
 					</td>
-					<td style="padding-left: 12px">{{ activity.modifiedTime | date: "shortDate" }}</td>
+					<td *ngIf="activity.status === 0" class="text-center">
+						{{ enumUtils.toDmpStatusString(activity.status) }}
+					</td>
+					<td>{{ activity.modifiedTime | date: "shortDate" }}</td>
 					<td>
 						<!-- <i class="material-icons more-icon">more_horiz</i> -->
-						<button mat-icon-button [matMenuTriggerFor]="actionsMenu" class="ml-auto more-icon"
-							(click)="$event.stopImmediatePropagation();">
+						<button mat-icon-button [matMenuTriggerFor]="actionsMenu" class="ml-auto more-icon" (click)="$event.stopImmediatePropagation();">
 							<mat-icon class="more-horiz">more_horiz</mat-icon>
 						</button>
 						<mat-menu #actionsMenu="matMenu">
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
index 5ff771ebb..7599cb273 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
@@ -164,14 +164,14 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 		}
 	}
 
-	dmpProfileDisplay(value: any) {
-		if (value != null) {
-			return value;
-		}
-		else {
-			return "--";
-		}
-	}
+	// dmpProfileDisplay(value: any) {
+	// 	if (value != null) {
+	// 		return value;
+	// 	}
+	// 	else {
+	// 		return "--";
+	// 	}
+	// }
 
 	downloadXml(id: string) {
 		this.dmpService.downloadXML(id)