Revision d8791ff2
Added by Andreas Kohlbecker over 2 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/RegistrationTermLists.java | ||
|---|---|---|
| 14 | 14 |
import java.util.UUID; |
| 15 | 15 |
|
| 16 | 16 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus; |
| 17 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; |
|
| 17 | 18 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; |
| 18 | 19 |
import eu.etaxonomy.cdm.model.term.DefinedTerm; |
| 19 | 20 |
/** |
| ... | ... | |
| 59 | 60 |
// TODO add more see https://dev.e-taxonomy.eu/redmine/issues/6193 |
| 60 | 61 |
}); |
| 61 | 62 |
|
| 62 |
|
|
| 63 |
public static final List<NomenclaturalStatusType> NOMENCLATURAL_STATUS_TYPES = Arrays.asList(new NomenclaturalStatusType[]{
|
|
| 64 |
NomenclaturalStatusType.CONSERVED(), |
|
| 65 |
NomenclaturalStatusType.CONSERVED_PROP(), |
|
| 66 |
NomenclaturalStatusType.ILLEGITIMATE(), |
|
| 67 |
NomenclaturalStatusType.INVALID(), |
|
| 68 |
NomenclaturalStatusType.ORTHOGRAPHY_CONSERVED(), |
|
| 69 |
NomenclaturalStatusType.ORTHOGRAPHY_CONSERVED_PROP(), |
|
| 70 |
NomenclaturalStatusType.REJECTED(), |
|
| 71 |
NomenclaturalStatusType.REJECTED_PROP(), |
|
| 72 |
NomenclaturalStatusType.UTIQUE_REJECTED(), |
|
| 73 |
NomenclaturalStatusType.UTIQUE_REJECTED_PROP(), |
|
| 74 |
NomenclaturalStatusType.ORTHOGRAPHY_REJECTED() |
|
| 75 |
}); |
|
| 63 | 76 |
|
| 64 | 77 |
|
| 65 | 78 |
public static List<UUID> KIND_OF_UNIT_TERM_UUIDS(){
|
| ... | ... | |
| 78 | 91 |
NAME_TYPE_DESIGNATION_STATUS.forEach(t -> uuids.add(t.getUuid())); |
| 79 | 92 |
return uuids; |
| 80 | 93 |
} |
| 94 |
public static List<UUID> NOMENCLATURAL_STATUS_TYPE_UUIDS(){
|
|
| 95 |
List<UUID> uuids = new ArrayList<>(); |
|
| 96 |
NOMENCLATURAL_STATUS_TYPES.forEach(t -> uuids.add(t.getUuid())); |
|
| 97 |
return uuids; |
|
| 98 |
} |
|
| 81 | 99 |
|
| 82 | 100 |
|
| 83 | 101 |
} |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java | ||
|---|---|---|
| 43 | 43 |
import eu.etaxonomy.cdm.model.common.Language; |
| 44 | 44 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCodeEdition; |
| 45 | 45 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; |
| 46 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; |
|
| 47 | 46 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 48 | 47 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
| 49 | 48 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
| ... | ... | |
| 69 | 68 |
import eu.etaxonomy.cdm.vaadin.event.ToOneRelatedEntityReloader; |
| 70 | 69 |
import eu.etaxonomy.cdm.vaadin.model.name.NomenclaturalStatusDTO; |
| 71 | 70 |
import eu.etaxonomy.cdm.vaadin.model.name.TaxonNameDTO; |
| 71 |
import eu.etaxonomy.cdm.vaadin.model.registration.RegistrationTermLists; |
|
| 72 | 72 |
import eu.etaxonomy.cdm.vaadin.ui.RegistrationUIDefaults; |
| 73 | 73 |
import eu.etaxonomy.cdm.vaadin.util.CdmTitleCacheCaptionGenerator; |
| 74 | 74 |
import eu.etaxonomy.cdm.vaadin.util.ReferenceEllypsisCaptionGenerator; |
| ... | ... | |
| 204 | 204 |
public NomenclaturalStatusRow create() {
|
| 205 | 205 |
NomenclaturalStatusRow row = new NomenclaturalStatusRow(); |
| 206 | 206 |
|
| 207 |
BeanItemContainer<DefinedTermBase> statusTypeItemContainer = cdmBeanItemContainerFactory |
|
| 208 |
.buildVocabularyTermsItemContainer(
|
|
| 209 |
NomenclaturalStatusType.ALTERNATIVE().getVocabulary().getUuid());
|
|
| 207 |
BeanItemContainer<DefinedTermBase> statusTypeItemContainer = cdmBeanItemContainerFactory.buildTermItemContainer(
|
|
| 208 |
RegistrationTermLists.NOMENCLATURAL_STATUS_TYPE_UUIDS()
|
|
| 209 |
); |
|
| 210 | 210 |
row.type.setContainerDataSource(statusTypeItemContainer); |
| 211 | 211 |
row.type.setItemCaptionMode(ItemCaptionMode.EXPLICIT); |
| 212 | 212 |
for (DefinedTermBase term : statusTypeItemContainer.getItemIds()) {
|
| src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ListPresenter.java | ||
|---|---|---|
| 45 | 45 |
import eu.etaxonomy.cdm.vaadin.event.PagingEvent; |
| 46 | 46 |
import eu.etaxonomy.cdm.vaadin.event.ShowDetailsEvent; |
| 47 | 47 |
import eu.etaxonomy.cdm.vaadin.event.UpdateResultsEvent; |
| 48 |
import eu.etaxonomy.cdm.vaadin.model.registration.RegistrationTermLists; |
|
| 49 | 48 |
import eu.etaxonomy.vaadin.mvp.AbstractPresenter; |
| 50 | 49 |
import eu.etaxonomy.vaadin.ui.navigation.NavigationEvent; |
| 51 | 50 |
|
| ... | ... | |
| 113 | 112 |
getView().getSubmitterFilter().setItemCaptionPropertyId("username");
|
| 114 | 113 |
} |
| 115 | 114 |
|
| 116 |
List<UUID> typeDesignationStatusUUIDS = new ArrayList<>(); |
|
| 117 |
typeDesignationStatusUUIDS.addAll(RegistrationTermLists.NAME_TYPE_DESIGNATION_STATUS_UUIDS()); |
|
| 118 |
typeDesignationStatusUUIDS.addAll(RegistrationTermLists.SPECIMEN_TYPE_DESIGNATION_STATUS_UUIDS()); |
|
| 119 | 115 |
BeanItemContainer<TypeDesignationStatusFilter> buildTermItemContainer = new BeanItemContainer<>(TypeDesignationStatusFilter.class); |
| 120 | 116 |
// TODO use UI.getCurrent().getPage().getWebBrowser().getLocale() or the LocaleContext component to get the preferredLanguage? |
| 121 | 117 |
Collection<TypeDesignationStatusFilter> statusFilterTerms = new ArrayList<>(getRepo().getNameService().getTypeDesignationStatusFilterTerms(Arrays.asList(Language.DEFAULT()))); |
Also available in: Unified diff
fix #8975 limiting available nom status types