From 2d77ee846c5d20a97510381697cd0da991539511 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Wed, 7 Feb 2024 11:14:07 +0100 Subject: [PATCH] layout fixes - zahlungsart, sachbearbeiter --- .../forms/alexander/section_responsible.xhtml | 118 ++++++++---------- .../forms/alexander/sub_payment_type.xhtml | 23 ++-- .../forms/alexander/sub_process.xhtml | 12 +- .../forms/alexander/sub_responsible.xhtml | 118 ++++++++---------- .../pages/workitems/forms/sepa_export.xhtml | 58 ++++----- .../workitems/parts/alexander/azubi.xhtml | 28 ++--- .../parts/alexander/sachbearbeiter.xhtml | 25 ++-- .../workitems/parts/alexander/spaceref.xhtml | 18 ++- .../parts/alexander/zahlungsart.xhtml | 21 ++-- 9 files changed, 183 insertions(+), 238 deletions(-) diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml index 1e494cc..9f937da 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_responsible.xhtml @@ -1,9 +1,6 @@ - @@ -12,71 +9,64 @@ -
-
#{message['form.space']}
-
- - - - - - - - -
-
+
+
#{message['form.space']}
+
+ + + + + + + + +
+
-
-
- Sachbearbeiter:* -
-
- - - +
+
+ Sachbearbeiter:* +
+
+ + + + - + - - - -
-
+ + +
+
+
- - - - + -
-
- Azubi:* -
-
- - +
+
+ Azubi:* +
+
+ + - - - - -
-
+ + + +
+
+
- - - + + + -
- + \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type.xhtml index 41740f8..dbe726f 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_payment_type.xhtml @@ -1,28 +1,23 @@ - -
+
-
#{message['payment.type']}:
+
#{message['payment.type']}:
- - + + - + - +
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 index 92e40db..16707b9 100644 --- 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 @@ -13,8 +13,7 @@
Zahlungsart:
- + @@ -33,8 +32,7 @@
#{message['form.space']}
- + @@ -57,8 +55,7 @@
- + @@ -80,8 +77,7 @@ Azubi:*
- + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml index e778b3d..9d0e198 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/sub_responsible.xhtml @@ -1,9 +1,6 @@ - @@ -15,71 +12,64 @@ -
-
#{message['form.space']}
-
- - - - - - - - -
-
+
+
#{message['form.space']}
+
+ + + + + + + + +
+
-
-
- Sachbearbeiter:* -
-
- - - +
+
+ Sachbearbeiter:* +
+
+ + + + - + - - - -
-
+ + +
+
+
- - - - + -
-
- Azubi:* -
-
- - +
+
+ Azubi:* +
+
+ + - - - - -
-
+ + + +
+
+
- - - + + + -
- + \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml index 379c15a..73ee9d8 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml @@ -1,19 +1,15 @@ -
- +
Zahlungsart:
- + @@ -21,7 +17,7 @@
-
+
IBAN
@@ -37,7 +33,7 @@
-
+
@@ -57,26 +53,28 @@ - - #{invoice.item['cdtr.name']} - - + + + #{invoice.item['cdtr.name']} + + #{invoice.item['invoice.number']} - - + + + - - + + + - + + - + + #{invoice.item['invoice.currency']} #{invoice.item ['cdtr.iban']} @@ -86,12 +84,15 @@ - + + Summary - + - + + #{invoice.item['invoice.currency']} @@ -100,5 +101,4 @@
-
- + \ No newline at end of file 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 index f3beaad..2a251af 100644 --- 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 @@ -1,32 +1,25 @@ - + - + - + - - + + + - + @@ -35,5 +28,4 @@ - - + \ No newline at end of file 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 9e463bd..1f52754 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 @@ -1,29 +1,22 @@ - + - + - + - + + - + - - + \ No newline at end of file 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 index aa734c1..1d587bb 100644 --- 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 @@ -1,23 +1,20 @@ - - - + - + @@ -25,5 +22,4 @@ - - + \ No newline at end of file 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 index 87f8378..c8e6df8 100644 --- 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 @@ -1,21 +1,15 @@ - - - + + - + - + @@ -41,5 +35,4 @@ - - + \ No newline at end of file