RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #1123] Added condition to avoid max value equals zero

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Cristina Alvarino 2011-08-29 10:31:10 +02:00 • committed by Manuel Rego Casasnovas
parent 2977962575
commit 5652822eae
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
View file

@ -764,11 +764,13 @@ public class ManageOrderElementAdvancesController extends
.getValue();
if (!manageOrderElementAdvancesModel
.hasConsolidatedAdvances(advance)) {
if (value == null) {
((Decimalbox) comp).setValue(advance.getMaxValue());
if (value == null
|| (BigDecimal.ZERO.compareTo((BigDecimal) value) >= 0)) {
((Decimalbox) comp).setValue(advance.getAdvanceType()
.getDefaultMaxValue());
((Decimalbox) comp).invalidate();
throw new WrongValueException(comp,
_("The max value must be not empty"));
_("The max value must be greater than 0"));
}
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java
View file

@ -696,7 +696,7 @@ public class ManageOrderElementAdvancesModel implements
if (listAdvanceMeasurements.size() > 1) {
for (AdvanceMeasurement advanceMeasurement : listAdvanceMeasurements) {
BigDecimal value = advanceMeasurement.getValue();
if ((selectedAdvances.size() > 1) && (value != null)) {
if ((selectedAdvances.size() > 1) && (value != null) && (value.compareTo(BigDecimal.ZERO) > 0)) {
BigDecimal maxValue = directAdvanceAssignment
.getMaxValue();
value = value.setScale(2).divide(maxValue,