diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html
index fd502bf0e..e1b6b70a8 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html
@@ -13,7 +13,7 @@
diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts
index 7302ec939..1647a569d 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.ts
@@ -5,6 +5,7 @@ import { takeUntil } from 'rxjs/operators';
import { BaseComponent } from '../../../../core/common/base/base.component';
import { ExternalResearcherService } from '../../../../core/services/external-sources/researcher/external-researcher.service';
import { ResearcherEditorModel } from './add-researcher.model';
+import { ResearcherModel } from '../../../../core/model/researcher/researcher';
@Component({
selector: 'app-add-researcher-component',
@@ -25,12 +26,15 @@ export class AddResearcherComponent extends BaseComponent implements OnInit {
this.formGroup = researcher.buildForm();
}
-
send(value: any) {
this.externalResearcherService.createResearcher(this.formGroup.value)
.pipe(takeUntil(this._destroyed))
.subscribe(
- null, null, () => this.dialogRef.close()
+ null, null, () => this.dialogRef.close()
);
}
+
+ addResearcher() {
+ this.dialogRef.close(this.formGroup.value);
+ }
}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
index 8ff56903e..02bfca39a 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.ts
@@ -164,7 +164,19 @@ export class GeneralTabComponent extends BaseComponent implements OnInit {
addResearcher() {
const dialogRef = this.dialog.open(AddResearcherComponent, {
- data: {}
+ data: this.formGroup.get('researchers')
+ });
+ dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
+ if (result) {
+ const fullName = result.firstName + " " + result.lastName;
+ this.formGroup.get('researchers').value.push({
+ label: null,
+ name: fullName,
+ id: "dmp:" + fullName,
+ status: 0,
+ tag: null,
+ });
+ }
});
}