From 9cfdf62d71e109a718aee920fed8e4079f0e587d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Thu, 20 Dec 2012 11:16:04 +0100 Subject: [PATCH] Use for company view filtering all projects with status different to STORED or CANCELLED FEA: ItEr77S04BugFixing --- .../web/planner/company/CompanyPlanningModel.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java index 84580674b..fbe3552c6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java @@ -157,10 +157,13 @@ public class CompanyPlanningModel implements ICompanyPlanningModel { private LocalDate filterStartDate; private LocalDate filterFinishDate; + + // All the status but CANCELLED and STORED private static final EnumSet STATUS_VISUALIZED = EnumSet - .of(OrderStatusEnum.ACCEPTED, OrderStatusEnum.OFFERED, - OrderStatusEnum.STARTED, - OrderStatusEnum.OUTSOURCED); + .of(OrderStatusEnum.PRE_SALES, OrderStatusEnum.OFFERED, + OrderStatusEnum.OUTSOURCED, OrderStatusEnum.ACCEPTED, + OrderStatusEnum.STARTED, OrderStatusEnum.ON_HOLD, + OrderStatusEnum.FINISHED); public void setPlanningControllerEntryPoints( MultipleTabsPlannerController entryPoints) {