Skip to content
Snippets Groups Projects
Commit 0af1f045 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

merged origin/2021.1.0 into 1080981_standardWorkflows

parents addb1a5f 2aadf4e5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 617 deletions
.aditoprj/project.version
+ 2
− 2
View file @ 0af1f045
#This file is generated by ADITO designer. Do NOT delete or modify! #This file is generated by ADITO designer. Do NOT delete or modify!
#Thu Dec 17 10:59:19 CET 2020 #Mon May 17 10:12:06 CEST 2021
version=6.2.1 version=6.2.3
aliasDefinition/WorkflowModeler/WorkflowModeler.aod 0 → 100644
+ 6
− 0
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?>
<aliasDefinition 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/aliasDefinition/1.2.0">
<name>WorkflowModeler</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<datasourceType v="21" />
</aliasDefinition>
entity/360Degree_entity/360Degree_entity.aod
+ 1
− 17
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>360Degree_entity</name> <name>360Degree_entity</name>
<title>360 Degree</title> <title>360 Degree</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -43,14 +43,6 @@ ...@@ -43,14 +43,6 @@
<targetContextField>TARGET_CONTEXT</targetContextField> <targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField> <targetIdField>TARGET_ID</targetIdField>
<documentation>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/documentation.adoc</documentation> <documentation>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>15488007-165c-4630-828a-447cf2c27899</name>
<entityName>Organisation_entity</entityName>
<fieldName>360DegreeObjects</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ObjectType_param</name> <name>ObjectType_param</name>
...@@ -85,14 +77,6 @@ ...@@ -85,14 +77,6 @@
<targetContextField>TARGET_CONTEXT</targetContextField> <targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField> <targetIdField>TARGET_ID</targetIdField>
<documentation>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/documentation.adoc</documentation> <documentation>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>1d931ae6-137a-4db3-b02c-eb8872d349c6</name>
<entityName>Person_entity</entityName>
<fieldName>360DegreeObjects</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ObjectType_param</name> <name>ObjectType_param</name>
......
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 1
− 9
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ActivityLink_entity</name> <name>ActivityLink_entity</name>
<title>Connection</title> <title>Connection</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -40,14 +40,6 @@ ...@@ -40,14 +40,6 @@
<targetIdField>OBJECT_ROWID</targetIdField> <targetIdField>OBJECT_ROWID</targetIdField>
<documentation>%aditoprj%/entity/ActivityLink_entity/entityfields/links/documentation.adoc</documentation> <documentation>%aditoprj%/entity/ActivityLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer> <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>148c98ea-a24b-453a-afe9-975555486b2c</name>
<entityName>Activity_entity</entityName>
<fieldName>Links</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ActivityId_param</name> <name>ActivityId_param</name>
......
entity/Activity_entity/Activity_entity.aod
+ 1
− 95
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Activity_entity</name> <name>Activity_entity</name>
<title>Activity</title> <title>Activity</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -80,20 +80,6 @@ ...@@ -80,20 +80,6 @@
<entityProvider> <entityProvider>
<name>#PROVIDER</name> <name>#PROVIDER</name>
<recordContainer>db</recordContainer> <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>3ea70130-21b0-42ec-88e2-1a898059dcff</name>
<entityName>ObjectProxy_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>262fe53d-7358-40ff-8641-e08add14528a</name>
<entityName>Object_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider> </entityProvider>
<entityField> <entityField>
<name>ICON</name> <name>ICON</name>
...@@ -197,86 +183,6 @@ ...@@ -197,86 +183,6 @@
<name>LinkedObjects</name> <name>LinkedObjects</name>
<documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc</documentation>
<recordContainer>db</recordContainer> <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>8ececf30-a3bc-4cd2-ad04-fb9f3cb9332d</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>549af7f6-3828-4c15-8357-72f0c6fc4f0c</name>
<entityName>Contract_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>49a91b21-f24e-45c6-9b2c-5bb15d808d43</name>
<entityName>Organisation_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>6461d7f4-182f-4e5c-9453-49c145e15476</name>
<entityName>Person_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>207920cd-b4b8-4f40-b6c4-6e25d4df9947</name>
<entityName>Offer_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b086fbf7-aa94-441f-a33c-e2ca8eda5dcd</name>
<entityName>Order_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>00b4f354-5b82-4071-b70c-acab4780a2de</name>
<entityName>Product_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>9b416661-628d-4f8d-b8dc-9543cf5bbb1c</name>
<entityName>Campaign_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>4869a849-8717-48ec-9dbd-73df96992042</name>
<entityName>CampaignStep_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>709bafbd-d258-4f1c-85e8-b7062ee0e42b</name>
<entityName>BulkMail_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>4f51e380-7d34-4d6f-a10f-a9044ff671bb</name>
<entityName>SerialLetter_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>bfef6edf-e9c9-485b-afbe-8e175f6eda74</name>
<entityName>QuickEntry_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>943c36a2-d378-44a1-b214-25e92244c8cb</name>
<entityName>UniversalFileProcessor_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>OnlyInnate_param</name> <name>OnlyInnate_param</name>
......
entity/AddressType_entity/AddressType_entity.aod
+ 1
− 9
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AddressType_entity</name> <name>AddressType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AddressType_entity/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AddressType_entity/documentation.adoc</documentation>
...@@ -22,14 +22,6 @@ ...@@ -22,14 +22,6 @@
<name>ByCategory</name> <name>ByCategory</name>
<lookupIdfield>KEYID</lookupIdfield> <lookupIdfield>KEYID</lookupIdfield>
<documentation>%aditoprj%/entity/AddressType_entity/entityfields/bycategory/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AddressType_entity/entityfields/bycategory/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>0956b1f3-8b67-4f82-b04a-70be88aff19f</name>
<entityName>Address_entity</entityName>
<fieldName>KeywordAddressTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>UsageFilter_param</name> <name>UsageFilter_param</name>
......
entity/AddressValidation_entity/AddressValidation_entity.aod
+ 1
− 33
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AddressValidation_entity</name> <name>AddressValidation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AddressValidation_entity/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AddressValidation_entity/documentation.adoc</documentation>
...@@ -17,14 +17,6 @@ ...@@ -17,14 +17,6 @@
<entityProvider> <entityProvider>
<name>ZipValidaton</name> <name>ZipValidaton</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
<entityName>Address_entity</entityName>
<fieldName>ZipValidation</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>Type_param</name> <name>Type_param</name>
...@@ -76,14 +68,6 @@ ...@@ -76,14 +68,6 @@
<entityProvider> <entityProvider>
<name>CityValidation</name> <name>CityValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>27114db7-8562-43b2-87d8-fa605bbf2319</name>
<entityName>Address_entity</entityName>
<fieldName>CityValidation</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>Type_param</name> <name>Type_param</name>
...@@ -100,14 +84,6 @@ ...@@ -100,14 +84,6 @@
<entityProvider> <entityProvider>
<name>FullAddressValidation</name> <name>FullAddressValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>10f700b5-1ac6-4d50-bcb8-aae55714fb43</name>
<entityName>Address_entity</entityName>
<fieldName>FullAddressValidation</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>Type_param</name> <name>Type_param</name>
...@@ -136,14 +112,6 @@ ...@@ -136,14 +112,6 @@
<entityProvider> <entityProvider>
<name>StreetValidation</name> <name>StreetValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/streetvalidation/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/streetvalidation/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>3211d147-0867-4fc1-8640-34a1b8fdcf18</name>
<entityName>Address_entity</entityName>
<fieldName>StreetValidation</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>Type_param</name> <name>Type_param</name>
......
entity/Address_entity/Address_entity.aod
+ 1
− 71
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Address_entity</name> <name>Address_entity</name>
<title>Address</title> <title>Address</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -95,14 +95,6 @@ ...@@ -95,14 +95,6 @@
<entityProvider> <entityProvider>
<name>OrganisationAddresses</name> <name>OrganisationAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
<entityName>Organisation_entity</entityName>
<fieldName>Addresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ContactType_param</name> <name>ContactType_param</name>
...@@ -133,26 +125,6 @@ ...@@ -133,26 +125,6 @@
<entityProvider> <entityProvider>
<name>ContactAddresses</name> <name>ContactAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
<entityName>Person_entity</entityName>
<fieldName>PersAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>aecd30a8-b80e-42c5-be09-3042b75a3fa2</name>
<entityName>Contact_entity</entityName>
<fieldName>ContactAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>03534109-04a7-4deb-b139-5c548aa2fd00</name>
<entityName>CommunicationChannel_entity</entityName>
<fieldName>Addresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ContactType_param</name> <name>ContactType_param</name>
...@@ -189,14 +161,6 @@ ...@@ -189,14 +161,6 @@
<name>OrganisationAddressesByContact</name> <name>OrganisationAddressesByContact</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
<titlePlural>Company Addresses</titlePlural> <titlePlural>Company Addresses</titlePlural>
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
<entityName>Person_entity</entityName>
<fieldName>OrgAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ContactType_param</name> <name>ContactType_param</name>
...@@ -234,26 +198,6 @@ ...@@ -234,26 +198,6 @@
<entityProvider> <entityProvider>
<name>OrganisationAndContactAddresses</name> <name>OrganisationAndContactAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
<entityName>Person_entity</entityName>
<fieldName>ContactAndOrganisationAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>daa41953-8e95-46f2-b08a-6c843ab87985</name>
<entityName>Offer_entity</entityName>
<fieldName>PossibleAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>2f162626-bd99-4e2a-b9cf-e95864d9ed0e</name>
<entityName>Order_entity</entityName>
<fieldName>PossibleAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>DefaultAddressId_param</name> <name>DefaultAddressId_param</name>
...@@ -462,20 +406,6 @@ ...@@ -462,20 +406,6 @@
<entityProvider> <entityProvider>
<name>QuickEntryAdresses</name> <name>QuickEntryAdresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/quickentryadresses/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Address_entity/entityfields/quickentryadresses/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>d677a301-2038-4ccd-baa1-5f986e290564</name>
<entityName>QuickEntry_entity</entityName>
<fieldName>Adresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>aa315b76-7573-4627-ae15-2e7414b8b34d</name>
<entityName>QuickEntry_entity</entityName>
<fieldName>OrgAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider> </entityProvider>
<entityParameter> <entityParameter>
<name>ReplaceStandardAddress_param</name> <name>ReplaceStandardAddress_param</name>
......
entity/AdminViewRow_entity/AdminViewRow_entity.aod
+ 1
− 9
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AdminViewRow_entity</name> <name>AdminViewRow_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AdminViewRow_entity/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AdminViewRow_entity/documentation.adoc</documentation>
...@@ -27,14 +27,6 @@ ...@@ -27,14 +27,6 @@
<entityProvider> <entityProvider>
<name>AdminViewRows</name> <name>AdminViewRows</name>
<documentation>%aditoprj%/entity/AdminViewRow_entity/entityfields/adminviewrows/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AdminViewRow_entity/entityfields/adminviewrows/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>b5788fdf-1c82-45e2-8545-994c5e515476</name>
<entityName>DefaultAdminView_entity</entityName>
<fieldName>Rows</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider> </entityProvider>
<entityField> <entityField>
<name>CONTENTTYPE</name> <name>CONTENTTYPE</name>
......
entity/Analyses_entity/Analyses_entity.aod
+ 1
− 1
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Analyses_entity</name> <name>Analyses_entity</name>
<title>Analyses</title> <title>Analyses</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
......
entity/AnyContact_entity/AnyContact_entity.aod
+ 1
− 109
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AnyContact_entity</name> <name>AnyContact_entity</name>
<title>Contact</title> <title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -11,110 +11,10 @@ ...@@ -11,110 +11,10 @@
<entityFields> <entityFields>
<entityProvider> <entityProvider>
<name>#PROVIDER</name> <name>#PROVIDER</name>
<dependencies>
<entityDependency>
<name>5d8b421e-a234-4d03-bfec-ed01f464a54c</name>
<entityName>Contract_entity</entityName>
<fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>94e4fa2c-7525-49f9-b933-353d200b829c</name>
<entityName>Offer_entity</entityName>
<fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f1f7d959-ecb5-4438-9762-fc11f1bc5334</name>
<entityName>Order_entity</entityName>
<fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b2895709-2ebf-46ec-a46d-6b2e9a4575a3</name>
<entityName>BulkMailRecipient_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>c6402198-278c-43e2-9b15-9be28270c83f</name>
<entityName>LetterRecipient_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>ae9040a2-1f2e-4105-aaed-eb3d067b2376</name>
<entityName>DSGVOInfo_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>471b6e37-13ce-4e84-a797-82bccbe4e39a</name>
<entityName>UnlinkedMailMappingLink_entity</entityName>
<fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>aca9e52c-9138-4ef1-b039-1efeb3deb822</name>
<entityName>BulkMailTesting_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>bbd2bf84-7cad-4156-b736-32749949f97c</name>
<entityName>BulkMail_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>60518a9f-eaa5-4af8-8cd6-4276047f4371</name>
<entityName>ObjectProxy_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>ea7c855e-dccd-4c05-9efb-a1303f37dab8</name>
<entityName>CampaignParticipant_entity</entityName>
<fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b3cf7b34-6ea4-411a-8123-34afd7e10cfc</name>
<entityName>MailLog_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>578dbb91-ea76-40ec-9dbd-9acf462ceba7</name>
<entityName>BulkMailTestRecipient_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>cb874ee2-e147-4311-bdf1-a94df537bb9e</name>
<entityName>WeblinkClick_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider> </entityProvider>
<entityProvider> <entityProvider>
<name>ContactsByIds</name> <name>ContactsByIds</name>
<documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>0206f7a8-fd58-47e8-8b7a-5ff4531e56fb</name>
<entityName>QuickEntry_entity</entityName>
<fieldName>OrgAndPersDuplicates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>ee4b75ff-e1fc-4dbe-a900-81a7a92a273e</name>
<entityName>CampaignParticipant_entity</entityName>
<fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ContactId_param</name> <name>ContactId_param</name>
...@@ -201,14 +101,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description> ...@@ -201,14 +101,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<entityProvider> <entityProvider>
<name>OnlySameCompany</name> <name>OnlySameCompany</name>
<documentation>%aditoprj%/entity/AnyContact_entity/entityfields/onlysamecompany/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AnyContact_entity/entityfields/onlysamecompany/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>28b19d6b-237c-4268-b6c6-323df408c94a</name>
<entityName>Offer_entity</entityName>
<fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ContactId_param</name> <name>ContactId_param</name>
......
entity/AppointmentLink_entity/AppointmentLink_entity.aod
+ 1
− 9
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AppointmentLink_entity</name> <name>AppointmentLink_entity</name>
<title>Connection</title> <title>Connection</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -51,14 +51,6 @@ ...@@ -51,14 +51,6 @@
<targetIdField>OBJECTID</targetIdField> <targetIdField>OBJECTID</targetIdField>
<documentation>%aditoprj%/entity/AppointmentLink_entity/entityfields/links/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AppointmentLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer> <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>3dde1745-18a1-4499-83d0-61e414086997</name>
<entityName>Appointment_entity</entityName>
<fieldName>AppointmentLinks</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>AppointmentId_param</name> <name>AppointmentId_param</name>
......
entity/Appointment_entity/Appointment_entity.aod
+ 1
− 21
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Appointment_entity</name> <name>Appointment_entity</name>
<title>Appointment</title> <title>Appointment</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -205,26 +205,6 @@ ...@@ -205,26 +205,6 @@
<name>LinkedAppointments</name> <name>LinkedAppointments</name>
<documentation>%aditoprj%/entity/Appointment_entity/entityfields/linkedappointments/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Appointment_entity/entityfields/linkedappointments/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer> <recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
<name>74dea3cd-a528-4616-b468-cd27f3f1a795</name>
<entityName>Activity_entity</entityName>
<fieldName>LinkedAppointments</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>12b2a8cd-1b66-4123-b0a6-f1ca164bdfec</name>
<entityName>Person_entity</entityName>
<fieldName>Appointments</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>17129bd7-1b1b-4090-9185-d6b3b83ffb40</name>
<entityName>Organisation_entity</entityName>
<fieldName>LinkedAppointments</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider> </entityProvider>
<entityParameter> <entityParameter>
<name>LinkedAppointmentsFromDashlet_param</name> <name>LinkedAppointmentsFromDashlet_param</name>
......
entity/AroundLocation_entity/AroundLocation_entity.aod
+ 1
− 1
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AroundLocation_entity</name> <name>AroundLocation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AroundLocation_entity/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AroundLocation_entity/documentation.adoc</documentation>
......
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 1
− 151
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AttributeRelation_entity</name> <name>AttributeRelation_entity</name>
<title>Attribute</title> <title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -35,68 +35,6 @@ ...@@ -35,68 +35,6 @@
<entityProvider> <entityProvider>
<name>TreeProvider</name> <name>TreeProvider</name>
<documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
<entityName>Organisation_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
<entityName>Person_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
<entityName>Product_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
<entityName>Activity_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
<entityName>Contract_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>3921c712-d15c-4941-b04d-44f4536dc404</name>
<entityName>Employee_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>148faad1-78f6-4ff2-a4d5-9607d919adb9</name>
<entityName>Salesproject_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>8ed8bae6-c69e-45ce-9fc9-5fb43587a47b</name>
<entityName>Order_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>661f5b91-f71e-429e-a170-8bd18781bc69</name>
<entityName>Campaign_entity</entityName>
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>80a034ee-c3fd-45e3-986c-d3854608c148</name>
<entityName>Activity_entity</entityName>
<fieldName>AttributeTreeIsTheme</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>GetTree_param</name> <name>GetTree_param</name>
...@@ -167,86 +105,6 @@ ...@@ -167,86 +105,6 @@
<entityProvider> <entityProvider>
<name>AttributeRelations</name> <name>AttributeRelations</name>
<documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelations/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelations/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>69560cc2-d92a-453c-9e64-fb712a538c4f</name>
<entityName>Organisation_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>34f24d10-7312-4b03-8d6f-2918c8cb9eb8</name>
<entityName>Person_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>3cb1014d-a6c8-4b4a-83ba-a099d4488ab2</name>
<entityName>Activity_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>2662f513-6498-40c2-bed6-031087857e82</name>
<entityName>Contract_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>be336d6c-c550-4ae5-9f78-0f2ee56a2a6c</name>
<entityName>Employee_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>8488da81-0f98-4c4b-811f-ccda64c8624b</name>
<entityName>Offer_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>7df4a57a-646d-4b5a-802b-f1e2bf93d09b</name>
<entityName>Order_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>40a4c698-d34f-4c5a-bee8-239ee9d71f20</name>
<entityName>Product_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>99bc7ec8-195e-483f-923e-763c6f28a29c</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>fd90bd15-d9c2-4eb6-9e7f-7669fded02f6</name>
<entityName>Competition_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>e520143e-c72f-46e3-9c27-752471af51ae</name>
<entityName>Organisation_entity</entityName>
<fieldName>AttributeConditions</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>c66e5dbb-3d3c-424a-b816-31762eb72c1c</name>
<entityName>Leadimport_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>92855510-92c8-4837-85d3-072396f5f7f6</name>
<entityName>Contact_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>GetTree_param</name> <name>GetTree_param</name>
...@@ -376,14 +234,6 @@ ...@@ -376,14 +234,6 @@
</entityConsumer> </entityConsumer>
<entityProvider> <entityProvider>
<name>FilterProvider</name> <name>FilterProvider</name>
<dependencies>
<entityDependency>
<name>0560c6d0-8473-4050-9ca1-a935bbac2ef9</name>
<entityName>Organisation_entity</entityName>
<fieldName>AttributesFilter</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>DisplaySimpleName_param</name> <name>DisplaySimpleName_param</name>
......
entity/AttributeUsage_entity/AttributeUsage_entity.aod
+ 1
− 10
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AttributeUsage_entity</name> <name>AttributeUsage_entity</name>
<title>Usage</title> <title>Usage</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<siblings> <siblings>
<element>Attribute_entity</element> <element>Attribute_entity</element>
</siblings> </siblings>
<onValidation>%aditoprj%/entity/AttributeUsage_entity/onValidation.js</onValidation>
<recordContainer>db</recordContainer> <recordContainer>db</recordContainer>
<entityFields> <entityFields>
<entityProvider> <entityProvider>
...@@ -38,14 +37,6 @@ ...@@ -38,14 +37,6 @@
<name>SpecificAttribute</name> <name>SpecificAttribute</name>
<documentation>%aditoprj%/entity/AttributeUsage_entity/entityfields/specificattribute/documentation.adoc</documentation> <documentation>%aditoprj%/entity/AttributeUsage_entity/entityfields/specificattribute/documentation.adoc</documentation>
<recordContainer>db</recordContainer> <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>47ac9f95-8879-43fd-92a9-86079e735e58</name>
<entityName>Attribute_entity</entityName>
<fieldName>AttributeUsages</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider> </entityProvider>
<entityParameter> <entityParameter>
<name>AttributeId_param</name> <name>AttributeId_param</name>
......
entity/AttributeUsage_entity/entityfields/max_count/onValidation.js
+ 5
− 1
View file @ 0af1f045
...@@ -3,7 +3,8 @@ import("system.vars"); ...@@ -3,7 +3,8 @@ import("system.vars");
import("system.translate"); import("system.translate");
import("Entity_lib"); import("Entity_lib");
var maxCount = vars.get("local.value"); var minCount = vars.getString("$field.MIN_COUNT");
var maxCount = vars.get("$local.value");
if (maxCount) if (maxCount)
{ {
...@@ -12,4 +13,7 @@ if (maxCount) ...@@ -12,4 +13,7 @@ if (maxCount)
result.string(translate.text("Maximal count must be one or higher")); result.string(translate.text("Maximal count must be one or higher"));
else if (maxCount != Math.floor(maxCount)) else if (maxCount != Math.floor(maxCount))
result.string(translate.text("Maximal count has to be a whole number")); result.string(translate.text("Maximal count has to be a whole number"));
else if (minCount && minCount > maxCount)
result.string(translate.text("The minimal count can't be larger than the maximal count!"));
} }
entity/AttributeUsage_entity/onValidation.js deleted 100644 → 0
+ 0
− 8
View file @ addb1a5f
import("system.translate");
import("system.vars");
import("system.result");
var minCount = vars.getString("$field.MIN_COUNT");
var maxCount = vars.getString("$field.MAX_COUNT");
if (minCount != "" && maxCount != "" && minCount > maxCount)
result.string(translate.text("The minimal count can't be larger than the maximal count!"));
\ No newline at end of file
entity/Attribute_entity/Attribute_entity.aod
+ 2
− 60
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Attribute_entity</name> <name>Attribute_entity</name>
<title>Attribute</title> <title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
...@@ -13,14 +13,6 @@ ...@@ -13,14 +13,6 @@
<entityFields> <entityFields>
<entityProvider> <entityProvider>
<name>#PROVIDER</name> <name>#PROVIDER</name>
<dependencies>
<entityDependency>
<name>42e6f528-8452-4262-97bd-68e8cbe99c74</name>
<entityName>ObjectProxy_entity</entityName>
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider> </entityProvider>
<entityField> <entityField>
<name>ATTRIBUTE_NAME</name> <name>ATTRIBUTE_NAME</name>
...@@ -131,32 +123,6 @@ ...@@ -131,32 +123,6 @@
<name>SpecificAttribute</name> <name>SpecificAttribute</name>
<lookupIdfield>UID</lookupIdfield> <lookupIdfield>UID</lookupIdfield>
<documentation>%aditoprj%/entity/Attribute_entity/entityfields/specificattribute/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Attribute_entity/entityfields/specificattribute/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>SpecificAttribute</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>6bc87a7f-02f1-4cab-8c98-b89b626b59bd</name>
<entityName>Salesproject_entity</entityName>
<fieldName>ProjectTypeAttribute</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>26b85665-7914-45c4-b611-081ffe9502a4</name>
<entityName>Employee_entity</entityName>
<fieldName>Departments</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f31eceb3-2fcc-4298-8c5d-1076433e2c2a</name>
<entityName>PermissionCalendar_entity</entityName>
<fieldName>Departments</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ObjectType_param</name> <name>ObjectType_param</name>
...@@ -328,7 +294,7 @@ ...@@ -328,7 +294,7 @@
<onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
<isMenuAction v="true" /> <isMenuAction v="true" />
<isObjectAction v="false" /> <isObjectAction v="false" />
<isSelectionAction v="true" /> <selectionType>MULTI</selectionType>
<iconId>VAADIN:FILE_TREE_SMALL</iconId> <iconId>VAADIN:FILE_TREE_SMALL</iconId>
<state>AUTO</state> <state>AUTO</state>
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js</stateProcess> <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js</stateProcess>
...@@ -350,14 +316,6 @@ ...@@ -350,14 +316,6 @@
</entityActionField> </entityActionField>
<entityProvider> <entityProvider>
<name>ThemeProvider</name> <name>ThemeProvider</name>
<dependencies>
<entityDependency>
<name>6e314038-62de-4f0c-b89a-92f029c10933</name>
<entityName>Activity_entity</entityName>
<fieldName>ActivityAtrributes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>AttributeCount_param</name> <name>AttributeCount_param</name>
...@@ -392,14 +350,6 @@ ...@@ -392,14 +350,6 @@
<sortingField>SORTING</sortingField> <sortingField>SORTING</sortingField>
<documentation>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc</documentation>
<titlePlural>Child Attributes</titlePlural> <titlePlural>Child Attributes</titlePlural>
<dependencies>
<entityDependency>
<name>80023321-1954-483f-a4be-b7207557c068</name>
<entityName>Attribute_entity</entityName>
<fieldName>ChildAttributes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>ChildId_param</name> <name>ChildId_param</name>
...@@ -478,14 +428,6 @@ ...@@ -478,14 +428,6 @@
</entityProvider> </entityProvider>
<entityProvider> <entityProvider>
<name>SpecificFilterAttributes</name> <name>SpecificFilterAttributes</name>
<dependencies>
<entityDependency>
<name>9b2b5f2e-229d-4a10-a54f-cbf77aafe512</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>SpecificFilterAttributes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children> <children>
<entityParameter> <entityParameter>
<name>DisplaySimpleName_param</name> <name>DisplaySimpleName_param</name>
......
entity/AuditLogHistory_entity/AuditLogHistory_entity.aod
+ 1
− 1
View file @ 0af1f045
<?xml version="1.0" encoding="UTF-8"?> <?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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AuditLogHistory_entity</name> <name>AuditLogHistory_entity</name>
<title>Audit Log</title> <title>Audit Log</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment