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

dmp-overview: show-more deleted & dataset-label changed & clone-edit-newVersion urls open in new tab

This commit is contained in:
gpapavgeri 2020-07-22 11:19:25 +03:00
parent 3844c3a187
commit 20cd23ee35
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,8 +27,10 @@
{{'DMP-OVERVIEW.PRIVATE' | translate}}
</div>
</div>
<div *ngIf="lockStatus" class="d-flex flex-row mr-4">
<mat-icon class="status-icon">lock_outline</mat-icon>
<div *ngIf="lockStatus" class="d-flex flex-row mr-2">
<span>.</span>
<mat-icon class="status-icon ml-2">lock_outline</mat-icon>
{{'DMP-OVERVIEW.LOCKED' | translate}}
</div>
<span>.</span>
@ -85,24 +87,17 @@
</div>
<div class="row header">{{'DMP-OVERVIEW.DATASETS-USED' | translate}}</div>
<div class="d-flex flex-column">
<div *ngFor="let dataset of dmp.datasets; let i=index">
<div class="row" *ngIf="i < 3" (click)="datasetClicked(dataset.id)">
<div *ngFor="let dataset of dmp.datasets">
<div class="row" (click)="datasetClicked(dataset.id)">
<button mat-raised-button class="mb-2 mr-2 pl-0 pr-0">
<div matTooltip="{{ dataset.label }} : {{ dataset.datasetTemplate.label }}"
<div matTooltip="{{ dataset.label }}"
class="col-auto dataset-btn">
<div class="dataset-btn-label">{{ dataset.label }}:
{{ dataset.datasetTemplate.label }}</div>
<div class="dataset-btn-label">{{ dataset.label }}</div>
<mat-icon>launch</mat-icon>
</div>
</button>
</div>
</div>
<div class="row" *ngIf="dmp.datasets.length > 3" class="show-more-btn">
<button mat-button (click)="datasetsClicked(dmp.id)">
<mat-icon class="mr-2">expand_more</mat-icon>
{{ 'GENERAL.ACTIONS.SHOW-MORE' | translate }}
</button>
</div>
</div>
<div class="row mt-2 add-dataset-txt">
<button class="add-dataset-btn" *ngIf="isDraftDmp(dmp) && isUserOwner"

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

@ -57,7 +57,8 @@
.add-dataset-btn {
border: none;
font: Bold 0.875em Open Sans;
font: Bold 0.875em Roboto;
// font: Bold 0.875em Open Sans;
color: #444444;
background-color: transparent;
}
@ -215,6 +216,7 @@
box-shadow: 0px 1px 5px #00000026;
border-radius: 4px;
overflow: hidden;
min-width: 18.5em;
}
.frame-txt {
@ -302,7 +304,6 @@
::ng-deep .versions-select .mat-form-field-wrapper .mat-form-field-flex {
padding: 0 0.5rem 0 0.625rem;
margin-bottom: 0.2rem;
font-weight: 500;
}
::ng-deep mat-select .mat-select-arrow-wrapper {

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

@ -161,11 +161,13 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
}
editClicked(dmp: DmpOverviewModel) {
this.router.navigate(['/plans/edit/' + dmp.id]);
let url = this.router.createUrlTree(['/plans/edit/', dmp.id]);
window.open(url.toString(), '_blank');
}
cloneClicked(dmp: DmpOverviewModel) {
this.router.navigate(['/plans/clone/' + dmp.id]);
let url = this.router.createUrlTree(['/plans/clone/', dmp.id]);
window.open(url.toString(), '_blank');
}
grantClicked(grantId: String) {
@ -534,7 +536,8 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
}
newVersion(id: String, label: String) {
this.router.navigate(['/plans/new_version/' + id, { dmpLabel: label }]);
let url = this.router.createUrlTree(['/plans/new_version/', id, { dmpLabel: label }])
window.open(url.toString(), '_blank')
}
viewVersions(rowId: String, rowLabel: String) {
@ -604,7 +607,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
}
reloadPage(): void {
this.router.navigateByUrl('/plans', { skipLocationChange: true }).then(() => {
this.router.navigateByUrl('/reload', { skipLocationChange: true }).then(() => {
this.router.navigate([`/plans/overview/${this.dmp.id}`]);
});
}