From b43954a796876bf0818347a70e3c77c560eddfb4 Mon Sep 17 00:00:00 2001 From: j-dimension Date: Mon, 15 Feb 2021 20:34:01 +0100 Subject: [PATCH] Anpassungen lt. Dokument von @Kargoscha eingearbeitet. Issue #34 --- src/1.12.0.0/famr01_meta.groovy | 4 +- src/1.12.0.0/famr01_ui.groovy | 98 +++++++++++++++++++++++++++++++-- src/j-lawyer-forms.xml | 2 +- 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/src/1.12.0.0/famr01_meta.groovy b/src/1.12.0.0/famr01_meta.groovy index 2540967..2e45d8a 100644 --- a/src/1.12.0.0/famr01_meta.groovy +++ b/src/1.12.0.0/famr01_meta.groovy @@ -664,6 +664,6 @@ For more information on this, and how to apply and follow the GNU AGPL, see name = "Familienrecht" description = "Familienrecht" -version = "0.9.2"; +version = "1.0.0"; author = "Jens Kutschke" -updated = "13.02.2021" +updated = "15.02.2021" diff --git a/src/1.12.0.0/famr01_ui.groovy b/src/1.12.0.0/famr01_ui.groovy index 16884d6..e47cb14 100644 --- a/src/1.12.0.0/famr01_ui.groovy +++ b/src/1.12.0.0/famr01_ui.groovy @@ -777,6 +777,15 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For textField(name: "_EHE_INTRECHT", text: '', columns:30) } } + + tr { + td (colfill:true) { + label(text: 'Staatsangehörigkeit z.Zt. der Eheschließung:') + } + td { + textField(name: "_EHE_STAANG", text: '', columns:30) + } + } } } @@ -800,6 +809,15 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For formattedTextField(name: "_TR_EINK_MDT", text: '', columns:10, format: betragFormat) } } + + tr { + td (colfill:true) { + label(text: 'Beruf Mandant:') + } + td { + textField(name: "_TR_BERUF_MDT", text: '', columns:30) + } + } tr { td (colfill:true) { @@ -809,7 +827,14 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For formattedTextField(name: "_TR_EINK_GATTE", text: '', columns:10, format: betragFormat) } } - + tr { + td (colfill:true) { + label(text: 'Beruf Ehegatte:') + } + td { + textField(name: "_TR_BERUF_GATTE", text: '', columns:30) + } + } @@ -821,6 +846,15 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For checkBox(text: 'Gütliche Trennung', name: "_TR_GUETLICH", selected: false) } } + + tr { + td (colfill:true) { + label(text: ' ') + } + td { + checkBox(text: 'Versorgungsausgleich geklärt (Verzicht)', name: "_TR_VAUSGLEICH", selected: false) + } + } tr { td (colfill:true) { @@ -875,7 +909,14 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For checkBox(text: 'Umgangsrecht geklärt', name: "_TR_UMGARE", selected: false) } } - + tr { + td (colfill:true) { + label(text: ' ') + } + td { + checkBox(text: 'es liegt ein notarieller Vertrag vor', name: "_TR_NOTARVERTRAG", selected: false) + } + } tr { td (colfill:true) { @@ -924,6 +965,14 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For textField(name: "_K1_GEB", text: '', columns:10) } } + tr { + td (colfill:true) { + label(text: 'Kind 1 Geburtsort:') + } + td { + textField(name: "_K1_GEBORT", text: '', columns:30) + } + } tr { td (colfill:true) { label(text: 'Kind 1 eigenes Einkommen:') @@ -951,6 +1000,14 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For textField(name: "_K2_GEB", text: '', columns:10) } } + tr { + td (colfill:true) { + label(text: 'Kind 2 Geburtsort:') + } + td { + textField(name: "_K2_GEBORT", text: '', columns:30) + } + } tr { td (colfill:true) { label(text: 'Kind 2 eigenes Einkommen:') @@ -969,7 +1026,14 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For textField(name: "_K3_NAME", text: '', columns:30) } } - + tr { + td (colfill:true) { + label(text: 'Kind 3 Geburtsort:') + } + td { + textField(name: "_K3_GEBORT", text: '', columns:30) + } + } tr { td (colfill:true) { @@ -997,7 +1061,14 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For textField(name: "_K4_NAME", text: '', columns:30) } } - + tr { + td (colfill:true) { + label(text: 'Kind 4 Geburtsort:') + } + td { + textField(name: "_K4_GEBORT", text: '', columns:30) + } + } tr { td (colfill:true) { @@ -1027,6 +1098,21 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For 'Ehegatte' ], name: "_TR_KINDGELD", editable: true, actionPerformed: { + } + ) + } + } + tr { + td (colfill:true) { + label(text: 'bei minderjährigen Kindern Wohnort bei welchem Elternteil:') + } + td { + comboBox(items: [ + 'Mandant', + 'Ehegatte', + 'weder noch' + ], name: "_TR_KINDER_WO", editable: true, actionPerformed: { + } ) } @@ -1063,7 +1149,7 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For label(text: ' ') } td { - checkBox(text: 'PKH', name: "_SCH_PKH", selected: false) + checkBox(text: 'VKH', name: "_SCH_VKH", selected: false) } } @@ -1082,4 +1168,4 @@ public class famr01_ui implements com.jdimension.jlawyer.client.plugins.form.For } } - \ No newline at end of file + diff --git a/src/j-lawyer-forms.xml b/src/j-lawyer-forms.xml index 35f1385..38c00a4 100644 --- a/src/j-lawyer-forms.xml +++ b/src/j-lawyer-forms.xml @@ -10,6 +10,6 @@
- +