From c10b124bb569c404e2b3a7e6678efa35d97c4359 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Thu, 9 Jul 2020 18:31:51 +0300
Subject: [PATCH] Adds select form of dmp version on dmp overview

---
 .../dmp/overview/dmp-overview.component.html  |  8 +-
 .../dmp/overview/dmp-overview.component.scss  | 87 +++++++++++--------
 .../ui/dmp/overview/dmp-overview.component.ts |  5 ++
 3 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index 8cf89739d..0c944ddd6 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -2,8 +2,8 @@
 	<div class="container-fluid pl-0 pr-0">
 		<div *ngIf="dmp">
 			<a class="row mb-2 pl-1" (click)="goBack()" role="button">
-				<mat-icon class="back-icon">chevron_left</mat-icon>
-				<p class="label-txt">{{'DMP-WIZARD.ACTIONS.BACK' | translate}}</p>
+				<mat-icon class="back-icon pointer">chevron_left</mat-icon>
+				<p class="label-txt pointer">{{'DMP-WIZARD.ACTIONS.BACK' | translate}}</p>
 			</a>
 			<div class="row">
 				<div class="col-md-8 col-lg-8 pl-4">
@@ -34,8 +34,8 @@
 							(click)="viewVersions(dmp.groupId, dmp.label)">
 							{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}}
 						</button> -->
-						<mat-form-field appearance="fill">
-							<mat-select>
+						<mat-form-field appearance="outline" class="versions-select mr-4">
+							<mat-select placeholder="{{'DMP-LISTING.VERSION' | translate}} {{dmp.version}}" [(ngModel)]="version" (ngModelChange)="versionChanged(version.id)">
 							  <mat-option *ngFor="let version of versions" [value]="version">{{'DMP-LISTING.VERSION' | translate}} {{version.version}}</mat-option>
 							</mat-select>
 						  </mat-form-field>
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
index 73aba2582..be4874980 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
@@ -12,15 +12,16 @@
 .mat-mini-fab {
   width: 2.5em;
   height: 2.5em;
-  background-color: #129D99;
+  background-color: #129d99;
 }
 
-.mat-mini-fab-icon, .status-icon {
+.mat-mini-fab-icon,
+.status-icon {
   font-size: 1.2em;
 }
 
 .status-icon {
-  color: #A7A7A7;
+  color: #a7a7a7;
 }
 
 .account-icon {
@@ -38,7 +39,7 @@
 }
 
 .id-btn {
-  background: url('../../../../assets/images/NoPath.png') no-repeat center;
+  background: url("../../../../assets/images/NoPath.png") no-repeat center;
   width: 1em;
   margin-right: 0.3em;
   align-self: center;
@@ -47,7 +48,7 @@
 .dataset-btn {
   width: 36.1em;
   padding: 0 1.1em;
-  background-color: #F7DD72;
+  background-color: #f7dd72;
   border-radius: 4px;
   justify-content: space-between;
   color: #212121;
@@ -58,7 +59,7 @@
   width: 31.6em;
   padding: 0 1em;
   background-color: #ffffff00;
-  color: #129D99;
+  color: #129d99;
   font-weight: 700;
 }
 
@@ -75,8 +76,8 @@
 }
 
 .finalize-btn {
-  border: 1px solid #129D99;
-  color: #129D99;
+  border: 1px solid #129d99;
+  color: #129d99;
 }
 
 .grant-title {
@@ -89,8 +90,9 @@
   text-transform: uppercase;
 }
 
-.frame-btn, .finalize-btn {
-  background: #FFFFFF;
+.frame-btn,
+.finalize-btn {
+  background: #ffffff;
   box-shadow: 0px 2px 6px #00000029;
 }
 
@@ -102,18 +104,18 @@
   margin-left: auto;
 }
 
-.invite-btn{
+.invite-btn {
   width: 9.4em;
   height: 2.9em;
-  background: #FFFFFF;
-  box-shadow: 0px 3px 6px #1E202029;
+  background: #ffffff;
+  box-shadow: 0px 3px 6px #1e202029;
   border: 2px solid #212121;
   border-radius: 30px;
 }
 
 .account_btn {
   background: white;
-  color: #D5D5D5;
+  color: #d5d5d5;
   border: none;
   height: 2.9em;
 }
@@ -123,10 +125,10 @@
 .dmp-logo {
   width: 4.8em;
   height: 2.6em;
-  background: #129D99;
+  background: #129d99;
   border-radius: 4px;
   font-size: 0.875em;
-  color: #FFFFFF;
+  color: #ffffff;
   opacity: 0.8;
 }
 
@@ -138,7 +140,8 @@
   font-size: 1em;
 }
 
-.label-txt, .label2-txt {
+.label-txt,
+.label2-txt {
   color: #848484;
 }
 
@@ -155,7 +158,6 @@
   color: #008887;
   padding-right: 0.5em;
   align-self: center;
-
 }
 
 .header {
@@ -164,7 +166,8 @@
   margin-bottom: 0.5em;
 }
 
-.dmp-label, .header {
+.dmp-label,
+.header {
   font-size: 1.25em;
   color: #212121;
 }
@@ -192,7 +195,7 @@
 .doi-txt {
   font-size: 0.8em;
   letter-spacing: 0.009em;
-  color: #7D7D7D;
+  color: #7d7d7d;
   width: 12em;
   height: 1em;
   overflow: hidden;
@@ -202,8 +205,8 @@
 
 .doi-panel {
   height: 3.5em;
-  background: #FAFAFA;
-  border: 1px solid #D1D1D1;
+  background: #fafafa;
+  border: 1px solid #d1d1d1;
   border-radius: 4px;
   flex-direction: row;
   justify-content: space-between;
@@ -214,7 +217,7 @@
 }
 
 .frame {
-  background: #FFFFFF;
+  background: #ffffff;
   box-shadow: 0px 1px 5px #00000026;
   border-radius: 4px;
   overflow: hidden;
@@ -225,10 +228,11 @@
 }
 
 .finalize-txt {
-  color: #129D99;
+  color: #129d99;
 }
 
-.frame-txt, .finalize-txt {
+.frame-txt,
+.finalize-txt {
   font-size: 0.75em;
   font-weight: bold;
   letter-spacing: 0px;
@@ -237,7 +241,7 @@
 }
 
 .hr-line {
-  border: 1px solid #DBDBDB;
+  border: 1px solid #dbdbdb;
   // width: 274px;
   // width: 17em;
   width: 100%;
@@ -259,22 +263,29 @@
 
 .authors-role {
   font-size: 0.875em;
-  color: #A8A8A8;
+  color: #a8a8a8;
   height: 1.4em;
   margin-bottom: 0px;
 }
 
 // ********CENTER ELEMENTS********
 
-.mat-mini-fab, .mat-mini-fab-icon,
-.status-icon, .dmp-logo, .frame-btn, .finalize-btn {
+.mat-mini-fab,
+.mat-mini-fab-icon,
+.status-icon,
+.dmp-logo,
+.frame-btn,
+.finalize-btn {
   display: flex;
   justify-content: center;
   align-items: center;
 }
 
-.dmp-label, .dataset-btn, .add-dataset-btn,
- .doi-panel, .researcher {
+.dmp-label,
+.dataset-btn,
+.add-dataset-btn,
+.doi-panel,
+.researcher {
   display: flex;
   align-items: center;
 }
@@ -284,12 +295,18 @@
   justify-content: center;
 }
 
+::ng-deep .mat-select-value {
+  color: #848484 !important;
+}
 
+::ng-deep .versions-select .mat-form-field-wrapper {
+  background-color: transparent !important;
+  padding-bottom: 0 !important;
+}
 
-
-
-
-
+::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
+  padding: 0rem 0rem 0.4rem 0rem !important;
+}
 
 // .card-content {
 //   display: flex;
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 945289876..a150df65d 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -56,6 +56,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 	lockStatus: Boolean;
 	textMessage: any;
 	versions: VersionListingModel[];
+	version: VersionListingModel;
 
 	@ViewChild('doi', { static: false })
 	doi: ElementRef;
@@ -540,6 +541,10 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		return !(!this.authentication.current());
 	}
 
+	versionChanged(versionId: string): void {
+		this.router.navigate(['/plans/overview/' + versionId]);
+	}
+
 	openShareDialog(rowId: any, rowName: any) {
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',