diff --git a/src/main/java/se/su/dsv/scipro/reusable/DatesPanel.java b/src/main/java/se/su/dsv/scipro/reusable/DatesPanel.java index 803d5acb78..4de7bcc0fb 100644 --- a/src/main/java/se/su/dsv/scipro/reusable/DatesPanel.java +++ b/src/main/java/se/su/dsv/scipro/reusable/DatesPanel.java @@ -24,10 +24,10 @@ public abstract class DatesPanel extends Panel { } public Date getFromDate(){ - return filterForm.fromDate; + return filterForm.dateFrom.getModelObject(); } public Date getToDate(){ - return filterForm.toDate; + return filterForm.dateTo.getModelObject(); } /** @@ -39,31 +39,25 @@ public abstract class DatesPanel extends Panel { private static final long serialVersionUID = 1L; - private transient Date fromDate; - private transient Date toDate; - private DateField dateFrom; private DateField dateTo; - private Model<Date> dateFromModel; - private Model<Date> dateToModel; - public FilterForm(String id) { super(id); Calendar cal = Calendar.getInstance(); - toDate = cal.getTime(); + Date toDate = cal.getTime(); cal.add(Calendar.MONTH, -6); - fromDate = cal.getTime(); + Date fromDate = cal.getTime(); - dateFrom = new DateField("dateFrom", dateFromModel = new Model<Date>(fromDate)){ + dateFrom = new DateField("dateFrom", new Model<Date>(fromDate)){ @Override protected DateTextField newDateTextField(String id, PropertyModel dateFieldModel) { return DateTextField.forDatePattern(id, dateFieldModel, "yyyy-MM-dd"); } }; - dateTo = new DateField("dateTo", dateToModel = new Model<Date>(toDate)){ + dateTo = new DateField("dateTo", new Model<Date>(toDate)){ @Override protected DateTextField newDateTextField(String id, PropertyModel dateFieldModel) { return DateTextField.forDatePattern(id, dateFieldModel, "yyyy-MM-dd"); @@ -77,17 +71,10 @@ public abstract class DatesPanel extends Panel { private static final long serialVersionUID = 1L; @Override protected void onSubmit(AjaxRequestTarget target, Form<?> form) { - onUpdateFilter(target, dateFromModel.getObject(), dateToModel.getObject()); + onUpdateFilter(target, dateFrom.getModelObject(), dateTo.getModelObject()); } }); } - - public Date getFromDate(){ - return dateFromModel.getObject(); - } - public Date getToDate(){ - return dateToModel.getObject(); - } } } \ No newline at end of file diff --git a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImpl.java b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImpl.java index ef6009b579..c505635bb1 100644 --- a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImpl.java +++ b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImpl.java @@ -60,21 +60,16 @@ public class ProjectServiceImpl extends AbstractQueryService<Project, Long> impl @Override public Page<Project> find(Date fromDate, Date toDate, Pageable pageable) { - System.out.println("FIND"); - System.out.println(fromDate); return projectRepo.findAll(projectCreatedAfter(fromDate).and(projectCreatedBefore(toDate)), pageable); } @Override public Long count(String filterString) { - return projectRepo.count(titleContains(filterString)); } @Override public Long count(Date fromDate, Date toDate) { - System.out.println("COUNT"); - System.out.println(fromDate); return projectRepo.count(projectCreatedAfter(fromDate).and(projectCreatedBefore(toDate))); }