Revision 6fa4d604
Added by Andreas Kohlbecker over 5 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/component/common/TimePeriodField.java | ||
|---|---|---|
| 27 | 27 |
return TimePeriod.class; |
| 28 | 28 |
} |
| 29 | 29 |
|
| 30 |
/** |
|
| 31 |
* |
|
| 32 |
*/ |
|
| 33 |
public TimePeriodField() {
|
|
| 34 |
super(); |
|
| 35 |
} |
|
| 36 |
|
|
| 37 |
/** |
|
| 38 |
* @param string |
|
| 39 |
*/ |
|
| 40 |
public TimePeriodField(String string) {
|
|
| 41 |
super(string); |
|
| 42 |
} |
|
| 43 |
|
|
| 30 | 44 |
/** |
| 31 | 45 |
* {@inheritDoc}
|
| 32 | 46 |
*/ |
| src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/SpecimenTypeDesignationWorkingSetDTO.java | ||
|---|---|---|
| 13 | 13 |
import java.util.List; |
| 14 | 14 |
import java.util.Set; |
| 15 | 15 |
|
| 16 |
import org.joda.time.Partial; |
|
| 17 |
|
|
| 18 | 16 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 19 | 17 |
import eu.etaxonomy.cdm.model.common.Annotation; |
| 20 | 18 |
import eu.etaxonomy.cdm.model.common.Language; |
| 21 | 19 |
import eu.etaxonomy.cdm.model.common.LanguageString; |
| 20 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
|
| 22 | 21 |
import eu.etaxonomy.cdm.model.common.VersionableEntity; |
| 23 | 22 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
| 24 | 23 |
import eu.etaxonomy.cdm.model.location.Point; |
| ... | ... | |
| 290 | 289 |
return fieldUnit.getGatheringEvent().getCollectingAreas(); |
| 291 | 290 |
} |
| 292 | 291 |
|
| 293 |
public Partial getGatheringDate(){
|
|
| 294 |
return fieldUnit.getGatheringEvent().getGatheringDate();
|
|
| 292 |
public TimePeriod getGatheringDate(){
|
|
| 293 |
return fieldUnit.getGatheringEvent().getTimeperiod();
|
|
| 295 | 294 |
} |
| 296 | 295 |
|
| 297 |
public void setGatheringDate(Partial gatheringDate){
|
|
| 298 |
fieldUnit.getGatheringEvent().setGatheringDate(gatheringDate);
|
|
| 296 |
public void setGatheringDate(TimePeriod gatheringDate){
|
|
| 297 |
fieldUnit.getGatheringEvent().setTimeperiod(gatheringDate);
|
|
| 299 | 298 |
} |
| 300 | 299 |
|
| 301 | 300 |
/** |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetPopupEditor.java | ||
|---|---|---|
| 27 | 27 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
| 28 | 28 |
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD; |
| 29 | 29 |
import eu.etaxonomy.cdm.vaadin.component.CollectionRowRepresentative; |
| 30 |
import eu.etaxonomy.cdm.vaadin.component.PartialDateField; |
|
| 31 | 30 |
import eu.etaxonomy.cdm.vaadin.component.common.FilterableAnnotationsField; |
| 32 | 31 |
import eu.etaxonomy.cdm.vaadin.component.common.GeoLocationField; |
| 33 | 32 |
import eu.etaxonomy.cdm.vaadin.component.common.MinMaxTextField; |
| 34 | 33 |
import eu.etaxonomy.cdm.vaadin.component.common.TeamOrPersonField; |
| 34 |
import eu.etaxonomy.cdm.vaadin.component.common.TimePeriodField; |
|
| 35 | 35 |
import eu.etaxonomy.cdm.vaadin.model.registration.SpecimenTypeDesignationDTO; |
| 36 | 36 |
import eu.etaxonomy.cdm.vaadin.model.registration.SpecimenTypeDesignationWorkingSetDTO; |
| 37 | 37 |
import eu.etaxonomy.cdm.vaadin.permission.AccessRestrictedView; |
| ... | ... | |
| 171 | 171 |
addField(collectorField, "collector", 0, row, 2, row); |
| 172 | 172 |
|
| 173 | 173 |
row++; |
| 174 |
PartialDateField collectionDateField = new PartialDateField("Collection date");
|
|
| 175 |
collectionDateField.setInputPrompt("dd.mm.yyyy");
|
|
| 174 |
|
|
| 175 |
TimePeriodField collectionDateField = new TimePeriodField("Collection date");
|
|
| 176 |
// collectionDateField.setInputPrompt("dd.mm.yyyy");
|
|
| 176 | 177 |
addField(collectionDateField, "gatheringDate", 0, row, 1, row); |
| 177 | 178 |
addTextField("Field number", "fieldNumber", 2, row);
|
| 178 | 179 |
|
Also available in: Unified diff
fix #7888 using EventBase.timespan for collection date