MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Adds select form of dmp version on dmp overview

This commit is contained in:
apapachristou 2020-07-09 18:31:51 +03:00
parent 052430d97c
commit c10b124bb5
3 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
View File

@ -2,8 +2,8 @@
<div class="container-fluid pl-0 pr-0"> <div class="container-fluid pl-0 pr-0">
<div *ngIf="dmp"> <div *ngIf="dmp">
<a class="row mb-2 pl-1" (click)="goBack()" role="button"> <a class="row mb-2 pl-1" (click)="goBack()" role="button">
<mat-icon class="back-icon">chevron_left</mat-icon> <mat-icon class="back-icon pointer">chevron_left</mat-icon>
<p class="label-txt">{{'DMP-WIZARD.ACTIONS.BACK' | translate}}</p> <p class="label-txt pointer">{{'DMP-WIZARD.ACTIONS.BACK' | translate}}</p>
</a> </a>
<div class="row"> <div class="row">
<div class="col-md-8 col-lg-8 pl-4"> <div class="col-md-8 col-lg-8 pl-4">
@ -34,8 +34,8 @@
(click)="viewVersions(dmp.groupId, dmp.label)"> (click)="viewVersions(dmp.groupId, dmp.label)">
{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}} {{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}}
</button> --> </button> -->
<mat-form-field appearance="fill"> <mat-form-field appearance="outline" class="versions-select mr-4">
<mat-select> <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-option *ngFor="let version of versions" [value]="version">{{'DMP-LISTING.VERSION' | translate}} {{version.version}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>

87
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
View File

@ -12,15 +12,16 @@
.mat-mini-fab { .mat-mini-fab {
width: 2.5em; width: 2.5em;
height: 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; font-size: 1.2em;
} }
.status-icon { .status-icon {
color: #A7A7A7; color: #a7a7a7;
} }
.account-icon { .account-icon {
@ -38,7 +39,7 @@
} }
.id-btn { .id-btn {
background: url('../../../../assets/images/NoPath.png') no-repeat center; background: url("../../../../assets/images/NoPath.png") no-repeat center;
width: 1em; width: 1em;
margin-right: 0.3em; margin-right: 0.3em;
align-self: center; align-self: center;
@ -47,7 +48,7 @@
.dataset-btn { .dataset-btn {
width: 36.1em; width: 36.1em;
padding: 0 1.1em; padding: 0 1.1em;
background-color: #F7DD72; background-color: #f7dd72;
border-radius: 4px; border-radius: 4px;
justify-content: space-between; justify-content: space-between;
color: #212121; color: #212121;
@ -58,7 +59,7 @@
width: 31.6em; width: 31.6em;
padding: 0 1em; padding: 0 1em;
background-color: #ffffff00; background-color: #ffffff00;
color: #129D99; color: #129d99;
font-weight: 700; font-weight: 700;
} }
@ -75,8 +76,8 @@
} }
.finalize-btn { .finalize-btn {
border: 1px solid #129D99; border: 1px solid #129d99;
color: #129D99; color: #129d99;
} }
.grant-title { .grant-title {
@ -89,8 +90,9 @@
text-transform: uppercase; text-transform: uppercase;
} }
.frame-btn, .finalize-btn { .frame-btn,
background: #FFFFFF; .finalize-btn {
background: #ffffff;
box-shadow: 0px 2px 6px #00000029; box-shadow: 0px 2px 6px #00000029;
} }
@ -102,18 +104,18 @@
margin-left: auto; margin-left: auto;
} }
.invite-btn{ .invite-btn {
width: 9.4em; width: 9.4em;
height: 2.9em; height: 2.9em;
background: #FFFFFF; background: #ffffff;
box-shadow: 0px 3px 6px #1E202029; box-shadow: 0px 3px 6px #1e202029;
border: 2px solid #212121; border: 2px solid #212121;
border-radius: 30px; border-radius: 30px;
} }
.account_btn { .account_btn {
background: white; background: white;
color: #D5D5D5; color: #d5d5d5;
border: none; border: none;
height: 2.9em; height: 2.9em;
} }
@ -123,10 +125,10 @@
.dmp-logo { .dmp-logo {
width: 4.8em; width: 4.8em;
height: 2.6em; height: 2.6em;
background: #129D99; background: #129d99;
border-radius: 4px; border-radius: 4px;
font-size: 0.875em; font-size: 0.875em;
color: #FFFFFF; color: #ffffff;
opacity: 0.8; opacity: 0.8;
} }
@ -138,7 +140,8 @@
font-size: 1em; font-size: 1em;
} }
.label-txt, .label2-txt { .label-txt,
.label2-txt {
color: #848484; color: #848484;
} }
@ -155,7 +158,6 @@
color: #008887; color: #008887;
padding-right: 0.5em; padding-right: 0.5em;
align-self: center; align-self: center;
} }
.header { .header {
@ -164,7 +166,8 @@
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
.dmp-label, .header { .dmp-label,
.header {
font-size: 1.25em; font-size: 1.25em;
color: #212121; color: #212121;
} }
@ -192,7 +195,7 @@
.doi-txt { .doi-txt {
font-size: 0.8em; font-size: 0.8em;
letter-spacing: 0.009em; letter-spacing: 0.009em;
color: #7D7D7D; color: #7d7d7d;
width: 12em; width: 12em;
height: 1em; height: 1em;
overflow: hidden; overflow: hidden;
@ -202,8 +205,8 @@
.doi-panel { .doi-panel {
height: 3.5em; height: 3.5em;
background: #FAFAFA; background: #fafafa;
border: 1px solid #D1D1D1; border: 1px solid #d1d1d1;
border-radius: 4px; border-radius: 4px;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
@ -214,7 +217,7 @@
} }
.frame { .frame {
background: #FFFFFF; background: #ffffff;
box-shadow: 0px 1px 5px #00000026; box-shadow: 0px 1px 5px #00000026;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
@ -225,10 +228,11 @@
} }
.finalize-txt { .finalize-txt {
color: #129D99; color: #129d99;
} }
.frame-txt, .finalize-txt { .frame-txt,
.finalize-txt {
font-size: 0.75em; font-size: 0.75em;
font-weight: bold; font-weight: bold;
letter-spacing: 0px; letter-spacing: 0px;
@ -237,7 +241,7 @@
} }
.hr-line { .hr-line {
border: 1px solid #DBDBDB; border: 1px solid #dbdbdb;
// width: 274px; // width: 274px;
// width: 17em; // width: 17em;
width: 100%; width: 100%;
@ -259,22 +263,29 @@
.authors-role { .authors-role {
font-size: 0.875em; font-size: 0.875em;
color: #A8A8A8; color: #a8a8a8;
height: 1.4em; height: 1.4em;
margin-bottom: 0px; margin-bottom: 0px;
} }
// ********CENTER ELEMENTS******** // ********CENTER ELEMENTS********
.mat-mini-fab, .mat-mini-fab-icon, .mat-mini-fab,
.status-icon, .dmp-logo, .frame-btn, .finalize-btn { .mat-mini-fab-icon,
.status-icon,
.dmp-logo,
.frame-btn,
.finalize-btn {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.dmp-label, .dataset-btn, .add-dataset-btn, .dmp-label,
.doi-panel, .researcher { .dataset-btn,
.add-dataset-btn,
.doi-panel,
.researcher {
display: flex; display: flex;
align-items: center; align-items: center;
} }
@ -284,12 +295,18 @@
justify-content: center; 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 { // .card-content {
// display: flex; // display: flex;

5
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
View File

@ -56,6 +56,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
lockStatus: Boolean; lockStatus: Boolean;
textMessage: any; textMessage: any;
versions: VersionListingModel[]; versions: VersionListingModel[];
version: VersionListingModel;
@ViewChild('doi', { static: false }) @ViewChild('doi', { static: false })
doi: ElementRef; doi: ElementRef;
@ -540,6 +541,10 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
return !(!this.authentication.current()); return !(!this.authentication.current());
} }
versionChanged(versionId: string): void {
this.router.navigate(['/plans/overview/' + versionId]);
}
openShareDialog(rowId: any, rowName: any) { openShareDialog(rowId: any, rowName: any) {
const dialogRef = this.dialog.open(DmpInvitationDialogComponent, { const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
// height: '250px', // height: '250px',