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

Retyles button add dataset on overview and removes pop up on click

This commit is contained in:
apapachristou 2020-09-24 12:02:51 +03:00
parent eb0bf2f003
commit 4c825d80b4
3 changed files with 160 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,11 +97,11 @@
<span class="material-icons">horizontal_rule</span> <span class="material-icons">horizontal_rule</span>
</div> </div>
</div> </div>
<div class="row mt-2"> <div class="row mt-2 add-dataset-txt">
<button mat-raised-button class="add-dataset-btn" *ngIf="isDraftDmp(dmp)" (click)="addNewDataset()"> <a class="add-dataset-btn" *ngIf="isDraftDmp(dmp)" [routerLink]="['/datasets/new/' + dmp.id]" target="_blank">
<mat-icon>add</mat-icon> <mat-icon>add</mat-icon>
{{'DMP-LISTING.ACTIONS.ADD-DATASET-SHORT' | translate}} {{'DMP-LISTING.ACTIONS.ADD-DATASET-SHORT' | translate}}
</button> </a>
</div> </div>
</div> </div>
<div class="col-md-4 col-lg-4 p-0"> <div class="col-md-4 col-lg-4 p-0">

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

@ -279,6 +279,7 @@
.dmp-label, .dmp-label,
.dataset-btn, .dataset-btn,
.add-dataset-btn,
.doi-panel, .doi-panel,
.researcher { .researcher {
display: flex; display: flex;
@ -286,8 +287,11 @@
} }
.add-dataset-btn { .add-dataset-btn {
border: 2px solid #212121; color: #212121 !important;
border-radius: 30px; }
.add-dataset-btn:hover {
color: #129d99 !important;
} }
.show-more-btn { .show-more-btn {

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

@ -656,23 +656,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
// } // }
addNewDataset() { addNewDataset() {
const dialogRef = this.dialog.open(StartNewDatasetDialogComponent, { this.router.navigate(['/datasets', 'new', this.dmp.id]);
disableClose: false,
restoreFocus: false,
data: {
startNewDmp: false,
formGroup: new DatasetWizardEditorModel().buildForm()
}
});
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
if (result) {
if (result.startNewDmp) {
this.openNewDmpDialog();
} else {
this.router.navigate(['/datasets', 'new', result.formGroup.get('dmp').value.id]);
}
}
});
} }
createDoiLink(doi: string): string { createDoiLink(doi: string): string {