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

Fixes bug on cancel button of dmp creation form

This commit is contained in:
apapachristou 2019-05-30 17:40:32 +03:00
parent 8705f916b2
commit 71604b0ae1
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
View File

@ -2,10 +2,13 @@
<div class="container-fluid"> <div class="container-fluid">
<div *ngIf="dmp" class="card"> <div *ngIf="dmp" class="card">
<div class="card-header card-header-plain d-flex"> <div class="card-header card-header-plain d-flex">
<div class="card-desc d-flex flex-column justify-content-center"> <div *ngIf="!isNew" class="card-desc d-flex flex-column justify-content-center">
<h4 class="card-title">{{ dmp.label }}</h4> <h4 class="card-title">{{ dmp.label }}</h4>
</div> </div>
<div class="d-flex ml-auto p-2"> <div *ngIf="isNew" class="card-desc new-dmp d-flex flex-column justify-content-center">
<h4 class="card-title">{{ 'DMP-EDITOR.TITLE.NEW' | translate }}</h4>
</div>
<div class="d-flex ml-auto p-2" *ngIf="!isNew">
<button mat-icon-button [matMenuTriggerFor]="actionsMenu" class="ml-auto more-icon" <button mat-icon-button [matMenuTriggerFor]="actionsMenu" class="ml-auto more-icon"
(click)="$event.stopImmediatePropagation();"> (click)="$event.stopImmediatePropagation();">
<mat-icon class="more-horiz">more_horiz</mat-icon> <mat-icon class="more-horiz">more_horiz</mat-icon>
@ -37,7 +40,7 @@
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<mat-tab-group class="mt-3"> <mat-tab-group class="mt-3">
<mat-tab> <mat-tab>
<ng-template mat-tab-label class="tab-label"> <ng-template mat-tab-label>
<i class="material-icons-outlined mr-2">view_agenda</i> <i class="material-icons-outlined mr-2">view_agenda</i>
{{ 'SIDE-BAR.GENERAL' | translate }} {{ 'SIDE-BAR.GENERAL' | translate }}
</ng-template> </ng-template>
@ -73,12 +76,18 @@
</mat-tab-group> </mat-tab-group>
<div class="d-flex justify-content-end pt-2 pb-4 pl-2 pr-2"> <div class="d-flex justify-content-end pt-2 pb-4 pl-2 pr-2">
<div> <div *ngIf="!isNew">
<button mat-raised-button color="primary" (click)="cancel(dmp.id)" type="button" <button mat-raised-button color="primary" (click)="cancel(dmp.id)" type="button"
class="lightblue-btn text-uppercase mr-2"> class="lightblue-btn text-uppercase mr-2">
{{'DMP-EDITOR.ACTIONS.CANCEL' | translate}} {{'DMP-EDITOR.ACTIONS.CANCEL' | translate}}
</button> </button>
</div> </div>
<div *ngIf="isNew">
<button mat-raised-button color="primary" (click)="cancelCreation()" type="button"
class="lightblue-btn text-uppercase mr-2">
{{'DMP-EDITOR.ACTIONS.CANCEL' | translate}}
</button>
</div>
<!-- <div class="col"></div> --> <!-- <div class="col"></div> -->
<!-- <div class="col-auto" *ngIf="!isNew && this.formGroup.enabled"> <!-- <div class="col-auto" *ngIf="!isNew && this.formGroup.enabled">
<button mat-raised-button color="primary" type="button" (click)="delete()"> <button mat-raised-button color="primary" type="button" (click)="delete()">

4
dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss
View File

@ -7,6 +7,10 @@
color: #aaaaaa; color: #aaaaaa;
} }
.new-dmp {
height: 3.5em;
}
.more-icon :hover { .more-icon :hover {
color: #4687e6; color: #4687e6;
} }

4
dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
View File

@ -255,6 +255,10 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
// this.router.navigate(['/plans']); // this.router.navigate(['/plans']);
} }
public cancelCreation(): void {
this.router.navigate(['/plans']);
}
public invite(): void { public invite(): void {
this.router.navigate(['/invite/' + this.dmp.id]); this.router.navigate(['/invite/' + this.dmp.id]);
} }