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

Added Sums of prices for Brand / Category / Pattern.

Browse Source 
Fixed NullPointerException
This commit is contained in:
Socrates
2020-05-31 20:32:15 +02:00
parent 8366dcdb4c
commit 31e10f7194
4 changed files with 67 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
i18n/Babydatenbank-labels_de.properties
View File

@@ -19,7 +19,9 @@ condition=Zustand
size=Gr<EFBFBD><EFBFBD>e size=Gr<EFBFBD><EFBFBD>e
articleCount=Anzahl Artikel articleCount=Anzahl Artikel
originalPriceSum=Summe der Originalpreise originalPriceSum=Summe Originalpreise
buyPriceSum=Summe Einkaufspreise
sellPriceSum=Summe Verkaufspreise
# ??? # ???
Cards=Karten Cards=Karten
and=und and=und

27
src/com/yourcompany/babydatenbank/model/Brand.java
View File

@@ -58,8 +58,13 @@ public class Brand {
public BigDecimal getOriginalPriceSum() { public BigDecimal getOriginalPriceSum() {
BigDecimal r = BigDecimal.ZERO; BigDecimal r = BigDecimal.ZERO;
for (Article e : articles) { for (Article elem : articles) {
r = r.add(e.getOriginalPrice()); try {
r = r.add(elem.getOriginalPrice());
}
catch(NullPointerException e) {
r = r.add(BigDecimal.ZERO);
}
} }
return r; return r;
@@ -70,8 +75,13 @@ public class Brand {
public BigDecimal getBuyPriceSum() { public BigDecimal getBuyPriceSum() {
BigDecimal r = BigDecimal.ZERO; BigDecimal r = BigDecimal.ZERO;
for (Article e : articles) { for (Article elem : articles) {
r = r.add(e.getBuyPrice()); try {
r = r.add(elem.getBuyPrice());
}
catch(NullPointerException e) {
r = r.add(BigDecimal.ZERO);
}
} }
return r; return r;
@@ -82,8 +92,13 @@ public class Brand {
public BigDecimal getSellPriceSum() { public BigDecimal getSellPriceSum() {
BigDecimal r = BigDecimal.ZERO; BigDecimal r = BigDecimal.ZERO;
for(Article e : articles) { for(Article elem : articles) {
r = r.add(e.getSellPrice()); try {
r = r.add(elem.getSellPrice());
}
catch(NullPointerException e) {
r = r.add(BigDecimal.ZERO);
}
} }
return r; return r;
} }

27
src/com/yourcompany/babydatenbank/model/Category.java
View File

@@ -56,8 +56,13 @@ public class Category {
public BigDecimal getOriginalPriceSum() { public BigDecimal getOriginalPriceSum() {
BigDecimal r = BigDecimal.ZERO; BigDecimal r = BigDecimal.ZERO;
for (Article e : articles) { for (Article elem : articles) {
r = r.add(e.getOriginalPrice()); try {
r = r.add(elem.getOriginalPrice());
}
catch(NullPointerException e) {
r = r.add(BigDecimal.ZERO);
}
} }
return r; return r;
@@ -68,8 +73,13 @@ public class Category {
public BigDecimal getBuyPriceSum() { public BigDecimal getBuyPriceSum() {
BigDecimal r = BigDecimal.ZERO; BigDecimal r = BigDecimal.ZERO;
for (Article e : articles) { for (Article elem : articles) {
r = r.add(e.getBuyPrice()); try {
r = r.add(elem.getBuyPrice());
}
catch(NullPointerException e) {
r = r.add(BigDecimal.ZERO);
}
} }
return r; return r;
@@ -80,8 +90,13 @@ public class Category {
public BigDecimal getSellPriceSum() { public BigDecimal getSellPriceSum() {
BigDecimal r = BigDecimal.ZERO; BigDecimal r = BigDecimal.ZERO;
for(Article e : articles) { for(Article elem : articles) {
r = r.add(e.getSellPrice()); try {
r = r.add(elem.getSellPrice());
}
catch(NullPointerException e) {
r = r.add(BigDecimal.ZERO);
}
} }
return r; return r;
} }

29
src/com/yourcompany/babydatenbank/model/Pattern.java
View File

@@ -57,8 +57,13 @@ public class Pattern {
public BigDecimal getOriginalPriceSum() { public BigDecimal getOriginalPriceSum() {
BigDecimal r = BigDecimal.ZERO; BigDecimal r = BigDecimal.ZERO;
for (Article e : articles) { for (Article elem : articles) {
r = r.add(e.getOriginalPrice()); try {
r = r.add(elem.getOriginalPrice());
}
catch(NullPointerException e) {
r = r.add(BigDecimal.ZERO);
}
} }
return r; return r;
@@ -69,8 +74,13 @@ public class Pattern {
public BigDecimal getBuyPriceSum() { public BigDecimal getBuyPriceSum() {
BigDecimal r = BigDecimal.ZERO; BigDecimal r = BigDecimal.ZERO;
for (Article e : articles) { for (Article elem : articles) {
r = r.add(e.getBuyPrice()); try {
r = r.add(elem.getBuyPrice());
}
catch(NullPointerException e) {
r = r.add(BigDecimal.ZERO);
}
} }
return r; return r;
@@ -81,11 +91,16 @@ public class Pattern {
public BigDecimal getSellPriceSum() { public BigDecimal getSellPriceSum() {
BigDecimal r = BigDecimal.ZERO; BigDecimal r = BigDecimal.ZERO;
for(Article e : articles) { for(Article elem : articles) {
r = r.add(e.getSellPrice()); try {
r = r.add(elem.getSellPrice());
}
catch(NullPointerException e) {
r = r.add(BigDecimal.ZERO);
}
} }
return r; return r;
} }
} }