Project

General

Profile

Revision 3b4bcfb5

ID3b4bcfb52e1aa9f8f673d85ff1aee25aa81cc3cb
Parent 0ce0edd2
Child 11493d8f

Added by Andreas Kohlbecker over 2 years ago

fix #7350 fixing GatheringDate set method & fixing field type

View differences:

src/main/java/eu/etaxonomy/cdm/service/CdmStore.java
206 206
        T mergedBean = mergedBean(bean);
207 207

  
208 208
        // NOTE: saveOrUpdate is really needed here even if we to a merge before
209
        repo.getCommonService().saveOrUpdate(mergedBean);
209
        // repo.getCommonService().saveOrUpdate(mergedBean);
210 210
        session.flush();
211 211
        commitTransction();
212 212

  
src/main/java/eu/etaxonomy/cdm/vaadin/component/PartialDateField.java
9 9
package eu.etaxonomy.cdm.vaadin.component;
10 10

  
11 11
import com.vaadin.data.Property;
12
import com.vaadin.ui.TextField;
13 12

  
14 13
import eu.etaxonomy.cdm.vaadin.util.converter.JodaTimePartialConverter;
15 14

  
......
23 22
 * @since Apr 7, 2017
24 23
 *
25 24
 */
26
public class PartialDateField extends TextField {
25
public class PartialDateField extends TextFieldNFix {
27 26

  
28 27
    private static final long serialVersionUID = -347319052346135100L;
29 28

  
src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/SpecimenTypeDesignationWorkingSetDTO.java
293 293
        return fieldUnit.getGatheringEvent().getGatheringDate();
294 294
    }
295 295

  
296
    public void getGatheringDate(Partial gatheringDate){
296
    public void setGatheringDate(Partial gatheringDate){
297 297
        fieldUnit.getGatheringEvent().setGatheringDate(gatheringDate);
298 298
    }
299 299

  
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetPopupEditor.java
26 26

  
27 27
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
28 28
import eu.etaxonomy.cdm.vaadin.component.CollectionRowRepresentative;
29
import eu.etaxonomy.cdm.vaadin.component.PartialDateField;
29 30
import eu.etaxonomy.cdm.vaadin.component.common.GeoLocationField;
30 31
import eu.etaxonomy.cdm.vaadin.component.common.MinMaxTextField;
31 32
import eu.etaxonomy.cdm.vaadin.component.common.TeamOrPersonField;
32
import eu.etaxonomy.cdm.vaadin.component.common.TimePeriodField;
33 33
import eu.etaxonomy.cdm.vaadin.model.registration.SpecimenTypeDesignationDTO;
34 34
import eu.etaxonomy.cdm.vaadin.model.registration.SpecimenTypeDesignationWorkingSetDTO;
35 35
import eu.etaxonomy.cdm.vaadin.security.AccessRestrictedView;
......
158 158
        addField(collectorField, "collector", 0, row, 2, row);
159 159

  
160 160
        row++;
161
        TimePeriodField collectionDateField = new TimePeriodField("Collection date");
161
        PartialDateField collectionDateField = new PartialDateField("Collection date");
162
        collectionDateField.setInputPrompt("dd.mm.yyyy");
162 163
        addField(collectionDateField, "gatheringDate", 0, row, 1, row);
163 164
        addTextField("Field number", "fieldNumber", 2, row);
164 165

  
166

  
165 167
        row++;
166 168

  
167 169
        // FIXME: can we use the Grid instead?

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)