From 5b7c3f45c2ffc78b813ed23d099bdb6e6820520e Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 14 Jul 2009 10:00:51 +0200 Subject: [PATCH] ItEr17S13CUConfiguracionDeOrganizacionsDeTraballoConUnidadesTraballoItEr15S11: Checking that there's at least one HoursGroup for every OrderLine. --- .../navalplanner/business/orders/entities/OrderElement.java | 5 +++++ .../org/navalplanner/web/orders/OrderElementController.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java index a2a3d14f8..eb2432726 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java @@ -136,4 +136,9 @@ public abstract class OrderElement { public boolean isScheduled() { return !taskElements.isEmpty(); } + + public boolean checkAtLeastOneHoursGroup() { + return (getHoursGroups().size() > 0); + } + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java index ac91623fc..56796310c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java @@ -236,6 +236,12 @@ public class OrderElementController extends GenericForwardComposer { * managed by "save-when" at .zul file. */ public void back() { + if (!getOrderElement().checkAtLeastOneHoursGroup()) { + throw new WrongValueException(window + .getFellow("hoursGroupsListbox"), + "At least one HoursGroup is needed"); + } + window.setVisible(false); Util.reloadBindings(window.getParent()); }