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

Refactored to OrderStatusEnum static method to get default visible project status

Browse source
This commit is contained in:
Lorenzo Tilve Álvaro 2013-01-30 17:13:38 +01:00
parent bd5914b011
commit dcd7cd8c09
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java
View file

@ -23,6 +23,8 @@ package org.libreplan.business.orders.entities;
import static org.libreplan.business.i18n.I18nHelper._;
import java.util.EnumSet;
/**
* @author Susana Montes Pedreiera <smotnes@wirelessgalicia.com>
@ -53,4 +55,12 @@ public enum OrderStatusEnum {
public static OrderStatusEnum getDefault() {
return PRE_SALES;
}
public static EnumSet<OrderStatusEnum> getVisibleStatus() {
return EnumSet.of(OrderStatusEnum.PRE_SALES, OrderStatusEnum.OFFERED,
OrderStatusEnum.OUTSOURCED, OrderStatusEnum.ACCEPTED,
OrderStatusEnum.STARTED, OrderStatusEnum.ON_HOLD,
OrderStatusEnum.FINISHED);
}
}

7
libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
View file

@ -160,11 +160,8 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
private LocalDate filterFinishDate;
// All the status but CANCELLED and STORED
private static final EnumSet<OrderStatusEnum> STATUS_VISUALIZED = EnumSet
.of(OrderStatusEnum.PRE_SALES, OrderStatusEnum.OFFERED,
OrderStatusEnum.OUTSOURCED, OrderStatusEnum.ACCEPTED,
OrderStatusEnum.STARTED, OrderStatusEnum.ON_HOLD,
OrderStatusEnum.FINISHED);
private static final EnumSet<OrderStatusEnum> STATUS_VISUALIZED = OrderStatusEnum
.getVisibleStatus();
public void setPlanningControllerEntryPoints(
MultipleTabsPlannerController entryPoints) {