From bb2468463067da4cda0c074d05e2d91c9c9ce1a1 Mon Sep 17 00:00:00 2001 From: filippo-ferrari Date: Sun, 26 May 2024 19:19:25 +0200 Subject: [PATCH] feat: isRecurring form validation added --- .../munera/views/expenses/ExpensesView.java | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/application/munera/views/expenses/ExpensesView.java b/src/main/java/com/application/munera/views/expenses/ExpensesView.java index b31153b..706ddab 100644 --- a/src/main/java/com/application/munera/views/expenses/ExpensesView.java +++ b/src/main/java/com/application/munera/views/expenses/ExpensesView.java @@ -107,9 +107,26 @@ public class ExpensesView extends Div implements BeforeEnterObserver { binder = new BeanValidationBinder<>(Expense.class); // Bind fields. This is where you'd define e.g. validation rules - binder.bindInstanceFields(this); + // We set initial value of isPeriodic to true and show period fields + isPeriodic.setValue(true); + periodUnit.setVisible(true); + periodInterval.setVisible(true); + + // We show the periodic fields only when the isPeriodic boolean is true + isPeriodic.addValueChangeListener(event -> { + boolean isPeriodicChecked = event.getValue(); + periodUnit.setVisible(isPeriodicChecked); + periodInterval.setVisible(isPeriodicChecked); + + // Clear periodUnit and periodInterval if isPeriodic is unchecked + if (!isPeriodicChecked) { + periodUnit.clear(); + periodInterval.clear(); + } + }); + cancel.addClickListener(e -> { clearForm(); refreshGrid(); @@ -151,7 +168,6 @@ public class ExpensesView extends Div implements BeforeEnterObserver { n.addThemeVariants(NotificationVariant.LUMO_ERROR); } }); - } @Override @@ -193,7 +209,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver { periodUnit.setItems(PeriodUnit.values()); periodInterval = new TextField("Period Interval"); date = new DatePicker("Date"); - LitRenderer importantRenderer = LitRenderer.of( + LitRenderer isPeriodicRenderer = LitRenderer.of( "") .withProperty("icon", important -> important.getIsPeriodic() ? "check" : "minus").withProperty("color", important -> important.getIsPeriodic() @@ -201,7 +217,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver { : "var(--lumo-disabled-text-color)"); formLayout.add(name, cost, category, description, isPeriodic, periodUnit, periodInterval, date); - grid.addColumn(importantRenderer).setHeader("Periodic").setAutoWidth(true); + grid.addColumn(isPeriodicRenderer).setHeader("Periodic").setAutoWidth(true); editorDiv.add(formLayout); createButtonLayout(editorLayoutDiv); @@ -214,7 +230,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver { cancel.addThemeVariants(ButtonVariant.LUMO_TERTIARY); save.addThemeVariants(ButtonVariant.LUMO_PRIMARY); delete.addThemeVariants(ButtonVariant.LUMO_PRIMARY); - buttonLayout.add(save, delete,cancel); + buttonLayout.add(save, delete, cancel); editorLayoutDiv.add(buttonLayout); } @@ -237,6 +253,8 @@ public class ExpensesView extends Div implements BeforeEnterObserver { private void populateForm(Expense value) { this.expense = value; binder.readBean(this.expense); - + boolean isPeriodicChecked = (value != null) && value.getIsPeriodic(); + periodUnit.setVisible(isPeriodicChecked); + periodInterval.setVisible(isPeriodicChecked); } -} \ No newline at end of file +}