diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/MachineWorkersConfigurationUnit.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/MachineWorkersConfigurationUnit.java
index d2d5d8019..4367838b4 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/MachineWorkersConfigurationUnit.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/MachineWorkersConfigurationUnit.java
@@ -27,6 +27,7 @@ import java.util.HashSet;
import java.util.Set;
import org.hibernate.validator.AssertTrue;
+import org.hibernate.validator.Valid;
import org.navalplanner.business.common.BaseEntity;
/**
@@ -75,6 +76,7 @@ public class MachineWorkersConfigurationUnit extends BaseEntity {
this.alpha = alpha;
}
+ @Valid
public BigDecimal getAlpha() {
return alpha;
}
@@ -159,6 +161,11 @@ public class MachineWorkersConfigurationUnit extends BaseEntity {
return assigned;
}
+ @AssertTrue(message = "Alpha must be greater than 0")
+ public boolean checkAlpha() {
+ return (this.alpha.compareTo(new BigDecimal(0)) > 0);
+ }
+
@AssertTrue(message = "All Machine worker assignments must have a start date earlier than the finish date")
public boolean checkWorkerAssignmentsIntervalsProperlyDefined() {
boolean correctIntervals = true;
diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
index 60e452dd6..9b0f67e49 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
@@ -40,17 +40,17 @@
+ constraint="no empty:${i18n:_('Code cannot be null or empty')}" />
+ constraint="no empty:${i18n:_('Name cannot be null or empty')}" />
+ constraint="no empty:${i18n:_('Description cannot be null or empty')}" />
diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul
index c09a740aa..1236c9e41 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul
@@ -127,7 +127,7 @@
+ constraint="no zero,no empty,/[1-9][0-9]*(\.[0-9][0-9]?)?/:${i18n:_('must be a real positive number')}" />