From ecb28fd030ba200ec50913fc2b4766c1e40ff465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 20 Jan 2010 21:52:16 +0100 Subject: [PATCH] ItEr44S10CUGravacionModelosUnidadesTraballoItEr43S12: Copying work hours so the order elements are created with the same work hours. Copying the structure of the hours groups with the actual criterions it's pending. --- .../templates/entities/OrderLineTemplate.java | 19 ++++++++++++++++--- .../templates/entities/Templates.hbm.xml | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java index 277e2e351..1f565b84d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java @@ -36,13 +36,17 @@ import org.navalplanner.business.orders.entities.OrderLineGroup; public class OrderLineTemplate extends OrderElementTemplate { public static OrderLineTemplate create(OrderLine orderLine) { - return create(new OrderLineTemplate(), orderLine); + OrderLineTemplate beingBuilt = new OrderLineTemplate(); + beingBuilt.workHours = orderLine.getWorkHours(); + return create(beingBuilt, orderLine); } public static OrderLineTemplate createNew() { return createNew(new OrderLineTemplate()); } + private Integer workHours; + @Override public List getChildrenTemplates() { return Collections.emptyList(); @@ -72,12 +76,14 @@ public class OrderLineTemplate extends OrderElementTemplate { @Override public OrderLine createElement() { - return setupElementParts(OrderLine.create()); + return setupElementParts(OrderLine + .createOrderLineWithUnfixedPercentage(getWorkHours())); } @Override public OrderElement createElement(OrderLineGroup parent) { - OrderLine line = OrderLine.create(); + OrderLine line = OrderLine + .createOrderLineWithUnfixedPercentage(getWorkHours()); parent.add(line); return setupElementParts(line); } @@ -87,4 +93,11 @@ public class OrderLineTemplate extends OrderElementTemplate { return _("Line"); } + public int getWorkHours() { + if (workHours == null) { + return 0; + } + return workHours; + } + } diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/templates/entities/Templates.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/templates/entities/Templates.hbm.xml index 32052d812..c746fc3db 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/templates/entities/Templates.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/templates/entities/Templates.hbm.xml @@ -56,6 +56,7 @@ +