Working on percentageEditor.

Still having problems with combination of @Max / @Digits /
@Column(length=xxx)
This commit is contained in:
Socrates
2020-06-10 11:22:24 +02:00
parent 224ce9d2a4
commit 905519266b
8 changed files with 74 additions and 7 deletions

View File

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
"#buyDate, sellDate];" +
"remarks"
)
@Tab(properties="name, photo, category.description, brand.description, pattern.description, size.description, condition.description, remarks", defaultOrder="${name} asc")
@Tab(properties="name, category.description, brand.description, pattern.description, size.description, condition.description, discountedSellPrice, remarks", defaultOrder="${name} asc")
public class Article {
@Id @Hidden @GeneratedValue(generator="system-uuid2")
@@ -89,8 +89,11 @@ public class Article {
private LocalDate sellDate;
@Digits(integer=3, fraction = 0)
//@Max(value=100)
//@Stereotype("PERCENTAGE")
//@Column(length=11)
private BigDecimal discount;
public String getOid() {
return oid;
}
@@ -211,8 +214,9 @@ public class Article {
this.discount = discount;
}
@Column(length=8)
@Stereotype("MONEY")
@Calculation("(100 - discount) / 100 * originalPrice")
@Column(length=8)
public BigDecimal getDiscountedSellPrice() {
try {
return getOriginalPrice().multiply(BigDecimal.ONE.subtract(getDiscount().divide(new BigDecimal(100), 2, RoundingMode.HALF_EVEN)));
@@ -221,5 +225,5 @@ public class Article {
return BigDecimal.ZERO;
}
}
}
}