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

Improve Order's validations

Browse source 
Init date and deadline date are required depending on the scheduling
mode.

FEA: ItEr64OTS03PlanificacionHaciaAtras
This commit is contained in:
Óscar González Fernández 2010-12-09 15:55:57 +01:00
parent 7886af8f29
commit d0e19c2062
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
View file

@ -311,14 +311,22 @@ public class Order extends OrderLineGroup {
@SuppressWarnings("unused")
@AssertTrue(message = "the order must have a init date")
private boolean checkConstraintOrderMustHaveStartDate() {
return getInitDate() != null;
private boolean ifSchedulingModeIsForwardOrderMustHaveStartDate() {
return getSchedulingMode() != SchedulingMode.FORWARD
|| getInitDate() != null;
}
@SuppressWarnings("unused")
@AssertTrue(message = "the order must have a deadline")
private boolean ifSchedulingModeIsBackwardsOrderMustHaveDeadline() {
return getSchedulingMode() != SchedulingMode.BACKWARDS
|| getDeadline() != null;
}
@SuppressWarnings("unused")
@AssertTrue(message = "deadline must be after start date")
private boolean checkConstraintDeadlineMustBeAfterStart() {
return !this.isDeadlineBeforeStart();
return getInitDate() == null || !this.isDeadlineBeforeStart();
}
@SuppressWarnings("unused")