socrates/Babydatenbank
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Changes on discount

Browse Source 
- Changed type of discounts from int to Integer
- added i18n for defaultDiscount
- changed defaultOrder for Condition to number asc
This commit is contained in:
Socrates
2020-06-10 21:03:50 +02:00
parent 6a8d20585b
commit 95a86750e1
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
i18n/Babydatenbank-labels_de.properties
View File

@@ -18,6 +18,7 @@ brand=Marke
condition=Zustand condition=Zustand
size=Gr<EFBFBD><EFBFBD>e size=Gr<EFBFBD><EFBFBD>e
discountedSellPrice=Preisvorschlag discountedSellPrice=Preisvorschlag
defaultDiscount=Standardrabatt
articleCount=Anzahl Artikel articleCount=Anzahl Artikel
originalPriceSum=Summe Originalpreise originalPriceSum=Summe Originalpreise

10
src/com/yourcompany/babydatenbank/model/Article.java
View File

@@ -11,8 +11,6 @@ import com.yourcompany.babydatenbank.actions.*;
import java.math.*; import java.math.*;
import java.time.*; import java.time.*;
import javax.validation.constraints.*;
@Entity @Entity
@View(members= @View(members=
"name;" + "name;" +
@@ -92,8 +90,8 @@ public class Article {
@Stereotype("PERCENTAGE") @Stereotype("PERCENTAGE")
@Range(min=0, max=100) @Range(min=0, max=100)
@DisplaySize(value=8) @Column(length=12)
private int discount; private Integer discount;
public String getOid() { public String getOid() {
return oid; return oid;
@@ -207,11 +205,11 @@ public class Article {
this.sellDate = sellDate; this.sellDate = sellDate;
} }
public int getDiscount() { public Integer getDiscount() {
return discount; return discount;
} }
public void setDiscount(int discount) { public void setDiscount(Integer discount) {
this.discount = discount; this.discount = discount;
} }

11
src/com/yourcompany/babydatenbank/model/Condition.java
View File

@@ -1,16 +1,13 @@
package com.yourcompany.babydatenbank.model; package com.yourcompany.babydatenbank.model;
import java.math.*;
import javax.persistence.*; import javax.persistence.*;
import javax.validation.constraints.*;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.hibernate.validator.constraints.*; import org.hibernate.validator.constraints.*;
import org.openxava.annotations.*; import org.openxava.annotations.*;
@Entity @Entity
@Tab(properties="number, description, defaultDiscount") @Tab(properties="number, description, defaultDiscount", defaultOrder="${number} asc")
public class Condition { public class Condition {
@Id @Id
@Hidden @Hidden
@@ -28,7 +25,7 @@ public class Condition {
@Range(min=0, max=100) @Range(min=0, max=100)
@Stereotype("PERCENTAGE") @Stereotype("PERCENTAGE")
@DisplaySize(value=8) @DisplaySize(value=8)
private int defaultDiscount; private Integer defaultDiscount;
public String getOid() { public String getOid() {
return oid; return oid;
@@ -54,11 +51,11 @@ public class Condition {
this.number = number; this.number = number;
} }
public int getDefaultDiscount() { public Integer getDefaultDiscount() {
return defaultDiscount; return defaultDiscount;
} }
public void setDefaultDiscount(int defaultDiscount) { public void setDefaultDiscount(Integer defaultDiscount) {
this.defaultDiscount = defaultDiscount; this.defaultDiscount = defaultDiscount;
} }