From 09d85f1485ceb5647d2447652e29d68fb2134f1f Mon Sep 17 00:00:00 2001 From: apapachristou Date: Tue, 14 May 2019 14:35:02 +0300 Subject: [PATCH] Ticket: -When clicking the Project name (it should be displayed as link), the user should be navigated to the Project editor Page for that project. (#80) --- dmp-frontend/src/app/core/model/dmp/dmp-listing.ts | 1 + .../listing-item/dmp-listing-item.component.html | 2 +- .../listing-item/dmp-listing-item.component.scss | 10 ++++++++++ .../listing-item/dmp-listing-item.component.ts | 13 +++++++++---- 4 files changed, 21 insertions(+), 5 deletions(-) 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 9b032ec73..105b2c388 100644 --- a/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts +++ b/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts @@ -6,6 +6,7 @@ export interface DmpListingModel { description: String; status: DmpStatus; project: String; + projectId: String; projectAbbreviation: String; profile: String; creationTime: String; 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 3057be6f7..4fb559d58 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 @@ -2,7 +2,7 @@
- {{dmp.projectAbbreviation}} +

{{dmp.projectAbbreviation}}

diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss index e57862178..f02b4e0fa 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss @@ -10,6 +10,16 @@ text-transform: uppercase; } +.container-header p { + letter-spacing: 5px; + color: #aaaaaa; + margin-bottom: 0px; +} + +.container-header :hover { + color: #4687e6; +} + .about-item { display: flex; flex-wrap: wrap; 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 650816797..3e960ce69 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 @@ -3,6 +3,7 @@ import { DmpListingModel } from '../../../../core/model/dmp/dmp-listing'; import { MatDialog } from '@angular/material'; import { DmpInvitationDialogComponent } from '../../invitation/dmp-invitation.component'; import { Router } from '@angular/router'; +import { ProjectListingModel } from '../../../../core/model/project/project-listing'; @Component({ selector: 'app-dmp-listing-item-component', @@ -24,10 +25,6 @@ export class DmpListingItemComponent implements OnInit { else { this.isDraft = false } } - itemClicked() { - this.onClick.emit(this.dmp); - } - openShareDialog(rowId: any, rowName: any) { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { // height: '250px', @@ -50,4 +47,12 @@ export class DmpListingItemComponent implements OnInit { viewVersions(rowId: String, rowLabel: String) { this.router.navigate(['/plans/versions/' + rowId], { queryParams: { groupLabel: rowLabel } }); } + + itemClicked() { + this.onClick.emit(this.dmp); + } + + projectClicked(projectId: String) { + this.router.navigate(['/projects/edit/' + projectId]); + } }