From 72aa2b07d018f332cff395ef221e2c845ea6804d Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 28 Jul 2009 08:21:21 +0200 Subject: [PATCH] ItEr19S11CUAsignacionRecursosEspecificosAPlanificacionItEr18S14: Showing a message when the criterions list is empty during the resource allocation. --- .../web/planner/ResourceAllocationController.java | 11 ++++++++++- navalplanner-webapp/src/main/webapp/planner/order.zul | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java index a8e3235da..30c224db9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java @@ -46,7 +46,16 @@ public class ResourceAllocationController extends GenericForwardComposer { private Window window; public Set getCriterions() { - return resourceAllocationModel.getCriterions(); + Set criterions = resourceAllocationModel.getCriterions(); + if (criterions.isEmpty()) { + window.getFellow("requiredCriterions").setVisible(false); + window.getFellow("requiredCriterionsEmpty").setVisible(true); + } else { + window.getFellow("requiredCriterionsEmpty").setVisible(false); + window.getFellow("requiredCriterions").setVisible(true); + } + + return criterions; } public Set getResourceAllocations() { diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul index 5c7c012c2..ee9b44f2b 100644 --- a/navalplanner-webapp/src/main/webapp/planner/order.zul +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -51,6 +51,7 @@ +