task/4.x/date filter

forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/table/DateFilteredBootstrapPropertyColumn.java

@@ -1,7 +1,8 @@
 package org.devgateway.toolkit.forms.wicket.components.table;
 
-import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.filter.TextFilteredPropertyColumn;
 import org.apache.wicket.model.IModel;
@@ -32,7 +33,12 @@ public Component getFilter(final String componentId, final FilterForm<?> form) {
         final DateFieldBootstrapFormComponent dateField =
                 new DateFieldBootstrapFormComponent(componentId, getFilterModel(form));
         dateField.hideLabel();
-        dateField.getField().add(AttributeModifier.replace("onchange", "this.form.submit();"));
+        dateField.getField().add(new AjaxFormComponentUpdatingBehavior("change") {
+            @Override
+            protected void onUpdate(final AjaxRequestTarget target) {
+                target.add(form);
+            }
+        });
         return dateField;
     }
 }

forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/table/LocalDateFilteredBootstrapPropertyColumn.java

@@ -1,7 +1,8 @@
 package org.devgateway.toolkit.forms.wicket.components.table;
 
-import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.filter.TextFilteredPropertyColumn;
 import org.apache.wicket.model.IModel;
@@ -28,7 +29,12 @@ public Component getFilter(final String componentId, final FilterForm<?> form) {
         final LocalDateFieldBootstrapFormComponent dateField =
                 new LocalDateFieldBootstrapFormComponent(componentId, getFilterModel(form));
         dateField.hideLabel();
-        dateField.getField().add(AttributeModifier.replace("onchange", "this.form.submit();"));
+        dateField.getField().add(new AjaxFormComponentUpdatingBehavior("change") {
+            @Override
+            protected void onUpdate(final AjaxRequestTarget target) {
+                target.add(form);
+            }
+        });
         return dateField;
     }
 }

forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/table/filter/TestFormFilterState.java

@@ -8,6 +8,7 @@
 
 import javax.persistence.criteria.Predicate;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,6 +19,8 @@ public class TestFormFilterState extends JpaFilterState<TestForm> {
     private static final long serialVersionUID = 8005371716983257722L;
     private String textField;
 
+    private Date date;
+
     @Override
     public Specification<TestForm> getSpecification() {
         return (root, query, cb) -> {
@@ -29,6 +32,9 @@ public Specification<TestForm> getSpecification() {
             if (StringUtils.isNotBlank(textField)) {
                 predicates.add(cb.like(root.get(TestForm_.textField), "%" + textField + "%"));
             }
+            if (date != null) {
+                predicates.add(cb.equal(root.get(TestForm_.date), date));
+            }
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
     }
@@ -40,4 +46,12 @@ public String getTextField() {
     public void setTextField(final String textField) {
         this.textField = textField;
     }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(final Date date) {
+        this.date = date;
+    }
 }

forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/ListTestFormPage.java

@@ -13,9 +13,11 @@
 
 import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.devgateway.toolkit.forms.security.SecurityConstants;
+import org.devgateway.toolkit.forms.wicket.components.table.DateFilteredBootstrapPropertyColumn;
 import org.devgateway.toolkit.forms.wicket.components.table.TextFilteredBootstrapPropertyColumn;
 import org.devgateway.toolkit.forms.wicket.components.table.filter.JpaFilterState;
 import org.devgateway.toolkit.forms.wicket.components.table.filter.TestFormFilterState;
@@ -42,6 +44,7 @@ public ListTestFormPage(final PageParameters pageParameters) {
         this.editPageClass = EditTestFormPage.class;
 
         columns.add(new TextFilteredBootstrapPropertyColumn<>(new Model<>("Text Field"), "textField", "textField"));
+        columns.add(new DateFilteredBootstrapPropertyColumn<>(new StringResourceModel("date"), "date", "date"));
     }
 
     @Override

forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/lists/ListTestFormPage.properties

@@ -10,4 +10,5 @@
 # Development Gateway - initial API and implementation
 ###############################################################################
 page.title=DG Toolkit Components Test
-name=Name
+name=Name
+date=Date