Skip to content

Commit 6a56391

Browse files
AB-xdevAB-xdev
committed
Improve demo
1 parent 6fc1e35 commit 6a56391

File tree

6 files changed

+68
-125
lines changed

6 files changed

+68
-125
lines changed

‎vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/AbstractSimpleChangeDemo.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package software.xdev.vaadin.daterange_picker.example;
2+
3+
import java.time.LocalDate;
4+
import java.util.Arrays;
5+
import java.util.HashMap;
6+
import java.util.List;
7+
import java.util.Map;
8+
import java.util.stream.Collectors;
9+
10+
import com.vaadin.flow.component.Composite;
11+
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
12+
import com.vaadin.flow.component.textfield.TextArea;
13+
14+
import software.xdev.vaadin.daterange_picker.business.DateRangeModel;
15+
import software.xdev.vaadin.daterange_picker.business.SimpleDateRange;
16+
import software.xdev.vaadin.daterange_picker.business.SimpleDateRanges;
17+
import software.xdev.vaadin.daterange_picker.ui.DateRangePicker;
18+
19+
20+
public abstract class AbstractSimpleChangeDemo extends Composite<VerticalLayout>
21+
{
22+
protected static final List<SimpleDateRange> DATERANGE_VALUES = Arrays.asList(SimpleDateRanges.allValues());
23+
24+
protected final DateRangePicker<SimpleDateRange> dateRangePicker =
25+
new DateRangePicker<>(
26+
() -> new DateRangeModel<>(LocalDate.now(), LocalDate.now(), SimpleDateRanges.TODAY),
27+
DATERANGE_VALUES);
28+
29+
protected final TextArea taResult =
30+
new TextArea("ValueChangeEvent", "Change something in the date-picker to see the result");
31+
32+
protected void registerDefaultValueChangeListener()
33+
{
34+
this.dateRangePicker.addValueChangeListener(ev ->
35+
{
36+
final DateRangeModel<SimpleDateRange> modell = ev.getValue();
37+
38+
this.taResult.clear();
39+
40+
final Map<String, String> results = new HashMap<>(Map.of(
41+
"DateRange", modell.getDateRange().getKey(),
42+
"Start", modell.getStart().toString(),
43+
"End", modell.getEnd().toString(),
44+
"IsFromClient", String.valueOf(ev.isFromClient())
45+
));
46+
if(ev.getOldValue() != null)
47+
{
48+
results.putAll(Map.of(
49+
"OldValue-DateRange", ev.getOldValue().getDateRange().getKey(),
50+
"OldValue-Start", ev.getOldValue().getStart().toString(),
51+
"OldValue-End", ev.getOldValue().getEnd().toString()));
52+
}
53+
else
54+
{
55+
results.put("OldValue", "null");
56+
}
57+
this.taResult.setValue(results.entrySet()
58+
.stream()
59+
.map(e -> e.getKey() + ": " + e.getValue())
60+
.collect(Collectors.joining("\r\n")));
61+
});
62+
}
63+
}

‎vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerCustomizedDemo.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ public class DateRangePickerCustomizedDemo extends Composite<VerticalLayout>
3232
private final TextArea taResult =
3333
new TextArea("ValueChangeEvent", "Change something in the datepicker to see the result");
3434

35-
/*
36-
* Fields
37-
*/
38-
3935
public DateRangePickerCustomizedDemo()
4036
{
4137
this.initUI();

‎vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerLocalizedDemo.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ else if(dr == SimpleDateRanges.FREE)
8181

8282
private final Button btnToogleReadonly = new Button("Toogle Readonly");
8383

84-
/*
85-
* Fields
86-
*/
87-
8884
public DateRangePickerLocalizedDemo()
8985
{
9086
this.initUI();

‎vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerParameterDemo.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ public class DateRangePickerParameterDemo extends Composite<VerticalLayout> impl
4242
() -> new DateRangeModel<>(LocalDate.now(), LocalDate.now(), SimpleDateRanges.TODAY),
4343
DATERANGE_VALUES);
4444

45-
/*
46-
* Fields
47-
*/
4845
private boolean blockUpdates = true;
4946

5047
public DateRangePickerParameterDemo()

‎vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerRangeExceedingDemo.java‎

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,18 @@
11
package software.xdev.vaadin.daterange_picker.example;
22

3-
import java.time.LocalDate;
4-
import java.util.Arrays;
5-
import java.util.HashMap;
6-
import java.util.List;
7-
import java.util.Map;
8-
import java.util.stream.Collectors;
9-
10-
import com.vaadin.flow.component.Composite;
113
import com.vaadin.flow.component.HasSize;
124
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
13-
import com.vaadin.flow.component.textfield.TextArea;
145
import com.vaadin.flow.router.Route;
156

16-
import software.xdev.vaadin.daterange_picker.business.DateRangeModel;
17-
import software.xdev.vaadin.daterange_picker.business.SimpleDateRange;
18-
import software.xdev.vaadin.daterange_picker.business.SimpleDateRanges;
19-
import software.xdev.vaadin.daterange_picker.ui.DateRangePicker;
20-
217

228
@Route(DateRangePickerRangeExceedingDemo.NAV)
23-
public class DateRangePickerRangeExceedingDemo extends Composite<VerticalLayout>
9+
public class DateRangePickerRangeExceedingDemo extends AbstractSimpleChangeDemo
2410
{
2511
public static final String NAV = "rangeExceeding";
2612

27-
protected static final List<SimpleDateRange> DATERANGE_VALUES = Arrays.asList(SimpleDateRanges.allValues());
28-
29-
private final DateRangePicker<SimpleDateRange> dateRangePicker =
30-
new DateRangePicker<>(
31-
() -> new DateRangeModel<>(LocalDate.now(), LocalDate.now(), SimpleDateRanges.TODAY),
32-
DATERANGE_VALUES)
33-
.withAllowRangeLimitExceeding(true);
34-
35-
private final TextArea taResult =
36-
new TextArea("ValueChangeEvent", "Change something in the datepicker to see the result");
37-
38-
/*
39-
* Fields
40-
*/
41-
4213
public DateRangePickerRangeExceedingDemo()
4314
{
15+
this.dateRangePicker.withAllowRangeLimitExceeding(true);
4416
this.initUI();
4517
}
4618

@@ -53,33 +25,6 @@ protected void initUI()
5325
this.getContent().getChildren().forEach(comp -> ((HasSize)comp).setHeight("50%"));
5426
this.getContent().setHeightFull();
5527

56-
this.dateRangePicker.addValueChangeListener(ev ->
57-
{
58-
final DateRangeModel<SimpleDateRange> modell = ev.getValue();
59-
60-
this.taResult.clear();
61-
62-
final Map<String, String> results = new HashMap<>(Map.of(
63-
"DateRange", modell.getDateRange().getKey(),
64-
"Start", modell.getStart().toString(),
65-
"End", modell.getEnd().toString(),
66-
"IsFromClient", String.valueOf(ev.isFromClient())
67-
));
68-
if(ev.getOldValue() != null)
69-
{
70-
results.putAll(Map.of(
71-
"OldValue-DateRange", ev.getOldValue().getDateRange().getKey(),
72-
"OldValue-Start", ev.getOldValue().getStart().toString(),
73-
"OldValue-End", ev.getOldValue().getEnd().toString()));
74-
}
75-
else
76-
{
77-
results.put("OldValue", "null");
78-
}
79-
this.taResult.setValue(results.entrySet()
80-
.stream()
81-
.map(e -> e.getKey() + ": " + e.getValue())
82-
.collect(Collectors.joining("\r\n")));
83-
});
28+
this.registerDefaultValueChangeListener();
8429
}
8530
}

‎vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerStyledDemo.java‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,22 @@
11
package software.xdev.vaadin.daterange_picker.example;
22

3-
import java.time.LocalDate;
4-
import java.util.Arrays;
5-
import java.util.HashMap;
6-
import java.util.List;
7-
import java.util.Map;
8-
import java.util.stream.Collectors;
9-
10-
import com.vaadin.flow.component.Composite;
113
import com.vaadin.flow.component.HasSize;
124
import com.vaadin.flow.component.UI;
135
import com.vaadin.flow.component.button.Button;
146
import com.vaadin.flow.component.icon.VaadinIcon;
157
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
16-
import com.vaadin.flow.component.textfield.TextArea;
178
import com.vaadin.flow.dom.ThemeList;
189
import com.vaadin.flow.router.Route;
1910
import com.vaadin.flow.theme.lumo.Lumo;
2011

21-
import software.xdev.vaadin.daterange_picker.business.DateRangeModel;
22-
import software.xdev.vaadin.daterange_picker.business.SimpleDateRange;
23-
import software.xdev.vaadin.daterange_picker.business.SimpleDateRanges;
24-
import software.xdev.vaadin.daterange_picker.ui.DateRangePicker;
25-
2612

2713
@Route(DateRangePickerStyledDemo.NAV)
28-
public class DateRangePickerStyledDemo extends Composite<VerticalLayout>
14+
public class DateRangePickerStyledDemo extends AbstractSimpleChangeDemo
2915
{
3016
public static final String NAV = "styled";
3117

32-
protected static final List<SimpleDateRange> DATERANGE_VALUES = Arrays.asList(SimpleDateRanges.allValues());
33-
34-
private final DateRangePicker<SimpleDateRange> dateRangePicker =
35-
new DateRangePicker<>(
36-
() -> new DateRangeModel<>(LocalDate.now(), LocalDate.now(), SimpleDateRanges.TODAY),
37-
DATERANGE_VALUES);
38-
39-
private final TextArea taResult =
40-
new TextArea("ValueChangeEvent", "Change something in the datepicker to see the result");
41-
4218
private final Button btnDarkMode = new Button("Toogle theme");
4319

44-
/*
45-
* Fields
46-
*/
47-
4820
public DateRangePickerStyledDemo()
4921
{
5022
this.initUI();
@@ -77,33 +49,7 @@ protected void initUI()
7749
this.getContent().getChildren().forEach(comp -> ((HasSize)comp).setHeight("50%"));
7850
this.getContent().setHeightFull();
7951

80-
this.dateRangePicker.addValueChangeListener(ev ->
81-
{
82-
final DateRangeModel<SimpleDateRange> modell = ev.getValue();
83-
84-
this.taResult.clear();
85-
final Map<String, String> results = new HashMap<>(Map.of(
86-
"DateRange", modell.getDateRange().getKey(),
87-
"Start", modell.getStart().toString(),
88-
"End", modell.getEnd().toString(),
89-
"IsFromClient", String.valueOf(ev.isFromClient())
90-
));
91-
if(ev.getOldValue() != null)
92-
{
93-
results.putAll(Map.of(
94-
"OldValue-DateRange", ev.getOldValue().getDateRange().getKey(),
95-
"OldValue-Start", ev.getOldValue().getStart().toString(),
96-
"OldValue-End", ev.getOldValue().getEnd().toString()));
97-
}
98-
else
99-
{
100-
results.put("OldValue", "null");
101-
}
102-
this.taResult.setValue(results.entrySet()
103-
.stream()
104-
.map(e -> e.getKey() + ": " + e.getValue())
105-
.collect(Collectors.joining("\r\n")));
106-
});
52+
this.registerDefaultValueChangeListener();
10753

10854
this.updateBtnDarkMode();
10955
}

0 commit comments

Comments
 (0)