From 5e9bc15e19002d521ecbbe92bbf4204bd05af032 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 28 Aug 2012 17:06:47 +0200 Subject: [PATCH] Generate properly codes for order elements after importing a project FEA: ItEr77S05BasicProjectImport --- .../libreplan/importers/OrderImporterMPXJ.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java index 717b96d69..21e9d8ee4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java @@ -141,6 +141,8 @@ public class OrderImporterMPXJ implements IOrderImporter { orderElement = Order.createUnvalidated(code); + orderElement.setCodeAutogenerated(true); + ((Order) orderElement).setVersionForScenario(current, orderVersion); ((Order) orderElement).setDependenciesConstraintsHavePriority(true); @@ -167,6 +169,9 @@ public class OrderImporterMPXJ implements IOrderImporter { orderElement.setInitDate(new Date()); + ((Order) orderElement).generateOrderElementCodes(entitySequenceDAO + .getNumberOfDigitsCode(EntityNameEnum.ORDER)); + return (Order) orderElement; } @@ -187,13 +192,10 @@ public class OrderImporterMPXJ implements IOrderImporter { Validate.notNull(orderVersion); OrderElement orderElement; - String code; if (task.children.size() == 0) { - code = getCode(EntityNameEnum.ORDER); - orderElement = OrderLine.createUnvalidatedWithUnfixedPercentage( - code, 0); + UUID.randomUUID().toString(), 0); if (!orderElement.getHoursGroups().isEmpty()) { orderElement.getHoursGroups().get(0) @@ -201,8 +203,8 @@ public class OrderImporterMPXJ implements IOrderImporter { } } else { - code = getCode(EntityNameEnum.ORDER); - orderElement = OrderLineGroup.createUnvalidated(code); + orderElement = OrderLineGroup.createUnvalidated(UUID.randomUUID() + .toString()); orderElement.useSchedulingDataFor(orderVersion); } @@ -219,7 +221,6 @@ public class OrderImporterMPXJ implements IOrderImporter { } orderElement.setName(task.name); - orderElement.setCode(code); orderElement.setInitDate(new Date()); return orderElement;