diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java index fa889df..230224f 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java @@ -306,6 +306,18 @@ public class OPListController implements Serializable { } + public double calculateInvoiceTotal(String currency) { + double result = 0; + for (ItemCollection invoice : invoiceList) { + if (currency.equals(invoice.getItemValueString("invoice.currency"))) { + result = result + invoice.getItemValueDouble("invoice.total"); + } + } + // rond with 2 digits + return InvoiceUtil.round(result); + + } + /** * Berechnet den gesammten OP Saldo * diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml index 41f81ce..7eff773 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml @@ -9,7 +9,6 @@ - @@ -149,12 +148,23 @@ - + + + + +
+ +
- + + + EUR
USD
+ + +