Revision 556dd2bd
Added by Andreas Kohlbecker over 6 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetEditorPresenter.java | ||
|---|---|---|
| 20 | 20 |
import eu.etaxonomy.cdm.api.service.IRegistrationService; |
| 21 | 21 |
import eu.etaxonomy.cdm.cache.CdmEntityCache; |
| 22 | 22 |
import eu.etaxonomy.cdm.cache.EntityCache; |
| 23 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
|
| 24 |
import eu.etaxonomy.cdm.model.agent.Person; |
|
| 25 |
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; |
|
| 23 | 26 |
import eu.etaxonomy.cdm.model.location.Country; |
| 24 | 27 |
import eu.etaxonomy.cdm.model.name.Registration; |
| 25 | 28 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
| ... | ... | |
| 142 | 145 |
CdmBeanItemContainerFactory selectFactory = new CdmBeanItemContainerFactory(getRepo()); |
| 143 | 146 |
getView().getCountrySelectField().setContainerDataSource(selectFactory.buildBeanItemContainer(Country.uuidCountryVocabulary)); |
| 144 | 147 |
|
| 148 |
CdmFilterablePagingProvider<AgentBase, TeamOrPersonBase> termOrPersonPagingProvider = new CdmFilterablePagingProvider<AgentBase, TeamOrPersonBase>(getRepo().getAgentService(), TeamOrPersonBase.class); |
|
| 149 |
CdmFilterablePagingProvider<AgentBase, Person> personPagingProvider = new CdmFilterablePagingProvider<AgentBase, Person>(getRepo().getAgentService(), Person.class); |
|
| 150 |
getView().getCollectorField().setFilterablePersonPagingProvider(personPagingProvider, this); |
|
| 151 |
getView().getCollectorField().setFilterableTeamPagingProvider(termOrPersonPagingProvider, this); |
|
| 152 |
|
|
| 145 | 153 |
getView().getTypeDesignationsCollectionField().addElementRemovedListener(e -> deleteTypeDesignation(e.getElement())); |
| 146 | 154 |
getView().getTypeDesignationsCollectionField().addElementAddedListener(e -> addTypeDesignation(e.getElement())); |
| 147 | 155 |
|
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetPopupEditor.java | ||
|---|---|---|
| 62 | 62 |
|
| 63 | 63 |
private EnumSet<CRUD> crud; |
| 64 | 64 |
|
| 65 |
private TeamOrPersonField collectorField; |
|
| 66 |
|
|
| 65 | 67 |
/** |
| 66 | 68 |
* @return the countrySelectField |
| 67 | 69 |
*/ |
| ... | ... | |
| 139 | 141 |
bindField(distanceToGroundMinMax.getTextField(), "distanceToGroundText"); |
| 140 | 142 |
|
| 141 | 143 |
row++; |
| 142 |
TeamOrPersonField collectorField = new TeamOrPersonField("Collector");
|
|
| 144 |
collectorField = new TeamOrPersonField("Collector");
|
|
| 143 | 145 |
addField(collectorField, "collector", 0, row, 2, row); |
| 144 | 146 |
|
| 145 | 147 |
row++; |
| ... | ... | |
| 289 | 291 |
|
| 290 | 292 |
} |
| 291 | 293 |
|
| 294 |
/** |
|
| 295 |
* @return the collectorField |
|
| 296 |
*/ |
|
| 297 |
@Override |
|
| 298 |
public TeamOrPersonField getCollectorField() {
|
|
| 299 |
return collectorField; |
|
| 300 |
} |
|
| 301 |
|
|
| 292 | 302 |
|
| 293 | 303 |
|
| 294 | 304 |
} |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetPopupEditorView.java | ||
|---|---|---|
| 13 | 13 |
import com.vaadin.ui.Component; |
| 14 | 14 |
import com.vaadin.ui.ListSelect; |
| 15 | 15 |
|
| 16 |
import eu.etaxonomy.cdm.vaadin.component.common.TeamOrPersonField; |
|
| 16 | 17 |
import eu.etaxonomy.cdm.vaadin.model.registration.SpecimenTypeDesignationDTO; |
| 17 | 18 |
import eu.etaxonomy.vaadin.mvp.ApplicationView; |
| 18 | 19 |
|
| ... | ... | |
| 35 | 36 |
* TypeDesignationWorkingSet |
| 36 | 37 |
*/ |
| 37 | 38 |
public void updateAllowDelete(); |
| 39 |
|
|
| 40 |
TeamOrPersonField getCollectorField(); |
|
| 38 | 41 |
} |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java | ||
|---|---|---|
| 85 | 85 |
|
| 86 | 86 |
getView().getBasionymCombobox().setCaptionGenerator(new CdmTitleCacheCaptionGenerator<TaxonName>()); |
| 87 | 87 |
CdmFilterablePagingProvider<TaxonName, TaxonName> namePagingProvider = new CdmFilterablePagingProvider<TaxonName, TaxonName>(getRepo().getNameService()); |
| 88 |
|
|
| 88 | 89 |
getView().getBasionymCombobox().setPagingProviders(namePagingProvider, namePagingProvider, namePagingProvider.getPageSize()); |
| 89 | 90 |
} |
| 90 | 91 |
|
| src/main/java/eu/etaxonomy/cdm/vaadin/view/reference/ReferenceEditorPresenter.java | ||
|---|---|---|
| 17 | 17 |
|
| 18 | 18 |
import eu.etaxonomy.cdm.api.service.IService; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 20 |
import eu.etaxonomy.cdm.model.agent.Person; |
|
| 20 | 21 |
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; |
| 21 | 22 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 22 | 23 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| ... | ... | |
| 67 | 68 |
getView().getInReferenceCombobox().getSelect().addValueChangeListener(new ToOneRelatedEntityButtonUpdater<Reference>(getView().getInReferenceCombobox())); |
| 68 | 69 |
|
| 69 | 70 |
CdmFilterablePagingProvider<AgentBase, TeamOrPersonBase> teamOrPersonPagingProvider = new CdmFilterablePagingProvider<AgentBase, TeamOrPersonBase>(getRepo().getAgentService()); |
| 71 |
CdmFilterablePagingProvider<AgentBase, Person> personPagingProvider = new CdmFilterablePagingProvider<AgentBase, Person>(getRepo().getAgentService(), Person.class); |
|
| 70 | 72 |
getView().getAuthorshipField().setFilterableTeamPagingProvider(teamOrPersonPagingProvider, this); |
| 73 |
getView().getAuthorshipField().setFilterablePersonPagingProvider(personPagingProvider, this); |
|
| 71 | 74 |
} |
| 72 | 75 |
|
| 73 | 76 |
/** |
Also available in: Unified diff
adding missing CdmFilterablePagingProvider for teamOrPerson fields