Revision 41415
Added by Stefania Martziou about 8 years ago
| modules/uoa-goldoa-portal/trunk/src/main/java/eu/dnetlib/client/user/UserRegistrationForm.java | ||
|---|---|---|
| 92 | 92 |
private DataServiceAsync dataService = GWT.create(DataService.class); |
| 93 | 93 |
|
| 94 | 94 |
private boolean isEdit = false; |
| 95 |
private Person registeredPerson; |
|
| 95 | 96 |
|
| 96 | 97 |
private Map<String, Integer> rolesMap = new HashMap<>(); |
| 97 | 98 |
|
| ... | ... | |
| 481 | 482 |
|
| 482 | 483 |
private Person getPerson() {
|
| 483 | 484 |
|
| 484 |
Person person = new Person(); |
|
| 485 |
Person person; |
|
| 486 |
if(isEdit) |
|
| 487 |
person = registeredPerson; |
|
| 488 |
else |
|
| 489 |
person = new Person(); |
|
| 485 | 490 |
|
| 486 | 491 |
person.setName(firstNameTextBox.getValue().trim()); |
| 487 | 492 |
person.setLastname(lastNameTextBox.getValue().trim()); |
| ... | ... | |
| 676 | 681 |
|
| 677 | 682 |
private void loadUserInfo() {
|
| 678 | 683 |
|
| 679 |
Person person = GoldOAPortal.currentUser;
|
|
| 684 |
registeredPerson = GoldOAPortal.currentUser;
|
|
| 680 | 685 |
|
| 681 |
firstNameTextBox.setValue(person.getName());
|
|
| 682 |
lastNameTextBox.setValue(person.getLastname());
|
|
| 686 |
firstNameTextBox.setValue(registeredPerson.getName());
|
|
| 687 |
lastNameTextBox.setValue(registeredPerson.getLastname());
|
|
| 683 | 688 |
|
| 684 |
if(person.getInitials()!=null)
|
|
| 685 |
initialsTextBox.setValue(person.getInitials());
|
|
| 689 |
if(registeredPerson.getInitials()!=null)
|
|
| 690 |
initialsTextBox.setValue(registeredPerson.getInitials());
|
|
| 686 | 691 |
|
| 687 |
emailTextBox.setValue(person.getEmail());
|
|
| 688 |
passwordTextBox.setValue(person.getPassword());
|
|
| 689 |
confirmPasswordTextBox.setValue(person.getPassword());
|
|
| 692 |
emailTextBox.setValue(registeredPerson.getEmail());
|
|
| 693 |
passwordTextBox.setValue(registeredPerson.getPassword());
|
|
| 694 |
confirmPasswordTextBox.setValue(registeredPerson.getPassword());
|
|
| 690 | 695 |
|
| 691 |
if(person.getTelephone()!=null)
|
|
| 692 |
telephoneTextBox.setValue(person.getTelephone());
|
|
| 696 |
if(registeredPerson.getTelephone()!=null)
|
|
| 697 |
telephoneTextBox.setValue(registeredPerson.getTelephone());
|
|
| 693 | 698 |
|
| 694 |
multipleAffiliationsWidget.loadAffiliations(person.getAffiliations());
|
|
| 699 |
multipleAffiliationsWidget.loadAffiliations(registeredPerson.getAffiliations());
|
|
| 695 | 700 |
|
| 696 |
for(PersonRole personRole : person.getRoles()) {
|
|
| 701 |
for(PersonRole personRole : registeredPerson.getRoles()) {
|
|
| 697 | 702 |
if(personRole.getRole().getId().equals("administrator") || personRole.getRole().getId().equals("moderator")
|
| 698 | 703 |
|| personRole.getRole().getId().equals("accounting"))
|
| 699 | 704 |
notShownRoles.add(personRole.getRole().getId()); |
| ... | ... | |
| 708 | 713 |
|
| 709 | 714 |
for(String selectedValue : selectedRoles) {
|
| 710 | 715 |
if(selectedValue.equals("researcher")) {
|
| 711 |
if(person.getOrcidId()!=null)
|
|
| 712 |
orcidID.setValue(person.getOrcidId());
|
|
| 716 |
if(registeredPerson.getOrcidId()!=null)
|
|
| 717 |
orcidID.setValue(registeredPerson.getOrcidId());
|
|
| 713 | 718 |
orcidFormFieldSet.setVisible(true); |
| 714 | 719 |
} |
| 715 | 720 |
if(selectedValue.equals("project_coordinator")) {
|
| 716 | 721 |
|
| 717 |
Project coordinatedProject = person.getCoordinatedProjects().get(0);
|
|
| 722 |
Project coordinatedProject = registeredPerson.getCoordinatedProjects().get(0);
|
|
| 718 | 723 |
String projectValue = coordinatedProject.getAcronym() + " - " + coordinatedProject.getGrant() |
| 719 | 724 |
+ " (" + coordinatedProject.getTitle() + ")";
|
| 720 | 725 |
projectAutoComplete.setValue(projectValue); |
| 721 | 726 |
projectFormFieldSet.setVisible(true); |
| 722 | 727 |
isProjectSelected = true; |
| 723 |
projectId = person.getCoordinatedProjects().get(0).getId();
|
|
| 728 |
projectId = registeredPerson.getCoordinatedProjects().get(0).getId();
|
|
| 724 | 729 |
} |
| 725 | 730 |
if(selectedValue.equals("publisher")) {
|
| 726 | 731 |
|
| 727 |
publisherAutoComplete.setValue(person.getPublisher().getName());
|
|
| 732 |
publisherAutoComplete.setValue(registeredPerson.getPublisher().getName());
|
|
| 728 | 733 |
publisherFormFieldSet.setVisible(true); |
| 729 | 734 |
affiliationsFormFieldSet.setVisible(false); |
| 730 | 735 |
isPublisherSelected = true; |
| 731 |
publisher = person.getPublisher();
|
|
| 736 |
publisher = registeredPerson.getPublisher();
|
|
| 732 | 737 |
} |
| 733 | 738 |
} |
| 734 | 739 |
|
Also available in: Unified diff
When updating a person, keep the original object that contains the id