+
-
+
+
+
+ {{'DMP-PROFILE-EDITOR.TITLE.NEW' | translate}}
+{{formGroup.get('label').value}}
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss
index 972e19d7b..ae188ac09 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss
+++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss
@@ -1,5 +1,7 @@
.dmp-profile-editor {
margin-top: 1.3rem;
+ margin-left: 1em;
+ margin-right: 3em;
.centered-row-item {
align-items: center;
@@ -25,3 +27,37 @@
::ng-deep .mat-checkbox-disabled.mat-checkbox-checked .mat-checkbox-background, .mat-checkbox-disabled.mat-checkbox-indeterminate .mat-checkbox-background {
background-color: #b0b0b0;
}
+
+.finalize-btn {
+ border-radius: 30px;
+ border: 1px solid #129D99;
+ background: transparent;
+ padding-left: 2em;
+ padding-right: 2em;
+ box-shadow: 0px 3px 6px #1E202029;
+ color: #129D99;
+ &:disabled{
+ background-color: #CBCBCB;
+ color: #FFF;
+ border: 0px;
+ }
+}
+
+.action-btn {
+ border-radius: 30px;
+ background-color: #f7dd72;
+ border: 1px solid transparent;
+ padding-left: 2em;
+ padding-right: 2em;
+ box-shadow: 0px 3px 6px #1E202029;
+
+ transition-property: background-color, color;
+ transition-duration: 200ms;
+ transition-delay: 50ms;
+ transition-timing-function: ease-in-out;
+ &:disabled{
+ background-color: #CBCBCB;
+ color: #FFF;
+ border: 0px;
+ }
+}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts
index 90cc566e0..0de715ef4 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.ts
@@ -23,6 +23,8 @@ import { map, takeUntil } from 'rxjs/operators';
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
import { HttpClient } from '@angular/common/http';
import { MatomoService } from '@app/core/services/matomo/matomo-service';
+import { MatDialog } from '@angular/material';
+import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
@Component({
@@ -50,7 +52,8 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
private formService: FormService,
private configurationService: ConfigurationService,
private httpClient: HttpClient,
- private matomoService: MatomoService
+ private matomoService: MatomoService,
+ private dialog: MatDialog
) {
super();
this.host = configurationService.server;
@@ -177,13 +180,27 @@ export class DmpProfileEditorComponent extends BaseComponent implements AfterVie
}
delete() {
- this.formGroup.get('status').setValue(DmpProfileStatus.Deleted);
- this.dmpProfileService.createDmp(this.formGroup.value)
- .pipe(takeUntil(this._destroyed))
- .subscribe(
- complete => this.onCallbackSuccess(),
- error => this.onCallbackError(error)
- );
+ this.dialog.open(ConfirmationDialogComponent,{data:{
+ isDeleteConfirmation: true,
+ confirmButton: this.language.instant('DMP-PROFILE-EDITOR.CONFIRM-DELETE-DIALOG.CONFIRM-BUTTON'),
+ cancelButton: this.language.instant("DMP-PROFILE-EDITOR.CONFIRM-DELETE-DIALOG.CANCEL-BUTTON"),
+ message: this.language.instant("DMP-PROFILE-EDITOR.CONFIRM-DELETE-DIALOG.MESSAGE")
+ }})
+ .afterClosed()
+ .subscribe(
+ confirmed =>{
+ if(confirmed){
+ this.formGroup.get('status').setValue(DmpProfileStatus.Deleted);
+ this.dmpProfileService.createDmp(this.formGroup.value)
+ .pipe(takeUntil(this._destroyed))
+ .subscribe(
+ complete => this.onCallbackSuccess(),
+ error => this.onCallbackError(error)
+ );
+ }
+ }
+ )
+
}
finalize() {
diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
index 83c70604d..c07d4eca4 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
+++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
@@ -4,10 +4,26 @@
+
{{ data.message }}
-
-
+
+
+
+
+
+ {{ selectedFileName }}
+
+
+
+
+
+
+
@@ -15,11 +31,11 @@
-
+
-
+