From 81598f35e06708a1916de8534c26b4b945942677 Mon Sep 17 00:00:00 2001 From: annabakouli Date: Fri, 12 Jan 2018 12:17:37 +0200 Subject: [PATCH] no message --- .../datasetwizard/DatasetWizardModel.java | 7 ++-- .../dataset-wizard.component.ts | 34 +++++++++---------- .../autocomplete/autocomplete.component.ts | 2 ++ 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java index c3e8d9c4f..42faa675b 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java @@ -1,5 +1,6 @@ package eu.eudat.models.datasetwizard; +import eu.eudat.entities.DMP; import eu.eudat.entities.Dataset; import eu.eudat.models.DataModel; import eu.eudat.models.dataset.DataRepository; @@ -10,10 +11,7 @@ import eu.eudat.models.dmp.DataManagementPlan; import eu.eudat.models.user.composite.DatasetProfile; import eu.eudat.utilities.builders.DomainModelConverter; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** @@ -161,6 +159,7 @@ public class DatasetWizardModel implements DataModel { this.dataRepositories = new DomainModelConverter().fromDataModel(entity.getDataRepositories().stream().collect(Collectors.toList()), DataRepository.class); this.services = new DomainModelConverter().fromDataModel(entity.getServices().stream().collect(Collectors.toList()), Service.class); this.created = entity.getCreated(); + this.dmp = new DomainModelConverter().fromDataModel(Arrays.asList(entity.getDmp()), DataManagementPlan.class).get(0); } @Override diff --git a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts index b09e2b5e5..f4df96e26 100644 --- a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts @@ -1,7 +1,7 @@ import { DatasetProfileDefinitionModel } from '../models/DatasetProfileDefinitionModel'; import { TranslateService } from '@ngx-translate/core'; import { BaseErrorModel } from '../models/error/BaseErrorModel'; -import { ActivatedRoute, Router, Params} from '@angular/router'; +import { ActivatedRoute, Router, Params } from '@angular/router'; import { DatasetService } from '../services/dataset/dataset.service'; import { DatasetWizardModel } from '../models/datasets/DatasetWizardModel'; import { DatasetProfileCriteria } from '../models/criteria/dataset-profile/DatasetProfileCriteria'; @@ -29,17 +29,17 @@ export class DatasetWizardComponent implements AfterViewInit { dmpAutoCompleteConfiguration: AutoCompleteConfiguration; datasetProfileAutoCompleteConfiguration: AutoCompleteConfiguration; - datasetWizardModel:DatasetWizardModel; + datasetWizardModel: DatasetWizardModel; isNew = true; - formGroup:FormGroup; + formGroup: FormGroup; constructor( private datasetWizardService: DatasetWizardService, private formBuilder: FormBuilder, private datasetService: DatasetService, private route: ActivatedRoute, - public snackBar: MatSnackBar, + public snackBar: MatSnackBar, public router: Router, - public language: TranslateService, + public language: TranslateService, ) { } @@ -64,25 +64,25 @@ export class DatasetWizardComponent implements AfterViewInit { this.datasetWizardModel = JsonSerializer.fromJSONObject(data, DatasetWizardModel); this.formGroup = this.datasetWizardModel.buildForm(); this.datasetProfileAutoCompleteConfiguration = new AutoCompleteConfiguration(this.datasetWizardService.getAvailableProfiles.bind(this.datasetWizardService), datasetProfileRequestItem); - this.formGroup.get("dmp").valueChanges.subscribe(change=>{ - this.datasetProfileAutoCompleteConfiguration.requestItem.criteria.id=change.id - } - ); + this.formGroup.get("dmp").valueChanges.subscribe(change => { + this.formGroup.get('profile').setValue(null, { emitEvent: false }); + this.datasetProfileAutoCompleteConfiguration.requestItem.criteria.id = change.id + }); }); } else { this.datasetWizardModel = new DatasetWizardModel(); setTimeout(() => { this.formGroup = this.datasetWizardModel.buildForm(); this.datasetProfileAutoCompleteConfiguration = new AutoCompleteConfiguration(this.datasetWizardService.getAvailableProfiles.bind(this.datasetWizardService), datasetProfileRequestItem); - this.formGroup.get("dmp").valueChanges.subscribe(change=>{ - this.datasetProfileAutoCompleteConfiguration.requestItem.criteria.id=change.id - } - ); + this.formGroup.get("dmp").valueChanges.subscribe(change => { + this.formGroup.get('profile').setValue(null, { emitEvent: false }); + this.datasetProfileAutoCompleteConfiguration.requestItem.criteria.id = change.id + }); }); } }); - - + + } ngAfterViewInit() { @@ -125,8 +125,8 @@ export class DatasetWizardComponent implements AfterViewInit { this.datasetWizardService.createDataset(this.formGroup.value).subscribe( complete => { this.datasetWizardService.getSingle(complete.id).subscribe( - result=>{ - this.datasetWizardModel = JsonSerializer.fromJSONObject(result,DatasetWizardModel); + result => { + this.datasetWizardModel = JsonSerializer.fromJSONObject(result, DatasetWizardModel); } ) this.onCallbackSuccess() diff --git a/dmp-frontend/src/app/shared/components/autocomplete/autocomplete.component.ts b/dmp-frontend/src/app/shared/components/autocomplete/autocomplete.component.ts index 77bd66a04..de25e16af 100644 --- a/dmp-frontend/src/app/shared/components/autocomplete/autocomplete.component.ts +++ b/dmp-frontend/src/app/shared/components/autocomplete/autocomplete.component.ts @@ -126,6 +126,8 @@ export class AutocompleteComponent implements OnInit { optionSelected(event: any) { this.hasSelectedItem = true; this.control.setValue(event.option.value, { emitEvent: false }); + this.filteredItems = [event.option.value]; + //this.selectedDropdownItemChange.emit(event.option.value); //this.form.updateValueAndValidity(); //this.options = [event.option.value];