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

no message

This commit is contained in:
annabakouli 2018-01-12 12:17:37 +02:00
parent e4276815a9
commit 81598f35e0
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dmp-backend/src/main/java/eu/eudat/models/datasetwizard/DatasetWizardModel.java
View File

@ -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<Dataset> {
this.dataRepositories = new DomainModelConverter<eu.eudat.entities.DataRepository, DataRepository>().fromDataModel(entity.getDataRepositories().stream().collect(Collectors.toList()), DataRepository.class);
this.services = new DomainModelConverter<eu.eudat.entities.Service, Service>().fromDataModel(entity.getServices().stream().collect(Collectors.toList()), Service.class);
this.created = entity.getCreated();
this.dmp = new DomainModelConverter<eu.eudat.entities.DMP, DataManagementPlan>().fromDataModel(Arrays.asList(entity.getDmp()), DataManagementPlan.class).get(0);
}
@Override

8
dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
View File

@ -65,9 +65,9 @@ export class DatasetWizardComponent implements AfterViewInit {
this.formGroup = this.datasetWizardModel.buildForm();
this.datasetProfileAutoCompleteConfiguration = new AutoCompleteConfiguration(this.datasetWizardService.getAvailableProfiles.bind(this.datasetWizardService), datasetProfileRequestItem);
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();
@ -75,9 +75,9 @@ export class DatasetWizardComponent implements AfterViewInit {
this.formGroup = this.datasetWizardModel.buildForm();
this.datasetProfileAutoCompleteConfiguration = new AutoCompleteConfiguration(this.datasetWizardService.getAvailableProfiles.bind(this.datasetWizardService), datasetProfileRequestItem);
this.formGroup.get("dmp").valueChanges.subscribe(change => {
this.formGroup.get('profile').setValue(null, { emitEvent: false });
this.datasetProfileAutoCompleteConfiguration.requestItem.criteria.id = change.id
}
);
});
});
}
});

2
dmp-frontend/src/app/shared/components/autocomplete/autocomplete.component.ts
View File

@ -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];