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 3147209..e75bbb7 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 @@ -89,24 +89,36 @@ public class OPListController implements Serializable { * @param item - name of the item to summarize * @return sum rounded to 2 digits */ - public double calculateSum(List refids, String item) { + public double calculateSum() { double result = 0; + + List refids=workflowController.getWorkitem().getItemValueList("$workitemref",String.class); + for (String id : refids) { ItemCollection doc = documentService.load(id); - if (doc != null) { - if ("credit".equals(doc.getItemValueString("payment.type"))) { - result = result + doc.getItemValueDouble(item); - } else { - result = result - doc.getItemValueDouble(item); - } - } else { - logger.warning("invalid read access to calculate sum"); + if (doc!=null) { + result = result + doc.getItemValueDouble("invoice.total"); } } // rond with 2 digits return Math.round(result * 100.0) / 100.0; } + + /** + * Berechnet den gesammten OP Saldo + * @return + */ + public double calculateSaldo(List invoices ) { + double result = 0; + for (ItemCollection invoice : invoices) { + result = result + invoice.getItemValueDouble("invoice.total"); + } + // rond with 2 digits + return Math.round(result * 100.0) / 100.0; + + } + /** * This method removes an uniqueid form the item $workitemref diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch2.old b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch2.old deleted file mode 100644 index a99ae40..0000000 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch2.old +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - -
-

Es liegen derzeit keine Rechnungen zur Prüfung für Sie vor.

-
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bereich#{message['form.company']}#{message['form.invoicenumber']}#{message['form.date']}Fälligkeit#{message['form.amount']}
#{invoice.item['space.name']} - #{invoice.item['cdtr.name']} - - #{invoice.item['invoice.number']} - - - - - - #{invoice.item['invoice.currency']}
-
-
- - - - - - -
- diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_opliste.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml similarity index 88% rename from office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_opliste.xhtml rename to office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml index f4793c5..50bed72 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_opliste.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste.xhtml @@ -9,11 +9,9 @@ - + -

Offene Posten

- - +
@@ -64,10 +62,18 @@ + + + + + @@ -75,12 +81,9 @@ + style="display:none;" value="#{workitem.itemList['$workitemref']}"/> -
#{message['form.invoicenumber']} #{message['form.date']} Summary + value="#{opListController.calculateSaldo(invoices)}"> #{invoice.item['invoice.currency']} + +