From 98d5fc5aa747fdf4c81577798db3b8643f6c9b02 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 30 Sep 2009 18:19:53 +0200 Subject: [PATCH] ItEr28S05RFControlAvancesIncompatiblesEnUnidadesTraballoItEr27S05: Modified the default max value showed for new AdvanceAssignments. --- .../ManageOrderElementAdvancesController.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java index 88637f46c..74281dcb0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java @@ -261,15 +261,23 @@ public class ManageOrderElementAdvancesController extends (comboItem.getValue() instanceof AdvanceType)){ AdvanceType advanceType = (AdvanceType)comboItem.getValue(); advance.setAdvanceType(advanceType); - advance.setMaxValue(advanceType.getDefaultMaxValue()); + advance.setMaxValue(getMaxValue(advanceType)); } } + }); Listcell listCell = new Listcell(); listCell.appendChild(comboAdvanceTypes); listItem.appendChild(listCell); } + private BigDecimal getMaxValue(AdvanceType advanceType) { + if (advanceType.getPercentage()) { + return advanceType.getDefaultMaxValue(); + } + return BigDecimal.ZERO; + } + private void appendLabelAdvanceType(final Listitem listItem){ final AdvanceAssignment advance = (AdvanceAssignment) listItem.getValue(); Label unitName = new Label(advance.getAdvanceType().getUnitName()); @@ -496,8 +504,8 @@ public class ManageOrderElementAdvancesController extends if(advanceType != null){ DirectAdvanceAssignment advance = (DirectAdvanceAssignment) item .getValue(); - advance.setMaxValue(advanceType.getDefaultMaxValue()); - miBox.setValue(advanceType.getDefaultMaxValue()); + advance.setMaxValue(getMaxValue(advanceType)); + miBox.setValue(getMaxValue(advanceType)); } } }