You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/04/18 17:30:50 UTC
[isis] branch master updated: ISIS-2340: simple date picker (no
value update binding yet)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new e7dd64e ISIS-2340: simple date picker (no value update binding yet)
e7dd64e is described below
commit e7dd64e5facb32953812520d93eed3191b19cdbb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Apr 18 19:30:38 2020 +0200
ISIS-2340: simple date picker (no value update binding yet)
---
.../vaadin/ui/components/temporal/date/DateField.java | 13 +++++++------
.../ui/components/temporal/date/TemporalFieldFactory.java | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/date/DateField.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/date/DateField.java
index 9ae2674..67322a3 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/date/DateField.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/date/DateField.java
@@ -23,19 +23,19 @@ import java.time.LocalDate;
import javax.annotation.Nullable;
import com.vaadin.flow.component.customfield.CustomField;
+import com.vaadin.flow.component.datepicker.DatePicker;
-// TODO just a stub yet
-//
public class DateField extends CustomField<LocalDate> {
private static final long serialVersionUID = 1L;
+ private final DatePicker datePicker = new DatePicker();
private LocalDate temporal;
public DateField(String label) {
super();
setLabel(label);
- // ...
+ add(datePicker);
}
@Override
@@ -48,11 +48,12 @@ public class DateField extends CustomField<LocalDate> {
this.temporal = temporal;
if(temporal==null) {
- // ...
+ datePicker.setPlaceholder("no date");
return;
}
- // ...
+ datePicker.setValue(temporal);
+
}
-
+
}
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/date/TemporalFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/date/TemporalFieldFactory.java
index 9d7fe7e..897cab6 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/date/TemporalFieldFactory.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/date/TemporalFieldFactory.java
@@ -53,7 +53,7 @@ public class TemporalFieldFactory implements UiComponentHandlerVaa {
val offsetCharacteristic = temporalFacet.getOffsetCharacteristic();
val temporal = request.getPojo(Temporal.class);
- switch(temporalFacet.getTemporalCharacteristic()) {
+ switch(temporalCharacteristic) {
case DATE_ONLY:{
val uiField = new DateField(request.getFeatureLabel());
uiField.setValue(toLocalDate(temporal).orElse(null));
@@ -66,7 +66,7 @@ public class TemporalFieldFactory implements UiComponentHandlerVaa {
// TODO ...
}
default:
- throw _Exceptions.unmatchedCase(temporalFacet.getTemporalCharacteristic());
+ throw _Exceptions.unmatchedCase(temporalCharacteristic);
}
}