From 8e12fa6a9b7dce3ef89af6d833cc7571c0764ca3 Mon Sep 17 00:00:00 2001
From: "c.wimmer" <c.wimmer@cwimmer-nb.aditosoftware.local>
Date: Thu, 17 Dec 2020 10:07:34 +0100
Subject: [PATCH] Merge Konflikte
---
entity/Person_entity/Person_entity.aod | 184 ++++---------------------
1 file changed, 27 insertions(+), 157 deletions(-)
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 63ca1249615..f0e58d37b3a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1072,14 +1072,6 @@
<entityProvider>
<name>IdFilteredActiveContacts</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>511f3e4c-7493-4a31-a136-0ba80ba2ec85</name>
- <entityName>Member_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludedContactIds_param</name>
@@ -1114,6 +1106,14 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>511f3e4c-7493-4a31-a136-0ba80ba2ec85</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>Contacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>COUNT</name>
@@ -1148,29 +1148,21 @@
<name>Districts</name>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/districts/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>District_entity</entityName>
- <fieldName>ResponsibleDistricts</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DistrictsByContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>District_entity</entityName>
+ <fieldName>ResponsibleDistricts</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>NonselfDuplicates</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>3a4352e2-9686-4c52-9d01-dbfad8c68ea7</name>
- <entityName>Duplicates_entity</entityName>
- <fieldName>DuplicatePersonsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -1193,22 +1185,30 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>3a4352e2-9686-4c52-9d01-dbfad8c68ea7</name>
+ <entityName>Duplicates_entity</entityName>
+ <fieldName>DuplicatePersonsConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityConsumer>
<name>DistrictResponsibles</name>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/districtresponsibles/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>OrganisationResponsibles</fieldName>
- </dependency>
<children>
<entityParameter>
<name>OrgUid_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>OrganisationResponsibles</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>openEditDefaultsView</name>
@@ -1408,42 +1408,7 @@
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/newvisitplanentry/stateProcess.js</stateProcess>
</entityActionField>
<entityProvider>
- <name>IdFilteredActiveContacts</name>
- <documentation>%aditoprj%/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>ExcludedContactIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>DuplicateActionsControl_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OnlyOwnSupervised_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OrgId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OnlyShowContactIds_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OnlyActive_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>DuplicateCurrentContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
+ <name>ebdb88f5-f030-426c-b261-9f3828d19356</name>
<dependencies>
<entityDependency>
<name>511f3e4c-7493-4a31-a136-0ba80ba2ec85</name>
@@ -1453,101 +1418,6 @@
</entityDependency>
</dependencies>
</entityProvider>
- <entityField>
- <name>COUNT</name>
- <title>Count</title>
- <contentType>NUMBER</contentType>
- </entityField>
- <entityAggregateField>
- <name>COUNT_aggregate</name>
- <parentField>COUNT</parentField>
- <title>Count</title>
- </entityAggregateField>
- <entityProvider>
- <name>indexP</name>
- <documentation>%aditoprj%/entity/Person_entity/entityfields/indexp/documentation.adoc</documentation>
- <recordContainer>index</recordContainer>
- <children>
- <entityParameter>
- <name>DuplicateActionsControl_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>PERSON_OBJECTTYPE</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_objecttype/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>#PROVIDER_AGGREGATES</name>
- <useAggregates v="true" />
- </entityProvider>
- <entityConsumer>
- <name>Districts</name>
- <state>INVISIBLE</state>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/districts/stateProcess.js</stateProcess>
- <children>
- <entityParameter>
- <name>DistrictsByContactId_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- <dependency>
- <name>dependency</name>
- <entityName>District_entity</entityName>
- <fieldName>ResponsibleDistricts</fieldName>
- </dependency>
- </entityConsumer>
- <entityProvider>
- <name>NonselfDuplicates</name>
- <documentation>%aditoprj%/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>DuplicateCurrentContactId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OnlyShowContactIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrgId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OnlyOwnSupervised_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- <dependencies>
- <entityDependency>
- <name>3a4352e2-9686-4c52-9d01-dbfad8c68ea7</name>
- <entityName>Duplicates_entity</entityName>
- <fieldName>DuplicatePersonsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityConsumer>
- <name>DistrictResponsibles</name>
- <state>INVISIBLE</state>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/districtresponsibles/stateProcess.js</stateProcess>
- <children>
- <entityParameter>
- <name>OrgUid_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- <dependency>
- <name>dependency</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>OrganisationResponsibles</fieldName>
- </dependency>
- </entityConsumer>
<entityConsumer>
<name>Orders</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/orders/documentation.adoc</documentation>
--
GitLab