From bab66fa26bbbb5edbe6f250e0bd1dba7e676f906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sat, 13 Feb 2010 23:15:19 +0100 Subject: [PATCH] ItEr47S04ValidacionEProbasFuncionaisItEr46S04: [Bug #290] Fixing bug. Instead of throwing an exception a message is shown. It's pending formatting it better. --- .../AdvancedAllocationController.java | 23 +++++++++++++++---- .../webapp/planner/advance_allocation.zul | 8 +++++-- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java index 43ce16348..e979fceed 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java @@ -50,6 +50,7 @@ import org.navalplanner.business.planner.entities.StretchesFunction.Type; import org.navalplanner.web.common.IMessagesForUser; import org.navalplanner.web.common.Level; import org.navalplanner.web.common.MessagesForUser; +import org.navalplanner.web.common.OnlyOneVisible; import org.navalplanner.web.planner.allocation.streches.StrechesFunctionConfiguration; import org.navalplanner.web.resourceload.ResourceLoadModel; import org.zkoss.ganttz.timetracker.ICellForDetailItemRenderer; @@ -383,7 +384,6 @@ public class AdvancedAllocationController extends GenericForwardComposer { private void setInputData(IBack back, List allocationInputs) { Validate.notNull(back); Validate.noNullElements(allocationInputs); - Validate.isTrue(!allocationInputs.isEmpty()); this.back = back; this.allocationInputs = allocationInputs; } @@ -397,17 +397,26 @@ public class AdvancedAllocationController extends GenericForwardComposer { @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); + normalLayout = comp.getFellow("normalLayout"); + noDataLayout = comp.getFellow("noDataLayout"); + onlyOneVisible = new OnlyOneVisible(normalLayout, noDataLayout); this.associatedComponent = comp; loadAndInitializeComponents(); } + private void loadAndInitializeComponents() { messages = new MessagesForUser(associatedComponent .getFellow("messages")); - createComponents(); - insertComponentsInLayout(); - timeTrackerComponent.afterCompose(); - table.afterCompose(); + if (allocationInputs.isEmpty()) { + onlyOneVisible.showOnly(noDataLayout); + } else { + onlyOneVisible.showOnly(normalLayout); + createComponents(); + insertComponentsInLayout(); + timeTrackerComponent.afterCompose(); + table.afterCompose(); + } } private void createComponents() { @@ -482,6 +491,10 @@ public class AdvancedAllocationController extends GenericForwardComposer { private List rowsCached = null; private Map groupingRows = new HashMap(); + private OnlyOneVisible onlyOneVisible; + private Component normalLayout; + private Component noDataLayout; + private List getRows() { if (rowsCached != null) { return rowsCached; diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul index b23b53c6f..ef132d2b0 100644 --- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul +++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul @@ -20,14 +20,18 @@ - + - +
+ ${i18n:_('No Allocations have been done')} +
+ +