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

ItEr44S21CUExportarTraballoRealizadaPorSubcontrata: Added new state SUBCONTRACTED_PENDING_ORDER that is set to orders received via subcontract service.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-01-22 09:17:12 +01:00 • committed by Javier Moran Rua
parent 24c5292d7a
commit 889ec67ae8
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java
View file

@ -20,6 +20,8 @@
package org.navalplanner.business.orders.entities;
import static org.navalplanner.business.i18n.I18nHelper._;
/**
* @author Susana Montes Pedreiera <smotnes@wirelessgalicia.com>
@ -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;

3
navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java
View file

@ -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);
}

3
navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/SubcontractServiceTest.java
View file

@ -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()));