diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 0598011a8..c28b59b93 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -170,7 +170,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr }); }); } else if (dmpId != null) { - console.log("inhere"); this.isNew = true; this.dmpService.getSingle(dmpId).map(data => data as DmpModel) .pipe(takeUntil(this._destroyed)) diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts index 83ac2b21a..024b02a82 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts @@ -440,12 +440,12 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC confirmButton: this.language.instant('DMP-FINALISE-DIALOG.SUBMIT'), cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'), submitFunction: () => { - this.formGroup.get('status').setValue('1'); + this.formGroup.get('status').setValue(DmpStatus.Finalized); this.formSubmit(); dialogRef.close(); } } }); - dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { }); + dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {}); } } diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index 5dd0ca08b..63f8b7bf2 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -16,6 +16,7 @@ import { QuickWizardEditorWizardModel } from './quick-wizard-editor.model'; import { DatasetEditorWizardComponent } from '../dataset-editor/dataset-editor-wizard.component'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; import { DmpFinalizeDialogComponent } from '../../dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component'; +import { DmpStatus } from '../../../core/common/enum/dmp-status'; @Component({ @@ -91,9 +92,9 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit, if (!this.isFormValid()) { return; } if (this.formGroup.get('datasets') && this.formGroup.get('datasets').get('datasetsList') && (this.formGroup.get('datasets').get('datasetsList') as FormArray).length > 0) { for (let control of (this.formGroup.get('datasets').get('datasetsList') as FormArray).controls) { - control.get('status').setValue('1'); + control.get('status').setValue(DmpStatus.Finalized); } - this.formGroup.get('dmp').get('status').setValue('1'); + this.formGroup.get('dmp').get('status').setValue(DmpStatus.Finalized); this.onSubminSaveAndFinalize(); } else { return;