refactor dfi: Pers_entity

entity/Org_entity/Org_entity.aod

@@ -140,7 +140,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Pers_entity</entityName>
-        <fieldName>PersOrg_dfi</fieldName>
+        <fieldName>OrganisationRelated</fieldName>
       </dependency>
       <children>
         <entityParameter>

entity/Pers_entity/Pers_entity.aod

@@ -131,7 +131,7 @@
       <searchable v="false" />
     </entityField>
     <entityProvider>
-      <name>PersOrg_dfi</name>
+      <name>OrganisationRelated</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <dependencies>
@@ -299,7 +299,13 @@
         <entityDependency>
           <name>b72f99e9-0c8d-4b54-863b-b47eafbb0189</name>
           <entityName>SalesprojectMember_entity</entityName>
-          <fieldName>PersLookup_dfo</fieldName>
+          <fieldName>Contacts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>4eaa8874-e6c8-4a0e-9a69-b5fc33d2a780</name>
+          <entityName>Timetracking_entity</entityName>
+          <fieldName>Contacts</fieldName>
           <isConsumer v="false" />
         </entityDependency>
       </dependencies>
@@ -334,18 +340,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityProvider>
-      <name>PersSalesprojectMember_dfi</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>9f55eb02-bb8d-4472-9332-3b99049f7d1b</name>
-          <entityName>SalesprojectMember_entity</entityName>
-          <fieldName>PersSalesprojectMember_dfo</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
     <entityParameter>
       <name>RelationId_param</name>
       <expose v="true" />
@@ -368,7 +362,7 @@
       </fields>
     </entityFieldGroup>
     <entityProvider>
-      <name>RelationPers_dfi</name>
+      <name>byUid</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <recordContainer>db</recordContainer>
       <dependencies>
@@ -378,7 +372,23 @@
           <fieldName>RelationPers_dfo</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>12c5350a-3159-449b-a94e-d57658b4c124</name>
+          <entityName>SalesprojectMember_entity</entityName>
+          <fieldName>CurrentContact</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
+      <children>
+        <entityParameter>
+          <name>OrgId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>RelationId_param</name>
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityConsumer>
       <name>OrgAddresses</name>
@@ -425,19 +435,6 @@
       <onActionProcess>%aditoprj%/entity/Pers_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:CART</iconId>
     </entityActionField>
-    <entityProvider>
-      <name>TimetrackingPers_dfi</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>d30713a5-ab92-400e-8127-dde9598027b0</name>
-          <entityName>Timetracking_entity</entityName>
-          <fieldName>TimetrackingPers_dfo</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityProvider>
     <entityField>
       <name>STANDARD_EMAIL_COMM</name>
       <title>E-Mail</title>

entity/Relation_entity/Relation_entity.aod

@@ -66,7 +66,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
       <dependency>
         <name>dependency</name>
         <entityName>Pers_entity</entityName>
-        <fieldName>RelationPers_dfi</fieldName>
+        <fieldName>byUid</fieldName>
       </dependency>
       <children>
         <entityParameter>

entity/SalesprojectMember_entity/SalesprojectMember_entity.aod

@@ -100,17 +100,17 @@
       <state>READONLY</state>
     </entityField>
     <entityConsumer>
-      <name>SalesprojectMemberPers_dfo</name>
+      <name>CurrentContact</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
         <entityName>Pers_entity</entityName>
-        <fieldName>PersSalesprojectMember_dfi</fieldName>
+        <fieldName>byUid</fieldName>
       </dependency>
       <children>
         <entityParameter>
           <name>RelationId_param</name>
-          <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesprojectmemberpers_dfo/children/relationid_param/code.js</code>
+          <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/currentcontact/children/relationid_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>
@@ -142,7 +142,7 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
       <contentType>NUMBER</contentType>
     </entityField>
     <entityConsumer>
-      <name>PersLookup_dfo</name>
+      <name>Contacts</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>

entity/Timetracking_entity/Timetracking_entity.aod

@@ -88,12 +88,12 @@
       </dependencies>
     </entityProvider>
     <entityConsumer>
-      <name>TimetrackingPers_dfo</name>
+      <name>Contacts</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
         <entityName>Pers_entity</entityName>
-        <fieldName>TimetrackingPers_dfi</fieldName>
+        <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
   </entityFields>