From 1519d403ef69eec8b052bff033e1b26068dca436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20H=C3=B6rmann?= <j.hoermann@adito.de>
Date: Tue, 19 Mar 2019 07:18:52 +0000
Subject: [PATCH] Delete .merge_file_a67688
---
.merge_file_a67688 | 279 ---------------------------------------------
1 file changed, 279 deletions(-)
delete mode 100644 .merge_file_a67688
diff --git a/.merge_file_a67688 b/.merge_file_a67688
deleted file mode 100644
index e1dd74e5b3..0000000000
--- a/.merge_file_a67688
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
- <name>Address_entity</name>
- <title>Addresses</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
- <titleProcess>%aditoprj%/entity/Address_entity/titleProcess.js</titleProcess>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityField>
- <name>ADDRESS</name>
- <title>Address</title>
- <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
- </entityField>
- <entityField>
- <name>ADDRESSADDITION</name>
- </entityField>
- <entityField>
- <name>ADDRESSID</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/addressid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ADDRIDENTIFIER</name>
- </entityField>
- <entityField>
- <name>ADDR_TYPE</name>
- <documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
- <title>Addresstype</title>
- <consumer>KeywordAddressType</consumer>
- </entityField>
- <entityField>
- <name>BUILDINGNO</name>
- <title>House number</title>
- </entityField>
- <entityField>
- <name>CITY</name>
- <title>City</title>
- <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
- </entityField>
- <entityField>
- <name>COUNTRY</name>
- <title>Country</title>
- <consumer>Countries</consumer>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>DISTRICT</name>
- <title>District</title>
- </entityField>
- <entityField>
- <name>REGION</name>
- <title>Region</title>
- </entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contact_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>STATE</name>
- <title>${ADDRESS_STATE}</title>
- <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/state/mandatoryProcess.js</mandatoryProcess>
- </entityField>
- <entityField>
- <name>ZIP</name>
- <title>postcode</title>
- <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
- <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
- </entityField>
- <entityProvider>
- <name>OrganisationAddresses</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Addresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactType_param</name>
- <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js</code>
- <expose v="true" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>DefaultAddressId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <documentation>%aditoprj%/entity/Address_entity/entityfields/contactid_param/documentation.adoc</documentation>
- </entityParameter>
- <entityProvider>
- <name>ContactAddresses</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
- <entityName>Person_entity</entityName>
- <fieldName>PersAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactType_param</name>
- <code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js</code>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>DefaultAddressId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityConsumer>
- <name>Countries</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Countries_Entity</entityName>
- <fieldName>ISO2_NAME</fieldName>
- </dependency>
- </entityConsumer>
- <entityProvider>
- <name>OrganisationAddressesByContact</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
- <entityName>Person_entity</entityName>
- <fieldName>OrgAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactType_param</name>
- <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js</code>
- <expose v="true" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>IS_STANDARD</name>
- <documentation>%aditoprj%/entity/Address_entity/entityfields/is_standard/documentation.adoc</documentation>
- <contentType>BOOLEAN</contentType>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>DefaultAddressId_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
- <description>provide a ADDRESSID-value of the standard address (of a CONTACT)</description>
- </entityParameter>
- <entityParameter>
- <name>ContactType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <documentation>%aditoprj%/entity/Address_entity/entityfields/contacttype_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>KeywordAddressType</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>containerName_param</name>
- <code>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js</code>
- </entityParameter>
- </children>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
- <tableName>ADDRESS</tableName>
- <primaryKey>ADDRESSID</primaryKey>
- <isUIDTable v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ADDRESS.value</name>
- <recordfield>ADDRESS.ADDRESS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CITY.value</name>
- <recordfield>ADDRESS.CITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRESSADDITION.value</name>
- <recordfield>ADDRESS.ADDRESSADDITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COUNTRY.value</name>
- <recordfield>ADDRESS.COUNTRY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRESSID.value</name>
- <recordfield>ADDRESS.ADDRESSID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRIDENTIFIER.value</name>
- <recordfield>ADDRESS.ADDRIDENTIFIER</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDR_TYPE.value</name>
- <recordfield>ADDRESS.ADDR_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DISTRICT.value</name>
- <recordfield>ADDRESS.DISTRICT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>BUILDINGNO.value</name>
- <recordfield>ADDRESS.BUILDINGNO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REGION.value</name>
- <recordfield>ADDRESS.REGION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ID.value</name>
- <recordfield>ADDRESS.CONTACT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATE.value</name>
- <recordfield>ADDRESS.STATE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ZIP.value</name>
- <recordfield>ADDRESS.ZIP</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDR_TYPE.displayValue</name>
- <expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
--
GitLab