From 509c7858ccf1be0501d93ddeffa0b265e4d87b96 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Tue, 9 Nov 2021 16:56:57 +0100 Subject: [PATCH] update form parts --- .../forms/alexander/sub_process.xhtml | 132 ++++++++++++++++++ .../workitems/parts/alexander/azubi.xhtml | 39 ++++++ .../parts/alexander/datumseingabe.xhtml | 23 +-- .../parts/alexander/datumseingabe_tage.xhtml | 28 ++-- .../parts/alexander/exchangerate.xhtml | 21 +++ .../parts/alexander/sachbearbeiter.xhtml | 29 ++-- .../workitems/parts/alexander/spaceref.xhtml | 30 ++++ .../parts/alexander/zahlungsart.xhtml | 32 +++++ workflow/rechnungseingang-de-1.2.12.bpmn | 97 ++++++++++++- 9 files changed, 398 insertions(+), 33 deletions(-) create mode 100644 office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_process.xhtml create mode 100644 office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml create mode 100644 office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml create mode 100644 office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml create mode 100644 office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_process.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_process.xhtml new file mode 100644 index 0000000..32b6f0a --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_process.xhtml @@ -0,0 +1,132 @@ + + + + +

#{app.sub_dispatch}

+ + + + +
+
Zahlungsart:
+
+ + + + + + + + + + + +
+
+ + + +
+
#{message['form.space']}
+
+ + + + + + + + +
+
+ + + + + + +
+
+ Sachbearbeiter:* +
+
+ + + + + + + + + +
+
+ + + + + + +
+
+ Azubi:* +
+
+ + + + + + + +
+
+
+ +
+ +
+ +
+
+
+ Exchange Rate:* +
+
+ + + +
+
+ + + +
+ +
+ diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml new file mode 100644 index 0000000..48e22d5 --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/azubi.xhtml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe.xhtml index c1975b7..776ea99 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe.xhtml @@ -5,15 +5,20 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"> - - - - - - + + + + + + + + + + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe_tage.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe_tage.xhtml index bc544c8..0bdac7d 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe_tage.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/datumseingabe_tage.xhtml @@ -6,17 +6,23 @@ xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"> - - - - - - - - + + + + + + + + + + + + + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml new file mode 100644 index 0000000..7281c2b --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/exchangerate.xhtml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml index f8c1fda..104b326 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/sachbearbeiter.xhtml @@ -5,20 +5,27 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"> - + - - + value="#{teamController.getSpaceById(workitem.item['space.ref'])}"> - + + + - - - + + + + + + + + + + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml new file mode 100644 index 0000000..62e8b73 --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/spaceref.xhtml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml new file mode 100644 index 0000000..3ceca32 --- /dev/null +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/zahlungsart.xhtml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workflow/rechnungseingang-de-1.2.12.bpmn b/workflow/rechnungseingang-de-1.2.12.bpmn index 88755a3..b505d34 100644 --- a/workflow/rechnungseingang-de-1.2.12.bpmn +++ b/workflow/rechnungseingang-de-1.2.12.bpmn @@ -1345,7 +1345,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - + txtlastcomment]]> @@ -3232,7 +3232,7 @@ Betrag: invoice.total invoice.currency - + txtlastcomment]]> @@ -5195,6 +5195,73 @@ result.isValid=true; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + Es handelt sich um einen SEPA Lauf. Die Rechnung muss explizit freigegeben werden. @@ -5218,6 +5285,8 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' + + @@ -5915,6 +5984,18 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' + + + + + + + + + + + + @@ -6673,6 +6754,18 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export' + + + + + + + + + + + +