From 86e1d77791cacae9424d42e85274494d2869dd81 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 4 Feb 2013 13:32:06 +0100 Subject: [PATCH] New query in OrderDAO to get projects filtered The new query receives several params from the filters (dates, labels, criteria, customer and state) and returns the filtered orders. For the moment it's only used to get the initial list of orders for the projects list window. FEA: ItEr77S15FilteringEnhancements --- .../business/orders/daos/IOrderDAO.java | 8 + .../business/orders/daos/OrderDAO.java | 204 ++++++++++++++++++ .../org/libreplan/web/orders/IOrderModel.java | 5 + .../web/orders/OrderCRUDController.java | 42 +++- .../org/libreplan/web/orders/OrderModel.java | 17 ++ 5 files changed, 275 insertions(+), 1 deletion(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderDAO.java index 1a96f86a8..007ada378 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderDAO.java @@ -26,8 +26,11 @@ import java.util.List; import org.libreplan.business.common.daos.IIntegrationEntityDAO; import org.libreplan.business.common.exceptions.InstanceNotFoundException; +import org.libreplan.business.externalcompanies.entities.ExternalCompany; +import org.libreplan.business.labels.entities.Label; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.orders.entities.OrderElement; +import org.libreplan.business.orders.entities.OrderStatusEnum; import org.libreplan.business.planner.entities.Task; import org.libreplan.business.reports.dtos.CostExpenseSheetDTO; import org.libreplan.business.reports.dtos.OrderCostsPerResourceDTO; @@ -79,6 +82,11 @@ public interface IOrderDAO extends IIntegrationEntityDAO { List getOrdersByReadAuthorizationByScenario(String username, Scenario scenario); + List getOrdersByReadAuthorizationBetweenDatesByLabelsCriteriaCustomerAndState( + String username, Scenario scenario, Date startDate, Date endDate, + List