From 95a86750e10d19bea6aeeffe6fa679549863c23d Mon Sep 17 00:00:00 2001
From: Socrates <socrates@engels>
Date: Wed, 10 Jun 2020 21:03:50 +0200
Subject: [PATCH] Changes on discount

- Changed type of discounts from int to Integer
- added i18n for defaultDiscount
- changed defaultOrder for Condition to number asc
---
 i18n/Babydatenbank-labels_de.properties               |  1 +
 src/com/yourcompany/babydatenbank/model/Article.java  | 10 ++++------
 .../yourcompany/babydatenbank/model/Condition.java    | 11 ++++-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/i18n/Babydatenbank-labels_de.properties b/i18n/Babydatenbank-labels_de.properties
index b0c7f5f..6e9a20d 100644
--- a/i18n/Babydatenbank-labels_de.properties
+++ b/i18n/Babydatenbank-labels_de.properties
@@ -18,6 +18,7 @@ brand=Marke
 condition=Zustand
 size=Größe
 discountedSellPrice=Preisvorschlag
+defaultDiscount=Standardrabatt
 
 articleCount=Anzahl Artikel
 originalPriceSum=Summe Originalpreise
diff --git a/src/com/yourcompany/babydatenbank/model/Article.java b/src/com/yourcompany/babydatenbank/model/Article.java
index 3410f7a..48ba5dd 100644
--- a/src/com/yourcompany/babydatenbank/model/Article.java
+++ b/src/com/yourcompany/babydatenbank/model/Article.java
@@ -11,8 +11,6 @@ import com.yourcompany.babydatenbank.actions.*;
 import java.math.*;
 import java.time.*;
 
-import javax.validation.constraints.*;
-
 @Entity
 @View(members=
 		"name;" +
@@ -92,8 +90,8 @@ public class Article {
 
 	@Stereotype("PERCENTAGE")
 	@Range(min=0, max=100)
-	@DisplaySize(value=8)
-	private int discount;
+	@Column(length=12)
+	private Integer discount;
 
 	public String getOid() {
 		return oid;
@@ -207,11 +205,11 @@ public class Article {
 		this.sellDate = sellDate;
 	}
 
-	public int getDiscount() {
+	public Integer getDiscount() {
 		return discount;
 	}
 
-	public void setDiscount(int discount) {
+	public void setDiscount(Integer discount) {
 		this.discount = discount;
 	}
 	
diff --git a/src/com/yourcompany/babydatenbank/model/Condition.java b/src/com/yourcompany/babydatenbank/model/Condition.java
index 940c0a4..e49f8c8 100644
--- a/src/com/yourcompany/babydatenbank/model/Condition.java
+++ b/src/com/yourcompany/babydatenbank/model/Condition.java
@@ -1,16 +1,13 @@
 package com.yourcompany.babydatenbank.model;
 
-import java.math.*;
-
 import javax.persistence.*;
-import javax.validation.constraints.*;
 
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.validator.constraints.*;
 import org.openxava.annotations.*;
 
 @Entity
-@Tab(properties="number, description, defaultDiscount")
+@Tab(properties="number, description, defaultDiscount", defaultOrder="${number} asc")
 public class Condition {
 	@Id
 	@Hidden
@@ -28,7 +25,7 @@ public class Condition {
 	@Range(min=0, max=100)
 	@Stereotype("PERCENTAGE")
 	@DisplaySize(value=8)
-	private int defaultDiscount;
+	private Integer defaultDiscount;
 
 	public String getOid() {
 		return oid;
@@ -54,11 +51,11 @@ public class Condition {
 		this.number = number;
 	}
 
-	public int getDefaultDiscount() {
+	public Integer getDefaultDiscount() {
 		return defaultDiscount;
 	}
 
-	public void setDefaultDiscount(int defaultDiscount) {
+	public void setDefaultDiscount(Integer defaultDiscount) {
 		this.defaultDiscount = defaultDiscount;
 	}