op section währungen

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
      * 

office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml

@@ -9,7 +9,6 @@
 
 	<!-- Shows the op liste fo rthe current dbtr.number -->
 
-
 	<h:commandScript name="calculateOpSummary"
 		execute="invoiceRefHolder_ID" render="opcalculater_id" />
 
@@ -149,12 +148,23 @@
 				<!-- Invoice total -->
 				<td style="text-align: right;"><strong> <h:panelGroup
 							id="invoice_total">
-							<h:outputText value="#{opListController.calculateInvoiceTotal()}">
+							<h:outputText value="#{opListController.calculateInvoiceTotal('EUR')}">
+								<f:convertNumber minFractionDigits="2" locale="de" />
+							</h:outputText>
+
+							<br />
+							
+							<h:outputText value="#{opListController.calculateInvoiceTotal('USD')}">
 								<f:convertNumber minFractionDigits="2" locale="de" />
 							</h:outputText>
 						</h:panelGroup>
 				</strong></td>
-				<td /><td /><td /><td /> <td /> 
+
+
+				<td><strong>EUR<br />USD</strong></td>
+				
+				
+				<td /><td /><td /> <td /> 
 				<td />
 				<td /><td />