diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java index b5d58caa0..ef3b57a05 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java @@ -20,6 +20,8 @@ package org.navalplanner.business.orders.entities; +import static org.navalplanner.business.i18n.I18nHelper._; + /** * @author Susana Montes Pedreiera @@ -27,8 +29,9 @@ package org.navalplanner.business.orders.entities; public enum OrderStatusEnum { - OFFERED("OFFERED"), ACCEPTED("ACCEPTED"), STARTED("STARTED"), FINISHED( - "FINISHED"), CANCELLED("CANCELLED"); + OFFERED(_("OFFERED")), ACCEPTED(_("ACCEPTED")), STARTED(_("STARTED")), FINISHED( + _("FINISHED")), CANCELLED(_("CANCELLED")), SUBCONTRACTED_PENDING_ORDER( + _("SUBCONTRACTED PENDING ORDER")); private String description; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java index 708642f71..e01bf8bf6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java @@ -43,6 +43,7 @@ import org.navalplanner.business.externalcompanies.entities.ExternalCompany; import org.navalplanner.business.orders.daos.IOrderElementDAO; import org.navalplanner.business.orders.entities.Order; import org.navalplanner.business.orders.entities.OrderElement; +import org.navalplanner.business.orders.entities.OrderStatusEnum; import org.navalplanner.ws.common.api.InstanceConstraintViolationsDTO; import org.navalplanner.ws.common.api.InstanceConstraintViolationsListDTO; import org.navalplanner.ws.common.api.OrderElementDTO; @@ -137,6 +138,8 @@ public class SubcontractServiceREST implements ISubcontractService { order.setCode(code); generateCodes(order); + order.setState(OrderStatusEnum.SUBCONTRACTED_PENDING_ORDER); + if (subcontractedTaskDataDTO.workDescription != null) { order.setName(subcontractedTaskDataDTO.workDescription); } diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/SubcontractServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/SubcontractServiceTest.java index 423a074f1..06064164b 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/SubcontractServiceTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/SubcontractServiceTest.java @@ -45,6 +45,7 @@ import org.navalplanner.business.externalcompanies.entities.ExternalCompany; import org.navalplanner.business.orders.daos.IOrderDAO; import org.navalplanner.business.orders.entities.Order; import org.navalplanner.business.orders.entities.OrderElement; +import org.navalplanner.business.orders.entities.OrderStatusEnum; import org.navalplanner.ws.common.api.InstanceConstraintViolationsDTO; import org.navalplanner.ws.common.api.OrderElementDTO; import org.navalplanner.ws.common.api.OrderLineDTO; @@ -188,6 +189,8 @@ public class SubcontractServiceTest { Order order = orderDAO.getOrders().get(previous); assertNotNull(order.getCode()); assertNull(order.getExternalCode()); + assertThat(order.getState(), + equalTo(OrderStatusEnum.SUBCONTRACTED_PENDING_ORDER)); assertThat(order.getWorkHours(), equalTo(0)); assertThat(order.getCustomer().getId(), equalTo(externalCompany.getId()));