Added importCountry

Gui/AddApplicant.qml

@@ -24,6 +24,12 @@ import QtQuick.Layouts
         ButtonGroup
         {
             buttons: radio.children
+            onClicked:
+            {
+                checkFields()
+                personalData.requiredField()
+            }
+
         }
 
         Row
@@ -39,6 +45,7 @@ import QtQuick.Layouts
             RadioButton
             {
                 text: qsTr("Mitarbeiter")
+
             }
         }
         RowLayout
@@ -87,23 +94,16 @@ import QtQuick.Layouts
                         checked: false
                     }
 
-                    CheckBox
+
-                    {
-                        id: checkbankdata
-                        Layout.fillWidth: true
-                        text: qsTr("Bankdaten")
-                        checked: false
-                    }
 
                     ApplicantBankData
                     {
-                        id: checkbankData
+                        id: bankAccount
-                        visible: checkbankdata.checked
                     }
 
                     ApplicantNationalInsurance
                     {
-
+                        id: nationalInsurance
                     }
 
                     ApplicantVarious
@@ -117,10 +117,7 @@ import QtQuick.Layouts
             }
         }
 
-        Item
+
-        {
-            Layout.fillHeight: true
-        }
 
         RowLayout
         {
@@ -153,6 +150,24 @@ import QtQuick.Layouts
                 // }
             }
         }
+        Item
+        {
+            Layout.fillHeight: true
+        }
+        function checkFields()
+        {
+            if(radio.children[1].checked)
+            {
+                if(!personalData.checkPersonalField() || !bankAccount.checkBankField()  )
+                    saveBtn.enabled = false
+                else
+                    saveBtn.enabled = true
+            }
+            else if (!personalData.checkPersonalField())
+                saveBtn.enabled = false
+            else
+                saveBtn.enabled = true
+        }
     }
 //}
 

Gui/AddContact.qml

@@ -105,7 +105,7 @@ Frame
 
         Label
         {
-            text: qsTr("Handy")
+            text: qsTr("Mobil")
             Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
         }
         TextField

Gui/ApplicantBankData.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts
 
 GridLayout
 {
+    id: bankAccount
     columns: 2
     Label
     {
@@ -14,6 +15,8 @@ GridLayout
     {
         id: iban
         Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
     }
     Label
     {
@@ -25,5 +28,13 @@ GridLayout
     {
         id: bankname
         Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
     }
+    function checkBankField()
+    {
+        return (iban.text.trim() && bankname.text.trim())
     }
+
+}
+

Gui/ApplicantBirthData.qml

@@ -1,4 +1,6 @@
 import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 Label
 {

Gui/ApplicantNationalInsurance.qml

@@ -4,27 +4,40 @@ import QtQuick.Layouts
 
 GridLayout
 {
+    id: nationalInsurance
     columns: 2
 
+
     Label
     {
         text: qsTr("Staatsangehörigkeit Deutsch")
     }
 
+    ButtonGroup
+    {
+        buttons: radio.children
+        onClicked:
+        {
+            checkFields()
+            personalData.requiredField()
+        }
+
+    }
+
     Row
     {
+        id: radio
         Layout.fillWidth: true
         Layout.alignment: Qt.AlignLeft
         RadioButton
         {
-            id: radioyes
+
             text: qsTr("Ja")
             checked: true
         }
 
         RadioButton
         {
-            id: radiono
             text: qsTr("Nein")
         }
     }
@@ -38,6 +51,8 @@ GridLayout
     {
         id: socialnumber
         Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
     }
 
     Label
@@ -49,6 +64,8 @@ GridLayout
     {
         id: taxnumber
         Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
     }
 
     Label
@@ -60,46 +77,54 @@ GridLayout
     {
         id: medicalinsurance
         Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
     }
 
     CheckBox
     {
         Layout.columnSpan: 2
         text: qsTr("Arbeitserlaubnis")
-        visible: radiono.checked
+        visible: radio.children[1].checked
     }
     Label
     {
         text: qsTr("Staatsangehörigkeit")
-        visible: radiono.checked
+        visible: radio.children[1].checked
     }
     TextField
     {
         id: nationality
-        visible: radiono.checked
+        visible: radio.children[1].checked
         Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
     }
     Label
     {
         text: qsTr("Pass gültig bis")
-        visible: radiono.checked
+        visible: radio.children[1].checked
     }
     TextField
     {
         id: pass
-        visible: radiono.checked
+        visible: radio.children[1].checked
         Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
     }
     Label
     {
         text: qsTr("Aufenthaltstitel gültig bis")
-        visible: radiono.checked
+        visible: radio.children[1].checked
     }
     TextField
     {
         id: aufenthalt
-        visible: radiono.checked
+        visible: radio.children[1].checked
         Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
     }
 }
 

Gui/ApplicantPersonalData.qml

@@ -32,6 +32,7 @@ GridLayout
         Layout.fillWidth: true
         placeholderText: "Pflichtfeld"
         placeholderTextColor: "red"
+        onTextChanged: checkFields()
 
     }
     Label
@@ -45,6 +46,7 @@ GridLayout
         Layout.fillWidth: true
         placeholderText: "Pflichtfeld"
         placeholderTextColor: "red"
+        onTextChanged: checkFields()
 
     }
     Label
@@ -56,6 +58,8 @@ GridLayout
     {
         id: street
         Layout.fillWidth: true
+        placeholderTextColor: "red"
+
     }
     Label
     {
@@ -68,6 +72,20 @@ GridLayout
         {
             id: postcode
             Layout.fillWidth: true
+            editable: true
+            onCurrentTextChanged: checkFields()
+            onEditTextChanged: checkFields()
+            onActivated: currentValue
+            model: address_model
+            textRole: "display"
+            popup.height: 300
+            popup.y: postcode.y + 5 - (postcode.height * 2)
+            currentIndex: -1
+            onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
+            validator: RegularExpressionValidator
+            {
+                regularExpression: /([0-9]{1,5})/
+            }
         }
 
 
@@ -81,6 +99,15 @@ GridLayout
         {
             id: city
             Layout.fillWidth: true
+            editable: true
+            onEditTextChanged: checkFields()
+            onCurrentTextChanged: checkFields()
+            model: address_model
+            textRole: "city"
+            popup.height: 300
+            popup.y: postcode.y + 5 - (postcode.height * 2)
+            currentIndex: -1
+
         }
     }
     Label
@@ -92,6 +119,18 @@ GridLayout
     {
         id: phonenumber
         Layout.fillWidth: true
+        placeholderTextColor: "red"
+    }
+    Label
+    {
+        text: qsTr("Mobil")
+        Layout.alignment: Qt.AlignRight
+    }
+    TextField
+    {
+        id: cellphone
+        Layout.fillWidth: true
+        placeholderTextColor: "red"
     }
     Label
     {
@@ -102,6 +141,7 @@ GridLayout
     {
         id: email
         Layout.fillWidth: true
+        placeholderTextColor: "red"
     }
     Label
     {
@@ -128,6 +168,7 @@ GridLayout
         id: jobdescription
         Layout.fillWidth: true
         visible: radio.children[1].checked
+        placeholderTextColor: "red"
     }
     Label
     {
@@ -140,6 +181,7 @@ GridLayout
         id: workstart
         Layout.fillWidth: true
         visible: radio.children[1].checked
+        placeholderTextColor: "red"
     }
     Label
     {
@@ -152,6 +194,7 @@ GridLayout
         id: workend
         Layout.fillWidth: true
         visible: radio.children[1].checked
+        placeholderTextColor: "red"
     }
     Label
     {
@@ -164,6 +207,7 @@ GridLayout
         id: timetowork
         Layout.fillWidth: true
         visible: radio.children[1].checked
+        placeholderTextColor: "red"
     }
     Label
     {
@@ -174,6 +218,7 @@ GridLayout
     {
         id: briefAnrede
         Layout.fillWidth: true
+        placeholderTextColor: "red"
     }
 
     Item
@@ -181,5 +226,29 @@ GridLayout
         Layout.fillHeight: true
         Layout.columnSpan: 2
     }
-
+    function checkPersonalField()
+    {
+        if (radio.children[0].checked)
+        {
+            return (firstname.text.trim() && lastname.text.trim())
+        }
+        else
+        {
+            console.log("Mitarbeiter")
+            return (firstname.text.trim() && lastname.text.trim())
+        }
+    }
+    function requiredField()
+    {
+        var pf = (radio.children[1].checked)?"Pflichtfeld":""
+        street.placeholderText = pf
+        phonenumber.placeholderText = pf
+        cellphone.placeholderText = pf
+        email.placeholderText = pf
+        jobdescription.placeholderText = pf
+        workstart.placeholderText = pf
+        workend.placeholderText = pf
+        timetowork.placeholderText = pf
+        briefAnrede.placeholderText = pf
+    }
 }

Gui/CustomerView.qml

@@ -149,7 +149,7 @@ GridLayout
 
     Label
     {
-        text: qsTr("Handy")
+        text: qsTr("Mobil")
         Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
     }
     TextField

doc/.$datenbank.drawio.dtmp

@@ -287,17 +287,6 @@
             <mxPoint x="-5" y="163" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-33" value="" style="endArrow=none;html=1;rounded=0;exitX=0.941;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="wp44KSVxnTE4gDC1YKSh-247" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="550" y="590" as="sourcePoint" />
-            <mxPoint x="-380" y="810" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="530" y="850" />
-              <mxPoint x="-310" y="850" />
-              <mxPoint x="-310" y="810" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-34" value="1" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="1" connectable="0" vertex="1">
           <mxGeometry x="535" y="180.00000000000006" as="geometry" />
         </mxCell>
@@ -886,23 +875,13 @@
             <mxPoint x="320" y="580" as="sourcePoint" />
             <mxPoint x="990" y="655" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="800" y="705" />
+              <mxPoint x="810" y="1060" />
-              <mxPoint x="800" y="665" />
+              <mxPoint x="810" y="660" />
               <mxPoint x="1130" y="665" />
               <mxPoint x="1130" y="625" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-313" value="" style="endArrow=none;html=1;rounded=0;exitX=0.998;exitY=0.115;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="wp44KSVxnTE4gDC1YKSh-145" target="Ya_982ONw7_15APAzA8q-298" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="620" y="480" as="sourcePoint" />
-            <mxPoint x="670" y="430" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="-320" y="563" />
-              <mxPoint x="-320" y="585" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-258" value="Rechnungsformular" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="1181" y="940" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
@@ -1037,7 +1016,7 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="DMnziE9b4w_ej3E0RpvA-62" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="DMnziE9b4w_ej3E0RpvA-60" vertex="1">
+        <mxCell id="DMnziE9b4w_ej3E0RpvA-62" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="DMnziE9b4w_ej3E0RpvA-60" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
@@ -1104,13 +1083,13 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="RGG-I-Th0KsJHSMTwLBq-55" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="RGG-I-Th0KsJHSMTwLBq-43" edge="1">
+        <mxCell id="RGG-I-Th0KsJHSMTwLBq-55" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="RGG-I-Th0KsJHSMTwLBq-43" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="-380" y="930" as="sourcePoint" />
+            <mxPoint x="-560" y="870" as="sourcePoint" />
-            <mxPoint x="850" y="820" as="targetPoint" />
+            <mxPoint x="-640" y="1090" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-360" y="930" />
+              <mxPoint x="-580" y="870" />
-              <mxPoint x="-360" y="1045" />
+              <mxPoint x="-580" y="1045" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -1278,7 +1257,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-144" value="Angestellter" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-560" y="530" width="180" height="420" as="geometry" />
+          <mxGeometry x="-560" y="530" width="180" height="390" as="geometry" />
         </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-145" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="wp44KSVxnTE4gDC1YKSh-144" vertex="1">
           <mxGeometry y="30" width="180" height="30" as="geometry" />
@@ -1288,7 +1267,7 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-147" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="wp44KSVxnTE4gDC1YKSh-145" vertex="1">
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-147" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="wp44KSVxnTE4gDC1YKSh-145" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
@@ -1367,11 +1346,6 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-177" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-560" y="800" width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-179" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-560" y="830" width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
@@ -1383,68 +1357,58 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-184" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-560" y="890" width="30" height="30" as="geometry">
+          <mxGeometry x="-560" y="830" width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-187" value="Telefon" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-530" y="830" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-189" value="E-Mail" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-530" y="860" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-190" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-560" y="920" width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-191" value="AusweisID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-530" y="890" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-197" value="jobstatusid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-530" y="920" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-238" value="Straße" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-530" y="770" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-239" value="PLZID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-189" value="E-Mail" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-530" y="800" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-190" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-560" y="860" width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-191" value="AusweisID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-530" y="830" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-197" value="jobstatusid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-530" y="860" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-273" value="" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="1" connectable="0" vertex="1">
           <mxGeometry x="-390" y="750" as="geometry">
             <mxPoint x="23" y="65" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-4" value="N" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="1" connectable="0" vertex="1">
-          <mxGeometry x="-360" y="810" as="geometry" />
-        </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-26" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="Ya_982ONw7_15APAzA8q-14" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="-380" y="910" as="sourcePoint" />
+            <mxPoint x="-380" y="840" as="sourcePoint" />
             <mxPoint x="600" y="980" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-340" y="910" />
+              <mxPoint x="-360" y="840" />
-              <mxPoint x="-340" y="965" />
+              <mxPoint x="-360" y="910" />
+              <mxPoint x="-360" y="965" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-27" value="1" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="1" connectable="0" vertex="1">
-          <mxGeometry x="-370" y="900" as="geometry" />
+          <mxGeometry x="-370" y="900" as="geometry">
+            <mxPoint x="4" y="-63" as="offset" />
+          </mxGeometry>
         </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-281" value="MItarbeiter Zuordnung" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
-          <mxGeometry x="600" y="630" width="180" height="120" as="geometry" />
+          <mxGeometry x="600" y="985" width="180" height="120" as="geometry" />
         </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-282" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="Ya_982ONw7_15APAzA8q-281" vertex="1">
           <mxGeometry y="30" width="180" height="30" as="geometry" />
@@ -1480,20 +1444,21 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-290" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-288" vertex="1">
+        <mxCell id="Ya_982ONw7_15APAzA8q-290" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-288" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-294" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="Ya_982ONw7_15APAzA8q-288" target="wp44KSVxnTE4gDC1YKSh-145" edge="1">
+        <mxCell id="Ya_982ONw7_15APAzA8q-294" value="" style="endArrow=none;html=1;rounded=0;entryX=1.011;entryY=0.767;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryPerimeter=0;" parent="1" source="Ya_982ONw7_15APAzA8q-288" target="wp44KSVxnTE4gDC1YKSh-145" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="320" y="580" as="sourcePoint" />
             <mxPoint x="370" y="530" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="570" y="735" />
+              <mxPoint x="550" y="1090" />
-              <mxPoint x="570" y="870" />
+              <mxPoint x="250" y="1090" />
+              <mxPoint x="250" y="870" />
               <mxPoint x="-340" y="870" />
-              <mxPoint x="-340" y="575" />
+              <mxPoint x="-340" y="583" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -1649,80 +1614,6 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="RGG-I-Th0KsJHSMTwLBq-73" value="" style="group" parent="1" vertex="1" connectable="0">
-          <mxGeometry x="-290" y="530" width="190" height="180" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-297" value="Arbeitszeit" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="RGG-I-Th0KsJHSMTwLBq-73" vertex="1">
-          <mxGeometry x="10" y="10" width="180" height="180" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-298" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
-          <mxGeometry y="30" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-299" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-298" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-300" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-298" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-301" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
-          <mxGeometry y="60" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-302" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-301" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-303" value="Datum" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-301" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-304" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
-          <mxGeometry y="90" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-305" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-304" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-306" value="Arbeitsbeginn" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-304" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-307" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
-          <mxGeometry y="120" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-308" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-307" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-309" value="Arbeitsende" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-307" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-310" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="RGG-I-Th0KsJHSMTwLBq-73" vertex="1">
-          <mxGeometry x="10" y="150" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-311" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-310" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-312" value="Urlaub" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-310" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-314" value="N" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="RGG-I-Th0KsJHSMTwLBq-73" connectable="0" vertex="1">
-          <mxGeometry y="40" as="geometry" />
-        </mxCell>
         <mxCell id="RGG-I-Th0KsJHSMTwLBq-41" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="wp44KSVxnTE4gDC1YKSh-69" target="RGG-I-Th0KsJHSMTwLBq-29" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="770" y="690" as="sourcePoint" />
@@ -1757,7 +1648,7 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5CqAkLydmV_yxfNIBBfD-62" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="5CqAkLydmV_yxfNIBBfD-60" vertex="1">
+        <mxCell id="5CqAkLydmV_yxfNIBBfD-62" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="5CqAkLydmV_yxfNIBBfD-60" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
@@ -2214,35 +2105,6 @@
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-1" value="location_ct" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
-          <mxGeometry x="595" y="409" width="180" height="150" as="geometry" />
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-2" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="0ebifRNcYiTJB-p98SDf-1" vertex="1">
-          <mxGeometry y="30" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-3" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-2" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-4" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-2" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="0ebifRNcYiTJB-p98SDf-1" vertex="1">
-          <mxGeometry y="60" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-9" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-8" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-10" value="addressid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-8" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
         <mxCell id="0ebifRNcYiTJB-p98SDf-17" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="1" vertex="1">
           <mxGeometry x="595" y="500" width="180" height="30" as="geometry" />
         </mxCell>
@@ -2256,11 +2118,6 @@
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-16" value="businessid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="625" y="529" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
         <mxCell id="0ebifRNcYiTJB-p98SDf-37" value="house" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
           <mxGeometry x="270" y="269" width="180" height="120" as="geometry" />
         </mxCell>
@@ -2357,8 +2214,8 @@
             <mxPoint x="370" y="420" as="sourcePoint" />
             <mxPoint x="420" y="370" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="810" y="484" />
+              <mxPoint x="790" y="484" />
-              <mxPoint x="810" y="85" />
+              <mxPoint x="790" y="85" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -2521,6 +2378,200 @@
             </Array>
           </mxGeometry>
         </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-25" value="" style="group" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="595" y="409" width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-1" value="location_ct" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="AkoRetE9dPsFytqfa5Kx-25" vertex="1">
+          <mxGeometry width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-2" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="0ebifRNcYiTJB-p98SDf-1" vertex="1">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-3" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-2" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-4" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-2" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="0ebifRNcYiTJB-p98SDf-1" vertex="1">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-9" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-8" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-10" value="addressid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-8" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-16" value="businessid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="AkoRetE9dPsFytqfa5Kx-25" vertex="1">
+          <mxGeometry x="30" y="120" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-26" value="" style="group" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="600" y="610" width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-27" value="location_emp" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-26">
+          <mxGeometry width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-28" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-27">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-29" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-28">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-30" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-28">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-31" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-27">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-32" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-31">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-33" value="addressid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-31">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-34" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-26">
+          <mxGeometry x="30" y="120" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-35" value="houseid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-26">
+          <mxGeometry x="30" y="90" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-36" value="" style="endArrow=none;html=1;rounded=0;exitX=0.994;exitY=0.3;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0.006;entryY=0.3;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="wp44KSVxnTE4gDC1YKSh-145" target="Ya_982ONw7_15APAzA8q-298">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint y="680" as="sourcePoint" />
+            <mxPoint x="50" y="630" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-38" value="Grad der Behinderung" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="-530" y="890" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-40" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" target="wp44KSVxnTE4gDC1YKSh-145">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="600" y="740" as="sourcePoint" />
+            <mxPoint x="50" y="630" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="470" y="740" />
+              <mxPoint x="470" y="860" />
+              <mxPoint x="-330" y="860" />
+              <mxPoint x="-330" y="575" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-45" value="" style="endArrow=none;html=1;rounded=0;" edge="1" parent="1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="600" y="710" as="sourcePoint" />
+            <mxPoint x="480" y="510" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="480" y="710" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-46" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" target="AkoRetE9dPsFytqfa5Kx-31">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="790" y="480" as="sourcePoint" />
+            <mxPoint x="50" y="490" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="790" y="685" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-47" value="" style="group" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="-210" y="530" width="190" height="210" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-310" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="AkoRetE9dPsFytqfa5Kx-47" vertex="1">
+          <mxGeometry x="10" y="150" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-311" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-310" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-312" value="Urlaub" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-310" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-314" value="N" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="AkoRetE9dPsFytqfa5Kx-47" connectable="0" vertex="1">
+          <mxGeometry y="70" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-297" value="Arbeitszeit" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="AkoRetE9dPsFytqfa5Kx-47" vertex="1">
+          <mxGeometry x="10" width="180" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-298" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-299" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-298" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-300" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-298" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-301" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-302" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-301" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-303" value="Datum" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-301" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-42" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="Ya_982ONw7_15APAzA8q-297">
+          <mxGeometry y="90" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-43" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-42">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-44" value="Arbeitsbeginn" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-42">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-307" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
+          <mxGeometry y="120" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-308" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-307" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-309" value="Arbeitsende" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-307" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>

doc/datenbank.drawio

@@ -1,6 +1,6 @@
 <mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/25.0.2 Chrome/128.0.6613.186 Electron/32.2.5 Safari/537.36" version="25.0.2">
   <diagram name="Seite-1" id="krh1Wum05D0y0HCIq7V8">
-    <mxGraphModel dx="2422" dy="919" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="2901" dy="1195" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -248,12 +248,12 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-249" value="OrtID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="wp44KSVxnTE4gDC1YKSh-247" vertex="1">
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-249" value="adressid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="wp44KSVxnTE4gDC1YKSh-247" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-253" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" edge="1" source="wp44KSVxnTE4gDC1YKSh-3">
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-253" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="wp44KSVxnTE4gDC1YKSh-3" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="220" y="190" as="sourcePoint" />
             <mxPoint x="593" y="540" as="targetPoint" />
@@ -287,17 +287,6 @@
             <mxPoint x="-5" y="163" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-33" value="" style="endArrow=none;html=1;rounded=0;exitX=0.941;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="wp44KSVxnTE4gDC1YKSh-247" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="550" y="590" as="sourcePoint" />
-            <mxPoint x="-380" y="810" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="530" y="850" />
-              <mxPoint x="-310" y="850" />
-              <mxPoint x="-310" y="810" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-34" value="1" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="1" connectable="0" vertex="1">
           <mxGeometry x="535" y="180.00000000000006" as="geometry" />
         </mxCell>
@@ -886,23 +875,13 @@
             <mxPoint x="320" y="580" as="sourcePoint" />
             <mxPoint x="990" y="655" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="800" y="705" />
+              <mxPoint x="810" y="1060" />
-              <mxPoint x="800" y="665" />
+              <mxPoint x="810" y="660" />
               <mxPoint x="1130" y="665" />
               <mxPoint x="1130" y="625" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-313" value="" style="endArrow=none;html=1;rounded=0;exitX=0.998;exitY=0.115;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="wp44KSVxnTE4gDC1YKSh-145" target="Ya_982ONw7_15APAzA8q-298" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="620" y="480" as="sourcePoint" />
-            <mxPoint x="670" y="430" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="-320" y="563" />
-              <mxPoint x="-320" y="585" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-258" value="Rechnungsformular" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="1181" y="940" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
@@ -1037,7 +1016,7 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="DMnziE9b4w_ej3E0RpvA-62" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="DMnziE9b4w_ej3E0RpvA-60" vertex="1">
+        <mxCell id="DMnziE9b4w_ej3E0RpvA-62" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="DMnziE9b4w_ej3E0RpvA-60" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
@@ -1104,13 +1083,13 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="RGG-I-Th0KsJHSMTwLBq-55" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="RGG-I-Th0KsJHSMTwLBq-43" edge="1">
+        <mxCell id="RGG-I-Th0KsJHSMTwLBq-55" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="RGG-I-Th0KsJHSMTwLBq-43" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="-380" y="930" as="sourcePoint" />
+            <mxPoint x="-560" y="870" as="sourcePoint" />
-            <mxPoint x="850" y="820" as="targetPoint" />
+            <mxPoint x="-640" y="1090" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-360" y="930" />
+              <mxPoint x="-580" y="870" />
-              <mxPoint x="-360" y="1045" />
+              <mxPoint x="-580" y="1045" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -1278,7 +1257,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-144" value="Angestellter" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-560" y="530" width="180" height="420" as="geometry" />
+          <mxGeometry x="-560" y="530" width="180" height="390" as="geometry" />
         </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-145" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="wp44KSVxnTE4gDC1YKSh-144" vertex="1">
           <mxGeometry y="30" width="180" height="30" as="geometry" />
@@ -1288,7 +1267,7 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-147" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="wp44KSVxnTE4gDC1YKSh-145" vertex="1">
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-147" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="wp44KSVxnTE4gDC1YKSh-145" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
@@ -1367,11 +1346,6 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-177" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-560" y="800" width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-179" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-560" y="830" width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
@@ -1383,68 +1357,58 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-184" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-560" y="890" width="30" height="30" as="geometry">
+          <mxGeometry x="-560" y="830" width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-187" value="Telefon" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-530" y="830" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-189" value="E-Mail" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-530" y="860" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-190" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-560" y="920" width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-191" value="AusweisID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-530" y="890" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-197" value="jobstatusid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-530" y="920" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-238" value="Straße" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-530" y="770" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-239" value="PLZID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-189" value="E-Mail" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-530" y="800" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-190" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-560" y="860" width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-191" value="AusweisID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-530" y="830" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-197" value="jobstatusid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-530" y="860" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-273" value="" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="1" connectable="0" vertex="1">
           <mxGeometry x="-390" y="750" as="geometry">
             <mxPoint x="23" y="65" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-4" value="N" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="1" connectable="0" vertex="1">
-          <mxGeometry x="-360" y="810" as="geometry" />
-        </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-26" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="Ya_982ONw7_15APAzA8q-14" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="-380" y="910" as="sourcePoint" />
+            <mxPoint x="-380" y="840" as="sourcePoint" />
             <mxPoint x="600" y="980" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-340" y="910" />
+              <mxPoint x="-360" y="840" />
-              <mxPoint x="-340" y="965" />
+              <mxPoint x="-360" y="910" />
+              <mxPoint x="-360" y="965" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-27" value="1" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="1" connectable="0" vertex="1">
-          <mxGeometry x="-370" y="900" as="geometry" />
+          <mxGeometry x="-370" y="900" as="geometry">
+            <mxPoint x="4" y="-63" as="offset" />
+          </mxGeometry>
         </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-281" value="MItarbeiter Zuordnung" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
-          <mxGeometry x="600" y="630" width="180" height="120" as="geometry" />
+          <mxGeometry x="600" y="985" width="180" height="120" as="geometry" />
         </mxCell>
         <mxCell id="Ya_982ONw7_15APAzA8q-282" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="Ya_982ONw7_15APAzA8q-281" vertex="1">
           <mxGeometry y="30" width="180" height="30" as="geometry" />
@@ -1480,20 +1444,21 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-290" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-288" vertex="1">
+        <mxCell id="Ya_982ONw7_15APAzA8q-290" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-288" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-294" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="Ya_982ONw7_15APAzA8q-288" target="wp44KSVxnTE4gDC1YKSh-145" edge="1">
+        <mxCell id="Ya_982ONw7_15APAzA8q-294" value="" style="endArrow=none;html=1;rounded=0;entryX=1.011;entryY=0.767;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryPerimeter=0;" parent="1" source="Ya_982ONw7_15APAzA8q-288" target="wp44KSVxnTE4gDC1YKSh-145" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="320" y="580" as="sourcePoint" />
             <mxPoint x="370" y="530" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="570" y="735" />
+              <mxPoint x="550" y="1090" />
-              <mxPoint x="570" y="870" />
+              <mxPoint x="250" y="1090" />
+              <mxPoint x="250" y="870" />
               <mxPoint x="-340" y="870" />
-              <mxPoint x="-340" y="575" />
+              <mxPoint x="-340" y="583" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -1649,80 +1614,6 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="RGG-I-Th0KsJHSMTwLBq-73" value="" style="group" parent="1" vertex="1" connectable="0">
-          <mxGeometry x="-290" y="530" width="190" height="180" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-297" value="Arbeitszeit" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="RGG-I-Th0KsJHSMTwLBq-73" vertex="1">
-          <mxGeometry x="10" y="10" width="180" height="180" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-298" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
-          <mxGeometry y="30" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-299" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-298" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-300" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-298" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-301" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
-          <mxGeometry y="60" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-302" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-301" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-303" value="Datum" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-301" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-304" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
-          <mxGeometry y="90" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-305" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-304" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-306" value="Arbeitsbeginn" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-304" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-307" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
-          <mxGeometry y="120" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-308" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-307" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-309" value="Arbeitsende" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-307" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-310" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="RGG-I-Th0KsJHSMTwLBq-73" vertex="1">
-          <mxGeometry x="10" y="150" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-311" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-310" vertex="1">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-312" value="Urlaub" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-310" vertex="1">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Ya_982ONw7_15APAzA8q-314" value="N" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="RGG-I-Th0KsJHSMTwLBq-73" connectable="0" vertex="1">
-          <mxGeometry y="40" as="geometry" />
-        </mxCell>
         <mxCell id="RGG-I-Th0KsJHSMTwLBq-41" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="wp44KSVxnTE4gDC1YKSh-69" target="RGG-I-Th0KsJHSMTwLBq-29" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="770" y="690" as="sourcePoint" />
@@ -1757,7 +1648,7 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5CqAkLydmV_yxfNIBBfD-62" value="Personalnummer" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="5CqAkLydmV_yxfNIBBfD-60" vertex="1">
+        <mxCell id="5CqAkLydmV_yxfNIBBfD-62" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="5CqAkLydmV_yxfNIBBfD-60" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
@@ -2214,96 +2105,62 @@
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-1" value="addresses" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-17" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="1" vertex="1">
-          <mxGeometry x="595" y="409" width="180" height="150" as="geometry" />
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-2" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-1">
-          <mxGeometry y="30" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-3" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-2">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-4" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-2">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-1">
-          <mxGeometry y="60" width="180" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-9" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-8">
-          <mxGeometry width="30" height="30" as="geometry">
-            <mxRectangle width="30" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-10" value="ortid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-8">
-          <mxGeometry x="30" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-17" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="1">
           <mxGeometry x="595" y="500" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-18" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-17">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-18" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-17" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-19" value="houseid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-17">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-19" value="houseid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-17" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-16" value="businessid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-37" value="house" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
-          <mxGeometry x="625" y="529" width="150" height="30" as="geometry">
-            <mxRectangle width="150" height="30" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-37" value="house" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
           <mxGeometry x="270" y="269" width="180" height="120" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-38" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-37">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-38" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="0ebifRNcYiTJB-p98SDf-37" vertex="1">
           <mxGeometry y="30" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-39" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-38">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-39" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-38" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-40" value="houseid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-38">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-40" value="houseid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-38" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-41" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-37">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-41" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="0ebifRNcYiTJB-p98SDf-37" vertex="1">
           <mxGeometry y="60" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-42" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-41">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-42" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-41" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-43" value="strid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-41">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-43" value="strid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-41" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-44" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-37">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-44" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="0ebifRNcYiTJB-p98SDf-37" vertex="1">
           <mxGeometry y="90" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-45" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-44">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-45" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-44" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-46" value="houseno" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-44">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-46" value="houseno" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-44" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-47" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="0ebifRNcYiTJB-p98SDf-49" target="0ebifRNcYiTJB-p98SDf-41">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-47" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="0ebifRNcYiTJB-p98SDf-49" target="0ebifRNcYiTJB-p98SDf-41" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="460" y="400" as="sourcePoint" />
             <mxPoint x="420" y="370" as="targetPoint" />
@@ -2313,36 +2170,36 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-48" value="street" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-48" value="street" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
           <mxGeometry x="270" y="507" width="180" height="83" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-49" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-48">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-49" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="0ebifRNcYiTJB-p98SDf-48" vertex="1">
           <mxGeometry y="30" width="180" height="23" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-50" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-49">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-50" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-49" vertex="1">
           <mxGeometry width="30" height="23" as="geometry">
             <mxRectangle width="30" height="23" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-51" value="strid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-49">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-51" value="strid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-49" vertex="1">
           <mxGeometry x="30" width="150" height="23" as="geometry">
             <mxRectangle width="150" height="23" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-55" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-48">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-55" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="0ebifRNcYiTJB-p98SDf-48" vertex="1">
           <mxGeometry y="53" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-56" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-55">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-56" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-55" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-57" value="name" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-55">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-57" value="name" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-55" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-58" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="0ebifRNcYiTJB-p98SDf-17" target="0ebifRNcYiTJB-p98SDf-38">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-58" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="0ebifRNcYiTJB-p98SDf-17" target="0ebifRNcYiTJB-p98SDf-38" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="370" y="420" as="sourcePoint" />
             <mxPoint x="420" y="370" as="targetPoint" />
@@ -2352,13 +2209,13 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-60" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="0ebifRNcYiTJB-p98SDf-8" target="wp44KSVxnTE4gDC1YKSh-260">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-60" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="0ebifRNcYiTJB-p98SDf-8" target="wp44KSVxnTE4gDC1YKSh-260" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="370" y="420" as="sourcePoint" />
             <mxPoint x="420" y="370" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="810" y="484" />
+              <mxPoint x="790" y="484" />
-              <mxPoint x="810" y="85" />
+              <mxPoint x="790" y="85" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -2440,36 +2297,36 @@
             <mxPoint x="-179" y="119" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-21" value="country" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-21" value="country" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
           <mxGeometry x="870" y="40" width="180" height="90" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-22" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-21">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-22" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="0ebifRNcYiTJB-p98SDf-21" vertex="1">
           <mxGeometry y="30" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-23" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-22">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-23" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-22" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-24" value="countryid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-22">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-24" value="countryid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-22" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-25" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-21">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-25" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="0ebifRNcYiTJB-p98SDf-21" vertex="1">
           <mxGeometry y="60" width="180" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-26" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-25">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-26" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-25" vertex="1">
           <mxGeometry width="30" height="30" as="geometry">
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-27" value="&lt;div&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;land&lt;/span&gt;&lt;br&gt;&lt;/div&gt;" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="0ebifRNcYiTJB-p98SDf-25">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-27" value="&lt;div&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;land&lt;/span&gt;&lt;br&gt;&lt;/div&gt;" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-25" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-199" value="Ort" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-199" value="address" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="1" vertex="1">
           <mxGeometry x="590" y="40" width="180" height="120" as="geometry" />
         </mxCell>
         <mxCell id="wp44KSVxnTE4gDC1YKSh-260" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="wp44KSVxnTE4gDC1YKSh-199" vertex="1">
@@ -2480,7 +2337,7 @@
             <mxRectangle width="30" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="wp44KSVxnTE4gDC1YKSh-262" value="OrtID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="wp44KSVxnTE4gDC1YKSh-260" vertex="1">
+        <mxCell id="wp44KSVxnTE4gDC1YKSh-262" value="addressid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="wp44KSVxnTE4gDC1YKSh-260" vertex="1">
           <mxGeometry x="30" width="150" height="30" as="geometry">
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
@@ -2511,7 +2368,7 @@
             <mxRectangle width="150" height="30" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="0ebifRNcYiTJB-p98SDf-36" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="wp44KSVxnTE4gDC1YKSh-203" target="0ebifRNcYiTJB-p98SDf-22">
+        <mxCell id="0ebifRNcYiTJB-p98SDf-36" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="wp44KSVxnTE4gDC1YKSh-203" target="0ebifRNcYiTJB-p98SDf-22" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="820" y="280" as="sourcePoint" />
             <mxPoint x="870" y="230" as="targetPoint" />
@@ -2521,6 +2378,213 @@
             </Array>
           </mxGeometry>
         </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-25" value="" style="group" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="595" y="409" width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-1" value="location_ct" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="AkoRetE9dPsFytqfa5Kx-25" vertex="1">
+          <mxGeometry width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-2" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="0ebifRNcYiTJB-p98SDf-1" vertex="1">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-3" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-2" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-4" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-2" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-8" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="0ebifRNcYiTJB-p98SDf-1" vertex="1">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-9" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-8" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-10" value="addressid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="0ebifRNcYiTJB-p98SDf-8" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="0ebifRNcYiTJB-p98SDf-16" value="businessid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="AkoRetE9dPsFytqfa5Kx-25" vertex="1">
+          <mxGeometry x="30" y="120" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-26" value="" style="group" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="600" y="610" width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-27" value="location_emp" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-26">
+          <mxGeometry width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-28" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-27">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-29" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-28">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-30" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-28">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-31" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-27">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-32" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-31">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-33" value="addressid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-31">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-34" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-26">
+          <mxGeometry x="30" y="120" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-35" value="houseid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-26">
+          <mxGeometry x="30" y="90" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-36" value="" style="endArrow=none;html=1;rounded=0;exitX=0.994;exitY=0.3;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0.006;entryY=0.3;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="wp44KSVxnTE4gDC1YKSh-145" target="Ya_982ONw7_15APAzA8q-298">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint y="680" as="sourcePoint" />
+            <mxPoint x="50" y="630" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-38" value="Grad der Behinderung" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="-530" y="890" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-40" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" target="wp44KSVxnTE4gDC1YKSh-145">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="600" y="740" as="sourcePoint" />
+            <mxPoint x="50" y="630" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="470" y="740" />
+              <mxPoint x="470" y="860" />
+              <mxPoint x="-330" y="860" />
+              <mxPoint x="-330" y="575" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-45" value="" style="endArrow=none;html=1;rounded=0;" edge="1" parent="1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="600" y="710" as="sourcePoint" />
+            <mxPoint x="480" y="510" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="480" y="710" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-46" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" target="AkoRetE9dPsFytqfa5Kx-31">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="790" y="480" as="sourcePoint" />
+            <mxPoint x="50" y="490" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="790" y="685" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-47" value="" style="group" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="-210" y="530" width="190" height="210" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-310" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="AkoRetE9dPsFytqfa5Kx-47" vertex="1">
+          <mxGeometry x="10" y="180" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-311" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-310" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-312" value="Urlaub" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=1;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-310" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-314" value="N" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" parent="AkoRetE9dPsFytqfa5Kx-47" connectable="0" vertex="1">
+          <mxGeometry y="70" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-297" value="Arbeitszeit" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" parent="AkoRetE9dPsFytqfa5Kx-47" vertex="1">
+          <mxGeometry x="10" width="180" height="210" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-298" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-299" value="FK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-298" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-300" value="personalid" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-298" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-301" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-302" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-301" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-303" value="Datum" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-301" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-42" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="Ya_982ONw7_15APAzA8q-297">
+          <mxGeometry y="90" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-43" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-42">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="AkoRetE9dPsFytqfa5Kx-44" value="Arbeitsbeginn" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="AkoRetE9dPsFytqfa5Kx-42">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-304" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
+          <mxGeometry y="120" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-305" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-304" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-306" value="Arbeitsbeginn" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-304" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-307" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" parent="Ya_982ONw7_15APAzA8q-297" vertex="1">
+          <mxGeometry y="150" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-308" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-307" vertex="1">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Ya_982ONw7_15APAzA8q-309" value="Arbeitsende" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" parent="Ya_982ONw7_15APAzA8q-307" vertex="1">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>

lib/AddCity.py

@@ -1,42 +0,0 @@
-import json
-import mariadb
-from .DB.DbManager import DbManager
-
-
-
-class AddCity:
-    def __init__(self):
-        super().__init__()
-        self.__con = DbManager().getConnection()
-        if self.__con:
-            self.__cur = self.__con.cursor()
-
-    def addPlz(self):
-            count = 1
-            with open("/home/dstoppek/Downloads/postleitzahl.json", "r") as plz:
-                postcodes = json.load(plz)
-                try:
-                    for i in postcodes:
-                        test =i["plz_name"].split(",")
-                        for town in test:
-
-                            if "u.a" in town:
-                                town = town[:-4]
-                            town = town.strip()
-                            if town:
-
-
-                                print(f"PROCESSING {i['name']} {town}")
-                                self.__cur.callproc("addZipCodes", (i["name"], town, count,))
-
-
-                        #time.sleep(1)
-                        # self.__cur.execute(f"INSERT INTO postcode(postcode, addressid) VALUE ({i["name"]}, {count})")
-                        # count += 1
-
-                except mariadb.OperationalError as e:
-                    print(f"Database Error: {e}")
-                finally:
-                    self.__con.commit()
-                    print("FINISHED")
-

lib/DB/AddressDAO.py

@@ -8,10 +8,12 @@ class AddressDAO:
     def __init__(self):
         #print(f"*** File: {__file__}, init()")
         self.__con = DbManager().getConnection()
+
         if self.__con:
             self.__cur = self.__con.cursor()
 
 
+
     def __importPlz(self):
         with open("import json filepath here", "r") as plz:
             postcodes = json.load(plz)
@@ -31,6 +33,36 @@ class AddressDAO:
                 self.__con.commit()
                 print("FINISHED")#
 
+    def __importCountry(self):
+        with open("/home/dstoppek/Downloads/staaten.json", "r") as country:
+            countries = json.load(country)
+            old = ""
+            try:
+                for i in countries["daten"]:
+                    if i[4] == "–":
+                        continue
+                    elif i[8] == "YU":
+                        continue
+                    elif i[4] == old:
+                        continue
+                    elif i[4] == "Serbien und Montenegro":
+                        continue
+                    elif i[4] == "Bosnien und Herzegowina":
+                        continue
+
+                    print(i[4], i[3], i[2], i[8], i[7])
+
+                    self.__cur.execute("INSERT INTO country (country, countryshort, nationality, iso2, iso3) VALUES (%s, %s, %s, %s, %s)", (i[4], i[3], i[2], i[8], i[7]))
+                    old = i[4]
+            except mariadb.OperationalError as e:
+                print(f"Database Error: {e}")
+            finally:
+                self.__con.commit()
+                print("FINISHED")#
+
+
+
+
     def getAddressData(self, all = True, zipcode = None):
         try:
             if self.__cur:

main.py

@@ -14,7 +14,7 @@ from lib.DB.AddressModel import AddressModel
 from lib.DB.BTypeModel import BTypeModel
 from lib.DB.ContactModel import ContactModel
 
-from lib.AddCity import AddCity
+
 
 
 # [pyqcrm]
@@ -89,7 +89,7 @@ if __name__ == "__main__":
     engine.rootContext().setContextProperty("config", config)
 
     engine.load(qml_file)
-    #AddCity().addPlz()
+
 
     if not engine.rootObjects():
         sys.exit(-1)

pyqcrm.pyproject

@@ -18,7 +18,6 @@
         "lib/DB/BTypeModel.py",
         "lib/DB/BTypeDAO.py",
         "lib/DB/ContactDAO.py",
-        "lib/DB/ContactModel.py",
+        "lib/DB/ContactModel.py"
-        "lib/AddCity.py"
     ]
 }