RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr45S09RFNavegacionOrganizacionTraballoItEr44S15 : Changes the order predicate to filter correctly when its dates are empty.

Browse source
This commit is contained in:
Susana Montes Pedreira 2010-01-29 10:28:09 +01:00 • committed by Javier Moran Rua
parent debb8dd8b8
commit 91d15c8055
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java
View file

@ -185,11 +185,22 @@ public class OrderPredicate implements IPredicate {
private boolean acceptFiltersDates(Order order) {
// Check if exist work report items into interval between the start date
// and finish date.
if (isInTheRangeFilterDates(order.getInitDate())
&& isInTheRangeFilterDates(order.getDeadline())) {
return (acceptStartDate(order.getInitDate()) && (acceptFinishDate(order
.getDeadline())));
}
private boolean acceptStartDate(Date initDate) {
if ((initDate == null) && (startDate == null)) {
return true;
}
return false;
return isInTheRangeFilterDates(initDate);
}
private boolean acceptFinishDate(Date deadLine) {
if ((deadLine == null) && (finishDate == null)) {
return true;
}
return isInTheRangeFilterDates(deadLine);
}
private boolean isInTheRangeFilterDates(Date date) {
@ -198,13 +209,6 @@ public class OrderPredicate implements IPredicate {
date, finishDate));
}
private boolean isInTheRangeWorkReportDates(Date date,
Order order) {
// Check if date is into interval between the startdate and finish date
return (isGreaterToStartDate(date, order.getInitDate()) && isLowerToFinishDate(
date, order.getDeadline()));
}
private boolean isGreaterToStartDate(Date date, Date startDate) {
if (startDate == null) {
return true;