test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-8067 Changing value of DatePicker doesn't affect datasource

Browse Source
This commit is contained in:
Nikita Petunin 2016-10-24 17:32:44 +04:00
parent 5f9fbb3275
commit 3d1eafe393
1 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
modules/web/src/com/haulmont/cuba/web/gui/components/WebDatePicker.java
View File

@ -17,22 +17,15 @@
package com.haulmont.cuba.web.gui.components;
import com.haulmont.bali.util.Preconditions;
import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.chile.core.model.MetaPropertyPath;
import com.haulmont.chile.core.model.utils.InstanceUtils;
import com.haulmont.cuba.core.entity.Entity;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.MessageTools;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.gui.components.DatePicker;
import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.data.impl.WeakItemChangeListener;
import com.haulmont.cuba.gui.data.impl.WeakItemPropertyChangeListener;
import com.haulmont.cuba.web.gui.data.ItemWrapper;
import com.haulmont.cuba.web.gui.data.PropertyWrapper;
import com.haulmont.cuba.web.toolkit.ui.CubaDatePicker;
import com.vaadin.ui.InlineDateField;
import org.apache.commons.lang.StringUtils;
import java.util.Collection;
import java.util.Date;
@ -41,9 +34,6 @@ public class WebDatePicker extends WebAbstractField<InlineDateField> implements
protected Resolution resolution = Resolution.DAY;
protected Datasource.ItemChangeListener itemChangeListener;
protected Datasource.ItemPropertyChangeListener itemPropertyChangeListener;
public WebDatePicker() {
this.component = new CubaDatePicker();
attachListener(component);
@ -64,50 +54,6 @@ public class WebDatePicker extends WebAbstractField<InlineDateField> implements
};
}
protected Date getEntityValue(Entity item) {
return InstanceUtils.getValueEx(item, metaPropertyPath.getPath());
}
@Override
public void setDatasource(Datasource datasource, String property) {
this.datasource = datasource;
MetaClass metaClass = datasource.getMetaClass();
resolveMetaPropertyPath(metaClass, property);
itemChangeListener = e -> {
Date value = getEntityValue(e.getItem());
this.setValue(value);
};
//noinspection unchecked
datasource.addItemChangeListener(new WeakItemChangeListener(datasource, itemChangeListener));
itemPropertyChangeListener = e -> {
if (e.getProperty().equals(metaPropertyPath.toString())) {
this.setValue(e.getValue());
}
};
//noinspection unchecked
datasource.addItemPropertyChangeListener(new WeakItemPropertyChangeListener(datasource, itemPropertyChangeListener));
if (datasource.getState() == Datasource.State.VALID && datasource.getItem() != null) {
if (property.equals(metaPropertyPath.toString())) {
Date value = getEntityValue(datasource.getItem());
this.setValue(value);
}
}
setRequired(metaProperty.isMandatory());
if (StringUtils.isEmpty(getRequiredMessage())) {
MessageTools messageTools = AppBeans.get(MessageTools.NAME);
setRequiredMessage(messageTools.getDefaultRequiredMessage(metaClass, property));
}
if (metaProperty.isReadOnly()) {
setEditable(false);
}
}
@Override
public Resolution getResolution() {
return resolution;