From 59d08f6b6d230af0273bc6d3cf3b3204a2d99404 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Fri, 15 Jan 2021 09:01:24 +0100
Subject: [PATCH] Upgrade all Datamodels
---
entity/360Degree_entity/360Degree_entity.aod | 36 +-
.../ActivityLink_entity.aod | 46 +-
entity/Activity_entity/Activity_entity.aod | 198 +++----
.../AddressType_entity/AddressType_entity.aod | 38 +-
.../AddressValidation_entity.aod | 58 +-
entity/Address_entity/Address_entity.aod | 170 +++---
.../AdminViewRow_entity.aod | 2 +-
entity/Analyses_entity/Analyses_entity.aod | 4 +-
.../AnyContact_entity/AnyContact_entity.aod | 92 +--
.../AppointmentLink_entity.aod | 46 +-
.../Appointment_entity/Appointment_entity.aod | 14 +-
.../AroundLocation_entity.aod | 12 +-
.../AttributeRelation_entity.aod | 74 +--
.../AttributeUsage_entity.aod | 34 +-
entity/Attribute_entity/Attribute_entity.aod | 156 +++---
.../AuditLogHistory_entity.aod | 24 +-
.../BulkMailAddRecipients_entity.aod | 2 +-
.../BulkMailRecipient_entity.aod | 86 +--
.../BulkMailStatusChart_entity.aod | 4 +-
.../BulkMailTesting_entity.aod | 2 +-
entity/BulkMail_entity/BulkMail_entity.aod | 112 ++--
.../CampaignAddParticipants_entity.aod | 14 +-
.../CampaignAnalysis_entity.aod | 18 +-
.../CampaignCostChart_entity.aod | 2 +-
.../CampaignCost_entity.aod | 112 ++--
.../CampaignParticipantChart_entity.aod | 2 +-
.../CampaignParticipant_entity.aod | 124 ++---
.../CampaignPlanning_entity.aod | 14 +-
.../CampaignStep_entity.aod | 118 ++--
entity/Campaign_entity/Campaign_entity.aod | 188 +++----
.../ClassificationAdmin_entity.aod | 4 +-
.../ClassificationGrading_entity.aod | 38 +-
.../ClassificationGroup_entity.aod | 34 +-
.../ClassificationScore_entity.aod | 24 +-
.../ClassificationType_entity.aod | 34 +-
.../Classification_entity.aod | 24 +-
.../CommRestriction_Entity.aod | 44 +-
.../Communication_entity.aod | 124 ++---
.../Competition_entity/Competition_entity.aod | 128 ++---
entity/Contact_entity/Contact_entity.aod | 118 ++--
entity/Context_entity/Context_entity.aod | 68 +--
entity/Contract_entity/Contract_entity.aod | 170 +++---
entity/Countries_Entity/Countries_Entity.aod | 48 +-
entity/DSGVOInfo_entity/DSGVOInfo_entity.aod | 48 +-
.../DSGVOReport_entity/DSGVOReport_entity.aod | 4 +-
entity/DSGVO_entity/DSGVO_entity.aod | 32 +-
.../DefaultAdminView_entity.aod | 12 +-
.../DescriptionTranslation_entity.aod | 34 +-
.../DistrictResponsible_entity.aod | 96 ++--
entity/District_entity/District_entity.aod | 92 +--
.../DocumentTemplateLink_entity.aod | 66 +--
.../DocumentTemplatePlaceOfUse_entity.aod | 46 +-
.../DocumentTemplateTypeCategory_entity.aod | 34 +-
.../DocumentTemplate_entity.aod | 96 ++--
entity/Document_entity/Document_entity.aod | 90 +--
...plicateScannerResultFieldConfig_entity.aod | 22 +-
.../DuplicateScanner_entity.aod | 34 +-
.../DuplicatesUnrelated_entity.aod | 2 +-
.../Duplicates_entity/Duplicates_entity.aod | 66 +--
entity/Email_entity/Email_entity.aod | 22 +-
.../EmployeeRole_entity.aod | 28 +-
.../EmployeeToken_entity.aod | 24 +-
entity/Employee_entity/Employee_entity.aod | 102 ++--
.../ExportTemplateField_entity.aod | 24 +-
.../ExportTemplatePlaceOfUse_entity.aod | 46 +-
.../ExportTemplateSelection_entity.aod | 14 +-
.../ExportTemplate_entity.aod | 58 +-
entity/Favorite_entity/Favorite_entity.aod | 4 +-
entity/Forecast_entity/Forecast_entity.aod | 44 +-
entity/Gender_keyword/Gender_keyword.aod | 2 +-
.../ImportField_Entity/ImportField_Entity.aod | 32 +-
.../IndexSearchEntity/IndexSearchEntity.aod | 2 +-
.../KeywordAttributeRelation_entity.aod | 48 +-
.../KeywordAttribute_entity.aod | 34 +-
.../KeywordEntry_entity.aod | 56 +-
.../KnowledgeDiscussion_entity.aod | 14 +-
.../KnowledgeLink_entity.aod | 50 +-
.../KnowledgeManagementTagList_entity.aod | 2 +-
.../KnowledgeManagementTags_entity.aod | 14 +-
.../KnowledgeManagement_entity.aod | 110 ++--
.../KnowledgeNewsFeed_entity.aod | 4 +-
.../KnowledgeRole_entity.aod | 34 +-
entity/Language_entity/Language_entity.aod | 48 +-
entity/LeadLog_entity/LeadLog_entity.aod | 32 +-
entity/LeadTemp_entity/LeadTemp_entity.aod | 22 +-
entity/Lead_entity/Lead_entity.aod | 42 +-
.../LeadimportMappingAssistant_entity.aod | 34 +-
.../Leadimport_entity/Leadimport_entity.aod | 122 ++--
.../LetterRecipient_entity.aod | 64 +--
entity/Letter_entity/Letter_entity.aod | 12 +-
.../LogHistory_entity/LogHistory_entity.aod | 16 +-
.../MSTTeamLink_entity/MSTTeamLink_entity.aod | 36 +-
.../MSTTeamMember_entity.aod | 14 +-
entity/MSTTeam_entity/MSTTeam_entity.aod | 36 +-
.../MSTeamsActivityImport_entity.aod | 22 +-
.../MSTeamsChannel_entity.aod | 4 +-
.../MSTeamsDocument_entity.aod | 12 +-
.../MSTeamsMessage_entity.aod | 2 +-
.../MarketingWorkflowLauncher_entity.aod | 24 +-
.../MemberRoles_entity/MemberRoles_entity.aod | 22 +-
entity/Member_entity/Member_entity.aod | 96 ++--
.../ModuleTree_entity/ModuleTree_entity.aod | 24 +-
.../Notification_entity.aod | 54 +-
.../ObjectProxy_entity/ObjectProxy_entity.aod | 2 +-
.../ObjectRelationType_entity.aod | 18 +-
.../ObjectTree_entity/ObjectTree_entity.aod | 46 +-
entity/Object_entity/Object_entity.aod | 124 ++---
.../Observation_entity/Observation_entity.aod | 54 +-
entity/Offer_entity/Offer_entity.aod | 318 +++++------
entity/Offeritem_entity/Offeritem_entity.aod | 58 +-
entity/Order_entity/Order_entity.aod | 260 ++++-----
entity/Orderitem_entity/Orderitem_entity.aod | 68 +--
.../Organisation_entity.aod | 524 +++++++++---------
.../PermissionAction_entity.aod | 4 +-
.../PermissionCalendar_entity.aod | 44 +-
.../PermissionDetail_entity.aod | 30 +-
.../PermissionMetaData_entity.aod | 28 +-
.../PermissionOverview_entity.aod | 4 +-
entity/Person_entity/Person_entity.aod | 476 ++++++++--------
.../PrivatePerson_entity.aod | 34 +-
entity/Prod2prod_entity/Prod2prod_entity.aod | 30 +-
entity/Product_entity/Product_entity.aod | 210 +++----
.../Productprice_entity.aod | 60 +-
.../QuickEntry_entity/QuickEntry_entity.aod | 94 ++--
.../RoleChildren_entity.aod | 4 +-
.../RoleParent_entity/RoleParent_entity.aod | 4 +-
entity/Role_entity/Role_entity.aod | 62 +--
.../SalesprojectAnalyses_entity.aod | 4 +-
.../SalesprojectConversionRate_entity.aod | 4 +-
.../SalesprojectMilestone_entity.aod | 54 +-
.../SalesprojectPhase_entity.aod | 4 +-
.../SalesprojectSource_entity.aod | 34 +-
.../Salesproject_entity.aod | 334 +++++------
.../SalutationDistinct_entity.aod | 14 +-
.../SalutationTitleDistinct_entity.aod | 18 +-
.../Salutation_entity/Salutation_entity.aod | 34 +-
.../SerialLetterAddRecipients_entity.aod | 2 +-
.../SerialLetter_entity.aod | 98 ++--
.../SingleObject_entity.aod | 2 +-
entity/Social_entity/Social_entity.aod | 6 +-
entity/Stock_entity/Stock_entity.aod | 46 +-
.../SupportTicket_entity.aod | 134 ++---
entity/TaskLink_entity/TaskLink_entity.aod | 46 +-
entity/Task_entity/Task_entity.aod | 148 ++---
.../Timetracking_entity.aod | 54 +-
.../TurnoverTree_entity.aod | 16 +-
entity/Turnover_entity/Turnover_entity.aod | 30 +-
.../UniversalFileProcessor_entity.aod | 12 +-
.../UnlinkedMailMappingLink_entity.aod | 4 +-
.../UnlinkedMailMappingWrapper_entity.aod | 14 +-
.../UnlinkedMail_entity.aod | 24 +-
.../UserhelpResources_entity.aod | 12 +-
.../Usersettings_entity.aod | 4 +-
.../VisitPlanEmployeeWeek_entity.aod | 44 +-
.../VisitPlanEntry_entity.aod | 48 +-
.../VisitRecommendation_entity.aod | 54 +-
.../WorkflowDefinition_entity.aod | 54 +-
.../WorkflowInstanceHistory_entity.aod | 14 +-
.../WorkflowInstance_entity.aod | 54 +-
.../WorkflowLauncher_entity.aod | 12 +-
.../WorkflowModel_entity.aod | 4 +-
.../WorkflowSignal_entity.aod | 44 +-
.../WorkflowStartConfig_entity.aod | 44 +-
.../WorkflowTask_entity.aod | 44 +-
.../WorkflowVariableValue_entity.aod | 4 +-
165 files changed, 4520 insertions(+), 4548 deletions(-)
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 730a252767..cf7b453f03 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>360Degree_entity</name>
+ <title>360 Degree</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/360Degree_entity/documentation.adoc</documentation>
- <title>360 Degree</title>
<siblings>
<element>Offer_entity</element>
<element>Salesproject_entity</element>
@@ -43,6 +43,14 @@
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField>
<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>
<entityParameter>
<name>ObjectType_param</name>
@@ -54,14 +62,6 @@
<valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/children/basecontextid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>15488007-165c-4630-828a-447cf2c27899</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>360DegreeObjects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>TARGET_CONTEXT</name>
@@ -85,6 +85,14 @@
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField>
<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>
<entityParameter>
<name>ObjectType_param</name>
@@ -96,14 +104,6 @@
<valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/children/basecontextid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>1d931ae6-137a-4db3-b02c-eb8872d349c6</name>
- <entityName>Person_entity</entityName>
- <fieldName>360DegreeObjects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityActionGroup>
<name>newModule</name>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index a03c86a0d4..d9d7007ec9 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ActivityLink_entity</name>
+ <title>Connection</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ActivityLink_entity/documentation.adoc</documentation>
- <title>Connection</title>
<titlePlural>Connections</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -40,12 +40,6 @@
<targetIdField>OBJECT_ROWID</targetIdField>
<documentation>%aditoprj%/entity/ActivityLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>ActivityId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>148c98ea-a24b-453a-afe9-975555486b2c</name>
@@ -54,20 +48,26 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityConsumer>
- <name>Objects</name>
<children>
<entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ <name>ActivityId_param</name>
+ <expose v="true" />
</entityParameter>
</children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Objects</name>
<dependency>
<name>dependency</name>
<entityName>Object_entity</entityName>
<fieldName>AllObjects</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityConsumer>
<name>Context</name>
@@ -106,20 +106,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>66f9eb3e-6f56-4731-a868-ffc9ffcce340</name>
- <tableName>ACTIVITYLINK</tableName>
- <primaryKey>ACTIVITYLINKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ACTIVITY_ID.value</name>
@@ -154,6 +145,15 @@
<recordfield>ACTIVITYLINK.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>66f9eb3e-6f56-4731-a868-ffc9ffcce340</name>
+ <tableName>ACTIVITYLINK</tableName>
+ <primaryKey>ACTIVITYLINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index a6bcb8b4a5..d2107e5721 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Activity_entity</name>
+ <title>Activity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
- <title>Activity</title>
<grantDeleteProcess>%aditoprj%/entity/Activity_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Activity_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
@@ -103,10 +103,10 @@
</entityField>
<entityParameter>
<name>OnlyInnate_param</name>
- <title>Show only own</title>
<expose v="true" />
<mandatory v="false" />
<documentation>%aditoprj%/entity/Activity_entity/entityfields/onlyinnate_param/documentation.adoc</documentation>
+ <title>Show only own</title>
</entityParameter>
<entityParameter>
<name>ObjectId_param</name>
@@ -117,6 +117,11 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -127,15 +132,15 @@
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -146,11 +151,6 @@
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ENTRYMONTH</name>
@@ -166,20 +166,25 @@
</entityField>
<entityConsumer>
<name>Links</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ActivityLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ActivityId_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/links/children/activityid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ActivityLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordDirections</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -187,47 +192,11 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>LinkedObjects</name>
<documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>OnlyInnate_param</name>
- <expose v="false" />
- <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc</documentation>
- </entityParameter>
- <entityParameter>
- <name>ObjectId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>RowId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>PresetLinks_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ParentContext_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ParentId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>PresetDocuments_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>8ececf30-a3bc-4cd2-ad04-fb9f3cb9332d</name>
@@ -308,6 +277,37 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyInnate_param</name>
+ <expose v="false" />
+ <documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>RowId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ParentContext_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ParentId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>PresetDocuments_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>RESPONSIBLE</name>
@@ -321,6 +321,11 @@
</entityField>
<entityConsumer>
<name>ModuleTrees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ModuleTree_entity</entityName>
+ <fieldName>TreeProviders</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContextName_param</name>
@@ -333,11 +338,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ModuleTree_entity</entityName>
- <fieldName>TreeProviders</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ParentId_param</name>
@@ -363,6 +363,11 @@
</entityField>
<entityConsumer>
<name>KeywordCategories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -370,11 +375,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ENTRYDAY</name>
@@ -384,6 +384,11 @@
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Activity_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -394,11 +399,6 @@
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Employees</name>
@@ -416,6 +416,11 @@
</entityParameter>
<entityConsumer>
<name>AttributeTree</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -426,11 +431,6 @@
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
@@ -485,6 +485,11 @@
</entityParameter>
<entityConsumer>
<name>ActivityAtrributes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>ThemeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ThemeObjectRowId_param</name>
@@ -495,14 +500,14 @@
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/activityatrributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>ThemeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTreeIsTheme</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -517,11 +522,6 @@
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/attributetreeistheme/children/gettheme_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ENTRYYEAR</name>
@@ -542,17 +542,17 @@
</entityParameter>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>Category_param</name>
@@ -728,7 +728,6 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<maximumDbRows v="10000" />
<fromClauseProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
@@ -736,15 +735,7 @@
<onDBInsert>%aditoprj%/entity/Activity_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Activity_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Activity_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>4d4e82f5-fd0d-48e0-805a-c713d73dfae0</name>
- <tableName>ACTIVITY</tableName>
- <primaryKey>ACTIVITYID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ACTIVITYID.value</name>
@@ -847,6 +838,15 @@
<isFilterable v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>4d4e82f5-fd0d-48e0-805a-c713d73dfae0</name>
+ <tableName>ACTIVITY</tableName>
+ <primaryKey>ACTIVITYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtensionSet>
<name>Attribute_filter</name>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index 843afd1e21..ed17a9345d 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>AddressType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AddressType_entity/documentation.adoc</documentation>
@@ -22,13 +22,6 @@
<name>ByCategory</name>
<lookupIdfield>KEYID</lookupIdfield>
<documentation>%aditoprj%/entity/AddressType_entity/entityfields/bycategory/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>UsageFilter_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>0956b1f3-8b67-4f82-b04a-70be88aff19f</name>
@@ -37,11 +30,18 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>UsageFilter_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>UsageFilter_param</name>
- <title></title>
<expose v="true" />
+ <title></title>
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
@@ -52,17 +52,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/AddressType_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>a4614347-7edb-4101-9e79-40971acfd79e</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ENTRYID.value</name>
@@ -77,6 +68,15 @@
<recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>a4614347-7edb-4101-9e79-40971acfd79e</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index 28904169c4..7a1a491935 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>AddressValidation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AddressValidation_entity/documentation.adoc</documentation>
@@ -17,13 +17,6 @@
<entityProvider>
<name>ZipValidaton</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
@@ -32,6 +25,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>Type_param</name>
@@ -75,13 +75,6 @@
<entityProvider>
<name>CityValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>27114db7-8562-43b2-87d8-fa605bbf2319</name>
@@ -90,6 +83,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>CurrentValue_param</name>
@@ -99,13 +99,6 @@
<entityProvider>
<name>FullAddressValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>10f700b5-1ac6-4d50-bcb8-aae55714fb43</name>
@@ -114,6 +107,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>STREET</name>
@@ -135,13 +135,6 @@
<entityProvider>
<name>StreetValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/streetvalidation/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/streetvalidation/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>3211d147-0867-4fc1-8640-34a1b8fdcf18</name>
@@ -150,6 +143,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/streetvalidation/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>City_param</name>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 13623adbb3..9cfa2f1f5b 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Address_entity</name>
+ <title>Address</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
- <title>Address</title>
<contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
<afterOperatingState>%aditoprj%/entity/Address_entity/afterOperatingState.js</afterOperatingState>
<titlePlural>Addresses</titlePlural>
@@ -90,6 +90,14 @@
<entityProvider>
<name>OrganisationAddresses</name>
<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>
<entityParameter>
<name>ContactType_param</name>
@@ -110,14 +118,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Addresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ContactId_param</name>
@@ -128,6 +128,20 @@
<entityProvider>
<name>ContactAddresses</name>
<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>
+ </dependencies>
<children>
<entityParameter>
<name>ContactType_param</name>
@@ -148,20 +162,6 @@
<expose v="false" />
</entityParameter>
</children>
- <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>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER</name>
@@ -178,6 +178,14 @@
<name>OrganisationAddressesByContact</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
<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>
<entityParameter>
<name>ContactType_param</name>
@@ -190,14 +198,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
- <entityName>Person_entity</entityName>
- <fieldName>OrgAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>IS_STANDARD</name>
@@ -223,27 +223,6 @@
<entityProvider>
<name>OrganisationAndContactAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>DefaultAddressId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ContactType_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OrganisationId_param</name>
- <title></title>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc</documentation>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
@@ -264,6 +243,27 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrganisationId_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc</documentation>
+ <title></title>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>OrganisationId_param</name>
@@ -272,17 +272,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordAddressTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AddressType_entity</entityName>
+ <fieldName>ByCategory</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>UsageFilter_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstypes/children/usagefilter_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AddressType_entity</entityName>
- <fieldName>ByCategory</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
@@ -309,6 +309,11 @@
</entityField>
<entityConsumer>
<name>ZipValidation</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AddressValidation_entity</entityName>
+ <fieldName>ZipValidaton</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Country_param</name>
@@ -319,14 +324,14 @@
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>CityValidation</name>
<dependency>
<name>dependency</name>
<entityName>AddressValidation_entity</entityName>
- <fieldName>ZipValidaton</fieldName>
+ <fieldName>CityValidation</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>CityValidation</name>
<children>
<entityParameter>
<name>CurrentValue_param</name>
@@ -337,11 +342,6 @@
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AddressValidation_entity</entityName>
- <fieldName>CityValidation</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>AddressSearch</name>
@@ -357,6 +357,11 @@
</entityField>
<entityConsumer>
<name>FullAddressValidation</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AddressValidation_entity</entityName>
+ <fieldName>FullAddressValidation</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CurrentValue_param</name>
@@ -367,14 +372,14 @@
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>StreetValidation</name>
<dependency>
<name>dependency</name>
<entityName>AddressValidation_entity</entityName>
- <fieldName>FullAddressValidation</fieldName>
+ <fieldName>StreetValidation</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>StreetValidation</name>
<children>
<entityParameter>
<name>City_param</name>
@@ -389,11 +394,6 @@
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/streetvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AddressValidation_entity</entityName>
- <fieldName>StreetValidation</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ShowDsgvoMessage_param</name>
@@ -491,20 +491,12 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
- <tableName>ADDRESS</tableName>
- <primaryKey>ADDRESSID</primaryKey>
- <isUIDTable v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADDRESS.value</name>
@@ -605,6 +597,14 @@
<recordfield>ADDRESS.LON</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/AdminViewRow_entity/AdminViewRow_entity.aod b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
index 5f87fe3406..943047aa8b 100644
--- a/entity/AdminViewRow_entity/AdminViewRow_entity.aod
+++ b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>AdminViewRow_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AdminViewRow_entity/documentation.adoc</documentation>
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 3eadc589a8..185dc5dacb 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Analyses_entity</name>
+ <title>Analyses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Analyses_entity/documentation.adoc</documentation>
<icon>VAADIN:GRID_BIG_O</icon>
- <title>Analyses</title>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 3b3b3c3e98..c604642bfd 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>AnyContact_entity</name>
+ <title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
- <title>Contact</title>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
<initFilterProcess>%aditoprj%/entity/AnyContact_entity/initFilterProcess.js</initFilterProcess>
<imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
@@ -83,12 +83,6 @@
<entityProvider>
<name>ContactsByIds</name>
<documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>0206f7a8-fd58-47e8-8b7a-5ff4531e56fb</name>
@@ -97,6 +91,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>ContactIds_param</name>
@@ -177,13 +177,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<entityProvider>
<name>OnlySameCompany</name>
<documentation>%aditoprj%/entity/AnyContact_entity/entityfields/onlysamecompany/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>28b19d6b-237c-4268-b6c6-323df408c94a</name>
@@ -192,6 +185,13 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>WithPrivatePersons_param</name>
@@ -210,40 +210,10 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>6786a204-2cea-42ae-857d-4335bad6b5e4</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>d15ccb84-6928-4c44-b940-0f5d04826b55</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>b778622f-449a-4185-b7cb-9b373ba4024f</name>
- <tableName>ADDRESS</tableName>
- <primaryKey>ADDRESSID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADDRESS_ID.value</name>
@@ -318,6 +288,36 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<recordfield>PERSON.PICTURE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>6786a204-2cea-42ae-857d-4335bad6b5e4</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>d15ccb84-6928-4c44-b940-0f5d04826b55</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>b778622f-449a-4185-b7cb-9b373ba4024f</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 1d6a1b12b3..e3d3ce500a 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>AppointmentLink_entity</name>
+ <title>Connection</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AppointmentLink_entity/documentation.adoc</documentation>
- <title>Connection</title>
<titlePlural>Connections</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -51,12 +51,6 @@
<targetIdField>OBJECTID</targetIdField>
<documentation>%aditoprj%/entity/AppointmentLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>AppointmentId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>3dde1745-18a1-4499-83d0-61e414086997</name>
@@ -65,6 +59,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityConsumer>
<name>Context</name>
@@ -76,17 +76,17 @@
</entityConsumer>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>opencontext</name>
@@ -110,17 +110,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
- <tableName>AB_APPOINTMENTLINK</tableName>
- <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>APPOINTMENT_ID.value</name>
@@ -139,6 +130,15 @@
<recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
+ <tableName>AB_APPOINTMENTLINK</tableName>
+ <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index cb201e6b12..d615ac8db0 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Appointment_entity</name>
+ <title>Appointment</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
- <title>Appointment</title>
<siblings />
<grantUpdateProcess>%aditoprj%/entity/Appointment_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Appointment_entity/grantDeleteProcess.js</grantDeleteProcess>
@@ -171,6 +171,11 @@
</entityParameter>
<entityConsumer>
<name>AppointmentLinks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AppointmentLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AppointmentId_param</name>
@@ -182,11 +187,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AppointmentLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>deleteSeries</name>
diff --git a/entity/AroundLocation_entity/AroundLocation_entity.aod b/entity/AroundLocation_entity/AroundLocation_entity.aod
index ae50af9dc4..1ccc8984c6 100644
--- a/entity/AroundLocation_entity/AroundLocation_entity.aod
+++ b/entity/AroundLocation_entity/AroundLocation_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>AroundLocation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AroundLocation_entity/documentation.adoc</documentation>
@@ -22,17 +22,17 @@
<entityConsumer>
<name>Organisations</name>
<state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>OrganisationsViaIndex</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OnlyShowContactIds_param</name>
<valueProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>OrganisationsViaIndex</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>Open</name>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index b5b408f91f..57050b50ba 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>AttributeRelation_entity</name>
+ <title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AttributeRelation_entity/documentation.adoc</documentation>
- <title>Attribute</title>
<grantUpdateProcess>%aditoprj%/entity/AttributeRelation_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/AttributeRelation_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/AttributeRelation_entity/contentTitleProcess.js</contentTitleProcess>
@@ -35,13 +35,6 @@
<entityProvider>
<name>TreeProvider</name>
<documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>GetTree_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
@@ -104,6 +97,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>GetTree_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>AB_ATTRIBUTE_ID</name>
@@ -133,6 +133,11 @@
</entityField>
<entityConsumer>
<name>SpecificAttribute</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -151,11 +156,6 @@
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/themeobjectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>GetTree_param</name>
@@ -166,13 +166,6 @@
<entityProvider>
<name>AttributeRelations</name>
<documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelations/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>GetTree_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelations/children/gettree_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>69560cc2-d92a-453c-9e64-fb712a538c4f</name>
@@ -247,6 +240,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>GetTree_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelations/children/gettree_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>DATE_EDIT</name>
@@ -314,6 +314,11 @@
</entityField>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectProxy_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Entity_param</name>
@@ -324,11 +329,6 @@
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/objects/children/filter_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>DROPDOWNDEFINITION</name>
@@ -351,6 +351,11 @@
</entityProvider>
<entityConsumer>
<name>SpecificFilterAttributes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificFilterAttributes</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AttributeCount_param</name>
@@ -361,20 +366,9 @@
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificFilterAttributes</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>FilterProvider</name>
- <children>
- <entityParameter>
- <name>DisplaySimpleName_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/filterprovider/children/displaysimplename_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>0560c6d0-8473-4050-9ca1-a935bbac2ef9</name>
@@ -383,6 +377,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/filterprovider/children/displaysimplename_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityProvider>
</entityFields>
<recordContainers>
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 166b6b8423..7537ce2687 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>AttributeUsage_entity</name>
+ <title>Usage</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
- <title>Usage</title>
<siblings>
<element>Attribute_entity</element>
</siblings>
@@ -72,6 +72,11 @@
</entityField>
<entityConsumer>
<name>Context</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -82,11 +87,6 @@
<valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>SingleSelection_param</name>
@@ -106,20 +106,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>c30f5670-580e-4621-95dd-0fec4a99190f</name>
- <tableName>AB_ATTRIBUTEUSAGE</tableName>
- <primaryKey>AB_ATTRIBUTEUSAGEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_ATTRIBUTE_ID.value</name>
@@ -142,6 +133,15 @@
<recordfield>AB_ATTRIBUTEUSAGE.MIN_COUNT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>c30f5670-580e-4621-95dd-0fec4a99190f</name>
+ <tableName>AB_ATTRIBUTEUSAGE</tableName>
+ <primaryKey>AB_ATTRIBUTEUSAGEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 76187e3927..0efb778259 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Attribute_entity</name>
+ <title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
- <title>Attribute</title>
<grantDeleteProcess>%aditoprj%/entity/Attribute_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Attribute_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
@@ -61,6 +61,11 @@
<name>AttributeUsages</name>
<refreshParent v="true" />
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeUsage_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AttributeId_param</name>
@@ -76,11 +81,6 @@
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/disablemincount_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeUsage_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ATTRIBUTE_ACTIVE</name>
@@ -92,6 +92,11 @@
</entityField>
<entityConsumer>
<name>KeywordAttributeTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -103,11 +108,6 @@
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>DROPDOWNDEFINITION</name>
@@ -132,33 +132,6 @@
<name>SpecificAttribute</name>
<lookupIdfield>UID</lookupIdfield>
<documentation>%aditoprj%/entity/Attribute_entity/entityfields/specificattribute/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>FilteredAttributeIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>DisplaySimpleName_param</name>
- <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ChildId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ChildType_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ParentId_param</name>
- <description>parent id, this is used for filtering by the parent in the content process</description>
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
@@ -191,6 +164,33 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>FilteredAttributeIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ChildId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ChildType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ParentId_param</name>
+ <description>parent id, this is used for filtering by the parent in the content process</description>
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>FULL_ATTRIBUTE_NAME</name>
@@ -242,6 +242,11 @@
<entityConsumer>
<name>AttributeGroup</name>
<description>Used for the selection of the parent attribute</description>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>AttributeGroups</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ChildId_param</name>
@@ -256,11 +261,6 @@
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributegroup/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeGroups</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ICON</name>
@@ -311,6 +311,11 @@
</entityField>
<entityConsumer>
<name>Contexts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -321,11 +326,6 @@
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
- </dependency>
</entityConsumer>
<entityActionGroup>
<name>AttributeActions</name>
@@ -357,6 +357,14 @@
</entityActionField>
<entityProvider>
<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>
<entityParameter>
<name>AttributeCount_param</name>
@@ -375,14 +383,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>6e314038-62de-4f0c-b89a-92f029c10933</name>
- <entityName>Activity_entity</entityName>
- <fieldName>ActivityAtrributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ParentId_param</name>
@@ -399,6 +399,14 @@
<sortingField>SORTING</sortingField>
<documentation>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc</documentation>
<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>
<entityParameter>
<name>ChildId_param</name>
@@ -438,19 +446,16 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>80023321-1954-483f-a4be-b7207557c068</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>ChildAttributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>ChildAttributes</name>
<refreshParent v="true" />
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>AttributeChildren</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DisplaySimpleName_param</name>
@@ -465,11 +470,6 @@
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/childattributes/children/parenttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeChildren</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>GetOnlyFirstLevelChildren_param</name>
@@ -485,6 +485,14 @@
</entityProvider>
<entityProvider>
<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>
<entityParameter>
<name>DisplaySimpleName_param</name>
@@ -495,14 +503,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>9b2b5f2e-229d-4a10-a54f-cbf77aafe512</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>SpecificFilterAttributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
</entityFields>
<recordContainers>
diff --git a/entity/AuditLogHistory_entity/AuditLogHistory_entity.aod b/entity/AuditLogHistory_entity/AuditLogHistory_entity.aod
index 2ed69d3a31..4425b01ed7 100644
--- a/entity/AuditLogHistory_entity/AuditLogHistory_entity.aod
+++ b/entity/AuditLogHistory_entity/AuditLogHistory_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>AuditLogHistory_entity</name>
+ <title>Audit Log</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AuditLogHistory_entity/documentation.adoc</documentation>
<icon>VAADIN:LINES_LIST</icon>
- <title>Audit Log</title>
<grantCreate v="false" />
<grantUpdate v="false" />
<grantDelete v="true" />
@@ -75,17 +75,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<orderClauseProcess>%aditoprj%/entity/AuditLogHistory_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>ed8bd1ca-64eb-443e-a04d-ea7aee0c352a</name>
- <tableName>AB_LOGHISTORY</tableName>
- <primaryKey>AB_LOGHISTORYID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>UID.value</name>
@@ -129,6 +120,15 @@
<isFilterable v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>ed8bd1ca-64eb-443e-a04d-ea7aee0c352a</name>
+ <tableName>AB_LOGHISTORY</tableName>
+ <primaryKey>AB_LOGHISTORYID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtension>
<name>contextFilter</name>
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index 95b5c59685..a43dd1134f 100644
--- a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>BulkMailAddRecipients_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 0e5fdd626e..1d00109008 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>BulkMailRecipient_entity</name>
+ <title>Recipient</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailRecipient_entity/documentation.adoc</documentation>
- <title>Recipient</title>
<siblings>
<element>Communication_entity</element>
</siblings>
@@ -67,17 +67,17 @@
</entityConsumer>
<entityConsumer>
<name>StatusKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>EMAIL_ADDRESS</name>
@@ -136,17 +136,17 @@
</entityField>
<entityConsumer>
<name>EmailAdresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>EmailCommunications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -156,43 +156,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>b8fa2cab-18d8-4297-adc3-191d21f60c3a</name>
- <tableName>BULKMAILRECIPIENT</tableName>
- <primaryKey>BULKMAILRECIPIENTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>c4c3f40e-9435-4414-a4c8-7611e112b460</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>cc598ca4-9623-48a5-8543-0963be24f714</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>7887492c-6920-4568-96b7-e9a2661ff9d1</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>BULKMAIL_ID.value</name>
@@ -255,6 +225,36 @@
<expression>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/problem.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>b8fa2cab-18d8-4297-adc3-191d21f60c3a</name>
+ <tableName>BULKMAILRECIPIENT</tableName>
+ <primaryKey>BULKMAILRECIPIENTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>c4c3f40e-9435-4414-a4c8-7611e112b460</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>cc598ca4-9623-48a5-8543-0963be24f714</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>7887492c-6920-4568-96b7-e9a2661ff9d1</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
index 63f5f1d407..8449b088e7 100644
--- a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
+++ b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>BulkMailStatusChart_entity</name>
+ <title>Recipient status</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailStatusChart_entity/documentation.adoc</documentation>
- <title>Recipient status</title>
<siblings>
<element>BulkMailRecipient_entity</element>
</siblings>
diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
index 008aa0177c..c876aa327d 100644
--- a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
+++ b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>BulkMailTesting_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailTesting_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index cc5791ce3a..a137066b8a 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>BulkMail_entity</name>
+ <title>Bulk Mail</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMail_entity/documentation.adoc</documentation>
<icon>VAADIN:AT</icon>
- <title>Bulk Mail</title>
<grantUpdateProcess>%aditoprj%/entity/BulkMail_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/BulkMail_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/BulkMail_entity/contentTitleProcess.js</contentTitleProcess>
@@ -56,20 +56,25 @@
<entityConsumer>
<name>Recipients</name>
<stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/recipients/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>BulkMailRecipient_entity</entityName>
+ <fieldName>BulkMailRecipients</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>BulkMailId_param</name>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/recipients/children/bulkmailid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>BulkMailRecipient_entity</entityName>
- <fieldName>BulkMailRecipients</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Templates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -80,11 +85,6 @@
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/templates/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>STATUS</name>
@@ -108,17 +108,17 @@
</entityField>
<entityConsumer>
<name>StatusKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>bindata</name>
@@ -155,17 +155,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CREATEACTIVITIES</name>
@@ -176,17 +176,17 @@
</entityField>
<entityConsumer>
<name>RecipientStatusChart</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>BulkMailStatusChart_entity</entityName>
+ <fieldName>RecipientStatusChart</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>BulkMailId_param</name>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/recipientstatuschart/children/bulkmailid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>BulkMailStatusChart_entity</entityName>
- <fieldName>RecipientStatusChart</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TESTING_CONTACT_ID</name>
@@ -213,6 +213,11 @@
</entityConsumer>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -223,11 +228,6 @@
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>sendMail</name>
@@ -291,13 +291,6 @@
<entityProvider>
<name>BulkMailsNotSent</name>
<documentation>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmailsnotsent/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>BulkMailStatus_param</name>
- <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmailsnotsent/children/bulkmailstatus_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>16cdf326-0b43-4d72-bf19-21434e047e85</name>
@@ -306,6 +299,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>BulkMailStatus_param</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmailsnotsent/children/bulkmailstatus_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>BulkMailStatus_param</name>
@@ -323,28 +323,12 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>6444866d-42ee-4b7b-8536-6dc8f6437c45</name>
- <tableName>BULKMAIL</tableName>
- <primaryKey>BULKMAILID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>914d6373-4409-44e5-882a-3f795b196d7b</name>
- <tableName>DOCUMENTTEMPLATE</tableName>
- <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>BULKMAILID.value</name>
@@ -413,6 +397,22 @@
<recordfield>BULKMAIL.USE_TEMPLATE_ATTACHMENTS</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>6444866d-42ee-4b7b-8536-6dc8f6437c45</name>
+ <tableName>BULKMAIL</tableName>
+ <primaryKey>BULKMAILID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>914d6373-4409-44e5-882a-3f795b196d7b</name>
+ <tableName>DOCUMENTTEMPLATE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 5a45ceab9f..07fdff425a 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>CampaignAddParticipants_entity</name>
+ <title>Add participants to Campaign</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignAddParticipants_entity/documentation.adoc</documentation>
- <title>Add participants to Campaign</title>
<siblings>
<element>CampaignParticipant_entity</element>
<element>Campaign_entity</element>
@@ -60,6 +60,11 @@
</entityConsumer>
<entityConsumer>
<name>CampaignStepConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
@@ -67,11 +72,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>UID</name>
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index 8aae1d74b9..432e1d4f79 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>CampaignAnalysis_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignAnalysis_entity/documentation.adoc</documentation>
@@ -15,6 +15,14 @@
<entityProvider>
<name>CampaignAnalysisProvider</name>
<documentation>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/campaignanalysisprovider/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>bd130613-f0e4-4591-8035-2c2491b08c50</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignAnalysisConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>DateEnd_param</name>
@@ -32,14 +40,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>bd130613-f0e4-4591-8035-2c2491b08c50</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignAnalysisConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>CampaignId_param</name>
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index f5d7ee451e..58a579ab19 100644
--- a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
+++ b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>CampaignCostChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignCostChart_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index 7652bce291..9016cfd74c 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>CampaignCost_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignCost_entity/documentation.adoc</documentation>
@@ -80,6 +80,14 @@
<entityProvider>
<name>CampaignCosts</name>
<documentation>%aditoprj%/entity/CampaignCost_entity/entityfields/campaigncosts/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>7131288b-af5c-4914-96f5-c5d70217fc23</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignCosts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>CampaignStepId_param</name>
@@ -99,18 +107,24 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityProvider>
+ <entityProvider>
+ <name>StepCosts</name>
+ <documentation>%aditoprj%/entity/CampaignCost_entity/entityfields/stepcosts/documentation.adoc</documentation>
<dependencies>
<entityDependency>
- <name>7131288b-af5c-4914-96f5-c5d70217fc23</name>
+ <name>af147f3e-a1bd-4eb0-9ac8-325dbdaba17d</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignStepCosts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2a92b738-c0bb-4c14-9915-aff9e18effaf</name>
<entityName>Campaign_entity</entityName>
- <fieldName>CampaignCosts</fieldName>
+ <fieldName>CampaignStepCosts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityProvider>
- <name>StepCosts</name>
- <documentation>%aditoprj%/entity/CampaignCost_entity/entityfields/stepcosts/documentation.adoc</documentation>
<children>
<entityParameter>
<name>CampaignStepId_param</name>
@@ -130,20 +144,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>af147f3e-a1bd-4eb0-9ac8-325dbdaba17d</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignStepCosts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2a92b738-c0bb-4c14-9915-aff9e18effaf</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignStepCosts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Campaigns</name>
@@ -155,20 +155,25 @@
</entityConsumer>
<entityConsumer>
<name>CampaignSteps</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
<valueProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordCampaignManagementCostCategory</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -179,11 +184,6 @@
<valueProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/blacklistids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>CampaignId_param</name>
@@ -222,9 +222,9 @@
</entityField>
<entityParameter>
<name>CampaignSteps_param</name>
- <title></title>
<expose v="true" />
<documentation>%aditoprj%/entity/CampaignCost_entity/entityfields/campaignsteps_param/documentation.adoc</documentation>
+ <title></title>
<description>PARAMETER</description>
</entityParameter>
<entityField>
@@ -249,33 +249,10 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/CampaignCost_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/CampaignCost_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/CampaignCost_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>6010c581-04c5-4578-b07b-5ab5ce27093b</name>
- <tableName>CAMPAIGNCOST</tableName>
- <primaryKey>CAMPAIGNCOSTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>e5fcdb82-a4f4-4bf8-a7e5-81b94d6377bb</name>
- <tableName>CAMPAIGNSTEP</tableName>
- <primaryKey>CAMPAIGNSTEPID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>22980b1e-ea89-4dc6-a648-bddb77401c6a</name>
- <tableName>CAMPAIGN</tableName>
- <primaryKey>CAMPAIGNID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CAMPAIGN_ID.value</name>
@@ -331,6 +308,29 @@
<expression>%aditoprj%/entity/CampaignCost_entity/recordcontainers/db/recordfieldmappings/netperparticipant_aggregate.value/expression.js</expression>
</aggregateFieldDbMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>6010c581-04c5-4578-b07b-5ab5ce27093b</name>
+ <tableName>CAMPAIGNCOST</tableName>
+ <primaryKey>CAMPAIGNCOSTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>e5fcdb82-a4f4-4bf8-a7e5-81b94d6377bb</name>
+ <tableName>CAMPAIGNSTEP</tableName>
+ <primaryKey>CAMPAIGNSTEPID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>22980b1e-ea89-4dc6-a648-bddb77401c6a</name>
+ <tableName>CAMPAIGN</tableName>
+ <primaryKey>CAMPAIGNID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index 6291fe367f..5e514a302a 100644
--- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>CampaignParticipantChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignParticipantChart_entity/documentation.adoc</documentation>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 92f21ead90..cc3e45b641 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>CampaignParticipant_entity</name>
+ <title>Participant</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignParticipant_entity/documentation.adoc</documentation>
- <title>Participant</title>
<siblings>
<element>CampaignAddParticipants_entity</element>
<element>CampaignParticipantChart_entity</element>
@@ -22,20 +22,6 @@
<name>CampaignParticipantsProvider</name>
<documentation>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignparticipantsprovider/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>CampaignId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>CampaignStepId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>f28945cd-4613-4dfa-91f7-a7d9d64cef58</name>
@@ -50,6 +36,20 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>CampaignId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>CampaignStepId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>CampaignStepId_param</name>
@@ -144,6 +144,11 @@
<entityConsumer>
<name>CampaignSteps</name>
<refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
@@ -151,11 +156,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CONTACTCONTEXT</name>
@@ -203,17 +203,17 @@
</entityConsumer>
<entityConsumer>
<name>CommRestrictionIcon</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttribute_entity</entityName>
+ <fieldName>SpecificContainerKeyword</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/commrestrictionicon/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttribute_entity</entityName>
- <fieldName>SpecificContainerKeyword</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
@@ -280,57 +280,27 @@
</entityField>
<entityConsumer>
<name>ResponsibleEmployees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>EmployeeContactIdWhitelist_param</name>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/responsibleemployees/children/employeecontactidwhitelist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Employees</fieldName>
- </dependency>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<hasDependentRecords v="true" />
<fromClauseProcess>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <linkInformation>
- <linkInformation>
- <name>02d0ac80-2767-401c-bdc1-aac3e8abf0e4</name>
- <tableName>CAMPAIGNPARTICIPANT</tableName>
- <primaryKey>CAMPAIGNPARTICIPANTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>6c320211-601b-47bf-a562-003886666040</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>e1719eb5-112c-4acd-8f72-58a688d5f058</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>8be80af4-69ea-4a5d-b404-8a26c1f8d8da</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CAMPAIGN_ID.value</name>
@@ -433,6 +403,36 @@
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>02d0ac80-2767-401c-bdc1-aac3e8abf0e4</name>
+ <tableName>CAMPAIGNPARTICIPANT</tableName>
+ <primaryKey>CAMPAIGNPARTICIPANTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>6c320211-601b-47bf-a562-003886666040</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>e1719eb5-112c-4acd-8f72-58a688d5f058</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>8be80af4-69ea-4a5d-b404-8a26c1f8d8da</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
index 62ae8a76e9..33c4b451ad 100644
--- a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
+++ b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>CampaignPlanning_entity</name>
+ <title>Campaign Planning</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignPlanning_entity/documentation.adoc</documentation>
- <title>Campaign Planning</title>
<siblings>
<element>Campaign_entity</element>
<element>CampaignStep_entity</element>
@@ -81,17 +81,17 @@
</entityField>
<entityConsumer>
<name>CampaignStatusKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CampaignPlanning_entity/entityfields/campaignstatuskeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 3632eda854..db37cfd536 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>CampaignStep_entity</name>
+ <title>Campaign Step</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignStep_entity/documentation.adoc</documentation>
<icon>NEON:GROUP_APPOINTMENT</icon>
- <title>Campaign Step</title>
<siblings>
<element>CampaignPlanning_entity</element>
<element>Campaign_entity</element>
@@ -131,13 +131,6 @@
<name>CampaignSteps</name>
<documentation>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignsteps/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>campaignId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>421e6cc2-f874-4834-b022-fe1b253d50af</name>
@@ -176,6 +169,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>campaignId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>campaignId_param</name>
@@ -184,17 +184,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordStates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>MAXPARTICIPANTS</name>
@@ -206,6 +206,11 @@
<entityConsumer>
<name>CampaignParticipantsConsumer</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignParticipant_entity</entityName>
+ <fieldName>CampaignParticipantsProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CampaignId_param</name>
@@ -216,11 +221,6 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>CampaignParticipantsProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CurrentMaxParticipantsInfo</name>
@@ -241,20 +241,25 @@
</entityField>
<entityConsumer>
<name>Employees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OnlyActives_param</name>
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Employees</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>CampaignStepCosts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignCost_entity</entityName>
+ <fieldName>StepCosts</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CampaignId_param</name>
@@ -265,11 +270,6 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepcosts/children/campaignstepid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignCost_entity</entityName>
- <fieldName>StepCosts</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>COST</name>
@@ -289,6 +289,11 @@
<entityConsumer>
<name>Activities</name>
<title>Activities</title>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -299,16 +304,16 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
<title>Tasks</title>
<stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -319,11 +324,6 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -357,6 +357,11 @@
</entityField>
<entityConsumer>
<name>CampaignStepsConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
@@ -368,11 +373,6 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepsconsumer/children/maxsort_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CampaignName</name>
@@ -419,37 +419,28 @@
</entityField>
<entityConsumer>
<name>KeywordStepMedium</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/keywordstepmedium/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>b039db2c-3988-42a0-9257-9689b1eb4e58</name>
- <tableName>CAMPAIGNSTEP</tableName>
- <primaryKey>CAMPAIGNSTEPID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CAMPAIGN_ID.value</name>
@@ -542,6 +533,15 @@
<expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>b039db2c-3988-42a0-9257-9689b1eb4e58</name>
+ <tableName>CAMPAIGNSTEP</tableName>
+ <primaryKey>CAMPAIGNSTEPID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 1c9ab60821..f5c04fb9aa 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Campaign_entity</name>
+ <title>Campaign</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Campaign_entity/documentation.adoc</documentation>
<icon>VAADIN:GROUP</icon>
- <title>Campaign</title>
<siblings>
<element>CampaignStep_entity</element>
<element>CampaignCost_entity</element>
@@ -129,6 +129,11 @@
<entityConsumer>
<name>CampaignSteps</name>
<state>EDITABLE</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
@@ -137,11 +142,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>STATUS</name>
@@ -153,17 +153,17 @@
</entityField>
<entityConsumer>
<name>KeywordStates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>Campaigns</name>
@@ -200,6 +200,11 @@
<name>CampaignParticipants</name>
<refreshParent v="false" />
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignParticipant_entity</entityName>
+ <fieldName>CampaignParticipantsProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CampaignStepId_param</name>
@@ -211,11 +216,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>CampaignParticipantsProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Employee</name>
@@ -227,17 +227,17 @@
</entityConsumer>
<entityConsumer>
<name>CampaignCosts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignCost_entity</entityName>
+ <fieldName>CampaignCosts</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CampaignId_param</name>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaigncosts/children/campaignid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignCost_entity</entityName>
- <fieldName>CampaignCosts</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>COST</name>
@@ -248,17 +248,17 @@
</entityField>
<entityConsumer>
<name>CampaignStepCosts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignCost_entity</entityName>
+ <fieldName>StepCosts</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CampaignId_param</name>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignstepcosts/children/campaignid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignCost_entity</entityName>
- <fieldName>StepCosts</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>stepCount</name>
@@ -273,6 +273,11 @@
<entityConsumer>
<name>Activities</name>
<title>Activities</title>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -283,11 +288,6 @@
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -306,32 +306,32 @@
<entityConsumer>
<name>CampaignCostsChart</name>
<title>Charts</title>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignCostChart_entity</entityName>
+ <fieldName>CostChart</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CampaignId_param</name>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaigncostschart/children/campaignid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignCostChart_entity</entityName>
- <fieldName>CostChart</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>CampaignParticipantsChart</name>
<title>Chart 2</title>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignParticipantChart_entity</entityName>
+ <fieldName>ParticipantChart</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CampaignId_param</name>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignparticipantschart/children/campaignid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignParticipantChart_entity</entityName>
- <fieldName>ParticipantChart</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>remainingRuntime</name>
@@ -341,22 +341,27 @@
<entityConsumer>
<name>CampaignStepsReadonly</name>
<state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignstepsreadonly/children/campaignid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Campaign_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -367,11 +372,6 @@
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newCampaignStep</name>
@@ -381,11 +381,16 @@
</entityActionField>
<entityConsumer>
<name>CampaignAnalysisConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignAnalysis_entity</entityName>
+ <fieldName>CampaignAnalysisProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CampaignId_param</name>
- <title></title>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignanalysisconsumer/children/campaignid_param/valueProcess.js</valueProcess>
+ <title></title>
</entityParameter>
<entityParameter>
<name>DateEnd_param</name>
@@ -396,14 +401,14 @@
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignanalysisconsumer/children/datestart_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignAnalysis_entity</entityName>
- <fieldName>CampaignAnalysisProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>MemberConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -414,16 +419,11 @@
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/memberconsumer/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Member_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ShowOnlyCurrentUsersCampaigns_param</name>
- <title>Show only own</title>
<expose v="true" />
+ <title>Show only own</title>
</entityParameter>
<entityActionField>
<name>copyCampaign</name>
@@ -440,6 +440,11 @@
</entityActionField>
<entityConsumer>
<name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -450,15 +455,15 @@
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributetree/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -469,11 +474,6 @@
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CURRENCY</name>
@@ -485,17 +485,17 @@
</entityField>
<entityConsumer>
<name>KeywordCurrency</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/keywordcurrency/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CAMPAIGN_OBEJCTTYPE</name>
@@ -540,6 +540,11 @@
</entityParameter>
<entityConsumer>
<name>Tasks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -550,30 +555,16 @@
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Campaign_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>f95b8870-15cd-4302-99ec-8a104ae2262d</name>
- <tableName>CAMPAIGN</tableName>
- <primaryKey>CAMPAIGNID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -679,6 +670,15 @@
<expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>f95b8870-15cd-4302-99ec-8a104ae2262d</name>
+ <tableName>CAMPAIGN</tableName>
+ <primaryKey>CAMPAIGNID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtensionSet>
<name>Attribute_filter</name>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index ce749baea1..23f1c3e8b3 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ClassificationAdmin_entity</name>
+ <title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ClassificationAdmin_entity/documentation.adoc</documentation>
<icon>VAADIN:LIST_OL</icon>
- <title>Classification</title>
<grantUpdateProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
index 845919600c..e241fcca9e 100644
--- a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
+++ b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ClassificationGrading_entity</name>
+ <title>Grading</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ClassificationGrading_entity/documentation.adoc</documentation>
- <title>Grading</title>
<titlePlural>Gradings in Percent</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -30,13 +30,6 @@
<entityProvider>
<name>ClassificationGradings</name>
<documentation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>ClassificationTypeId_param</name>
- <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>e0c6b86e-dcc1-43e1-9581-2b10c5c3d0cd</name>
@@ -45,6 +38,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -61,24 +61,15 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
<cacheKeyProcess>%aditoprj%/entity/ClassificationGrading_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
- <linkInformation>
- <linkInformation>
- <name>9a9482d5-005a-4dc5-8b58-e07c44420b64</name>
- <tableName>CLASSIFICATIONGRADING</tableName>
- <primaryKey>CLASSIFICATIONGRADINGID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>GRADING.value</name>
@@ -97,6 +88,15 @@
<recordfield>CLASSIFICATIONGRADING.MINPERCENT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>9a9482d5-005a-4dc5-8b58-e07c44420b64</name>
+ <tableName>CLASSIFICATIONGRADING</tableName>
+ <primaryKey>CLASSIFICATIONGRADINGID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
index c37f1f7de6..68724063ba 100644
--- a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
+++ b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ClassificationGroup_entity</name>
+ <title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ClassificationGroup_entity/documentation.adoc</documentation>
- <title>Classification</title>
<contentTitleProcess>%aditoprj%/entity/ClassificationGroup_entity/contentTitleProcess.js</contentTitleProcess>
<titlePlural>Classifications</titlePlural>
<recordContainer>db</recordContainer>
@@ -30,17 +30,17 @@
</entityConsumer>
<entityConsumer>
<name>ClassificationGradings</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationGrading_entity</entityName>
+ <fieldName>ClassificationGradings</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ClassificationTypeId_param</name>
<valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationGrading_entity</entityName>
- <fieldName>ClassificationGradings</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>SORTING</name>
@@ -78,21 +78,12 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/ClassificationGroup_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
<cacheKeyProcess>%aditoprj%/entity/ClassificationGroup_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
- <linkInformation>
- <linkInformation>
- <name>b0606861-e080-4441-94ac-fce33bbf7747</name>
- <tableName>CLASSIFICATIONGROUP</tableName>
- <primaryKey>CLASSIFICATIONGROUPID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>TITLE.value</name>
@@ -107,6 +98,15 @@
<recordfield>CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>b0606861-e080-4441-94ac-fce33bbf7747</name>
+ <tableName>CLASSIFICATIONGROUP</tableName>
+ <primaryKey>CLASSIFICATIONGROUPID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 1a55247ab4..2ae55fb562 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ClassificationScore_entity</name>
+ <title>Possible Value</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ClassificationScore_entity/documentation.adoc</documentation>
- <title>Possible Value</title>
<contentTitleProcess>%aditoprj%/entity/ClassificationScore_entity/contentTitleProcess.js</contentTitleProcess>
<titlePlural>Possible Values</titlePlural>
<recordContainer>db</recordContainer>
@@ -97,23 +97,14 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBUpdate>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
<cacheKeyProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
- <linkInformation>
- <linkInformation>
- <name>e2fecaf8-bc95-4a4d-bd96-88731568b1a4</name>
- <tableName>CLASSIFICATIONSCORE</tableName>
- <primaryKey>CLASSIFICATIONSCOREID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CLASSIFICATIONSCOREID.value</name>
@@ -140,6 +131,15 @@
<recordfield>CLASSIFICATIONSCORE.SCOREPERCENT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>e2fecaf8-bc95-4a4d-bd96-88731568b1a4</name>
+ <tableName>CLASSIFICATIONSCORE</tableName>
+ <primaryKey>CLASSIFICATIONSCOREID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index 97ee107365..749feeedc3 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ClassificationType_entity</name>
+ <title>Indicator</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ClassificationType_entity/documentation.adoc</documentation>
- <title>Indicator</title>
<contentTitleProcess>%aditoprj%/entity/ClassificationType_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
@@ -40,6 +40,11 @@
<entityConsumer>
<name>ClassificationScores</name>
<refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationScore_entity</entityName>
+ <fieldName>ClassificationScores</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ClassificationTypeId_param</name>
@@ -50,11 +55,6 @@
<valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationScore_entity</entityName>
- <fieldName>ClassificationScores</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -92,20 +92,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/ClassificationType_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
<cacheKeyProcess>%aditoprj%/entity/ClassificationType_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
- <linkInformation>
- <linkInformation>
- <name>0c764b72-f55b-4b87-8dc1-9a491a143f44</name>
- <tableName>CLASSIFICATIONTYPE</tableName>
- <primaryKey>CLASSIFICATIONTYPEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CLASSIFICATIONTYPEID.value</name>
@@ -132,6 +123,15 @@
<recordfield>CLASSIFICATIONTYPE.SCOREPOINTS</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>0c764b72-f55b-4b87-8dc1-9a491a143f44</name>
+ <tableName>CLASSIFICATIONTYPE</tableName>
+ <primaryKey>CLASSIFICATIONTYPEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index ea396e3a3d..f742a84e6a 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Classification_entity</name>
+ <title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Classification_entity/documentation.adoc</documentation>
- <title>Classification</title>
<grantDelete v="false" />
<afterOperatingState>%aditoprj%/entity/Classification_entity/afterOperatingState.js</afterOperatingState>
<titlePlural>Classifications</titlePlural>
@@ -85,6 +85,11 @@
</entityField>
<entityConsumer>
<name>ClassificationScores</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationScore_entity</entityName>
+ <fieldName>ClassificationScores</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ClassificationGroup_param</name>
@@ -99,11 +104,6 @@
<valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationScore_entity</entityName>
- <fieldName>ClassificationScores</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>Info</name>
@@ -118,17 +118,17 @@
</entityField>
<entityConsumer>
<name>KeywordClassificationTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Classification_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>SCORETYPE</name>
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index 00537fadd1..af5659bb88 100644
--- a/entity/CommRestriction_Entity/CommRestriction_Entity.aod
+++ b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>CommRestriction_Entity</name>
+ <title>Advertising ban</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CommRestriction_Entity/documentation.adoc</documentation>
- <title>Advertising ban</title>
<contentTitleProcess>%aditoprj%/entity/CommRestriction_Entity/contentTitleProcess.js</contentTitleProcess>
<titlePlural>Advertising bans</titlePlural>
<recordContainer>db</recordContainer>
@@ -56,6 +56,11 @@
</entityConsumer>
<entityConsumer>
<name>CommRestrictionMedium</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -67,11 +72,6 @@
<valueProcess>%aditoprj%/entity/CommRestriction_Entity/entityfields/commrestrictionmedium/children/blacklistids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>CommRestrictions</name>
@@ -104,17 +104,17 @@
</entityField>
<entityConsumer>
<name>MediumKeywordAttribute</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttribute_entity</entityName>
+ <fieldName>SpecificContainerKeyword</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CommRestriction_Entity/entityfields/mediumkeywordattribute/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttribute_entity</entityName>
- <fieldName>SpecificContainerKeyword</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -124,20 +124,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/CommRestriction_Entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/CommRestriction_Entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/CommRestriction_Entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/CommRestriction_Entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>d02c4bb0-c0aa-46fa-bf1b-4bcc44aeb012</name>
- <tableName>COMMRESTRICTION</tableName>
- <primaryKey>COMMRESTRICTIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>COMMRESTRICTIONID.value</name>
@@ -172,6 +163,15 @@
<expression>%aditoprj%/entity/CommRestriction_Entity/recordcontainers/db/recordfieldmappings/medium.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>d02c4bb0-c0aa-46fa-bf1b-4bcc44aeb012</name>
+ <tableName>COMMRESTRICTION</tableName>
+ <primaryKey>COMMRESTRICTIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index db52c114fe..fa0187084e 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Communication_entity</name>
+ <title>Communication</title>
<description>former Comm</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Communication_entity/documentation.adoc</documentation>
- <title>Communication</title>
<contentTitleProcess>%aditoprj%/entity/Communication_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
@@ -63,27 +63,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>AllCommunications</name>
<documentation>%aditoprj%/entity/Communication_entity/entityfields/allcommunications/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>CommCategory_param</name>
- <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" />
- <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
-Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
- </entityParameter>
- <entityParameter>
- <name>Address_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>AdditionalContactIds_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
@@ -110,16 +89,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityProvider>
- <name>PhoneCommunications</name>
- <documentation>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc</documentation>
- <recordContainer>db</recordContainer>
<children>
<entityParameter>
<name>CommCategory_param</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/children/commcategory_param/valueProcess.js</valueProcess>
- <expose v="false" />
+ <expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
@@ -130,14 +103,18 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
<entityParameter>
<name>Address_param</name>
- <expose v="true" />
- <mandatory v="false" />
+ <expose v="false" />
</entityParameter>
<entityParameter>
<name>AdditionalContactIds_param</name>
<expose v="false" />
</entityParameter>
</children>
+ </entityProvider>
+ <entityProvider>
+ <name>PhoneCommunications</name>
+ <documentation>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc</documentation>
+ <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>7382242a-aa18-4a31-ab77-69a79f2b97b8</name>
@@ -152,16 +129,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityProvider>
- <name>EmailCommunications</name>
- <documentation>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc</documentation>
- <recordContainer>db</recordContainer>
<children>
<entityParameter>
<name>CommCategory_param</name>
- <title></title>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/children/commcategory_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/children/commcategory_param/valueProcess.js</valueProcess>
<expose v="false" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
@@ -173,13 +144,19 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
<entityParameter>
<name>Address_param</name>
- <expose v="false" />
+ <expose v="true" />
+ <mandatory v="false" />
</entityParameter>
<entityParameter>
<name>AdditionalContactIds_param</name>
<expose v="false" />
</entityParameter>
</children>
+ </entityProvider>
+ <entityProvider>
+ <name>EmailCommunications</name>
+ <documentation>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc</documentation>
+ <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>ecfbf518-fe92-4661-8ebe-e2d3c8d259e1</name>
@@ -206,6 +183,29 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>CommCategory_param</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/children/commcategory_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <title></title>
+ <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" />
+ <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Address_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>AdditionalContactIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>CommCategory_param</name>
@@ -219,6 +219,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
<entityConsumer>
<name>KeywordMediums</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -226,11 +231,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
@@ -289,29 +289,13 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>5f6cd42e-34d5-4a1c-b9f0-8c87bf914f22</name>
- <tableName>COMMUNICATION</tableName>
- <primaryKey>COMMUNICATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>fd493a1b-3ff1-4e7e-8d21-0f9f28824e9e</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADDR.value</name>
@@ -356,6 +340,22 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<recordfield>COMMUNICATION.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>5f6cd42e-34d5-4a1c-b9f0-8c87bf914f22</name>
+ <tableName>COMMUNICATION</tableName>
+ <primaryKey>COMMUNICATIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>fd493a1b-3ff1-4e7e-8d21-0f9f28824e9e</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 50d4bcf309..8e08714b5b 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Competition_entity</name>
+ <title>Competition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Competition_entity/documentation.adoc</documentation>
- <title>Competition</title>
<titlePlural>Competition</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -79,6 +79,11 @@
</entityConsumer>
<entityConsumer>
<name>Organisations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>WithAttribute</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AttributeId_param</name>
@@ -97,15 +102,15 @@
<title></title>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>WithAttribute</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordWonLost</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -113,11 +118,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>PHASE</name>
@@ -127,6 +127,11 @@
</entityField>
<entityConsumer>
<name>KeywordPricePolitics</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -134,14 +139,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordWeaknesses</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordWeaknesses</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -149,14 +154,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStrenghts</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStrenghts</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -164,14 +169,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPhases</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordPhases</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -179,14 +184,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -194,15 +199,15 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<state>DISABLED</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -217,11 +222,6 @@
<valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>IMAGE</name>
@@ -254,6 +254,11 @@
</entityConsumer>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -262,15 +267,18 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>Links</name>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>be977304-6623-42eb-a8bd-80ef43831204</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Competitions</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -281,14 +289,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>be977304-6623-42eb-a8bd-80ef43831204</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Competitions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -298,25 +298,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Competition_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Competition_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>f9598278-9933-4976-85be-5db9c213bf6f</name>
- <tableName>COMPETITION</tableName>
- <primaryKey>COMPETITIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>d82df2c1-f8e7-4b78-b9d6-905ca653061c</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_CANCELLED.value</name>
@@ -379,6 +363,22 @@
<recordfield>COMPETITION.COMPETITIONID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>f9598278-9933-4976-85be-5db9c213bf6f</name>
+ <tableName>COMPETITION</tableName>
+ <primaryKey>COMPETITIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>d82df2c1-f8e7-4b78-b9d6-905ca653061c</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtensionSet>
<name>Attribute_filter</name>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 32fd41440f..862163b19b 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Contact_entity</name>
+ <title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
- <title>Contact</title>
<grantCreateProcess>%aditoprj%/entity/Contact_entity/grantCreateProcess.js</grantCreateProcess>
<grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess>
@@ -65,17 +65,17 @@
</entityField>
<entityConsumer>
<name>Organisations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>WithPersonIdFilter</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>WithPersonIdFilter</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>PersonId_param</name>
@@ -86,12 +86,6 @@
<name>PersonRelated</name>
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
- <children>
- <entityParameter>
- <name>OwnContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>14975dad-907c-4f8c-bd39-243508ede721</name>
@@ -100,6 +94,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>OwnContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>ADDRESS_ID</name>
@@ -115,31 +115,31 @@
</entityField>
<entityConsumer>
<name>Communications</name>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
<dependency>
<name>dependency</name>
<entityName>Communication_entity</entityName>
<fieldName>AllCommunications</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>ContactAddresses</name>
<children>
<entityParameter>
<name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/contactaddresses/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContactAddresses</name>
<dependency>
<name>dependency</name>
<entityName>Address_entity</entityName>
<fieldName>ContactAddresses</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/contactaddresses/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityField>
<name>LANGUAGE</name>
@@ -163,13 +163,6 @@
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
<titlePlural>Other Contactroles</titlePlural>
- <children>
- <entityParameter>
- <name>PersonId_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
@@ -178,6 +171,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>PersonId_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>OwnContactId_param</name>
@@ -198,17 +198,17 @@
</entityField>
<entityConsumer>
<name>KeywordContactStates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>LanguageKey_param</name>
@@ -259,36 +259,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Contact_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Contact_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Contact_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>86ded52f-1b55-4d3d-b89d-23c465f20566</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>61f92ee5-db46-4e17-a90d-02223e0df942</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>e74fd752-ef38-414d-adda-11e21258c5d4</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CONTACTID.value</name>
@@ -371,6 +348,29 @@
<expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>86ded52f-1b55-4d3d-b89d-23c465f20566</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>61f92ee5-db46-4e17-a90d-02223e0df942</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>e74fd752-ef38-414d-adda-11e21258c5d4</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 56d28cdc85..96796bb96d 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Context_entity</name>
+ <title>Private person</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
- <title>Private person</title>
<contentTitleProcess>%aditoprj%/entity/Context_entity/contentTitleProcess.js</contentTitleProcess>
<titlePlural>Private persons</titlePlural>
<recordContainer>jdito</recordContainer>
@@ -30,16 +30,6 @@
</entityField>
<entityProvider>
<name>Context</name>
- <children>
- <entityParameter>
- <name>InvertBlacklist_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>Blacklist_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
@@ -66,6 +56,16 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>InvertBlacklist_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>Blacklist_param</name>
@@ -74,13 +74,6 @@
</entityParameter>
<entityProvider>
<name>ActivityLinkable</name>
- <children>
- <entityParameter>
- <name>Blacklist_param</name>
- <valueProcess>%aditoprj%/entity/Context_entity/entityfields/activitylinkable/children/blacklist_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>de50f67e-5ed0-46aa-b007-8c086cf5fea5</name>
@@ -89,16 +82,16 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityProvider>
- <name>TaskLinkable</name>
<children>
<entityParameter>
<name>Blacklist_param</name>
- <valueProcess>%aditoprj%/entity/Context_entity/entityfields/tasklinkable/children/blacklist_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/activitylinkable/children/blacklist_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
+ </entityProvider>
+ <entityProvider>
+ <name>TaskLinkable</name>
<dependencies>
<entityDependency>
<name>ff8925da-b69a-46dd-8fe2-d6707da8808e</name>
@@ -107,6 +100,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/tasklinkable/children/blacklist_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>InvertBlacklist_param</name>
@@ -163,17 +163,6 @@
</entityProvider>
<entityProvider>
<name>ContextTemplatePlaceOfUse</name>
- <children>
- <entityParameter>
- <name>InvertBlacklist_param</name>
- <valueProcess>%aditoprj%/entity/Context_entity/entityfields/contexttemplateplaceofuse/children/invertblacklist_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Blacklist_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>423a7a33-02f4-4975-94fd-fa0c21278e3b</name>
@@ -188,6 +177,17 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>InvertBlacklist_param</name>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/contexttemplateplaceofuse/children/invertblacklist_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 1762eb6b3f..3e32624211 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Contract_entity</name>
+ <title>Contract</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
- <title>Contract</title>
<grantDeleteProcess>%aditoprj%/entity/Contract_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Contract_entity/contentTitleProcess.js</contentTitleProcess>
<contentDescriptionProcess>%aditoprj%/entity/Contract_entity/contentDescriptionProcess.js</contentDescriptionProcess>
@@ -125,12 +125,6 @@
<name>Contracts</name>
<documentation>%aditoprj%/entity/Contract_entity/entityfields/contracts/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
@@ -145,6 +139,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>ContactId_param</name>
@@ -170,6 +170,11 @@
</entityFieldGroup>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -184,11 +189,6 @@
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>AnyContacts</name>
@@ -229,6 +229,11 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -239,15 +244,15 @@
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -258,14 +263,14 @@
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>ContractPayments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -273,14 +278,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContractStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>ContractStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -288,14 +293,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContractTypes</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>ContractTypes</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -303,11 +308,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -321,6 +321,11 @@
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -333,15 +338,15 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -352,15 +357,15 @@
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -375,11 +380,6 @@
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newTask</name>
@@ -389,17 +389,17 @@
</entityActionField>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>openAdminView</name>
@@ -435,7 +435,6 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<maximumDbRows v="0" />
<fromClauseProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
@@ -443,36 +442,7 @@
<onDBInsert>%aditoprj%/entity/Contract_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Contract_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Contract_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>78925203-f1c5-4e7e-9424-1a23500c655d</name>
- <tableName>CONTRACT</tableName>
- <primaryKey>CONTRACTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>0637150d-c535-41ce-85f3-e9a6b980d195</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>9ba7de4b-999c-44cc-95ee-0dbdcc35bf0f</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>748d1280-6dd2-4ada-837e-b331166e78d3</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CONTRACTCODE.value</name>
@@ -582,6 +552,36 @@
<expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/active.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>78925203-f1c5-4e7e-9424-1a23500c655d</name>
+ <tableName>CONTRACT</tableName>
+ <primaryKey>CONTRACTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>0637150d-c535-41ce-85f3-e9a6b980d195</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>9ba7de4b-999c-44cc-95ee-0dbdcc35bf0f</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>748d1280-6dd2-4ada-837e-b331166e78d3</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtensionSet>
<name>Attribute_filter</name>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 1b19a2841c..dd854efc61 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Countries_Entity</name>
+ <title>Countries</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
- <title>Countries</title>
<contentTitleProcess>%aditoprj%/entity/Countries_Entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:FLAG</iconId>
<recordContainer>db</recordContainer>
@@ -16,18 +16,6 @@
<name>ISO2Name</name>
<lookupIdfield>ISO2</lookupIdfield>
<documentation>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>Key_param</name>
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>Value_param</name>
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
@@ -42,6 +30,18 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Key_param</name>
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>Value_param</name>
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>Key_param</name>
@@ -101,20 +101,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<orderClauseProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
<cacheKeyProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
- <linkInformation>
- <linkInformation>
- <name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>
- <tableName>AB_COUNTRYINFO</tableName>
- <primaryKey>ISO2</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADDR_FORMAT.value</name>
@@ -149,6 +140,15 @@
<recordfield>AB_COUNTRYINFO.FLAG</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>
+ <tableName>AB_COUNTRYINFO</tableName>
+ <primaryKey>ISO2</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index c170fcd06f..674803b125 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DSGVOInfo_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVOInfo_entity/documentation.adoc</documentation>
@@ -83,31 +83,31 @@
</entityField>
<entityConsumer>
<name>KeywordDeadline</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/keyworddeadline/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordTransmission</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordTransmission</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/keywordtransmission/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TRANSMISSION</name>
@@ -140,17 +140,17 @@
</entityConsumer>
<entityConsumer>
<name>KeywordGuarantee</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/keywordguarantee/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -165,17 +165,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>23dd4eb2-0ac4-406e-92e3-031f1342bd05</name>
- <tableName>DSGVOINFO</tableName>
- <primaryKey>DSGVOINFOID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
@@ -210,6 +201,15 @@
<expression>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>23dd4eb2-0ac4-406e-92e3-031f1342bd05</name>
+ <tableName>DSGVOINFO</tableName>
+ <primaryKey>DSGVOINFOID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DSGVOReport_entity/DSGVOReport_entity.aod b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
index b96cb3a3db..b3482dff7d 100644
--- a/entity/DSGVOReport_entity/DSGVOReport_entity.aod
+++ b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DSGVOReport_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVOReport_entity/documentation.adoc</documentation>
@@ -20,9 +20,9 @@
</entityParameter>
<entityParameter>
<name>DSGVOInfo_param</name>
- <title></title>
<expose v="true" />
<mandatory v="false" />
+ <title></title>
<description></description>
</entityParameter>
<entityField>
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index a6445e18ca..be47ef0d40 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DSGVO_entity</name>
+ <title>Data Privacy</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVO_entity/documentation.adoc</documentation>
<icon>VAADIN:LOCK</icon>
- <title>Data Privacy</title>
<siblings>
<element>Address_entity</element>
<element>Communication_entity</element>
@@ -84,32 +84,32 @@
</entityField>
<entityConsumer>
<name>KeywordDSGVOPurpose</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
- <title></title>
<valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/keyworddsgvopurpose/children/containername_param/valueProcess.js</valueProcess>
+ <title></title>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDSGVOStatuoritysource</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDSGVOStatuoritysource</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/keyworddsgvostatuoritysource/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Communications</name>
@@ -181,17 +181,17 @@
</entityField>
<entityConsumer>
<name>KeywordDSGVOType</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/keyworddsgvotype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>DSGVOEntries</name>
diff --git a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
index 7b0b1dd8ef..a5e20a9243 100644
--- a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
+++ b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DefaultAdminView_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DefaultAdminView_entity/documentation.adoc</documentation>
@@ -19,17 +19,17 @@
<entityConsumer>
<name>Rows</name>
<state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AdminViewRow_entity</entityName>
+ <fieldName>AdminViewRows</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Rows_param</name>
<valueProcess>%aditoprj%/entity/DefaultAdminView_entity/entityfields/rows/children/rows_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AdminViewRow_entity</entityName>
- <fieldName>AdminViewRows</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>Uid_param</name>
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
index 125b89eb92..858fe5c982 100644
--- a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+++ b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DescriptionTranslation_entity</name>
+ <title>Description</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DescriptionTranslation_entity/documentation.adoc</documentation>
- <title>Description</title>
<titlePlural>Descriptions</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -40,17 +40,17 @@
</entityField>
<entityConsumer>
<name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3NameFiltered</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludedIds_param</name>
<valueProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/languages/children/excludedids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3NameFiltered</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ObjectType_param</name>
@@ -81,17 +81,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DescriptionTranslation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>b12c4b68-b868-45fe-9f72-aa914a19382a</name>
- <tableName>DESCRIPTIONTRANSLATION</tableName>
- <primaryKey>DESCRIPTIONTRANSLATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DESCRIPTION.value</name>
@@ -118,6 +109,15 @@
<expression>%aditoprj%/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>b12c4b68-b868-45fe-9f72-aa914a19382a</name>
+ <tableName>DESCRIPTIONTRANSLATION</tableName>
+ <primaryKey>DESCRIPTIONTRANSLATIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 542e050c64..c883c48153 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DistrictResponsible_entity</name>
+ <title>District Responsible</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/documentation.adoc</documentation>
<icon>VAADIN:GLOBE</icon>
- <title>District Responsible</title>
<contentTitleProcess>%aditoprj%/entity/DistrictResponsible_entity/contentTitleProcess.js</contentTitleProcess>
<iconIdProcess>%aditoprj%/entity/DistrictResponsible_entity/iconIdProcess.js</iconIdProcess>
<image>VAADIN:GLOBE</image>
@@ -37,6 +37,11 @@
</entityField>
<entityConsumer>
<name>Departments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ParentId_param</name>
@@ -44,11 +49,6 @@
<description>parent id, this is used for filtering by the parent in the content process</description>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Employees</name>
@@ -90,6 +90,14 @@
<lookupIdfield>DISTRICTRESPONSIBLEID</lookupIdfield>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc</documentation>
<titlePlural>Responsibles</titlePlural>
+ <dependencies>
+ <entityDependency>
+ <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
+ <entityName>District_entity</entityName>
+ <fieldName>DistrictResponsibles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>DistrictId_param</name>
@@ -100,14 +108,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
- <entityName>District_entity</entityName>
- <fieldName>DistrictResponsibles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>DistrictId_param</name>
@@ -116,20 +116,25 @@
</entityParameter>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -140,11 +145,6 @@
<valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>departmentAttributeName</name>
@@ -159,12 +159,6 @@
<targetContextField>targetContext</targetContextField>
<targetIdField>EMPLOYEE_CONTACT_ID</targetIdField>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>DistrictId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>9c2fe0da-9456-44ef-ac6c-28ac234b35f7</name>
@@ -179,6 +173,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>DistrictId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>OrgUid_param</name>
@@ -209,28 +209,12 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<fromClauseProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
<cacheKeyProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
- <linkInformation>
- <linkInformation>
- <name>d24296ec-5040-4b40-ad5b-668d3e02b4aa</name>
- <tableName>DISTRICTRESPONSIBLE</tableName>
- <primaryKey>DISTRICTRESPONSIBLEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>86f9ab94-0d69-4a3a-9a04-615f61be2c23</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DEPARTMENT_ATTRIBUTE_ID.value</name>
@@ -293,6 +277,22 @@
<expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>d24296ec-5040-4b40-ad5b-668d3e02b4aa</name>
+ <tableName>DISTRICTRESPONSIBLE</tableName>
+ <primaryKey>DISTRICTRESPONSIBLEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>86f9ab94-0d69-4a3a-9a04-615f61be2c23</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index 8ae74f7b15..a592cb1d53 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>District_entity</name>
+ <title>District definition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/District_entity/documentation.adoc</documentation>
<icon>VAADIN:GLOBE</icon>
- <title>District definition</title>
<contentTitleProcess>%aditoprj%/entity/District_entity/contentTitleProcess.js</contentTitleProcess>
<iconIdProcess>%aditoprj%/entity/District_entity/iconIdProcess.js</iconIdProcess>
<titlePlural></titlePlural>
@@ -82,6 +82,14 @@
<documentation>%aditoprj%/entity/District_entity/entityfields/responsibledistricts/documentation.adoc</documentation>
<titlePlural>Responsible Districts</titlePlural>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>291c0ca4-5a68-45f5-80a7-745c7df56d7c</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>Districts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ExcludedDistrictIds_param</name>
@@ -92,14 +100,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>291c0ca4-5a68-45f5-80a7-745c7df56d7c</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>Districts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Languages</name>
@@ -111,17 +111,17 @@
</entityConsumer>
<entityConsumer>
<name>DistrictResponsibles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>DistrictResponsibles</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DistrictId_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>DistrictResponsibles</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
@@ -142,17 +142,17 @@
<entityConsumer>
<name>Organisations</name>
<refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>FilterPreSet_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
- </dependency>
</entityConsumer>
<entityFieldGroup>
<name>DISTRICT_NUMBER_fieldGroup</name>
@@ -164,6 +164,11 @@
</entityFieldGroup>
<entityConsumer>
<name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -174,11 +179,6 @@
<valueProcess>%aditoprj%/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
@@ -217,27 +217,21 @@
</entityProvider>
<entityConsumer>
<name>ParentDistricts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>#ENTITY</entityName>
+ <fieldName>ValidParentDistricts</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludedDistrictIds_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>#ENTITY</entityName>
- <fieldName>ValidParentDistricts</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>ValidParentDistricts</name>
<documentation>%aditoprj%/entity/District_entity/entityfields/validparentdistricts/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>DistrictsByContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>8b0738a4-e4cd-4f9e-8df1-f499046c81bf</name>
@@ -246,6 +240,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>DistrictsByContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>ExcludedDistrictIds_param</name>
@@ -255,21 +255,12 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/District_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/District_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
<cacheKeyProcess>%aditoprj%/entity/District_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
- <linkInformation>
- <linkInformation>
- <name>b8398641-f97b-43e4-8f2c-beda8690ab2f</name>
- <tableName>DISTRICT</tableName>
- <primaryKey>DISTRICTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -356,6 +347,15 @@
<isLookupFilter v="false" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>b8398641-f97b-43e4-8f2c-beda8690ab2f</name>
+ <tableName>DISTRICT</tableName>
+ <primaryKey>DISTRICTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index 045e605d32..843d06ed29 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DocumentTemplateLink_entity</name>
+ <title>Attachment</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DocumentTemplateLink_entity/documentation.adoc</documentation>
- <title>Attachment</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -51,24 +51,32 @@
</entityParameter>
<entityConsumer>
<name>Attachments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Attachments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
- <title></title>
<valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ <title></title>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>Attachments</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>Links</name>
<targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
<documentation>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Links</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>DocumentId_param</name>
@@ -79,14 +87,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>Links</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>Type_param</name>
@@ -111,25 +111,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>05d25e85-1cd8-4897-be48-ecf699322b1f</name>
- <tableName>DOCUMENTTEMPLATELINK</tableName>
- <primaryKey>DOCUMENTTEMPLATELINKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>34ca9c71-3de5-48ce-ade2-fa203360ebbd</name>
- <tableName>DOCUMENTTEMPLATE</tableName>
- <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -160,6 +144,22 @@
<recordfield>DOCUMENTTEMPLATELINK.USER_NEW</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>05d25e85-1cd8-4897-be48-ecf699322b1f</name>
+ <tableName>DOCUMENTTEMPLATELINK</tableName>
+ <primaryKey>DOCUMENTTEMPLATELINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>34ca9c71-3de5-48ce-ade2-fa203360ebbd</name>
+ <tableName>DOCUMENTTEMPLATE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
index ecc5974709..4ac6764a9d 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
+++ b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DocumentTemplatePlaceOfUse_entity</name>
+ <title>Documenttemplate Place Of Use</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/documentation.adoc</documentation>
- <title>Documenttemplate Place Of Use</title>
<titlePlural>Documenttemplate Places Of Useage</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -29,6 +29,11 @@
</entityField>
<entityConsumer>
<name>ContextDocumentTemplatePlaceOfUse</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>ContextTemplatePlaceOfUse</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>InvertBlacklist_param</name>
@@ -39,21 +44,10 @@
<valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>ContextTemplatePlaceOfUse</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>DocumentTemplatePlaceOfUse</name>
<documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>DocumentTemplatePlaceOfUse_param</name>
- <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc</documentation>
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>bc05b556-ecca-478c-9a92-b77e4d98d6f3</name>
@@ -62,6 +56,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplatePlaceOfUse_param</name>
+ <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc</documentation>
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>DocumentTemplatePlaceOfUse_param</name>
@@ -75,17 +75,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>df318337-f5d2-4046-989d-476f336b3fb4</name>
- <tableName>DOCUMENTTEMPLATEPLACEOFUSE</tableName>
- <primaryKey>DOCUMENTTEMPLATEPLACEOFUSEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DOCUMENTTEMPLATE_ID.value</name>
@@ -100,6 +91,15 @@
<recordfield>DOCUMENTTEMPLATEPLACEOFUSE.PLACEOFUSE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>df318337-f5d2-4046-989d-476f336b3fb4</name>
+ <tableName>DOCUMENTTEMPLATEPLACEOFUSE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEPLACEOFUSEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index c6fa4c852d..cd4ef60ae5 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DocumentTemplateTypeCategory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/documentation.adoc</documentation>
@@ -32,12 +32,6 @@
<lookupIdfield>KEYID</lookupIdfield>
<documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>usageFilter_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>5eb6b17c-8c13-48df-84d5-a949b7d21cf3</name>
@@ -46,6 +40,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>usageFilter_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -55,18 +55,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>6cfa2424-b81b-4750-ae43-e3b1126eab0a</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ENTRYID.value</name>
@@ -81,6 +72,15 @@
<recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>6cfa2424-b81b-4750-ae43-e3b1126eab0a</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index b19bc7ae52..91281b4cfa 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DocumentTemplate_entity</name>
+ <title>Document Template</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DocumentTemplate_entity/documentation.adoc</documentation>
<icon>VAADIN:FILE_FONT</icon>
- <title>Document Template</title>
<contentTitleProcess>%aditoprj%/entity/DocumentTemplate_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/DocumentTemplate_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/onValidation.js</onValidation>
@@ -94,6 +94,11 @@
</entityField>
<entityConsumer>
<name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -104,11 +109,6 @@
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
@@ -120,22 +120,27 @@
</entityConsumer>
<entityConsumer>
<name>KeywordDocumentTemplateType</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -146,11 +151,6 @@
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>Content</name>
@@ -176,6 +176,11 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTypeCategory</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateTypeCategory_entity</entityName>
+ <fieldName>ByCategory</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>usageFilter_param</name>
@@ -183,11 +188,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplateTypeCategory_entity</entityName>
- <fieldName>ByCategory</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>Attachments</name>
@@ -208,6 +208,11 @@
<entityConsumer>
<name>Links</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentId_param</name>
@@ -220,11 +225,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplateLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>DocumentTemplateTypeClassification_param</name>
@@ -234,12 +234,6 @@
<entityProvider>
<name>DocumentTemplateProvider</name>
<documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>ComingFrom_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>9c10883d-eb73-4587-b758-693a66367a4c</name>
@@ -284,6 +278,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ComingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -322,6 +322,11 @@
<name>DocumentTemplatePlaceOfUse</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
+ <fieldName>DocumentTemplatePlaceOfUse</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplatePlaceOfUse_param</name>
@@ -329,11 +334,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
- <fieldName>DocumentTemplatePlaceOfUse</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ComingFrom_param</name>
@@ -351,20 +351,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>982325b6-d12e-43f9-8ac2-c4b9f013aafd</name>
- <tableName>DOCUMENTTEMPLATE</tableName>
- <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -423,6 +414,15 @@
<expression>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/recordfieldmappings/kind.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>982325b6-d12e-43f9-8ac2-c4b9f013aafd</name>
+ <tableName>DOCUMENTTEMPLATE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtension>
<name>Favorite_filter</name>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 3fc6eca196..229813e514 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Document_entity</name>
+ <title>Document</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Document_entity/documentation.adoc</documentation>
- <title>Document</title>
<grantCreateProcess>%aditoprj%/entity/Document_entity/grantCreateProcess.js</grantCreateProcess>
<contentTitleProcess>%aditoprj%/entity/Document_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:FILE</iconId>
@@ -146,26 +146,6 @@
<name>Documents</name>
<documentation>%aditoprj%/entity/Document_entity/entityfields/documents/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
- <children>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <documentation>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc</documentation>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Keyword_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>1eae1907-53ea-4d6f-bcf1-772052365020</name>
@@ -264,23 +244,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityProvider>
- <name>MainDocuments</name>
- <recordContainer>jdito</recordContainer>
<children>
- <entityParameter>
- <name>Keyword_param</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="true" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
<expose v="true" />
- <documentation>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
+ <documentation>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc</documentation>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -291,10 +260,14 @@
<expose v="true" />
</entityParameter>
<entityParameter>
- <name>DisallowCreate_param</name>
- <expose v="false" />
+ <name>Keyword_param</name>
+ <expose v="true" />
</entityParameter>
</children>
+ </entityProvider>
+ <entityProvider>
+ <name>MainDocuments</name>
+ <recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
<name>87d738a5-5d5e-425e-b013-007371475a38</name>
@@ -339,6 +312,33 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Keyword_param</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>DisallowCreate_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>DisallowCreate_param</name>
@@ -348,6 +348,14 @@
<entityProvider>
<name>SingleDocument</name>
<titlePlural>Document</titlePlural>
+ <dependencies>
+ <entityDependency>
+ <name>91f87622-d0e8-43c6-99a0-5f9cebf79aaf</name>
+ <entityName>SerialLetter_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>AssignmentName_param</name>
@@ -363,14 +371,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>91f87622-d0e8-43c6-99a0-5f9cebf79aaf</name>
- <entityName>SerialLetter_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
index 3297b0d171..b336a59f80 100644
--- a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
+++ b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DuplicateScannerResultFieldConfig_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>recordContainer</recordContainer>
@@ -58,17 +58,8 @@
<recordContainers>
<dbRecordContainer>
<name>recordContainer</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>f7126f94-9e4c-46a0-8dc9-9e52fda1c7c0</name>
- <tableName>DUPLICATESCANNERRESULTFIELDCONFIG</tableName>
- <primaryKey>ID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -99,6 +90,15 @@
<recordfield>DUPLICATESCANNERRESULTFIELDCONFIG.DUPLICATESCANNER_ID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>f7126f94-9e4c-46a0-8dc9-9e52fda1c7c0</name>
+ <tableName>DUPLICATESCANNERRESULTFIELDCONFIG</tableName>
+ <primaryKey>ID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index b03785e283..450acf9d5e 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DuplicateScanner_entity</name>
+ <title>Duplicate Configuration</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DuplicateScanner_entity/documentation.adoc</documentation>
- <title>Duplicate Configuration</title>
<grantCreate v="false" />
<grantCreateProcess>%aditoprj%/entity/DuplicateScanner_entity/grantCreateProcess.js</grantCreateProcess>
<grantDelete v="false" />
@@ -74,17 +74,17 @@
</entityField>
<entityConsumer>
<name>ScannerResultFieldsConfig_Consumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DuplicateScannerResultFieldConfig_entity</entityName>
+ <fieldName>ScannerResultFieldConfigProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DuplicateScannerId_param</name>
<valueProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scannerresultfieldsconfig_consumer/children/duplicatescannerid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicateScannerResultFieldConfig_entity</entityName>
- <fieldName>ScannerResultFieldConfigProvider</fieldName>
- </dependency>
</entityConsumer>
<entityActionGroup>
<name>RunActionGroup</name>
@@ -110,19 +110,10 @@
<recordContainers>
<dbRecordContainer>
<name>DBRecordContainer</name>
- <alias>Data_alias</alias>
<onDBInsert>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>b61b26d3-e823-45ba-9ac5-12acaaa1ec15</name>
- <tableName>DUPLICATESCANNER</tableName>
- <primaryKey>ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ENTITY_TO_SCAN_NAME.value</name>
@@ -165,6 +156,15 @@
<recordfield>DUPLICATESCANNER.SCAN_PATTERN</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>b61b26d3-e823-45ba-9ac5-12acaaa1ec15</name>
+ <tableName>DUPLICATESCANNER</tableName>
+ <primaryKey>ID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
index eb93c9ccc9..7d2241b72c 100644
--- a/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
+++ b/entity/DuplicatesUnrelated_entity/DuplicatesUnrelated_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>DuplicatesUnrelated_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DuplicatesUnrelated_entity/documentation.adoc</documentation>
diff --git a/entity/Duplicates_entity/Duplicates_entity.aod b/entity/Duplicates_entity/Duplicates_entity.aod
index 0101669864..fe9a194850 100644
--- a/entity/Duplicates_entity/Duplicates_entity.aod
+++ b/entity/Duplicates_entity/Duplicates_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Duplicates_entity</name>
+ <title>Duplicates</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Duplicates_entity/documentation.adoc</documentation>
- <title>Duplicates</title>
<siblings>
<element>DuplicatesUnrelated_entity</element>
</siblings>
@@ -42,6 +42,11 @@
</entityProvider>
<entityConsumer>
<name>SelfPersonDuplicatesConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Duplicates_entity</entityName>
+ <fieldName>SelfPersonDuplicatesProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>TargetEntity</name>
@@ -49,15 +54,10 @@
</entityParameter>
<entityParameter>
<name>ClusterId_param</name>
- <title></title>
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/selfpersonduplicatesconsumer/children/clusterid_param/valueProcess.js</valueProcess>
+ <title></title>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Duplicates_entity</entityName>
- <fieldName>SelfPersonDuplicatesProvider</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>TargetEntity</name>
@@ -66,6 +66,11 @@
</entityParameter>
<entityConsumer>
<name>SelfOrganisationDuplicatesConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Duplicates_entity</entityName>
+ <fieldName>SelfOrganisationDuplicatesProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>TargetEntity</name>
@@ -76,11 +81,6 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/selforganisationduplicatesconsumer/children/clusterid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Duplicates_entity</entityName>
- <fieldName>SelfOrganisationDuplicatesProvider</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>SelfOrganisationDuplicatesProvider</name>
@@ -88,6 +88,11 @@
</entityProvider>
<entityConsumer>
<name>DuplicatesUnrelatedPersonConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DuplicatesUnrelated_entity</entityName>
+ <fieldName>UnrelatedPersonsProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>TargetEntity</name>
@@ -98,17 +103,17 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicatesunrelatedpersonconsumer/children/clusterid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicatesUnrelated_entity</entityName>
- <fieldName>UnrelatedPersonsProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CLUSTER_ID</name>
</entityField>
<entityConsumer>
<name>DuplicatePersonsConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>NonselfDuplicates</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OnlyShowContactIds_param</name>
@@ -119,11 +124,6 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicatepersonsconsumer/children/duplicateactionscontrol_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>NonselfDuplicates</fieldName>
- </dependency>
</entityConsumer>
<entityActionGroup>
<name>DuplicateClusterActionGroup</name>
@@ -140,6 +140,11 @@
</entityActionGroup>
<entityConsumer>
<name>DuplicatesUnrelatedOrganisationConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DuplicatesUnrelated_entity</entityName>
+ <fieldName>UnrelatedOrganisationsProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>TargetEntity</name>
@@ -150,11 +155,6 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicatesunrelatedorganisationconsumer/children/clusterid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicatesUnrelated_entity</entityName>
- <fieldName>UnrelatedOrganisationsProvider</fieldName>
- </dependency>
</entityConsumer>
<entityActionGroup>
<name>PersonOpenClusterDetailActionGroup</name>
@@ -186,6 +186,11 @@
</entityActionGroup>
<entityConsumer>
<name>DuplicateOrganisationsConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>NonselfDuplicates</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DuplicateActionsControl_param</name>
@@ -196,11 +201,6 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicateorganisationsconsumer/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>NonselfDuplicates</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 73da7f7901..852de0f302 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Email_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Email_entity/documentation.adoc</documentation>
@@ -29,6 +29,11 @@
</entityField>
<entityConsumer>
<name>DocumentTemplates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -43,11 +48,6 @@
<valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>Recipient_param</name>
@@ -65,17 +65,17 @@
</entityField>
<entityConsumer>
<name>EmailAddresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>EmailCommunications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index a3ed777f95..74475d9d45 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>EmployeeRole_entity</name>
+ <title>Role</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/EmployeeRole_entity/documentation.adoc</documentation>
- <title>Role</title>
<grantUpdate v="false" />
<titlePlural>Roles</titlePlural>
<recordContainer>jdito</recordContainer>
@@ -26,13 +26,6 @@
<name>EmployeeRoles</name>
<targetContextField>TARGETCONTEXT</targetContextField>
<targetIdField>UID</targetIdField>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
@@ -41,6 +34,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>ROLE</name>
@@ -51,17 +51,17 @@
</entityField>
<entityConsumer>
<name>Roles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Role_entity</entityName>
+ <fieldName>FilteredRoles</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludeRoles_param</name>
<valueProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Role_entity</entityName>
- <fieldName>FilteredRoles</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TARGETCONTEXT</name>
diff --git a/entity/EmployeeToken_entity/EmployeeToken_entity.aod b/entity/EmployeeToken_entity/EmployeeToken_entity.aod
index 0303a7a0bc..bb7b974062 100644
--- a/entity/EmployeeToken_entity/EmployeeToken_entity.aod
+++ b/entity/EmployeeToken_entity/EmployeeToken_entity.aod
@@ -1,8 +1,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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>EmployeeToken_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
<title>User token</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
<titlePlural>User tokens</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -85,17 +85,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>_____SYSTEMALIAS</alias>
<conditionProcess>%aditoprj%/entity/EmployeeToken_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>98f70a7c-4e43-4984-ad69-44339150f1ee</name>
- <tableName>ASYS_USERTOKEN</tableName>
- <primaryKey>ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>_____SYSTEMALIAS</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ID.value</name>
@@ -126,6 +117,15 @@
<recordfield>ASYS_USERTOKEN.VALID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>98f70a7c-4e43-4984-ad69-44339150f1ee</name>
+ <tableName>ASYS_USERTOKEN</tableName>
+ <primaryKey>ID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 150eac2cf1..1f473bcc5e 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Employee_entity</name>
+ <title>Employee</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Employee_entity/documentation.adoc</documentation>
- <title>Employee</title>
<siblings />
<grantDeleteProcess>%aditoprj%/entity/Employee_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Employee_entity/contentTitleProcess.js</contentTitleProcess>
@@ -132,6 +132,11 @@
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Employee_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -142,11 +147,6 @@
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityFieldGroup>
<name>NAME_fieldGroup</name>
@@ -177,20 +177,25 @@
</entityField>
<entityConsumer>
<name>EmployeeRoles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>EmployeeRole_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>UserTitle_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>EmployeeRole_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -201,15 +206,15 @@
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -220,22 +225,11 @@
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>Employees</name>
<lookupIdfield>CONTACT_ID</lookupIdfield>
<filterVariablesProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/filterVariablesProcess.js</filterVariablesProcess>
- <children>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>0ca415b9-a940-424e-bee8-05c007b20659</name>
@@ -310,20 +304,26 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityConsumer>
- <name>Departments</name>
<children>
<entityParameter>
- <name>ParentId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/departments/children/parentid_param/valueProcess.js</valueProcess>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Departments</name>
<dependency>
<name>dependency</name>
<entityName>Attribute_entity</entityName>
<fieldName>SpecificAttribute</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>ParentId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/departments/children/parentid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityActionField>
<name>openAdminView</name>
@@ -334,17 +334,17 @@
</entityActionField>
<entityConsumer>
<name>PossibleRoles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Role_entity</entityName>
+ <fieldName>FilteredRoles</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludeRoles_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/possibleroles/children/excluderoles_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Role_entity</entityName>
- <fieldName>FilteredRoles</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>SHORT_UID</name>
@@ -391,31 +391,31 @@
<entityConsumer>
<name>MyPermission</name>
<refreshParent v="false" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionCalendar_entity</entityName>
+ <fieldName>Permissions</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>PermissionProcurer_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/mypermission/children/permissionprocurer_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>TheirPermissions</name>
<dependency>
<name>dependency</name>
<entityName>PermissionCalendar_entity</entityName>
<fieldName>Permissions</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>TheirPermissions</name>
<children>
<entityParameter>
<name>PermissionDealer_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/theirpermissions/children/permissiondealer_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>PermissionCalendar_entity</entityName>
- <fieldName>Permissions</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>PICTURE</name>
@@ -437,17 +437,17 @@
</entityParameter>
<entityConsumer>
<name>EmployeeTokens</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>EmployeeToken_entity</entityName>
+ <fieldName>EmployeeTokenProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>employeeId_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeetokens/children/employeeid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>EmployeeToken_entity</entityName>
- <fieldName>EmployeeTokenProvider</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>EmployeeContactIdWhitelist_param</name>
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index ae07c537a2..dc20a3f5bb 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ExportTemplateField_entity</name>
+ <title>Export Template Field</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplateField_entity/documentation.adoc</documentation>
- <title>Export Template Field</title>
<titlePlural>Export Template Fields</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -62,20 +62,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="true" />
<isReadOnly v="false" />
<conditionProcess>%aditoprj%/entity/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/ExportTemplateField_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>7236de85-f623-4f6a-9ff5-d9014a2f7a4c</name>
- <tableName>EXPORTTEMPLATEFIELD</tableName>
- <primaryKey>EXPORTTEMPLATEFIELDID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>EXPORTTEMPLATE_ID.value</name>
@@ -94,6 +85,15 @@
<recordfield>EXPORTTEMPLATEFIELD.SORTING</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>7236de85-f623-4f6a-9ff5-d9014a2f7a4c</name>
+ <tableName>EXPORTTEMPLATEFIELD</tableName>
+ <primaryKey>EXPORTTEMPLATEFIELDID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
index 91964c2b41..7689336446 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ExportTemplatePlaceOfUse_entity</name>
+ <title>Place of Use</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc</documentation>
- <title>Place of Use</title>
<titlePlural>Places of Usage</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -32,6 +32,11 @@
</entityField>
<entityConsumer>
<name>ContextExportTemplatePlaceOfUse</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>ContextTemplatePlaceOfUse</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>InvertBlacklist_param</name>
@@ -42,11 +47,6 @@
<valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/blacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>ContextTemplatePlaceOfUse</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ExportTemplatePlaceOfUse_param</name>
@@ -55,12 +55,6 @@
<entityProvider>
<name>ExportTemplatePlaceOfUser</name>
<documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>ExportTemplatePlaceOfUse_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>c60a238a-51f0-4538-8c53-6921481ddd4c</name>
@@ -69,6 +63,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ExportTemplatePlaceOfUse_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -78,17 +78,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>5e6f806e-c845-49ab-bfee-31b12e4c41f3</name>
- <tableName>EXPORTTEMPLATEPLACEOFUSE</tableName>
- <primaryKey>EXPORTTEMPLATEPLACEOFUSEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>EXPORTTEMPLATE_ID.value</name>
@@ -103,6 +94,15 @@
<recordfield>EXPORTTEMPLATEPLACEOFUSE.PLACEOFUSE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>5e6f806e-c845-49ab-bfee-31b12e4c41f3</name>
+ <tableName>EXPORTTEMPLATEPLACEOFUSE</tableName>
+ <primaryKey>EXPORTTEMPLATEPLACEOFUSEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
index b8dcbc15cc..f68f881f9a 100644
--- a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ExportTemplateSelection_entity</name>
+ <title>Exporttempalte Selection</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplateSelection_entity/documentation.adoc</documentation>
- <title>Exporttempalte Selection</title>
<contentTitleProcess>%aditoprj%/entity/ExportTemplateSelection_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>datalessRecordContainer</recordContainer>
<entityFields>
@@ -29,6 +29,11 @@
</entityParameter>
<entityConsumer>
<name>ExportTemplateComsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplate_entity</entityName>
+ <fieldName>ExportTemplateIDs</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExportTemplateIDs_param</name>
@@ -39,11 +44,6 @@
<valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exporttemplatecomsumer/children/comingfrom_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ExportTemplate_entity</entityName>
- <fieldName>ExportTemplateIDs</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>UID</name>
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index 65ba57734b..8fbadb06e1 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ExportTemplate_entity</name>
+ <title>Export Template</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ExportTemplate_entity/documentation.adoc</documentation>
<icon>NEON:EXPORT</icon>
- <title>Export Template</title>
<grantCreate v="true" />
<grantUpdate v="true" />
<grantDelete v="true" />
@@ -74,6 +74,11 @@
<entityConsumer>
<name>ExportTemplateFields</name>
<state>EDITABLE</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplateField_entity</entityName>
+ <fieldName>ExportTemplateFields</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExportTemplateField_param</name>
@@ -82,11 +87,6 @@
<documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc</documentation>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ExportTemplateField_entity</entityName>
- <fieldName>ExportTemplateFields</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ExportTemplateIDs_param</name>
@@ -95,6 +95,11 @@
</entityParameter>
<entityConsumer>
<name>ExportTemplateplaceOfUseCon</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplatePlaceOfUse_entity</entityName>
+ <fieldName>ExportTemplatePlaceOfUser</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExportTemplatePlaceOfUse_param</name>
@@ -102,23 +107,11 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ExportTemplatePlaceOfUse_entity</entityName>
- <fieldName>ExportTemplatePlaceOfUser</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>ExportTemplateIDs</name>
<documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>ExportTemplateIDs_param</name>
- <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids/children/exporttemplateids_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>1b692618-b800-47ae-a48c-3d4164d68401</name>
@@ -127,6 +120,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ExportTemplateIDs_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids/children/exporttemplateids_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>comingFrom_param</name>
@@ -165,19 +165,10 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isReadOnly v="false" />
<conditionProcess>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBDelete>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>ce410f40-846b-43e6-9c30-150393cee43d</name>
- <tableName>EXPORTTEMPLATE</tableName>
- <primaryKey>EXPORTTEMPLATEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -238,6 +229,15 @@
<recordfield>EXPORTTEMPLATE.FIELDDELIMITER</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>ce410f40-846b-43e6-9c30-150393cee43d</name>
+ <tableName>EXPORTTEMPLATE</tableName>
+ <primaryKey>EXPORTTEMPLATEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtension>
<name>Favorite_filter</name>
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index bb5ba3f508..1e0fbcad30 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Favorite_entity</name>
+ <title>Favorite</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Favorite_entity/documentation.adoc</documentation>
<icon>VAADIN:STAR</icon>
- <title>Favorite</title>
<siblings>
<element>Organisation_entity</element>
</siblings>
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index 7487314f35..efc66cf89e 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Forecast_entity</name>
+ <title>${FORECAST_ENGLISH}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Forecast_entity/documentation.adoc</documentation>
- <title>${FORECAST_ENGLISH}</title>
<titlePlural>Forecasts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -53,6 +53,11 @@
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -60,11 +65,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>OBJECT_TYPE</name>
@@ -75,6 +75,11 @@
</entityField>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -83,11 +88,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
@@ -127,17 +127,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Forecast_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>920ae11e-ae44-400f-9df0-fa879131a05c</name>
- <tableName>FORECAST</tableName>
- <primaryKey>FORECASTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_START.value</name>
@@ -180,6 +171,15 @@
<recordfield>FORECAST.FORECASTID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>920ae11e-ae44-400f-9df0-fa879131a05c</name>
+ <tableName>FORECAST</tableName>
+ <primaryKey>FORECASTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 6c4c35a17b..17f5aa15fe 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Gender_keyword</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Gender_keyword/documentation.adoc</documentation>
diff --git a/entity/ImportField_Entity/ImportField_Entity.aod b/entity/ImportField_Entity/ImportField_Entity.aod
index 8b47e84bc5..98e67835fe 100644
--- a/entity/ImportField_Entity/ImportField_Entity.aod
+++ b/entity/ImportField_Entity/ImportField_Entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ImportField_Entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ImportField_Entity/documentation.adoc</documentation>
@@ -72,17 +72,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordImportFields</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/ImportField_Entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -92,18 +92,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/ImportField_Entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/ImportField_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>12009263-3fca-4d30-ae79-2f8c0ef20e9e</name>
- <tableName>IMPORTFIELD</tableName>
- <primaryKey>IMPORTFIELDID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -142,6 +133,15 @@
<isLookupFilter v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>12009263-3fca-4d30-ae79-2f8c0ef20e9e</name>
+ <tableName>IMPORTFIELD</tableName>
+ <primaryKey>IMPORTFIELDID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index d1274e4307..4cd16dc36d 100644
--- a/entity/IndexSearchEntity/IndexSearchEntity.aod
+++ b/entity/IndexSearchEntity/IndexSearchEntity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>IndexSearchEntity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/IndexSearchEntity/documentation.adoc</documentation>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 16bede930f..b5a77caf97 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KeywordAttributeRelation_entity</name>
+ <title>Keyword Attribute Values</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
- <title>Keyword Attribute Values</title>
<titlePlural>Keyword Attribute Values</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -51,13 +51,6 @@
<name>AttributesForKeywordEntry</name>
<titlePlural></titlePlural>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>KeywordEntryId_param</name>
- <expose v="true" />
- <mandatory v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>490d12c0-6ace-42e5-89e1-d40b25322161</name>
@@ -66,6 +59,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>KeywordEntryId_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>ContainerName_param</name>
@@ -75,6 +75,11 @@
</entityParameter>
<entityConsumer>
<name>KeywordAttributes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttribute_entity</entityName>
+ <fieldName>SpecificContainerKeyword</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -87,11 +92,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttribute_entity</entityName>
- <fieldName>SpecificContainerKeyword</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>KeywordEntryId_param</name>
@@ -124,19 +124,10 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<isRequireContainerFiltering v="false" />
<conditionProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>8e2938d2-e14b-403b-8ae5-875f70bc3f85</name>
- <tableName>AB_KEYWORD_ATTRIBUTERELATION</tableName>
- <primaryKey>AB_KEYWORD_ATTRIBUTERELATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ATTRIBUTERELATIONID.value</name>
@@ -171,6 +162,15 @@
<recordfield>AB_KEYWORD_ATTRIBUTERELATION.LONG_CHAR_VALUE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>8e2938d2-e14b-403b-8ae5-875f70bc3f85</name>
+ <tableName>AB_KEYWORD_ATTRIBUTERELATION</tableName>
+ <primaryKey>AB_KEYWORD_ATTRIBUTERELATIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index 13cb14c44b..0f89a75d32 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KeywordAttribute_entity</name>
+ <title>Keyword Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
- <title>Keyword Attribute</title>
<grantDeleteProcess>%aditoprj%/entity/KeywordAttribute_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/KeywordAttribute_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:KEY_O</iconId>
@@ -69,6 +69,11 @@
</entityParameter>
<entityConsumer>
<name>KeywordAttributeTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -76,11 +81,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -90,19 +90,10 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBDelete>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>bd113d67-34ab-4708-b0e5-60a44332e6b8</name>
- <tableName>AB_KEYWORD_ATTRIBUTE</tableName>
- <primaryKey>AB_KEYWORD_ATTRIBUTEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ATTRIBUTEID.value</name>
@@ -131,6 +122,15 @@
<expression>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>bd113d67-34ab-4708-b0e5-60a44332e6b8</name>
+ <tableName>AB_KEYWORD_ATTRIBUTE</tableName>
+ <primaryKey>AB_KEYWORD_ATTRIBUTEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 463fb78bbb..d5d2ddb6ac 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KeywordEntry_entity</name>
+ <title>Keyword</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
- <title>Keyword</title>
<siblings />
<grantDelete v="false" />
<grantDeleteProcess>%aditoprj%/entity/KeywordEntry_entity/grantDeleteProcess.js</grantDeleteProcess>
@@ -103,17 +103,6 @@
<lookupIdfield>KEYID</lookupIdfield>
<documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ContainerName_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
@@ -620,6 +609,17 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>TITLE_TRANSLATED</name>
@@ -634,6 +634,11 @@
<entityConsumer>
<name>KeywordAttributeRelations</name>
<onValidation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttributeRelation_entity</entityName>
+ <fieldName>AttributesForKeywordEntry</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>KeywordEntryId_param</name>
@@ -641,11 +646,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttributeRelation_entity</entityName>
- <fieldName>AttributesForKeywordEntry</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ExcludedKeyIdsSubquery_param</name>
@@ -681,22 +681,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
<cacheKeyProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
- <linkInformation>
- <linkInformation>
- <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>TITLE.value</name>
@@ -735,6 +726,15 @@
<isLookupFilter v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod b/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod
index 81246e32ac..ae567dde14 100644
--- a/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod
+++ b/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KnowledgeDiscussion_entity</name>
+ <title>Discussion</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KnowledgeDiscussion_entity/documentation.adoc</documentation>
- <title>Discussion</title>
<grantCreateProcess>%aditoprj%/entity/KnowledgeDiscussion_entity/grantCreateProcess.js</grantCreateProcess>
<grantUpdateProcess>%aditoprj%/entity/KnowledgeDiscussion_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/KnowledgeDiscussion_entity/grantDeleteProcess.js</grantDeleteProcess>
@@ -62,6 +62,11 @@
</entityField>
<entityConsumer>
<name>StatusKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -72,11 +77,6 @@
<valueProcess>%aditoprj%/entity/KnowledgeDiscussion_entity/entityfields/statuskeyword/children/onlyactives_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>ByKnowledgeId</name>
diff --git a/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod b/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
index e77405dfb6..b6d159ac4c 100644
--- a/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
+++ b/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KnowledgeLink_entity</name>
+ <title>Link</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KnowledgeLink_entity/documentation.adoc</documentation>
- <title>Link</title>
<iconIdProcess>%aditoprj%/entity/KnowledgeLink_entity/iconIdProcess.js</iconIdProcess>
<titlePlural>Links</titlePlural>
<recordContainer>db</recordContainer>
@@ -58,17 +58,17 @@
</entityConsumer>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectProxy_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Entity_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeLink_entity/entityfields/objects/children/entity_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>KnowledgeManagementId_param</name>
@@ -79,6 +79,14 @@
<targetContextField>OBJECT_TYPE</targetContextField>
<targetIdField>ROW_ID</targetIdField>
<documentation>%aditoprj%/entity/KnowledgeLink_entity/entityfields/byknowledgeid/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>c3ed10c1-db55-4e55-9c18-2b8d400df033</name>
+ <entityName>KnowledgeManagement_entity</entityName>
+ <fieldName>LinksByKnowledgeId</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -89,14 +97,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>c3ed10c1-db55-4e55-9c18-2b8d400df033</name>
- <entityName>KnowledgeManagement_entity</entityName>
- <fieldName>LinksByKnowledgeId</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>RowId_param</name>
@@ -114,17 +114,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/KnowledgeLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>aea9524a-589e-47df-87d7-5f79519eb135</name>
- <tableName>KNOWLEDGELINK</tableName>
- <primaryKey>KNOWLEDGELINKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -159,6 +150,15 @@
<recordfield>KNOWLEDGELINK.USER_NEW</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>aea9524a-589e-47df-87d7-5f79519eb135</name>
+ <tableName>KNOWLEDGELINK</tableName>
+ <primaryKey>KNOWLEDGELINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/KnowledgeManagementTagList_entity/KnowledgeManagementTagList_entity.aod b/entity/KnowledgeManagementTagList_entity/KnowledgeManagementTagList_entity.aod
index 3a8e46df4e..ce3999d283 100644
--- a/entity/KnowledgeManagementTagList_entity/KnowledgeManagementTagList_entity.aod
+++ b/entity/KnowledgeManagementTagList_entity/KnowledgeManagementTagList_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KnowledgeManagementTagList_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KnowledgeManagementTagList_entity/documentation.adoc</documentation>
diff --git a/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod b/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod
index 94e8106d88..3047fb341e 100644
--- a/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod
+++ b/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KnowledgeManagementTags_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KnowledgeManagementTags_entity/documentation.adoc</documentation>
@@ -15,12 +15,6 @@
<entityProvider>
<name>ByKnowledgeManagementId</name>
<documentation>%aditoprj%/entity/KnowledgeManagementTags_entity/entityfields/byknowledgemanagementid/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>KnowledgeManagementId_param</name>
- <mandatory v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>8d86a61b-0fe3-44c4-a512-e044c990fded</name>
@@ -29,6 +23,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>KnowledgeManagementId_param</name>
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>TAG</name>
diff --git a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
index 93e235fcee..f3636542e0 100644
--- a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
+++ b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KnowledgeManagement_entity</name>
+ <title>Knowledge</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KnowledgeManagement_entity/documentation.adoc</documentation>
<icon>VAADIN:ACADEMY_CAP</icon>
- <title>Knowledge</title>
<grantUpdateProcess>%aditoprj%/entity/KnowledgeManagement_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/KnowledgeManagement_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/KnowledgeManagement_entity/contentTitleProcess.js</contentTitleProcess>
@@ -101,32 +101,32 @@
<refreshParent v="true" />
<state>EDITABLE</state>
<onValidation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeManagementTags_entity</entityName>
+ <fieldName>ByKnowledgeManagementId</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>KnowledgeManagementId_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/children/knowledgemanagementid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeManagementTags_entity</entityName>
- <fieldName>ByKnowledgeManagementId</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>DiscussionsByKnowledgeId</name>
<refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeDiscussion_entity</entityName>
+ <fieldName>ByKnowledgeId</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>KnowledgeId_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/discussionsbyknowledgeid/children/knowledgeid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeDiscussion_entity</entityName>
- <fieldName>ByKnowledgeId</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>Provider</name>
@@ -142,37 +142,42 @@
</entityConsumer>
<entityConsumer>
<name>KeywordKnowledgeType</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/keywordknowledgetype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPublish</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordPublish</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/keywordpublish/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>indexTag</name>
</entityField>
<entityConsumer>
<name>LinkedDocuments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -183,11 +188,6 @@
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/linkeddocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>openEntryAsMail</name>
@@ -200,17 +200,17 @@
<entityConsumer>
<name>LinksByKnowledgeId</name>
<refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeLink_entity</entityName>
+ <fieldName>ByKnowledgeId</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>KnowledgeManagementId_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/linksbyknowledgeid/children/knowledgemanagementid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeLink_entity</entityName>
- <fieldName>ByKnowledgeId</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>LastChange</name>
@@ -219,17 +219,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>exportHTML_action</name>
@@ -271,6 +271,11 @@
<name>KnowledgeRoles</name>
<stateProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/knowledgeroles/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/knowledgeroles/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeRole_entity</entityName>
+ <fieldName>KnowledgeRole</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>KnowledgeManagement_param</name>
@@ -282,14 +287,14 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeRole_entity</entityName>
- <fieldName>KnowledgeRole</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -304,11 +309,6 @@
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>RESPONSIBLE_CONTACT_ID</name>
@@ -330,21 +330,12 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isRequireContainerFiltering v="true" />
<conditionProcess>%aditoprj%/entity/KnowledgeManagement_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/KnowledgeManagement_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/KnowledgeManagement_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/KnowledgeManagement_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <linkInformation>
- <linkInformation>
- <name>9d4a7198-a4d1-45b3-867f-bf12cd558274</name>
- <tableName>KNOWLEDGEMANAGEMENT</tableName>
- <primaryKey>KNOWLEDGEMANAGEMENTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AUTHOR_CONTACT_ID.value</name>
@@ -441,6 +432,15 @@
<expression>%aditoprj%/entity/KnowledgeManagement_entity/recordcontainers/db/recordfieldmappings/publish.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>9d4a7198-a4d1-45b3-867f-bf12cd558274</name>
+ <tableName>KNOWLEDGEMANAGEMENT</tableName>
+ <primaryKey>KNOWLEDGEMANAGEMENTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtension>
<name>TagFilter</name>
diff --git a/entity/KnowledgeNewsFeed_entity/KnowledgeNewsFeed_entity.aod b/entity/KnowledgeNewsFeed_entity/KnowledgeNewsFeed_entity.aod
index aa197ca8d2..044c654b10 100644
--- a/entity/KnowledgeNewsFeed_entity/KnowledgeNewsFeed_entity.aod
+++ b/entity/KnowledgeNewsFeed_entity/KnowledgeNewsFeed_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KnowledgeNewsFeed_entity</name>
+ <title>Feed</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KnowledgeNewsFeed_entity/documentation.adoc</documentation>
- <title>Feed</title>
<recordContainer>recordContainer</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod b/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod
index fe16e94a9f..a3aa8d298e 100644
--- a/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod
+++ b/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>KnowledgeRole_entity</name>
+ <title>Knowledge Role</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KnowledgeRole_entity/documentation.adoc</documentation>
- <title>Knowledge Role</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -17,17 +17,17 @@
</entityField>
<entityConsumer>
<name>NewsRole</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Role_entity</entityName>
+ <fieldName>FilterRolesWithoutPermission</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludeRoles_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeRole_entity/entityfields/newsrole/children/excluderoles_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Role_entity</entityName>
- <fieldName>FilterRolesWithoutPermission</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>KnowledgeRole</name>
@@ -75,19 +75,10 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<hasDependentRecords v="true" />
<conditionProcess>%aditoprj%/entity/KnowledgeRole_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <alias>Data_alias</alias>
<title>Knowledge Roles</title>
- <linkInformation>
- <linkInformation>
- <name>16e6127e-67c6-4dce-b2e9-4b2b951dbcd4</name>
- <tableName>KNOWLEDGEROLES</tableName>
- <primaryKey>KNOWLEDGEROLESID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ROLES.value</name>
@@ -108,6 +99,15 @@
<expression>%aditoprj%/entity/KnowledgeRole_entity/recordcontainers/db/recordfieldmappings/roles.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>16e6127e-67c6-4dce-b2e9-4b2b951dbcd4</name>
+ <tableName>KNOWLEDGEROLES</tableName>
+ <primaryKey>KNOWLEDGEROLESID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 6c74b7472d..e5ea652802 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Language_entity</name>
+ <title>Language</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Language_entity/documentation.adoc</documentation>
- <title>Language</title>
<contentTitleProcess>%aditoprj%/entity/Language_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
@@ -33,12 +33,6 @@
<lookupIdfield>ISO3</lookupIdfield>
<documentation>%aditoprj%/entity/Language_entity/entityfields/iso3name/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>ExcludedIds_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>471b099a-03ab-4c49-8372-729b1e789ecc</name>
@@ -101,17 +95,17 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityProvider>
- <name>ISO3NameFiltered</name>
- <lookupIdfield>ISO3</lookupIdfield>
- <documentation>%aditoprj%/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc</documentation>
<children>
<entityParameter>
<name>ExcludedIds_param</name>
- <expose v="true" />
+ <expose v="false" />
</entityParameter>
</children>
+ </entityProvider>
+ <entityProvider>
+ <name>ISO3NameFiltered</name>
+ <lookupIdfield>ISO3</lookupIdfield>
+ <documentation>%aditoprj%/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>2df9d0ed-c26b-4166-9667-786a55146e05</name>
@@ -120,6 +114,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludedIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>ExcludedIds_param</name>
@@ -133,20 +133,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<conditionProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
<cacheKeyProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
- <linkInformation>
- <linkInformation>
- <name>3cd06d7c-16c3-49e5-87cd-672a7222e613</name>
- <tableName>AB_LANGUAGE</tableName>
- <primaryKey>ISO3</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ISACTIVE.value</name>
@@ -175,6 +166,15 @@
<isLookupFilter v="false" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>3cd06d7c-16c3-49e5-87cd-672a7222e613</name>
+ <tableName>AB_LANGUAGE</tableName>
+ <primaryKey>ISO3</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/LeadLog_entity/LeadLog_entity.aod b/entity/LeadLog_entity/LeadLog_entity.aod
index c5d2fde11e..60e321526f 100644
--- a/entity/LeadLog_entity/LeadLog_entity.aod
+++ b/entity/LeadLog_entity/LeadLog_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>LeadLog_entity</name>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -61,6 +61,11 @@
</entityField>
<entityConsumer>
<name>LogDocuments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentName_param</name>
@@ -75,11 +80,6 @@
<valueProcess>%aditoprj%/entity/LeadLog_entity/entityfields/logdocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -89,18 +89,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/LeadLog_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/LeadLog_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>0c8cdc60-c8dd-4d03-9878-8312ebca21f9</name>
- <tableName>LEADLOG</tableName>
- <primaryKey>LEADLOGID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>LEADLOGID.value</name>
@@ -143,6 +134,15 @@
<isLookupFilter v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>0c8cdc60-c8dd-4d03-9878-8312ebca21f9</name>
+ <tableName>LEADLOG</tableName>
+ <primaryKey>LEADLOGID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/LeadTemp_entity/LeadTemp_entity.aod b/entity/LeadTemp_entity/LeadTemp_entity.aod
index 51582fefaf..b8ae307bfe 100644
--- a/entity/LeadTemp_entity/LeadTemp_entity.aod
+++ b/entity/LeadTemp_entity/LeadTemp_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>LeadTemp_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/LeadTemp_entity/documentation.adoc</documentation>
@@ -172,18 +172,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/LeadTemp_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/LeadTemp_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>d7b0d323-5516-4e53-a29f-57f708545ba1</name>
- <tableName>LEADTEMP</tableName>
- <primaryKey>LEADTEMPID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>COLUMN01.value</name>
@@ -386,6 +377,15 @@
<isLookupFilter v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>d7b0d323-5516-4e53-a29f-57f708545ba1</name>
+ <tableName>LEADTEMP</tableName>
+ <primaryKey>LEADTEMPID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Lead_entity/Lead_entity.aod b/entity/Lead_entity/Lead_entity.aod
index 1889a63574..f4f73b84ea 100644
--- a/entity/Lead_entity/Lead_entity.aod
+++ b/entity/Lead_entity/Lead_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Lead_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Lead_entity/documentation.adoc</documentation>
@@ -77,17 +77,17 @@
</entityField>
<entityConsumer>
<name>ContactId</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Contact</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Lead_entity/entityfields/contactid/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contact</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>LEADDUP_STATUS</name>
@@ -108,6 +108,11 @@
</entityField>
<entityConsumer>
<name>KeywordDupStatus</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -115,11 +120,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -129,17 +129,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Lead_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>c4a59fcc-2c94-4944-ae57-790a4adcca30</name>
- <tableName>LEAD</tableName>
- <primaryKey>LEADID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>LEAD_ADDRESS.value</name>
@@ -220,6 +211,15 @@
<recordfield>LEAD.ORGANISATION_ID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>c4a59fcc-2c94-4944-ae57-790a4adcca30</name>
+ <tableName>LEAD</tableName>
+ <primaryKey>LEADID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
index f525794d52..c179a144bc 100644
--- a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
+++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>LeadimportMappingAssistant_entity</name>
+ <title>Mapping</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/LeadimportMappingAssistant_entity/documentation.adoc</documentation>
- <title>Mapping</title>
<titlePlural>Mappings</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -70,17 +70,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordImportFields</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -90,18 +90,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>61a456d3-b7b5-4042-ae4c-6245d420da3b</name>
- <tableName>LEADIMPORTMAPPINGASSISTANT</tableName>
- <primaryKey>LEADIMPORTMAPPINGASSISTANTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -140,6 +131,15 @@
<recordfield>LEADIMPORTMAPPINGASSISTANT.USER_NEW</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>61a456d3-b7b5-4042-ae4c-6245d420da3b</name>
+ <tableName>LEADIMPORTMAPPINGASSISTANT</tableName>
+ <primaryKey>LEADIMPORTMAPPINGASSISTANTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index e19536e314..0acd7189f9 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Leadimport_entity</name>
+ <title>Lead Import</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Leadimport_entity/documentation.adoc</documentation>
<icon>NEON:IMPORT</icon>
- <title>Lead Import</title>
<grantUpdate v="true" />
<grantUpdateProcess>%aditoprj%/entity/Leadimport_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDelete v="true" />
@@ -126,17 +126,17 @@
</entityField>
<entityConsumer>
<name>KeywordImportStatus</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/keywordimportstatus/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Leadimport_Empl</name>
@@ -175,20 +175,25 @@
</entityProvider>
<entityConsumer>
<name>ImportFieldID</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ImportField_Entity</entityName>
+ <fieldName>LeadImportIds</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>LeadImportID</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/importfieldid/children/leadimportid/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ImportField_Entity</entityName>
- <fieldName>LeadImportIds</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>DocumentC</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -199,28 +204,28 @@
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/documentc/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistoryC</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/loghistoryc/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -231,15 +236,15 @@
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Leadimport_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -250,11 +255,6 @@
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>UID</name>
@@ -287,45 +287,45 @@
</entityActionField>
<entityConsumer>
<name>LeadTempC</name>
- <children>
- <entityParameter>
- <name>LeadImportId</name>
- <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadtempc/children/leadimportid/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
<dependency>
<name>dependency</name>
<entityName>LeadTemp_entity</entityName>
<fieldName>LeadTempP</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>LeadC</name>
<children>
<entityParameter>
<name>LeadImportId</name>
- <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadc/children/leadimportid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadtempc/children/leadimportid/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LeadC</name>
<dependency>
<name>dependency</name>
<entityName>Lead_entity</entityName>
<fieldName>LeadP</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>LeadLogC</name>
<children>
<entityParameter>
<name>LeadImportId</name>
- <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadlogc/children/leadimportid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadc/children/leadimportid/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LeadLogC</name>
<dependency>
<name>dependency</name>
<entityName>LeadLog_entity</entityName>
<fieldName>LeadLogP</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>LeadImportId</name>
+ <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadlogc/children/leadimportid/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityActionField>
<name>LeadimportReset</name>
@@ -337,17 +337,17 @@
</entityActionField>
<entityConsumer>
<name>LeadimportMappings</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LeadimportMappingAssistant_entity</entityName>
+ <fieldName>LeadimportMapping</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Leadimport_ID_param</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LeadimportMappingAssistant_entity</entityName>
- <fieldName>LeadimportMapping</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>LEADIMPORT_OBJECTTYPE</name>
@@ -361,19 +361,10 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<onDBInsert>%aditoprj%/entity/Leadimport_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Leadimport_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>afe18957-2a28-433c-9cce-515dad875ca0</name>
- <tableName>LEADIMPORT</tableName>
- <primaryKey>LEADIMPORTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>LEADIMPORTID.value</name>
@@ -444,6 +435,15 @@
<isLookupFilter v="false" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>afe18957-2a28-433c-9cce-515dad875ca0</name>
+ <tableName>LEADIMPORT</tableName>
+ <primaryKey>LEADIMPORTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index e8f4ac96e6..c69902cd77 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>LetterRecipient_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/LetterRecipient_entity/documentation.adoc</documentation>
@@ -106,43 +106,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/LetterRecipient_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/LetterRecipient_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/LetterRecipient_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/LetterRecipient_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/LetterRecipient_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/LetterRecipient_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>0a41cbd3-c199-4191-af95-ba793e4f2554</name>
- <tableName>LETTERRECIPIENT</tableName>
- <primaryKey>LETTERRECIPIENTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>d2204511-72e8-4b58-80b0-39cb334e68f7</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>25149c4f-b158-48e6-b114-cc7e05ebe75b</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>d653cba9-df2f-4b78-8bf3-8e92d8965d36</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
@@ -187,6 +157,36 @@
<recordfield>CONTACT.ADDRESS_ID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>0a41cbd3-c199-4191-af95-ba793e4f2554</name>
+ <tableName>LETTERRECIPIENT</tableName>
+ <primaryKey>LETTERRECIPIENTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>d2204511-72e8-4b58-80b0-39cb334e68f7</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>25149c4f-b158-48e6-b114-cc7e05ebe75b</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>d653cba9-df2f-4b78-8bf3-8e92d8965d36</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 6140a98113..1cd209bbe2 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Letter_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Letter_entity/documentation.adoc</documentation>
@@ -22,6 +22,11 @@
</entityField>
<entityConsumer>
<name>DocumentTemplates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -32,11 +37,6 @@
<valueProcess>%aditoprj%/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index b7abfc4219..059c91250d 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>LogHistory_entity</name>
+ <title>Log</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/LogHistory_entity/documentation.adoc</documentation>
- <title>Log</title>
<grantUpdate v="false" />
<grantDelete v="false" />
<iconId>NEON:HISTORY</iconId>
@@ -39,12 +39,6 @@
<entityProvider>
<name>LogHistoryProvider</name>
<documentation>%aditoprj%/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>tablenames_param</name>
- <documentation>%aditoprj%/entity/LogHistory_entity/entityfields/loghistoryprovider/children/tablenames_param/documentation.adoc</documentation>
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
@@ -131,6 +125,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <documentation>%aditoprj%/entity/LogHistory_entity/entityfields/loghistoryprovider/children/tablenames_param/documentation.adoc</documentation>
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>tablenames_param</name>
diff --git a/entity/MSTTeamLink_entity/MSTTeamLink_entity.aod b/entity/MSTTeamLink_entity/MSTTeamLink_entity.aod
index d2df3a1cd3..3660a3783e 100644
--- a/entity/MSTTeamLink_entity/MSTTeamLink_entity.aod
+++ b/entity/MSTTeamLink_entity/MSTTeamLink_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>MSTTeamLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTTeamLink_entity/documentation.adoc</documentation>
@@ -66,27 +66,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/MSTTeamLink_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/MSTTeamLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/MSTTeamLink_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/MSTTeamLink_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <linkInformation>
- <linkInformation>
- <name>178230f3-4ee4-4ec0-a7f6-4f4ddddbbb22</name>
- <tableName>MST_TEAMLINK</tableName>
- <primaryKey>MST_TEAMLINKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>53378325-f195-4eb3-9e22-68fd769eef03</name>
- <tableName>MST_TEAM</tableName>
- <primaryKey>MST_TEAMID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>MST_TEAMLINKID.value</name>
@@ -109,6 +93,22 @@
<recordfield>MST_TEAM.TEAMNAME</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>178230f3-4ee4-4ec0-a7f6-4f4ddddbbb22</name>
+ <tableName>MST_TEAMLINK</tableName>
+ <primaryKey>MST_TEAMLINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>53378325-f195-4eb3-9e22-68fd769eef03</name>
+ <tableName>MST_TEAM</tableName>
+ <primaryKey>MST_TEAMID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod b/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod
index 1f1e68f496..3c69226444 100644
--- a/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod
+++ b/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>MSTTeamMember_entity</name>
+ <title>Member</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTTeamMember_entity/documentation.adoc</documentation>
- <title>Member</title>
<siblings />
<titlePlural>Members</titlePlural>
<recordContainer>jdito</recordContainer>
@@ -39,6 +39,11 @@
</entityParameter>
<entityConsumer>
<name>ProjectMembers</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>TeamMemberProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -49,11 +54,6 @@
<valueProcess>%aditoprj%/entity/MSTTeamMember_entity/entityfields/projectmembers/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Member_entity</entityName>
- <fieldName>TeamMemberProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ISEXTERN</name>
diff --git a/entity/MSTTeam_entity/MSTTeam_entity.aod b/entity/MSTTeam_entity/MSTTeam_entity.aod
index f7675657fe..16929c27f7 100644
--- a/entity/MSTTeam_entity/MSTTeam_entity.aod
+++ b/entity/MSTTeam_entity/MSTTeam_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>MSTTeam_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTTeam_entity/documentation.adoc</documentation>
@@ -41,6 +41,11 @@
<name>TeamMembers</name>
<stateProcess>%aditoprj%/entity/MSTTeam_entity/entityfields/teammembers/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/MSTTeam_entity/entityfields/teammembers/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>MSTTeamMember_entity</entityName>
+ <fieldName>MembersOfTeam</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>MSTTeamId_param</name>
@@ -55,11 +60,6 @@
<valueProcess>%aditoprj%/entity/MSTTeam_entity/entityfields/teammembers/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>MSTTeamMember_entity</entityName>
- <fieldName>MembersOfTeam</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TEAMID_AND_NAME</name>
@@ -79,17 +79,17 @@
</entityParameter>
<entityConsumer>
<name>Channels</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>MSTeamsChannel_entity</entityName>
+ <fieldName>ChannelsForTeam</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>TeamId_param</name>
<valueProcess>%aditoprj%/entity/MSTTeam_entity/entityfields/channels/children/teamid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>MSTeamsChannel_entity</entityName>
- <fieldName>ChannelsForTeam</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -104,13 +104,6 @@
<name>TeamsByIdAndName</name>
<lookupIdfield>TEAMID_AND_NAME</lookupIdfield>
<documentation>%aditoprj%/entity/MSTTeam_entity/entityfields/teamsbyidandname/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>UseCache_param</name>
- <valueProcess>%aditoprj%/entity/MSTTeam_entity/entityfields/teamsbyidandname/children/usecache_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>e48136a2-5f66-4399-903a-cd1363fa30c6</name>
@@ -119,6 +112,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>UseCache_param</name>
+ <valueProcess>%aditoprj%/entity/MSTTeam_entity/entityfields/teamsbyidandname/children/usecache_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>UseCache_param</name>
diff --git a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
index 17cde5886a..5a3b3cc6b8 100644
--- a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
+++ b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>MSTeamsActivityImport_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTeamsActivityImport_entity/documentation.adoc</documentation>
@@ -13,6 +13,11 @@
<entityConsumer>
<name>Messages</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>MSTeamsMessage_entity</entityName>
+ <fieldName>Messages</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Channel_param</name>
@@ -27,11 +32,6 @@
<valueProcess>%aditoprj%/entity/MSTeamsActivityImport_entity/entityfields/messages/children/loadnext_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>MSTeamsMessage_entity</entityName>
- <fieldName>Messages</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CHANNEL_ID</name>
@@ -49,17 +49,17 @@
</entityField>
<entityConsumer>
<name>Channels</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>MSTeamsChannel_entity</entityName>
+ <fieldName>ChannelsForTeam</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>TeamId_param</name>
<valueProcess>%aditoprj%/entity/MSTeamsActivityImport_entity/entityfields/channels/children/teamid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>MSTeamsChannel_entity</entityName>
- <fieldName>ChannelsForTeam</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>loadNextMessages</name>
diff --git a/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod b/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod
index 4c2ea19b10..88467d4464 100644
--- a/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod
+++ b/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>MSTeamsChannel_entity</name>
+ <title>Channel</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTeamsChannel_entity/documentation.adoc</documentation>
- <title>Channel</title>
<siblings />
<contentTitleProcess>%aditoprj%/entity/MSTeamsChannel_entity/contentTitleProcess.js</contentTitleProcess>
<titlePlural>Channels</titlePlural>
diff --git a/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod b/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
index 282dfbc5ff..8c84356625 100644
--- a/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
+++ b/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>MSTeamsDocument_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTeamsDocument_entity/documentation.adoc</documentation>
@@ -40,17 +40,17 @@
</entityParameter>
<entityConsumer>
<name>Channels</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>MSTeamsChannel_entity</entityName>
+ <fieldName>ChannelsByName</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>TeamId_param</name>
<valueProcess>%aditoprj%/entity/MSTeamsDocument_entity/entityfields/channels/children/teamid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>MSTeamsChannel_entity</entityName>
- <fieldName>ChannelsByName</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>MSTTeamId_param</name>
diff --git a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
index 8100af9bbe..85a8139c1b 100644
--- a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
+++ b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>MSTeamsMessage_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTeamsMessage_entity/documentation.adoc</documentation>
diff --git a/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod b/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
index 8efdde1d70..272d727e2b 100644
--- a/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
+++ b/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
@@ -1,8 +1,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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>MarketingWorkflowLauncher_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
<title>Marketing workflow</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>dataLess</recordContainer>
<entityFields>
<entityProvider>
@@ -22,6 +22,11 @@
<entityConsumer>
<name>WorkflowLauncherIntegration</name>
<isOneToOneRelationship v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowLauncher_entity</entityName>
+ <fieldName>Integration</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Validationerrors_param</name>
@@ -40,11 +45,6 @@
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targetcontext_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowLauncher_entity</entityName>
- <fieldName>Integration</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ObjectType_param</name>
@@ -60,6 +60,11 @@
</entityParameter>
<entityConsumer>
<name>EmailTemplates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -70,11 +75,6 @@
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/comingfrom_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
</entityConsumer>
</entityFields>
<recordContainers>
diff --git a/entity/MemberRoles_entity/MemberRoles_entity.aod b/entity/MemberRoles_entity/MemberRoles_entity.aod
index 2871a36c5d..c373bff12a 100644
--- a/entity/MemberRoles_entity/MemberRoles_entity.aod
+++ b/entity/MemberRoles_entity/MemberRoles_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>MemberRoles_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MemberRoles_entity/documentation.adoc</documentation>
@@ -43,17 +43,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/MemberRoles_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>26c8ba40-981a-400b-9502-b561e8007b17</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ENTRID.value</name>
@@ -68,6 +59,15 @@
<recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>26c8ba40-981a-400b-9502-b561e8007b17</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index a416ef148b..588b0ea8bf 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Member_entity</name>
+ <title>${SALESPROJECT_MEMBER}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation>
- <title>${SALESPROJECT_MEMBER}</title>
<siblings>
<element>MSTTeam_entity</element>
<element>MSTTeamLink_entity</element>
@@ -86,6 +86,11 @@
</entityField>
<entityConsumer>
<name>Contacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>IdFilteredActiveContacts</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludedContactIds_param</name>
@@ -96,25 +101,20 @@
<valueProcess>%aditoprj%/entity/Member_entity/entityfields/contacts/children/onlyactive_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>IdFilteredActiveContacts</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordMemberRoles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>MemberRoles_entity</entityName>
+ <fieldName>ByCategory</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>UsageFilter_param</name>
<valueProcess>%aditoprj%/entity/Member_entity/entityfields/keywordmemberroles/children/usagefilter_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>MemberRoles_entity</entityName>
- <fieldName>ByCategory</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TARGETCONTEXT</name>
@@ -154,6 +154,11 @@
</entityParameter>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -162,11 +167,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
@@ -310,39 +310,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Member_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Member_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>b14ff9f6-97cc-4353-b19b-8acd50d56d5c</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>85599074-129e-4de8-b2b3-464bcfa8fb40</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>ae87b90e-b40d-4472-9bd0-08c080da7f7c</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>1455636c-66c8-4100-892d-80e6a37ccd4d</name>
- <tableName>OBJECTMEMBER</tableName>
- <primaryKey>OBJECTMEMBERID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ORGANISATION_NAME.value</name>
@@ -431,6 +401,36 @@
<expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/mst_memberrole.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>b14ff9f6-97cc-4353-b19b-8acd50d56d5c</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>85599074-129e-4de8-b2b3-464bcfa8fb40</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>ae87b90e-b40d-4472-9bd0-08c080da7f7c</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>1455636c-66c8-4100-892d-80e6a37ccd4d</name>
+ <tableName>OBJECTMEMBER</tableName>
+ <primaryKey>OBJECTMEMBERID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
<jDitoRecordContainer>
<name>jdito</name>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 4340bcf191..f799c2ef9b 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ModuleTree_entity</name>
+ <title>History</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ModuleTree_entity/documentation.adoc</documentation>
- <title>History</title>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
@@ -26,16 +26,6 @@
<targetContextField>TYPE</targetContextField>
<targetIdField>ROW_ID</targetIdField>
<recordContainer>jdito</recordContainer>
- <children>
- <entityParameter>
- <name>ContextName_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ID_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>7da88ffb-4292-4fe2-88e2-dda2dc4aa625</name>
@@ -56,6 +46,16 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ContextName_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ID_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>PARENT_ID</name>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 07dd08d1d4..d4e53b492e 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Notification_entity</name>
+ <title>Notifications</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Notification_entity/documentation.adoc</documentation>
- <title>Notifications</title>
<initFilterProcess>%aditoprj%/entity/Notification_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:BELL</iconId>
<titlePlural>Notifications</titlePlural>
@@ -132,31 +132,31 @@
</entityField>
<entityConsumer>
<name>StateKeywords</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>PrioKeywords</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>PrioKeywords</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Notification_entity/entityfields/priokeywords/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -179,28 +179,12 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>_____SYSTEMALIAS</alias>
<isPageable v="true" />
<fromClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBDelete>%aditoprj%/entity/Notification_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>3061f3b4-a5d1-4436-9c4d-28415363a056</name>
- <tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
- <primaryKey>CONTENTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>c4e34b96-6081-4d04-8377-040a8ed3e14c</name>
- <tableName>ASYS_NOTIFICATIONS</tableName>
- <primaryKey>ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>_____SYSTEMALIAS</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>BACKPACK.value</name>
@@ -293,6 +277,22 @@
<isLookupFilter v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>3061f3b4-a5d1-4436-9c4d-28415363a056</name>
+ <tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
+ <primaryKey>CONTENTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>c4e34b96-6081-4d04-8377-040a8ed3e14c</name>
+ <tableName>ASYS_NOTIFICATIONS</tableName>
+ <primaryKey>ID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/ObjectProxy_entity/ObjectProxy_entity.aod b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
index 601b41c258..71ef1a617e 100644
--- a/entity/ObjectProxy_entity/ObjectProxy_entity.aod
+++ b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ObjectProxy_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ObjectProxy_entity/documentation.adoc</documentation>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 4488b7e9c3..e35ca31e89 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ObjectRelationType_entity</name>
+ <title>Relation Type</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ObjectRelationType_entity/documentation.adoc</documentation>
<icon>VAADIN:SPLIT</icon>
- <title>Relation Type</title>
<grantDeleteProcess>%aditoprj%/entity/ObjectRelationType_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/ObjectRelationType_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:SPLIT</iconId>
@@ -30,13 +30,6 @@
</entityParameter>
<entityProvider>
<name>ObjectRelationTypes</name>
- <children>
- <entityParameter>
- <name>OnlyFirstSide_param</name>
- <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>81f4567a-fc89-49fc-be86-77600cb66305</name>
@@ -45,6 +38,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyFirstSide_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>OnlyFirstSide_param</name>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index b7a81ef152..f3a46c5839 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>ObjectTree_entity</name>
+ <title>Object relation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ObjectTree_entity/documentation.adoc</documentation>
- <title>Object relation</title>
<grantUpdate v="true" />
<grantUpdateProcess>%aditoprj%/entity/ObjectTree_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/ObjectTree_entity/grantDeleteProcess.js</grantDeleteProcess>
@@ -18,16 +18,6 @@
<name>TreeProvider</name>
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField>
- <children>
- <entityParameter>
- <name>Uid_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>RelationTypes_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
@@ -42,6 +32,16 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Uid_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>RelationTypes_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>ObjectIds_param</name>
@@ -69,17 +69,17 @@
</entityField>
<entityConsumer>
<name>ObjectRelationTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectRelationType_entity</entityName>
+ <fieldName>ObjectRelationTypes</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>SourceObjectTypes_param</name>
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttypes_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectRelationType_entity</entityName>
- <fieldName>ObjectRelationTypes</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ObjectTypes_param</name>
@@ -127,22 +127,22 @@
</entityField>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
- <title></title>
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ <title></title>
</entityParameter>
<entityParameter>
<name>ExcludedObjectIds_param</name>
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
</entityConsumer>
<entityActionGroup>
<name>alter</name>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 884a3a733c..860935ef74 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Object_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
@@ -27,21 +27,6 @@
<targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js</targetConsumerProcess>
<documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ExcludedObjectIds_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
@@ -80,23 +65,43 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityConsumer>
<name>Organisations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludedContactIds_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Persons</name>
<dependency>
<name>dependency</name>
- <entityName>Organisation_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Persons</name>
<children>
<entityParameter>
<name>ExcludedContactIds_param</name>
@@ -107,39 +112,34 @@
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/persons/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Offers</name>
<dependency>
<name>dependency</name>
- <entityName>Person_entity</entityName>
+ <entityName>Offer_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Offers</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Orders</name>
<dependency>
<name>dependency</name>
- <entityName>Offer_entity</entityName>
+ <entityName>Order_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Orders</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/orders/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Order_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Products</name>
@@ -151,31 +151,31 @@
</entityConsumer>
<entityConsumer>
<name>Contracts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/contracts/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Salesprojects</name>
<dependency>
<name>dependency</name>
- <entityName>Contract_entity</entityName>
+ <entityName>Salesproject_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Salesprojects</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ExcludedObjectIds_param</name>
@@ -185,21 +185,6 @@
<entityProvider>
<name>FilteredObjects</name>
<targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/filteredobjects/targetConsumerProcess.js</targetConsumerProcess>
- <children>
- <entityParameter>
- <name>ExcludedObjectIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>e644a709-cc8f-425e-bef2-9c51eea9bbe9</name>
@@ -220,6 +205,21 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityConsumer>
<name>Campaigns</name>
@@ -243,17 +243,17 @@
</entityParameter>
<entityConsumer>
<name>PrivatePersons</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PrivatePerson_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludedPersonIds_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/privatepersons/children/excludedpersonids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>PrivatePerson_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
diff --git a/entity/Observation_entity/Observation_entity.aod b/entity/Observation_entity/Observation_entity.aod
index c0763a22d5..abbabad7d3 100644
--- a/entity/Observation_entity/Observation_entity.aod
+++ b/entity/Observation_entity/Observation_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Observation_entity</name>
+ <title>Observation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Observation_entity/documentation.adoc</documentation>
- <title>Observation</title>
<titlePlural>Observations</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -73,17 +73,17 @@
</entityField>
<entityConsumer>
<name>PrioKeywords</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Observation_entity/entityfields/priokeywords/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Ussers</name>
@@ -95,17 +95,17 @@
</entityConsumer>
<entityConsumer>
<name>ObjectProxyConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectProxy_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Entity_param</name>
<valueProcess>%aditoprj%/entity/Observation_entity/entityfields/objectproxyconsumer/children/entity_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TRIGGEREVENTUPDATE</name>
@@ -180,6 +180,11 @@
</entityField>
<entityConsumer>
<name>Contexts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -190,11 +195,6 @@
<valueProcess>%aditoprj%/entity/Observation_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>OBSERVATION_ID</name>
@@ -228,22 +228,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isPageable v="false" />
<hasDependentRecords v="true" />
<conditionProcess>%aditoprj%/entity/Observation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Observation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBDelete>%aditoprj%/entity/Observation_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <alias>Data_alias</alias>
<cacheType>GLOBAL</cacheType>
- <linkInformation>
- <linkInformation>
- <name>013ae123-fbb0-42c1-b57a-0d6fcbf21477</name>
- <tableName>OBSERVATION</tableName>
- <primaryKey>OBSERVATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -320,6 +311,15 @@
<isFilterable v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>013ae123-fbb0-42c1-b57a-0d6fcbf21477</name>
+ <tableName>OBSERVATION</tableName>
+ <primaryKey>OBSERVATIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 5e1334a571..55136c757d 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Offer_entity</name>
+ <title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
- <title>Offer</title>
<siblings>
<element>Offeritem_entity</element>
</siblings>
@@ -139,6 +139,11 @@
<name>Offeritems</name>
<refreshParent v="true" />
<description></description>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offeritem_entity</entityName>
+ <fieldName>OfferItems</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OfferId_param</name>
@@ -172,11 +177,6 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/discount_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>OfferItems</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newOfferVersion</name>
@@ -273,22 +273,27 @@
</entityField>
<entityConsumer>
<name>AnyContacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AnyContact_entity</entityName>
+ <fieldName>OnlySameCompany</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/anycontacts/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>OnlySameCompany</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -299,15 +304,15 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -318,11 +323,6 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ADDRESS</name>
@@ -349,6 +349,11 @@
</entityField>
<entityConsumer>
<name>KeywordCurrencies</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -356,14 +361,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordOfferStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordOfferStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -371,11 +376,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newOrder</name>
@@ -393,6 +393,11 @@
</entityConsumer>
<entityConsumer>
<name>KeywordProbabilities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -400,14 +405,14 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -422,11 +427,6 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -438,6 +438,26 @@
</entityActionField>
<entityProvider>
<name>ContactOffers</name>
+ <dependencies>
+ <entityDependency>
+ <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a74b02c4-bdb3-4ba8-9207-66a0af528b1b</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -488,26 +508,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
- <entityName>Person_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a74b02c4-bdb3-4ba8-9207-66a0af528b1b</name>
- <entityName>Order_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>OfferCurrency_param</name>
@@ -577,35 +577,40 @@
</entityField>
<entityConsumer>
<name>KeywordPaymentTerm</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDeliveryTerm</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDeliveryTerm</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -620,11 +625,6 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>INFO</name>
@@ -636,6 +636,11 @@
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Offer_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -646,11 +651,6 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>OfferPaymentTerm_param</name>
@@ -690,17 +690,17 @@
</entityField>
<entityConsumer>
<name>PossibleAddresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrganisationAndContactAddresses</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>OrganisationAndContactAddresses</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ChoosenTEXHeader</name>
@@ -742,6 +742,11 @@
</entityField>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -752,14 +757,14 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/objects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -770,15 +775,18 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>Links</name>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>88a166e6-ccd0-4d51-b554-e3327f66d834</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>OfferDeliveryTerm_param</name>
@@ -834,14 +842,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>88a166e6-ccd0-4d51-b554-e3327f66d834</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -859,6 +859,11 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTexHeader</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -869,25 +874,20 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>FOOTER</name>
@@ -914,6 +914,11 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTexFooter</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -924,25 +929,20 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Salesprojects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CONTACT_ID</name>
@@ -1125,7 +1125,6 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<maximumDbRows v="0" />
<fromClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
@@ -1133,43 +1132,7 @@
<onDBInsert>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>69b62a9f-95bf-48be-8891-b6c2524f6ea1</name>
- <tableName>OFFER</tableName>
- <primaryKey>OFFERID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>d2334c28-1be0-4377-b13a-062bb1613c5a</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>16e5d66a-f156-4855-9da4-b9dee497c3f3</name>
- <tableName>SALESPROJECT</tableName>
- <primaryKey>SALESPROJECTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>6b708a89-8864-433b-bdec-4edcedb3d7d1</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>4cdfe047-48d0-409e-8b01-e2c1312e8a5b</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CURRENCY.value</name>
@@ -1386,6 +1349,43 @@
<recordfield>OFFER.DISCOUNTED_VAT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>69b62a9f-95bf-48be-8891-b6c2524f6ea1</name>
+ <tableName>OFFER</tableName>
+ <primaryKey>OFFERID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>d2334c28-1be0-4377-b13a-062bb1613c5a</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>16e5d66a-f156-4855-9da4-b9dee497c3f3</name>
+ <tableName>SALESPROJECT</tableName>
+ <primaryKey>SALESPROJECTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>6b708a89-8864-433b-bdec-4edcedb3d7d1</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>4cdfe047-48d0-409e-8b01-e2c1312e8a5b</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtensionSet>
<name>Attribute_filter</name>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 75863bb226..18bc15ee71 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Offeritem_entity</name>
+ <title>Offeritem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
- <title>Offeritem</title>
<siblings>
<element>Offer_entity</element>
</siblings>
@@ -163,6 +163,14 @@
<entityProvider>
<name>OfferItems</name>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Offeritems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -182,18 +190,10 @@
</entityParameter>
<entityParameter>
<name>Language_param</name>
- <title></title>
<expose v="true" />
+ <title></title>
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Offeritems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>INFO</name>
@@ -204,6 +204,11 @@
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -211,14 +216,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -226,11 +231,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Products</name>
@@ -256,7 +256,6 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<maximumDbRows v="0" />
<hasDependentRecords v="true" />
<conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
@@ -264,15 +263,7 @@
<onDBInsert>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
- <tableName>OFFERITEM</tableName>
- <primaryKey>OFFERITEMID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ASSIGNEDTO.value</name>
@@ -369,6 +360,15 @@
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
+ <tableName>OFFERITEM</tableName>
+ <primaryKey>OFFERITEMID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index ede77ea61f..fc5e7da1fe 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Order_entity</name>
+ <title>Receipt</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
- <title>Receipt</title>
<grantDeleteProcess>%aditoprj%/entity/Order_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Order_entity/contentTitleProcess.js</contentTitleProcess>
<contentDescriptionProcess>%aditoprj%/entity/Order_entity/contentDescriptionProcess.js</contentDescriptionProcess>
@@ -128,6 +128,11 @@
<entityConsumer>
<name>Orderitems</name>
<description></description>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Orderitem_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OrderId_param</name>
@@ -153,11 +158,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Orderitem_entity</entityName>
- <fieldName>Orderitems</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>NET</name>
@@ -219,6 +219,11 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -229,15 +234,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -248,28 +253,28 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Salesprojects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordCurrencies</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -277,14 +282,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -292,11 +297,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
@@ -315,6 +315,11 @@
</entityParameter>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -329,11 +334,6 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>OFFER_ID</name>
@@ -347,6 +347,11 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -361,15 +366,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Order_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -380,15 +385,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -399,25 +404,20 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ORDERTYPE</name>
@@ -495,31 +495,31 @@
</entityField>
<entityConsumer>
<name>KeywordOrderTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordordertypes/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDunningLevels</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDunningLevels</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keyworddunninglevels/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>OBJECT_ROWID</name>
@@ -547,6 +547,11 @@
</entityField>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -557,14 +562,14 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -575,11 +580,6 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>PossibleConnectionTypes</name>
@@ -632,46 +632,46 @@
</entityField>
<entityConsumer>
<name>KeywordPaymentTerms</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordpaymentterms/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDeliveryTerms</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDeliveryTerms</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keyworddeliveryterms/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>PossibleAddresses</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/possibleaddresses/documentation.adoc</documentation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrganisationAndContactAddresses</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>OrganisationAndContactAddresses</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>NOTICE</name>
@@ -688,20 +688,25 @@
</entityField>
<entityConsumer>
<name>Offers</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>ContactOffers</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Offer_entity</entityName>
- <fieldName>ContactOffers</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>DocumentTemplateTexHeader</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -712,14 +717,14 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>DocumentTemplateTexFooter</name>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>DocumentTemplateTexFooter</name>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -730,11 +735,6 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ChosenTexHeader</name>
@@ -958,7 +958,6 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<maximumDbRows v="0" />
<fromClauseProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
@@ -966,36 +965,7 @@
<onDBInsert>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>43290f18-46fb-4d1f-b653-60f39f1fe3fb</name>
- <tableName>SALESORDER</tableName>
- <primaryKey>SALESORDERID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>3f8c21b4-a81e-4405-8b4f-346ff724b8a5</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>0131be90-6232-4dda-9036-bbde951eded5</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>0efeab02-efaf-4155-9312-0aee1f7f5535</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CURRENCY.value</name>
@@ -1178,6 +1148,36 @@
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/active.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>43290f18-46fb-4d1f-b653-60f39f1fe3fb</name>
+ <tableName>SALESORDER</tableName>
+ <primaryKey>SALESORDERID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>3f8c21b4-a81e-4405-8b4f-346ff724b8a5</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>0131be90-6232-4dda-9036-bbde951eded5</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>0efeab02-efaf-4155-9312-0aee1f7f5535</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtension>
<name>Favorite_filter</name>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 1f80cb9b60..6603d77440 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Orderitem_entity</name>
+ <title>Orderitem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
- <title>Orderitem</title>
<siblings>
<element>Order_entity</element>
</siblings>
@@ -144,6 +144,20 @@
<entityProvider>
<name>Orderitems</name>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -166,20 +180,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>INFO</name>
@@ -188,6 +188,11 @@
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -195,14 +200,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -210,11 +215,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Products</name>
@@ -247,7 +247,6 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<maximumDbRows v="0" />
<hasDependentRecords v="true" />
<conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
@@ -255,15 +254,7 @@
<onDBInsert>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
- <tableName>SALESORDERITEM</tableName>
- <primaryKey>SALESORDERITEMID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ASSIGNEDTO.value</name>
@@ -348,6 +339,15 @@
<isLookupFilter v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
+ <tableName>SALESORDERITEM</tableName>
+ <primaryKey>SALESORDERITEMID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 1e6ea3c4e7..102426d691 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Organisation_entity</name>
+ <title>Company</title>
<description>former Org</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Organisation_entity/documentation.adoc</documentation>
- <title>Company</title>
<grantDeleteProcess>%aditoprj%/entity/Organisation_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
<contentDescriptionProcess>%aditoprj%/entity/Organisation_entity/contentDescriptionProcess.js</contentDescriptionProcess>
@@ -72,6 +72,11 @@
</entityField>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -82,26 +87,21 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Contact</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>OrganisationRelated</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OrgId_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contact/children/orgid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>OrganisationRelated</fieldName>
- </dependency>
</entityConsumer>
<entityFieldGroup>
<name>CUSTOMERCODE_DISPLAY_fieldGroup</name>
@@ -115,6 +115,44 @@
<name>Organisations</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisations/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>85aa363e-d8ba-4df5-8422-bf7aff86a4f8</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2eb60a6e-575c-4579-9278-5868ffe4bc75</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>be92b8cc-2cba-409c-b139-2b7cc8b567e6</name>
+ <entityName>DSGVOInfo_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>308bf57b-0e80-48a7-be13-8cf0d5005118</name>
+ <entityName>VisitPlanEntry_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>cbb5b03c-8c47-4aff-8f95-172216d2eff6</name>
+ <entityName>VisitRecommendation_entity</entityName>
+ <fieldName>OrganisationConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>36d6824f-8f2f-4207-9dde-60f0b8f08815</name>
+ <entityName>District_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>WithPrivate_param</name>
@@ -157,47 +195,14 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>85aa363e-d8ba-4df5-8422-bf7aff86a4f8</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2eb60a6e-575c-4579-9278-5868ffe4bc75</name>
- <entityName>Product_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>be92b8cc-2cba-409c-b139-2b7cc8b567e6</name>
- <entityName>DSGVOInfo_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>308bf57b-0e80-48a7-be13-8cf0d5005118</name>
- <entityName>VisitPlanEntry_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>cbb5b03c-8c47-4aff-8f95-172216d2eff6</name>
- <entityName>VisitRecommendation_entity</entityName>
- <fieldName>OrganisationConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>36d6824f-8f2f-4207-9dde-60f0b8f08815</name>
- <entityName>District_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Addresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrganisationAddresses</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DefaultAddressId_param</name>
@@ -209,11 +214,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>OrganisationAddresses</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ADDRESS_ID</name>
@@ -229,6 +229,11 @@
</entityField>
<entityConsumer>
<name>Communications</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>AllCommunications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -240,15 +245,15 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/contactsmaincountry_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>AllCommunications</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Contracts</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>Contracts</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -257,14 +262,14 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Contract_entity</entityName>
- <fieldName>Contracts</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Productprices</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>Productprices</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -273,11 +278,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>Productprices</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
@@ -317,6 +317,11 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -327,11 +332,6 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
@@ -347,6 +347,11 @@
</entityField>
<entityConsumer>
<name>PhoneCommunications</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>PhoneCommunications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -354,14 +359,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>EmailCommunications</name>
<dependency>
<name>dependency</name>
<entityName>Communication_entity</entityName>
- <fieldName>PhoneCommunications</fieldName>
+ <fieldName>EmailCommunications</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>EmailCommunications</name>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -369,11 +374,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Countries</name>
@@ -386,25 +386,30 @@
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Organisation_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <title></title>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ <title></title>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordContactStates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -412,14 +417,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordOrganisationTypes</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordOrganisationTypes</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -427,11 +432,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
@@ -443,6 +443,11 @@
</entityConsumer>
<entityConsumer>
<name>KeywordPricePolitics</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -450,14 +455,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordWeaknesses</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordWeaknesses</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -465,14 +470,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStrenghts</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStrenghts</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -480,14 +485,14 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Salesprojects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -496,14 +501,14 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Offers</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>ContactOffers</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -512,14 +517,14 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Offer_entity</entityName>
- <fieldName>ContactOffers</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -530,11 +535,6 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>WithPrivate_param</name>
@@ -545,6 +545,11 @@
</entityParameter>
<entityConsumer>
<name>ObjectTrees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectIds_param</name>
@@ -555,14 +560,14 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttrees/children/objecttypes_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectTree_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
@@ -571,14 +576,14 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>360DegreeObjects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>360Degree_entity</entityName>
+ <fieldName>OrganisationObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -589,11 +594,6 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/360degreeobjects/children/objectstatus_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>360Degree_entity</entityName>
- <fieldName>OrganisationObjects</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
@@ -604,12 +604,32 @@
<entityProvider>
<name>WithPersonIdFilter</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/withpersonidfilter/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>5a456b04-f0ca-4a45-9c1f-bdfdf074434a</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a80c3db0-29db-433c-8f7c-4ebf6639ad6d</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>748a3083-89c2-41b4-a233-3fd5364396e9</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>Organisation</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
- <title></title>
<expose v="true" />
<mandatory v="true" />
+ <title></title>
</entityParameter>
<entityParameter>
<name>WithPrivate_param</name>
@@ -648,26 +668,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>5a456b04-f0ca-4a45-9c1f-bdfdf074434a</name>
- <entityName>Contact_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a80c3db0-29db-433c-8f7c-4ebf6639ad6d</name>
- <entityName>Person_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>748a3083-89c2-41b4-a233-3fd5364396e9</name>
- <entityName>Competition_entity</entityName>
- <fieldName>Organisation</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>AttributeId_param</name>
@@ -682,6 +682,20 @@
<entityProvider>
<name>WithAttribute</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/withattribute/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f368be61-1a15-449f-b37c-b1343069412c</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>AttributeId_param</name>
@@ -725,20 +739,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
- <entityName>Competition_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f368be61-1a15-449f-b37c-b1343069412c</name>
- <entityName>Product_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ExcludedContactIds_param</name>
@@ -747,6 +747,11 @@
</entityParameter>
<entityConsumer>
<name>AttributeTree</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -757,11 +762,6 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>DATE_NEW</name>
@@ -813,6 +813,11 @@
<entityConsumer>
<name>AttributeConditions</name>
<onValidation>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -835,14 +840,14 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributeconditions/children/showempty_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>LinkedAppointments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Appointment_entity</entityName>
+ <fieldName>LinkedAppointments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>LinkedObjectId_param</name>
@@ -853,11 +858,6 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/linkedappointments/children/erroronpermissiondenied/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Appointment_entity</entityName>
- <fieldName>LinkedAppointments</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Products</name>
@@ -1170,6 +1170,11 @@
</entityParameter>
<entityConsumer>
<name>SelfDuplicatesUncached</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>SelfDuplicates</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DuplicateActionsControl_param</name>
@@ -1177,8 +1182,8 @@
</entityParameter>
<entityParameter>
<name>DuplicateCurrentContactId_param</name>
- <title></title>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/duplicatecurrentcontactid_param/valueProcess.js</valueProcess>
+ <title></title>
</entityParameter>
<entityParameter>
<name>OnlyShowContactIds_param</name>
@@ -1189,25 +1194,20 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>SelfDuplicates</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>CommRestrictions</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CommRestriction_Entity</entityName>
+ <fieldName>CommRestrictions</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CommRestriction_Entity</entityName>
- <fieldName>CommRestrictions</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>COMMRESTRICTIONS_ACTIVE</name>
@@ -1235,6 +1235,11 @@
<entityConsumer>
<name>Classifications</name>
<refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>Classifications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ClassificationType_param</name>
@@ -1252,11 +1257,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Classification_entity</entityName>
- <fieldName>Classifications</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>COUNT</name>
@@ -1277,6 +1277,14 @@
<name>OrganisationsViaIndex</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc</documentation>
<recordContainer>index</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>e60b8983-166d-4280-a1a5-f990ad77eeb9</name>
+ <entityName>AroundLocation_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
@@ -1331,14 +1339,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>e60b8983-166d-4280-a1a5-f990ad77eeb9</name>
- <entityName>AroundLocation_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>STANDARD_LAT</name>
@@ -1411,17 +1411,17 @@
</entityProvider>
<entityConsumer>
<name>DistrictResponsibles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>OrganisationResponsibles</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OrgUid_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>OrganisationResponsibles</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>FilterPreSet_param</name>
@@ -1430,6 +1430,14 @@
<entityProvider>
<name>NonselfDuplicates</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>2e410b9e-5ebc-48ea-9562-da386202d7e8</name>
+ <entityName>Duplicates_entity</entityName>
+ <fieldName>DuplicateOrganisationsConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>AttributeKeyId_param</name>
@@ -1464,14 +1472,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>2e410b9e-5ebc-48ea-9562-da386202d7e8</name>
- <entityName>Duplicates_entity</entityName>
- <fieldName>DuplicateOrganisationsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityActionField>
<name>startWorkflow</name>
@@ -1525,6 +1525,11 @@
</entityActionGroup>
<entityConsumer>
<name>AttributesFilter</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>FilterProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -1535,11 +1540,6 @@
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributesfilter/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>FilterProvider</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>OnlyActive_param</name>
@@ -1574,43 +1574,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>f63d7d1a-118a-4cc1-9963-495f57468f8d</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>3cca93ac-fb3b-4dae-933e-0ee1e8c84260</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>c0bcece8-306a-47ac-a406-7e42014fa4d7</name>
- <tableName>ADDRESS</tableName>
- <primaryKey>ADDRESSID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>c00213e6-4f5d-41df-a5f3-fd751a46e94b</name>
- <tableName>CLASSIFICATIONSTORAGE</tableName>
- <primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADDRESS_ID.value</name>
@@ -1804,6 +1774,36 @@
<recordfield>ADDRESS.LON</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>f63d7d1a-118a-4cc1-9963-495f57468f8d</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>3cca93ac-fb3b-4dae-933e-0ee1e8c84260</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>c0bcece8-306a-47ac-a406-7e42014fa4d7</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>c00213e6-4f5d-41df-a5f3-fd751a46e94b</name>
+ <tableName>CLASSIFICATIONSTORAGE</tableName>
+ <primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtensionSet>
<name>Attribute_filter</name>
diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
index ff1497fcaa..dc33aff6f6 100644
--- a/entity/PermissionAction_entity/PermissionAction_entity.aod
+++ b/entity/PermissionAction_entity/PermissionAction_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>PermissionAction_entity</name>
+ <title>Action</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionAction_entity/documentation.adoc</documentation>
- <title>Action</title>
<onValidation>%aditoprj%/entity/PermissionAction_entity/onValidation.js</onValidation>
<titlePlural>Actions</titlePlural>
<recordContainer>jDito</recordContainer>
diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index c4614de972..c21dd39814 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>PermissionCalendar_entity</name>
+ <title>Calendar Permission</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionCalendar_entity/documentation.adoc</documentation>
- <title>Calendar Permission</title>
<grantCreate v="true" />
<grantDelete v="true" />
<contentTitleProcess>%aditoprj%/entity/PermissionCalendar_entity/contentTitleProcess.js</contentTitleProcess>
@@ -147,6 +147,11 @@
</entityField>
<entityConsumer>
<name>Departments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ParentId_param</name>
@@ -157,11 +162,6 @@
<valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/departments/children/includeparentrecord_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>User</name>
@@ -184,17 +184,17 @@
</entityField>
<entityConsumer>
<name>KeywordPermissionCalendarTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/keywordpermissioncalendartypes/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>PermissionDealer_param</name>
@@ -247,17 +247,8 @@
<recordContainers>
<dbRecordContainer>
<name>permissionCalendarDb</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>6df4271e-d95f-4526-bdcc-7f127f0f1b31</name>
- <tableName>AB_PERMISSIONCALENDAR</tableName>
- <primaryKey>AB_PERMISSIONCALENDARID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_PERMISSIONCALENDARID.value</name>
@@ -308,6 +299,15 @@
<recordfield>AB_PERMISSIONCALENDAR.PERMISSIONDEALER_ROWID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>6df4271e-d95f-4526-bdcc-7f127f0f1b31</name>
+ <tableName>AB_PERMISSIONCALENDAR</tableName>
+ <primaryKey>AB_PERMISSIONCALENDARID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index eef8bd4f44..39f346f5c6 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>PermissionDetail_entity</name>
+ <title>Permission Detail</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionDetail_entity/documentation.adoc</documentation>
- <title>Permission Detail</title>
<siblings>
<element>PermissionOverview_entity</element>
</siblings>
@@ -139,6 +139,11 @@
</entityParameter>
<entityConsumer>
<name>KeywordConditionType</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -146,14 +151,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordAccessType</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordAccessType</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -161,17 +166,17 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>PermissionActions</name>
<refreshParent v="true" />
<stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/permissionactions/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionAction_entity</entityName>
+ <fieldName>PermissionActions</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>PermissionId_param</name>
@@ -190,11 +195,6 @@
<valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/permissionactions/children/fullpermissions_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>PermissionAction_entity</entityName>
- <fieldName>PermissionActions</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>FULLPERMISSIONS</name>
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index 1cff5303d3..774e666f97 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>PermissionMetaData_entity</name>
+ <title>Permission</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionMetaData_entity/documentation.adoc</documentation>
<icon>VAADIN:CONNECT</icon>
- <title>Permission</title>
<grantCreate v="false" />
<grantUpdate v="false" />
<grantDelete v="false" />
@@ -32,12 +32,6 @@
<entityProvider>
<name>MetaData</name>
<recordContainer>jDito</recordContainer>
- <children>
- <entityParameter>
- <name>EntityName_param</name>
- <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>3b2c9421-5ff0-49a3-99f0-6790f17bd76c</name>
@@ -46,16 +40,16 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityConsumer>
- <name>PermissionOverviews</name>
- <refreshParent v="true" />
<children>
<entityParameter>
- <name>EntityId_param</name>
- <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissionoverviews/children/entitytitle_param/valueProcess.js</valueProcess>
+ <name>EntityName_param</name>
+ <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityProvider>
+ <entityConsumer>
+ <name>PermissionOverviews</name>
+ <refreshParent v="true" />
<dependency>
<name>dependency</name>
<entityName>PermissionOverview_entity</entityName>
@@ -71,12 +65,6 @@
<entityConsumer>
<name>PermissionDetails</name>
<refreshParent v="true" />
- <children>
- <entityParameter>
- <name>EntityId_param</name>
- <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissiondetails/children/entitytitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
<dependency>
<name>dependency</name>
<entityName>PermissionDetail_entity</entityName>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index f0e8a07861..16c9910812 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>PermissionOverview_entity</name>
+ <title>Permission Overview</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PermissionOverview_entity/documentation.adoc</documentation>
- <title>Permission Overview</title>
<siblings>
<element>PermissionDetail_entity</element>
</siblings>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 9342573ad7..bbc841f5ca 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Person_entity</name>
+ <title>Contact</title>
<description>former Pers</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Person_entity/documentation.adoc</documentation>
- <title>Contact</title>
<siblings>
<element>Address_entity</element>
<element>Contact_entity</element>
@@ -92,6 +92,11 @@
</entityFieldGroup>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -106,11 +111,6 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CONTACTID</name>
@@ -121,6 +121,14 @@
<name>OrganisationRelated</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/organisationrelated/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>41952879-c2f0-411f-8ca1-36c38914a629</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Contact</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -139,14 +147,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>41952879-c2f0-411f-8ca1-36c38914a629</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Contact</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>PERSON_ID</name>
@@ -164,6 +164,11 @@
</entityField>
<entityConsumer>
<name>PersAddresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>ContactAddresses</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DefaultAddressId_param</name>
@@ -183,14 +188,14 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/replacestandardaddress_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>ContactAddresses</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Communications</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>AllCommunications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -208,29 +213,29 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/communications/children/contactsmaincountry_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>AllCommunications</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Organisations</name>
<selectionMode>SINGLE</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>WithPersonIdFilter</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>WithPersonIdFilter</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Contracts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>Contracts</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -239,16 +244,16 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Contract_entity</entityName>
- <fieldName>Contracts</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Pricelists</name>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/pricelists/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>Productprices</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -257,11 +262,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>Productprices</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Genders</name>
@@ -316,6 +316,11 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -330,11 +335,6 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
@@ -359,6 +359,14 @@
<name>Contact</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/contact/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>f925c8e6-b096-4093-bd39-c9cd30a6a71a</name>
+ <entityName>Lead_entity</entityName>
+ <fieldName>ContactId</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>OrgId_param</name>
@@ -386,19 +394,16 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>f925c8e6-b096-4093-bd39-c9cd30a6a71a</name>
- <entityName>Lead_entity</entityName>
- <fieldName>ContactId</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>OrgAddresses</name>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrganisationAddressesByContact</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -410,11 +415,6 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/orgaddresses/children/defaultaddressid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>OrganisationAddressesByContact</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
@@ -431,6 +431,11 @@
<entityConsumer>
<name>PhoneCommunications</name>
<description>Used for standard communication</description>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>PhoneCommunications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -440,15 +445,15 @@
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>PhoneCommunications</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>EmailCommunications</name>
<description>Used for standard communication</description>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>EmailCommunications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -458,11 +463,6 @@
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ADDRESS_ID</name>
@@ -474,6 +474,11 @@
</entityField>
<entityConsumer>
<name>KeywordGenders</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -481,11 +486,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
@@ -497,35 +497,40 @@
</entityConsumer>
<entityConsumer>
<name>Offers</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>ContactOffers</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Offer_entity</entityName>
- <fieldName>ContactOffers</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Salutations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalutationDistinct_entity</entityName>
+ <fieldName>Salutations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Language_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/salutations/children/language_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>SalutationDistinct_entity</entityName>
- <fieldName>Salutations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Person_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -540,14 +545,14 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/showdsgvomessage_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>SalutationTitles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalutationTitleDistinct_entity</entityName>
+ <fieldName>SalutationTitles</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Salutation_param</name>
@@ -558,15 +563,15 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/salutationtitles/children/language_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>SalutationTitleDistinct_entity</entityName>
- <fieldName>SalutationTitles</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
<state>EDITABLE</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -581,14 +586,14 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>ObjectTrees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectIds_param</name>
@@ -599,11 +604,6 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttrees/children/objecttypes_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectTree_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>STATUS</name>
@@ -615,20 +615,25 @@
</entityField>
<entityConsumer>
<name>KeywordContactStates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>ContactAndOrganisationAddresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrganisationAndContactAddresses</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -639,11 +644,6 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/contactandorganisationaddresses/children/organisationid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>OrganisationAndContactAddresses</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>DEPARTMENT</name>
@@ -666,6 +666,11 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
@@ -674,14 +679,14 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>OtherContacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>PersonsContactsExceptOwn</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OwnContactId_param</name>
@@ -692,11 +697,6 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/othercontacts/children/languagekey_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Contact_entity</entityName>
- <fieldName>PersonsContactsExceptOwn</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ORGANISATION_NAME</name>
@@ -709,6 +709,20 @@
<entityProvider>
<name>Contacts</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/contacts/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>c98da62f-d6b2-4ddb-9101-92e9a60abdfb</name>
+ <entityName>VisitPlanEmployeeWeek_entity</entityName>
+ <fieldName>Persons</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f56b1378-138d-4f88-b9df-274adce9f90c</name>
+ <entityName>VisitPlanEntry_entity</entityName>
+ <fieldName>Persons</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -735,23 +749,14 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>c98da62f-d6b2-4ddb-9101-92e9a60abdfb</name>
- <entityName>VisitPlanEmployeeWeek_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f56b1378-138d-4f88-b9df-274adce9f90c</name>
- <entityName>VisitPlanEntry_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>360DegreeObjects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>360Degree_entity</entityName>
+ <fieldName>PersonObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -762,14 +767,14 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/360degreeobjects/children/objectstatus_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>360Degree_entity</entityName>
- <fieldName>PersonObjects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -784,11 +789,6 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributetree/children/showdsgvomessage_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>DATE_NEW</name>
@@ -825,8 +825,8 @@
</entityField>
<entityParameter>
<name>AdditionalActivityTaskLinks_param</name>
- <title></title>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js</valueProcess>
+ <title></title>
<description>PARAMETER</description>
</entityParameter>
<entityField>
@@ -848,35 +848,40 @@
</entityParameter>
<entityConsumer>
<name>CommRestrictions</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CommRestriction_Entity</entityName>
+ <fieldName>CommRestrictions</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CommRestriction_Entity</entityName>
- <fieldName>CommRestrictions</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>DSGVOEntries</name>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/dsgvoentries/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DSGVO_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/dsgvoentries/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DSGVO_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Appointments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Appointment_entity</entityName>
+ <fieldName>LinkedAppointments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>LinkedObjectId_param</name>
@@ -887,11 +892,6 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/appointments/children/erroronpermissiondenied/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Appointment_entity</entityName>
- <fieldName>LinkedAppointments</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>OpenTasks</name>
@@ -928,6 +928,11 @@
</entityField>
<entityConsumer>
<name>SelfDuplicatesUncached</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>SelfDuplicates</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DuplicateActionsControl_param</name>
@@ -946,11 +951,6 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>SelfDuplicates</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>LEAD_LEADID</name>
@@ -981,6 +981,14 @@
<name>QuickEntryContacts</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc</documentation>
<titlePlural>Additional Contacts</titlePlural>
+ <dependencies>
+ <entityDependency>
+ <name>6d137850-63ba-4be0-9ca5-1464e71d4f77</name>
+ <entityName>QuickEntry_entity</entityName>
+ <fieldName>Contacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -1003,14 +1011,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>6d137850-63ba-4be0-9ca5-1464e71d4f77</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>OnlyShowContactIds_param</name>
@@ -1074,6 +1074,14 @@
<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>
@@ -1108,14 +1116,6 @@
<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>
@@ -1150,21 +1150,29 @@
<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>
@@ -1187,30 +1195,22 @@
<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>
@@ -1439,17 +1439,17 @@
<entityConsumer>
<name>Orders</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/orders/documentation.adoc</documentation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/orders/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Order_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>deleteFunction</name>
@@ -1461,43 +1461,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Person_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Person_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Person_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>bfc9ae0b-bd68-4913-b26e-64fcfdae835d</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>53ce95ab-08a3-4763-8540-8f3074f13d1f</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>e9124a94-cc1b-4967-84ec-e315a7565ce0</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>0b6ca3ff-31f7-4dcd-99f6-bb8f64948cb0</name>
- <tableName>ADDRESS</tableName>
- <primaryKey>ADDRESSID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>PERSONID.value</name>
@@ -1752,6 +1722,36 @@
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>bfc9ae0b-bd68-4913-b26e-64fcfdae835d</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>53ce95ab-08a3-4763-8540-8f3074f13d1f</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>e9124a94-cc1b-4967-84ec-e315a7565ce0</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>0b6ca3ff-31f7-4dcd-99f6-bb8f64948cb0</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtensionSet>
<name>Attribute_filter</name>
diff --git a/entity/PrivatePerson_entity/PrivatePerson_entity.aod b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
index 4739b80b0f..67d65775c2 100644
--- a/entity/PrivatePerson_entity/PrivatePerson_entity.aod
+++ b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>PrivatePerson_entity</name>
+ <title>Private person</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PrivatePerson_entity/documentation.adoc</documentation>
- <title>Private person</title>
<contentTitleProcess>%aditoprj%/entity/PrivatePerson_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
@@ -60,6 +60,11 @@
</entityParameter>
<entityConsumer>
<name>Persons</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>PersonRelated</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>PersonId_param</name>
@@ -70,11 +75,6 @@
<valueProcess>%aditoprj%/entity/PrivatePerson_entity/entityfields/persons/children/readonly_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Contact_entity</entityName>
- <fieldName>PersonRelated</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -84,18 +84,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/PrivatePerson_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/PrivatePerson_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>b2ae9c8c-c6de-46b7-ae10-e6823576f1ff</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
@@ -140,6 +131,15 @@
<recordfield>PERSON.SALUTATION</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>b2ae9c8c-c6de-46b7-ae10-e6823576f1ff</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 06bfbd3378..43e4260abf 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Prod2prod_entity</name>
+ <title>Parts list</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
- <title>Parts list</title>
<titlePlural>Parts list</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -64,6 +64,14 @@
<name>ProductLinks</name>
<targetContextField>targetContext</targetContextField>
<targetIdField>SOURCE_ID</targetIdField>
+ <dependencies>
+ <entityDependency>
+ <name>4bd06e3b-17a0-483e-a61c-818ff7e86be3</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>ProductLinks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ProductId_param</name>
@@ -74,14 +82,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>4bd06e3b-17a0-483e-a61c-818ff7e86be3</name>
- <entityName>Product_entity</entityName>
- <fieldName>ProductLinks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>PRODUCTCODE</name>
@@ -104,6 +104,11 @@
</entityActionGroup>
<entityConsumer>
<name>Products</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Products</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ExcludedProducts_param</name>
@@ -111,11 +116,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Product_entity</entityName>
- <fieldName>Products</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>PRODUCTID</name>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 131e65f6ec..aebfbe30a7 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Product_entity</name>
+ <title>Product</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
- <title>Product</title>
<siblings>
<element>Productprice_entity</element>
</siblings>
@@ -110,46 +110,46 @@
</entityField>
<entityConsumer>
<name>Organisations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OrganisationType_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Productprices</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>Productprices</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/productprices/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>Productprices</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Stocks</name>
<selectionMode>SINGLE</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Stock_entity</entityName>
+ <fieldName>Stocks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/stocks/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Stock_entity</entityName>
- <fieldName>Stocks</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>PICTURE</name>
@@ -158,17 +158,17 @@
<entityConsumer>
<name>StockCounts</name>
<state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Stock_entity</entityName>
+ <fieldName>Stocks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/stockcounts/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Stock_entity</entityName>
- <fieldName>Stocks</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
@@ -202,6 +202,11 @@
</entityProvider>
<entityConsumer>
<name>ProductLinks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Prod2prod_entity</entityName>
+ <fieldName>ProductLinks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
@@ -210,11 +215,6 @@
<mandatory v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Prod2prod_entity</entityName>
- <fieldName>ProductLinks</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>CONTACT_ID</name>
@@ -232,6 +232,11 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -242,15 +247,15 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -261,14 +266,14 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -276,14 +281,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -291,14 +296,14 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -309,11 +314,6 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -327,6 +327,11 @@
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Product_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -339,11 +344,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ExcludedProducts_param</name>
@@ -352,12 +352,6 @@
</entityParameter>
<entityProvider>
<name>Products</name>
- <children>
- <entityParameter>
- <name>ExcludedProducts_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>1b12e8ef-74ba-4294-bd2b-9d4afa80798c</name>
@@ -372,6 +366,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludedProducts_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityActionField>
<name>newTask</name>
@@ -382,6 +382,11 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -392,15 +397,15 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -411,11 +416,6 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
@@ -439,17 +439,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ProductText_param</name>
@@ -457,6 +457,11 @@
</entityParameter>
<entityConsumer>
<name>DescriptionTranslations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DescriptionTranslation_entity</entityName>
+ <fieldName>DescriptionTranslations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
@@ -467,11 +472,6 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/descriptiontranslations/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DescriptionTranslation_entity</entityName>
- <fieldName>DescriptionTranslations</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>openAdminView</name>
@@ -502,7 +502,6 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<maximumDbRows v="0" />
<fromClauseProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
@@ -510,29 +509,7 @@
<onDBInsert>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>0c8977f6-8d3d-4377-adb4-3ddde463ab1a</name>
- <tableName>PRODUCT</tableName>
- <primaryKey>PRODUCTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>6d77303b-6d0f-4636-b230-bb498470eec7</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>a4cc4ee2-e913-4c1a-bfe8-bdd83ccb3b5e</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ADVERTISING.value</name>
@@ -628,6 +605,29 @@
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>0c8977f6-8d3d-4377-adb4-3ddde463ab1a</name>
+ <tableName>PRODUCT</tableName>
+ <primaryKey>PRODUCTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>6d77303b-6d0f-4636-b230-bb498470eec7</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>a4cc4ee2-e913-4c1a-bfe8-bdd83ccb3b5e</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtensionSet>
<name>Attribute_filter</name>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 26dbe5048b..b28ece7b96 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Productprice_entity</name>
+ <title>Prices</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
<icon>VAADIN:MONEY</icon>
- <title>Prices</title>
<siblings>
<element>Product_entity</element>
</siblings>
@@ -143,16 +143,6 @@
<name>Productprices</name>
<titlePluralProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js</titlePluralProcess>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name>
@@ -173,9 +163,24 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityConsumer>
<name>KeywordCurrencies</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -183,14 +188,14 @@
<expose v="false" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPricelists</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordPricelists</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -198,11 +203,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>DELIVERYTERM</name>
@@ -242,19 +242,10 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<hasDependentRecords v="true" />
<conditionProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>85fd1bcf-499f-4708-ad8e-18f5a0f5337d</name>
- <tableName>PRODUCTPRICE</tableName>
- <primaryKey>PRODUCTPRICEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>BUYSELL.value</name>
@@ -333,6 +324,15 @@
<expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/fromquantity.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>85fd1bcf-499f-4708-ad8e-18f5a0f5337d</name>
+ <tableName>PRODUCTPRICE</tableName>
+ <primaryKey>PRODUCTPRICEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtension>
<name>FavoriteFilter</name>
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index 8f84148e24..9ce66331b3 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>QuickEntry_entity</name>
+ <title>Quick entry</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/QuickEntry_entity/documentation.adoc</documentation>
- <title>Quick entry</title>
<onValidation>%aditoprj%/entity/QuickEntry_entity/onValidation.js</onValidation>
<iconId>VAADIN:BOLT</iconId>
<recordContainer>jdito</recordContainer>
@@ -22,6 +22,11 @@
</entityField>
<entityConsumer>
<name>Adresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>QuickEntryAdresses</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -32,14 +37,14 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contacttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>QuickEntryAdresses</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Communications</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>QuickEntryCommunications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -50,11 +55,6 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/communications/children/additionalcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>QuickEntryCommunications</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
@@ -94,20 +94,25 @@
</entityField>
<entityConsumer>
<name>Salutations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalutationDistinct_entity</entityName>
+ <fieldName>Salutations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Language_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/salutations/children/language_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>SalutationDistinct_entity</entityName>
- <fieldName>Salutations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>SalutationTitles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalutationTitleDistinct_entity</entityName>
+ <fieldName>SalutationTitles</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Language_param</name>
@@ -118,25 +123,20 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/salutationtitles/children/salutation_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>SalutationTitleDistinct_entity</entityName>
- <fieldName>SalutationTitles</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Contacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>QuickEntryContacts</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OrgId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/contacts/children/orgid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>QuickEntryContacts</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ISOLANGUAGE</name>
@@ -147,6 +147,11 @@
</entityField>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Direction_param</name>
@@ -165,11 +170,6 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>DATE_NEW</name>
@@ -185,6 +185,11 @@
</entityField>
<entityConsumer>
<name>Salesprojects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>QuickEntrySalesprojects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -195,14 +200,14 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/salesprojects/children/presettitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>QuickEntrySalesprojects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>OrgAddresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>QuickEntryAdresses</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -213,11 +218,6 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/orgaddresses/children/contacttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>QuickEntryAdresses</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>leadQuickAcquisition</name>
@@ -228,6 +228,11 @@
</entityField>
<entityConsumer>
<name>OrgAndPersDuplicates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AnyContact_entity</entityName>
+ <fieldName>ContactsByIds</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactIds_param</name>
@@ -238,11 +243,6 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/organdpersduplicates/children/withprivatepersons_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>ContactsByIds</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/RoleChildren_entity/RoleChildren_entity.aod b/entity/RoleChildren_entity/RoleChildren_entity.aod
index 89c17291b4..353284819b 100644
--- a/entity/RoleChildren_entity/RoleChildren_entity.aod
+++ b/entity/RoleChildren_entity/RoleChildren_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>RoleChildren_entity</name>
+ <title>Child Role</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/RoleChildren_entity/documentation.adoc</documentation>
- <title>Child Role</title>
<titlePlural>Child Roles</titlePlural>
<recordContainer>jDito</recordContainer>
<entityFields>
diff --git a/entity/RoleParent_entity/RoleParent_entity.aod b/entity/RoleParent_entity/RoleParent_entity.aod
index a48ffa5d0d..86b5692906 100644
--- a/entity/RoleParent_entity/RoleParent_entity.aod
+++ b/entity/RoleParent_entity/RoleParent_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>RoleParent_entity</name>
+ <title>Parent Role</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/RoleParent_entity/documentation.adoc</documentation>
- <title>Parent Role</title>
<titlePlural>Parent Roles</titlePlural>
<recordContainer>jDito</recordContainer>
<entityFields>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index b2d23b5d87..be60cf3457 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Role_entity</name>
+ <title>Roles</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Role_entity/documentation.adoc</documentation>
<icon>VAADIN:USER_CHECK</icon>
- <title>Roles</title>
<grantUpdateProcess>%aditoprj%/entity/Role_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Role_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Role_entity/contentTitleProcess.js</contentTitleProcess>
@@ -41,47 +41,35 @@
</entityField>
<entityConsumer>
<name>TheirPermissions</name>
- <children>
- <entityParameter>
- <name>RoleName_param</name>
- <valueProcess>%aditoprj%/entity/Role_entity/entityfields/theirpermissions/children/roletitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- <children>
- <entityParameter>
- <name>RoleTitle_param</name>
- <valueProcess>%aditoprj%/entity/Role_entity/entityfields/theirpermissions/children/roletitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
<dependency>
<name>dependency</name>
<entityName>PermissionDetail_entity</entityName>
<fieldName>Permissions</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>PermissionOverviews</name>
<children>
<entityParameter>
<name>RoleName_param</name>
- <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissionoverviews/children/roletitle_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Role_entity/entityfields/theirpermissions/children/roletitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>PermissionOverviews</name>
<dependency>
<name>dependency</name>
<entityName>PermissionOverview_entity</entityName>
<fieldName>PermissionOverviews</fieldName>
</dependency>
- </entityConsumer>
- <entityProvider>
- <name>Roles</name>
- <recordContainer>jDito</recordContainer>
<children>
<entityParameter>
- <name>ExcludeRoles_param</name>
- <expose v="false" />
+ <name>RoleName_param</name>
+ <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissionoverviews/children/roletitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityProvider>
+ <name>Roles</name>
+ <recordContainer>jDito</recordContainer>
<dependencies>
<entityDependency>
<name>64d800d0-4db5-4b95-ab6a-9197b83cc09c</name>
@@ -102,6 +90,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludeRoles_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>ExcludeRoles_param</name>
@@ -139,6 +133,11 @@
<entityConsumer>
<name>RoleChildrens</name>
<onValidation>%aditoprj%/entity/Role_entity/entityfields/rolechildrens/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>RoleChildren_entity</entityName>
+ <fieldName>RoleChildrens</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RoleId_param</name>
@@ -149,11 +148,6 @@
<valueProcess>%aditoprj%/entity/Role_entity/entityfields/rolechildrens/children/roletype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>RoleChildren_entity</entityName>
- <fieldName>RoleChildrens</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>deleteEverythingLinkedToRole</name>
@@ -164,17 +158,17 @@
</entityActionField>
<entityConsumer>
<name>RoleParents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>RoleParent_entity</entityName>
+ <fieldName>RoleParents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RoleId_param</name>
<valueProcess>%aditoprj%/entity/Role_entity/entityfields/roleparents/children/roleid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>RoleParent_entity</entityName>
- <fieldName>RoleParents</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 3c35c7cf03..027b027c5f 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SalesprojectAnalyses_entity</name>
+ <title>Sales Project Analyses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
- <title>Sales Project Analyses</title>
<iconId>VAADIN:PIE_CHART</iconId>
<recordContainer>jdito</recordContainer>
<entityFields>
diff --git a/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
index 2432f8fbbf..b680e9ca07 100644
--- a/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
+++ b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SalesprojectConversionRate_entity</name>
+ <title>Conversion Rate</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectConversionRate_entity/documentation.adoc</documentation>
- <title>Conversion Rate</title>
<initFilterProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:PIE_CHART</iconId>
<recordContainer>jdito</recordContainer>
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index 8da44d6020..9b33104d18 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SalesprojectMilestone_entity</name>
+ <title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectMilestone_entity/documentation.adoc</documentation>
- <title></title>
<grantCreate v="false" />
<grantUpdate v="false" />
<grantDelete v="false" />
@@ -73,17 +73,17 @@
</entityField>
<entityConsumer>
<name>Keywords</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/keywords/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>Kind_param</name>
@@ -92,12 +92,6 @@
</entityParameter>
<entityProvider>
<name>StateMilestones</name>
- <children>
- <entityParameter>
- <name>Kind_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/kind_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>f705534d-dcf3-4049-a1ea-3f75e93aa2f0</name>
@@ -106,15 +100,15 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityProvider>
- <name>PhaseMilestones</name>
<children>
<entityParameter>
<name>Kind_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/kind_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/kind_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityProvider>
+ <entityProvider>
+ <name>PhaseMilestones</name>
<dependencies>
<entityDependency>
<name>b132527b-990c-416a-b2d6-ddbe6f4397e2</name>
@@ -123,6 +117,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Kind_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/kind_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityProvider>
<entityConsumer>
<name>SalesProjectPhases</name>
@@ -151,20 +151,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBUpdate>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <alias>Data_alias</alias>
<title></title>
- <linkInformation>
- <linkInformation>
- <name>464f1fd7-e5b6-4cfc-92f8-4873d4e10ce3</name>
- <tableName>SALESPROJECT_MILESTONE</tableName>
- <primaryKey>SALESPROJECT_MILESTONEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_END.value</name>
@@ -197,6 +188,15 @@
<isLookupFilter v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>464f1fd7-e5b6-4cfc-92f8-4873d4e10ce3</name>
+ <tableName>SALESPROJECT_MILESTONE</tableName>
+ <primaryKey>SALESPROJECT_MILESTONEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index fe5610bd13..93b68c42d5 100644
--- a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
+++ b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SalesprojectPhase_entity</name>
+ <title>Phase</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectPhase_entity/documentation.adoc</documentation>
- <title>Phase</title>
<siblings>
<element>SalesprojectMilestone_entity</element>
</siblings>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 4effdbc2ce..6621e3295e 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SalesprojectSource_entity</name>
+ <title>Touchpoint</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectSource_entity/documentation.adoc</documentation>
- <title>Touchpoint</title>
<iconId>VAADIN:HANDSHAKE</iconId>
<titlePlural>Touchpoints</titlePlural>
<recordContainer>db</recordContainer>
@@ -55,6 +55,11 @@
</entityField>
<entityConsumer>
<name>KeywordSources</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -62,11 +67,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>INFO</name>
@@ -86,17 +86,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>fa43b303-700e-43ea-a755-7db8aceffa0f</name>
- <tableName>SALESPROJECT_TOUCHPOINT</tableName>
- <primaryKey>SALESPROJECT_TOUCHPOINTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ENTRYDATE.value</name>
@@ -129,6 +120,15 @@
<recordfield>SALESPROJECT_TOUCHPOINT.SALESPROJECT_TOUCHPOINTID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>fa43b303-700e-43ea-a755-7db8aceffa0f</name>
+ <tableName>SALESPROJECT_TOUCHPOINT</tableName>
+ <primaryKey>SALESPROJECT_TOUCHPOINTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 7a82412677..b7ceaa3414 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Salesproject_entity</name>
+ <title>Sales Project</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Salesproject_entity/documentation.adoc</documentation>
- <title>Sales Project</title>
<siblings>
<element>SalesprojectMilestone_entity</element>
<element>Member_entity</element>
@@ -168,34 +168,39 @@
</entityField>
<entityConsumer>
<name>SalesprojectSources</name>
- <children>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
<dependency>
<name>dependency</name>
<entityName>SalesprojectSource_entity</entityName>
<fieldName>SalesprojectSouces</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>SalesprojectPhaseMilestones</name>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>SalesprojectPhaseMilestones</name>
<dependency>
<name>dependency</name>
<entityName>SalesprojectMilestone_entity</entityName>
<fieldName>PhaseMilestones</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityConsumer>
<name>Forecasts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Forecast_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -208,15 +213,15 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Competitions</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -229,14 +234,14 @@
<expose v="true" />
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Offers</name>
<dependency>
<name>dependency</name>
- <entityName>Competition_entity</entityName>
+ <entityName>Offer_entity</entityName>
<fieldName>Links</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Offers</name>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -249,14 +254,14 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>PresetLinks_param</name>
@@ -271,14 +276,14 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Members</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>WithDistrictResponsibles</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -303,11 +308,6 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/members/children/salesprojectcode_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Member_entity</entityName>
- <fieldName>WithDistrictResponsibles</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newOffer</name>
@@ -320,6 +320,11 @@
<entityConsumer>
<name>Timetrackings</name>
<refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>Timetracking_entity</entityName>
+ <fieldName>Timetrackings</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -330,11 +335,6 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>Timetrackings</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
@@ -358,6 +358,11 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -372,15 +377,15 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/mstteamid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -391,11 +396,6 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newTimetracking</name>
@@ -406,22 +406,27 @@
</entityActionField>
<entityConsumer>
<name>KeywordProbabilties</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
- <title></title>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordprobabilties/children/containername_param/valueProcess.js</valueProcess>
<expose v="false" />
+ <title></title>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -429,11 +434,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -453,17 +453,17 @@
<entityConsumer>
<name>KeywordWonLost</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>REASONS</name>
@@ -480,17 +480,6 @@
</entityField>
<entityProvider>
<name>Salesprojects</name>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>PresetTitle_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>0925d17f-a26a-4641-aaf4-0f74796fefa7</name>
@@ -511,6 +500,17 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>PresetTitle_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityActionField>
<name>newTask</name>
@@ -521,6 +521,11 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -535,14 +540,17 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>OpenSalesprojects</name>
+ <dependencies>
+ <entityDependency>
+ <name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>Status_param</name>
@@ -553,14 +561,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>Status_param</name>
@@ -569,22 +569,27 @@
</entityParameter>
<entityConsumer>
<name>SalesprojectStateMilestones</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalesprojectMilestone_entity</entityName>
+ <fieldName>StateMilestones</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectstatemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>SalesprojectMilestone_entity</entityName>
- <fieldName>StateMilestones</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -595,15 +600,15 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -614,29 +619,29 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Classifications</name>
<refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>Classifications</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
@@ -651,11 +656,6 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Classification_entity</entityName>
- <fieldName>Classifications</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>RemainingTime</name>
@@ -669,6 +669,11 @@
</entityField>
<entityConsumer>
<name>SalesprojectForecastCharts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Turnover_entity</entityName>
+ <fieldName>FilteredTurnovers</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
@@ -687,25 +692,20 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/yearcounttoshow_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Turnover_entity</entityName>
- <fieldName>FilteredTurnovers</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>SalesprojectPhaseStepper</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalesprojectPhase_entity</entityName>
+ <fieldName>Phases</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>CurrentPhase_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/currentphase_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>SalesprojectPhase_entity</entityName>
- <fieldName>Phases</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>PHASEINFO</name>
@@ -728,17 +728,17 @@
</entityField>
<entityConsumer>
<name>ProjectTypeAttribute</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>QuickEntrySalesprojects</name>
@@ -810,50 +810,13 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>75cc0cd9-09fc-46a8-b25d-369c4e9c0fd7</name>
- <tableName>SALESPROJECT</tableName>
- <primaryKey>SALESPROJECTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>a7b7adf3-c2fd-4688-9970-0000841712d7</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>b14de4fd-28a8-4503-9c29-0c4dd8b31607</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>1c73b0de-0e70-421e-a8aa-660dbd177f81</name>
- <tableName>CLASSIFICATIONSTORAGE</tableName>
- <primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>44fba381-e477-4a92-ba82-fc22c3d98c23</name>
- <tableName>MST_TEAM</tableName>
- <primaryKey>MST_TEAMID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ENDDATE.value</name>
@@ -981,6 +944,43 @@
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/active.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>75cc0cd9-09fc-46a8-b25d-369c4e9c0fd7</name>
+ <tableName>SALESPROJECT</tableName>
+ <primaryKey>SALESPROJECTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>a7b7adf3-c2fd-4688-9970-0000841712d7</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>b14de4fd-28a8-4503-9c29-0c4dd8b31607</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>1c73b0de-0e70-421e-a8aa-660dbd177f81</name>
+ <tableName>CLASSIFICATIONSTORAGE</tableName>
+ <primaryKey>CLASSIFICATIONSTORAGEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>44fba381-e477-4a92-ba82-fc22c3d98c23</name>
+ <tableName>MST_TEAM</tableName>
+ <primaryKey>MST_TEAMID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtensionSet>
<name>Attribute_filter</name>
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index 8109ebac74..b3181e070d 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SalutationDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalutationDistinct_entity/documentation.adoc</documentation>
@@ -14,12 +14,6 @@
</entityField>
<entityProvider>
<name>Salutations</name>
- <children>
- <entityParameter>
- <name>Language_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>2f56ee5c-0f54-4d26-a4d8-a598c136967b</name>
@@ -28,6 +22,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>Language_param</name>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 1919f07f0a..967342e884 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SalutationTitleDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalutationTitleDistinct_entity/documentation.adoc</documentation>
@@ -19,6 +19,14 @@
</entityParameter>
<entityProvider>
<name>SalutationTitles</name>
+ <dependencies>
+ <entityDependency>
+ <name>3514c1fb-09f5-485f-884b-2e21e4e85490</name>
+ <entityName>QuickEntry_entity</entityName>
+ <fieldName>SalutationTitles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>Language_param</name>
@@ -29,14 +37,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>3514c1fb-09f5-485f-884b-2e21e4e85490</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>SalutationTitles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>Language_param</name>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index 0d2090d774..09ab3134e3 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Salutation_entity</name>
+ <title>Salutation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Salutation_entity/documentation.adoc</documentation>
- <title>Salutation</title>
<iconId>VAADIN:COMMENT_ELLIPSIS</iconId>
<titlePlural>Salutations</titlePlural>
<recordContainer>db</recordContainer>
@@ -59,17 +59,17 @@
</entityField>
<entityConsumer>
<name>KeywordGenders</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/keywordgenders/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordLanguages</name>
@@ -87,17 +87,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<orderClauseProcess>%aditoprj%/entity/Salutation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>4cbc9860-9a09-4250-8540-7017c7d22545</name>
- <tableName>SALUTATION</tableName>
- <primaryKey>SALUTATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>HEADLINE.value</name>
@@ -150,6 +141,15 @@
<expression>%aditoprj%/entity/Salutation_entity/recordcontainers/db/recordfieldmappings/isolanguage.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>4cbc9860-9a09-4250-8540-7017c7d22545</name>
+ <tableName>SALUTATION</tableName>
+ <primaryKey>SALUTATIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
index a72c0501c5..6109b0da0a 100644
--- a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
+++ b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SerialLetterAddRecipients_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/documentation.adoc</documentation>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index 558eb8a4b6..0162e4d623 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SerialLetter_entity</name>
+ <title>Serial Letter</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SerialLetter_entity/documentation.adoc</documentation>
<icon>VAADIN:ENVELOPES</icon>
- <title>Serial Letter</title>
<grantDeleteProcess>%aditoprj%/entity/SerialLetter_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/SerialLetter_entity/contentTitleProcess.js</contentTitleProcess>
<onValidation>%aditoprj%/entity/SerialLetter_entity/onValidation.js</onValidation>
@@ -39,17 +39,17 @@
</entityField>
<entityConsumer>
<name>Recipients</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LetterRecipient_entity</entityName>
+ <fieldName>SerialLetterRecipients</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>SerialLetterId_param</name>
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/recipients/children/serialletterid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LetterRecipient_entity</entityName>
- <fieldName>SerialLetterRecipients</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ICON</name>
@@ -59,6 +59,11 @@
</entityField>
<entityConsumer>
<name>Templates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -69,11 +74,6 @@
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/templates/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TITLE</name>
@@ -88,17 +88,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>bindata</name>
@@ -114,21 +114,26 @@
</entityField>
<entityConsumer>
<name>StatusKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
<state>INVISIBLE</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -139,11 +144,6 @@
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>downloadLetter</name>
@@ -174,6 +174,11 @@
<entityConsumer>
<name>Documents</name>
<refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>SingleDocument</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -192,11 +197,6 @@
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>SingleDocument</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>generateLetter</name>
@@ -213,27 +213,11 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/SerialLetter_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<onDBInsert>%aditoprj%/entity/SerialLetter_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/SerialLetter_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/SerialLetter_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>5d9c983a-b129-437a-ae9d-203fb8ad03ec</name>
- <tableName>SERIALLETTER</tableName>
- <primaryKey>SERIALLETTERID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>bc81b1c3-ce99-4581-ac70-4e24bebb0c75</name>
- <tableName>DOCUMENTTEMPLATE</tableName>
- <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DOCUMENTTEMPLATE_ID.value</name>
@@ -272,6 +256,22 @@
<expression>%aditoprj%/entity/SerialLetter_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>5d9c983a-b129-437a-ae9d-203fb8ad03ec</name>
+ <tableName>SERIALLETTER</tableName>
+ <primaryKey>SERIALLETTERID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>bc81b1c3-ce99-4581-ac70-4e24bebb0c75</name>
+ <tableName>DOCUMENTTEMPLATE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/SingleObject_entity/SingleObject_entity.aod b/entity/SingleObject_entity/SingleObject_entity.aod
index b2d528450e..c6b3b52e6d 100644
--- a/entity/SingleObject_entity/SingleObject_entity.aod
+++ b/entity/SingleObject_entity/SingleObject_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SingleObject_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 41ff421fb2..1f3883abe8 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Social_entity</name>
+ <title>Social Media</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Social_entity/documentation.adoc</documentation>
- <title>Social Media</title>
<entityFields>
<entityField>
<name>TWITTER_TIMELINE</name>
@@ -25,9 +25,9 @@
</entityField>
<entityParameter>
<name>Account_param</name>
- <title>User</title>
<expose v="true" />
<mandatory v="true" />
+ <title>User</title>
<description>User</description>
</entityParameter>
<entityProvider>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index b77312e1cb..d41f642e3e 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Stock_entity</name>
+ <title>Stock</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
- <title>Stock</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityField>
@@ -53,12 +53,6 @@
<entityProvider>
<name>Stocks</name>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
@@ -73,6 +67,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>IMAGE</name>
@@ -95,6 +95,11 @@
</entityProvider>
<entityConsumer>
<name>KeywordWarehouses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -102,11 +107,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -116,19 +116,10 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<maximumDbRows v="0" />
<conditionProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>d291e552-0b6a-48e1-a830-1558beb5f58e</name>
- <tableName>STOCK</tableName>
- <primaryKey>STOCKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>ENTRYDATE.value</name>
@@ -163,6 +154,15 @@
<expression>%aditoprj%/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>d291e552-0b6a-48e1-a830-1558beb5f58e</name>
+ <tableName>STOCK</tableName>
+ <primaryKey>STOCKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 4f3947331f..18411b1b10 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>SupportTicket_entity</name>
+ <title>Support Ticket</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SupportTicket_entity/documentation.adoc</documentation>
- <title>Support Ticket</title>
<contentTitleProcess>%aditoprj%/entity/SupportTicket_entity/contentTitleProcess.js</contentTitleProcess>
<contentDescriptionProcess>%aditoprj%/entity/SupportTicket_entity/contentDescriptionProcess.js</contentDescriptionProcess>
<afterUiInit>%aditoprj%/entity/SupportTicket_entity/afterUiInit.js</afterUiInit>
@@ -149,22 +149,27 @@
</entityParameter>
<entityConsumer>
<name>Links</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TaskLink_entity</entityName>
+ <fieldName>Link</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>TaskId_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/links/children/taskid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>TaskLink_entity</entityName>
- <fieldName>Link</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -187,15 +192,15 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -206,15 +211,15 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -225,25 +230,20 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TASK_PROGRESS</name>
@@ -255,17 +255,17 @@
</entityField>
<entityConsumer>
<name>KeywordProgress</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordprogress/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TICKETTYPE</name>
@@ -295,20 +295,25 @@
</entityField>
<entityConsumer>
<name>KeywordTickettype</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtickettype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordTaskState</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordTaskState</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -319,11 +324,6 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>TicketType_param</name>
@@ -332,17 +332,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordTaskPriority</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>ContactEditors</name>
@@ -375,6 +375,11 @@
</entityActionField>
<entityConsumer>
<name>ModuleTrees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ModuleTree_entity</entityName>
+ <fieldName>TreeProviders</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContextName_param</name>
@@ -385,11 +390,6 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/moduletrees/children/id_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ModuleTree_entity</entityName>
- <fieldName>TreeProviders</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TASK_PARENT_ID</name>
@@ -491,7 +491,6 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<isRequireContainerFiltering v="true" />
<fromClauseProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
@@ -499,22 +498,7 @@
<onDBInsert>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>512c662b-33f6-4491-bd24-a8b862f2de84</name>
- <tableName>TICKET</tableName>
- <primaryKey>TICKETID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>4e818524-bb9c-46e7-a336-e48da60c06d1</name>
- <tableName>TASK</tableName>
- <primaryKey>TASKID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CODE.value</name>
@@ -634,6 +618,22 @@
<expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/active.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>512c662b-33f6-4491-bd24-a8b862f2de84</name>
+ <tableName>TICKET</tableName>
+ <primaryKey>TICKETID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>4e818524-bb9c-46e7-a336-e48da60c06d1</name>
+ <tableName>TASK</tableName>
+ <primaryKey>TASKID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
<filterExtensions>
<filterExtension>
<name>Favorite_filter</name>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 90fc5bd337..b78981407b 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>TaskLink_entity</name>
+ <title>Connection</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/TaskLink_entity/documentation.adoc</documentation>
- <title>Connection</title>
<titlePlural>Connections</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -39,12 +39,6 @@
<targetIdField>OBJECT_ROWID</targetIdField>
<documentation>%aditoprj%/entity/TaskLink_entity/entityfields/link/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>TaskId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>40cc8bcd-c178-4a77-a968-642e1d8e1f70</name>
@@ -59,6 +53,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>TaskId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>TaskId_param</name>
@@ -75,17 +75,17 @@
</entityConsumer>
<entityConsumer>
<name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -95,17 +95,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>75141ff0-c6de-4dfd-ad35-6bf2fc931fb9</name>
- <tableName>TASKLINK</tableName>
- <primaryKey>TASKLINKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>OBJECT_ROWID.value</name>
@@ -124,6 +115,15 @@
<recordfield>TASKLINK.TASKLINKID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>75141ff0-c6de-4dfd-ad35-6bf2fc931fb9</name>
+ <tableName>TASKLINK</tableName>
+ <primaryKey>TASKLINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 08d635a467..a1a958117b 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Task_entity</name>
+ <title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
- <title>Task</title>
<grantDeleteProcess>%aditoprj%/entity/Task_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Task_entity/contentTitleProcess.js</contentTitleProcess>
<contentDescriptionProcess>%aditoprj%/entity/Task_entity/contentDescriptionProcess.js</contentDescriptionProcess>
@@ -149,6 +149,11 @@
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -159,14 +164,14 @@
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordStates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -178,14 +183,14 @@
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordstates/children/whitelistids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>ModuleTrees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ModuleTree_entity</entityName>
+ <fieldName>TreeProviders</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ID_param</name>
@@ -200,11 +205,6 @@
<mandatory v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ModuleTree_entity</entityName>
- <fieldName>TreeProviders</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>PARENT_CONTEXT</name>
@@ -251,6 +251,11 @@
</entityParameter>
<entityConsumer>
<name>KeywordPriorities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -258,11 +263,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityActionField>
<name>newOffer</name>
@@ -281,58 +281,36 @@
</entityField>
<entityConsumer>
<name>KeywordProgress</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordprogress/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Links</name>
<state>EDITABLE</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TaskLink_entity</entityName>
+ <fieldName>Link</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>TaskId_param</name>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/links/children/taskid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>TaskLink_entity</entityName>
- <fieldName>Link</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>Tasks</name>
<documentation>%aditoprj%/entity/Task_entity/entityfields/tasks/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>RowId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>PresetLinks_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ParentId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ParentContext_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ObjectId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>dd79df43-264c-494b-9c92-cadf19e61db6</name>
@@ -401,6 +379,28 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>RowId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ParentId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ParentContext_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>PresetLinks_param</name>
@@ -429,21 +429,26 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -454,11 +459,6 @@
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>TYPE</name>
@@ -532,21 +532,12 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>6dfe6f25-2b83-413b-89e4-5c5b9839be2e</name>
- <tableName>TASK</tableName>
- <primaryKey>TASKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DESCRIPTION.value</name>
@@ -651,6 +642,15 @@
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>6dfe6f25-2b83-413b-89e4-5c5b9839be2e</name>
+ <tableName>TASK</tableName>
+ <primaryKey>TASKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index f4b7bc5268..7801512b42 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Timetracking_entity</name>
+ <title>Timetracking</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Timetracking_entity/documentation.adoc</documentation>
- <title>Timetracking</title>
<titlePlural>Timetracking entries</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -75,6 +75,14 @@
<entityProvider>
<name>Timetrackings</name>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>3636c414-fbc9-4144-a8b1-8e4ca0a146b2</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Timetrackings</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -85,14 +93,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>3636c414-fbc9-4144-a8b1-8e4ca0a146b2</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Timetrackings</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Employees</name>
@@ -126,25 +126,9 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>56c74a11-cd33-44e3-9d41-da54d64a997c</name>
- <tableName>TIMETRACKING</tableName>
- <primaryKey>TIMETRACKINGID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>c2ef3832-61c5-4d49-8484-f3188b95e277</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>INFO.value</name>
@@ -179,6 +163,22 @@
<recordfield>TIMETRACKING.TRACKINGMINUTES</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>56c74a11-cd33-44e3-9d41-da54d64a997c</name>
+ <tableName>TIMETRACKING</tableName>
+ <primaryKey>TIMETRACKINGID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>c2ef3832-61c5-4d49-8484-f3188b95e277</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index d862433445..dc19068f6d 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>TurnoverTree_entity</name>
+ <title>Tree</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/TurnoverTree_entity/documentation.adoc</documentation>
- <title>Tree</title>
<iconId>NEON:LOGO</iconId>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -57,12 +57,6 @@
<entityProvider>
<name>FilteredTurnovers</name>
<documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/filteredturnovers/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>YearCountToShow_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>0ea4ad47-985b-4a9c-81d8-946be324ae04</name>
@@ -71,6 +65,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityField>
<name>PARENT</name>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 81fdfb8dd0..5949a1679d 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Turnover_entity</name>
+ <title>Turnover</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
- <title>Turnover</title>
<siblings>
<element>Forecast_entity</element>
</siblings>
@@ -54,6 +54,14 @@
<entityProvider>
<name>FilteredTurnovers</name>
<documentation>%aditoprj%/entity/Turnover_entity/entityfields/filteredturnovers/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>51106aba-bd82-4ac5-8de6-fc56d53c6117</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>SalesprojectForecastCharts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>MaxYear_param</name>
@@ -64,17 +72,14 @@
<expose v="true" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>51106aba-bd82-4ac5-8de6-fc56d53c6117</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectForecastCharts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Turnover_tree</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TurnoverTree_entity</entityName>
+ <fieldName>FilteredTurnovers</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>MaxYear_param</name>
@@ -93,11 +98,6 @@
<valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/showturnover_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>TurnoverTree_entity</entityName>
- <fieldName>FilteredTurnovers</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>SalesprojectId_param</name>
diff --git a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
index 57fdcb96a6..5965389ecc 100644
--- a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
+++ b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>UniversalFileProcessor_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UniversalFileProcessor_entity/documentation.adoc</documentation>
@@ -24,17 +24,17 @@
</entityParameter>
<entityConsumer>
<name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ActivityIDs_param</name>
<valueProcess>%aditoprj%/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
index 32072b9ff3..b769af088b 100644
--- a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
+++ b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>UnlinkedMailMappingLink_entity</name>
+ <title>${UNLINKEDMAILMAPPING_ADDITIONAL_LINK}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UnlinkedMailMappingLink_entity/documentation.adoc</documentation>
- <title>${UNLINKEDMAILMAPPING_ADDITIONAL_LINK}</title>
<titlePlural>${UNLINKEDMAILMAPPING_ADDITIONAL_LINKS}</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index 29ba9b689d..54532cd9c8 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
+++ b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>UnlinkedMailMappingWrapper_entity</name>
+ <title>Link unlinked e-mail</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc</documentation>
- <title>Link unlinked e-mail</title>
<recordContainer>dummyJdito</recordContainer>
<entityFields>
<entityProvider>
@@ -49,17 +49,17 @@
<entityConsumer>
<name>UnlinkedMailMappingLinks</name>
<documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/entityfields/unlinkedmailmappinglinks/documentation.adoc</documentation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>UnlinkedMailMappingLink_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>MailAsText_param</name>
<valueProcess>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/entityfields/unlinkedmailmappinglinks/children/mailastext_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>UnlinkedMailMappingLink_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
index 7cc21c5dc1..3d3bf8f882 100644
--- a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
+++ b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>UnlinkedMail_entity</name>
+ <title>Unlinked e-mail</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UnlinkedMail_entity/documentation.adoc</documentation>
- <title>Unlinked e-mail</title>
<grantCreate v="false" />
<grantUpdate v="false" />
<iconId>VAADIN:AT</iconId>
@@ -68,17 +68,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<orderClauseProcess>%aditoprj%/entity/UnlinkedMail_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>eb823408-6792-4374-b6c5-749ee836c47a</name>
- <tableName>AB_UNLINKEDMAIL</tableName>
- <primaryKey>AB_UNLINKEDMAILID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_UNLINKEDMAILID.value</name>
@@ -105,6 +96,15 @@
<recordfield>AB_UNLINKEDMAIL.SUBJECT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>eb823408-6792-4374-b6c5-749ee836c47a</name>
+ <tableName>AB_UNLINKEDMAIL</tableName>
+ <primaryKey>AB_UNLINKEDMAILID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/UserhelpResources_entity/UserhelpResources_entity.aod b/entity/UserhelpResources_entity/UserhelpResources_entity.aod
index 32f253d411..39dd475719 100644
--- a/entity/UserhelpResources_entity/UserhelpResources_entity.aod
+++ b/entity/UserhelpResources_entity/UserhelpResources_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>UserhelpResources_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UserhelpResources_entity/documentation.adoc</documentation>
@@ -12,6 +12,11 @@
</entityField>
<entityConsumer>
<name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -22,11 +27,6 @@
<valueProcess>%aditoprj%/entity/UserhelpResources_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index 0214bb75b5..2653396dea 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>Usersettings_entity</name>
+ <title>Settings</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Usersettings_entity/documentation.adoc</documentation>
- <title>Settings</title>
<grantDelete v="false" />
<afterUiInit>%aditoprj%/entity/Usersettings_entity/afterUiInit.js</afterUiInit>
<titlePlural>Settings</titlePlural>
diff --git a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
index 6b93b13e76..df9c843f9b 100644
--- a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+++ b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>VisitPlanEmployeeWeek_entity</name>
+ <title>Visitplan Weekly Overview</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/documentation.adoc</documentation>
- <title>Visitplan Weekly Overview</title>
<grantDeleteProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/grantDeleteProcess.js</grantDeleteProcess>
<iconId>VAADIN:CAR</iconId>
<image>VAADIN:CAR</image>
@@ -93,6 +93,11 @@
</entityConsumer>
<entityConsumer>
<name>Entries</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>VisitPlanEntry_entity</entityName>
+ <fieldName>Entries</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Entries_param</name>
@@ -100,11 +105,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>VisitPlanEntry_entity</entityName>
- <fieldName>Entries</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -112,33 +112,24 @@
</entityProvider>
<entityConsumer>
<name>Employees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OnlyActives_param</name>
<valueProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Employees</fieldName>
- </dependency>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<orderClauseProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>3c138105-f800-4216-8b1e-42d08a20f1ae</name>
- <tableName>VISITPLANEMPLOYEEWEEK</tableName>
- <primaryKey>VISITPLANEMPLOYEEWEEKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>VISITPLANEMPLOYEEWEEKID.value</name>
@@ -168,6 +159,15 @@
<isFilterable v="false" />
</consumerMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>3c138105-f800-4216-8b1e-42d08a20f1ae</name>
+ <tableName>VISITPLANEMPLOYEEWEEK</tableName>
+ <primaryKey>VISITPLANEMPLOYEEWEEKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index 3efac87368..2884ac2165 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>VisitPlanEntry_entity</name>
+ <title>Weekplan</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/VisitPlanEntry_entity/documentation.adoc</documentation>
- <title>Weekplan</title>
<grantCreateProcess>%aditoprj%/entity/VisitPlanEntry_entity/grantCreateProcess.js</grantCreateProcess>
<grantUpdateProcess>%aditoprj%/entity/VisitPlanEntry_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/VisitPlanEntry_entity/grantDeleteProcess.js</grantDeleteProcess>
@@ -130,21 +130,26 @@
</entityActionGroup>
<entityConsumer>
<name>Organisations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OnlyActive_param</name>
<valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisations/children/onlyactive_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordVisitPlanEntryStatus</name>
<documentation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/keywordvisitplanentrystatus/documentation.adoc</documentation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -152,11 +157,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>Entries_param</name>
@@ -213,13 +213,6 @@
</entityField>
<entityConsumer>
<name>Persons</name>
- <children>
- <entityParameter>
- <name>OrgId_param</name>
- <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/orgid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
@@ -227,13 +220,10 @@
</dependency>
<children>
<entityParameter>
- <name>ExcludedContactIds_param</name>
+ <name>OrgId_param</name>
+ <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/orgid_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
- <entityParameter>
- <name>OnlyShowContactIds_param</name>
- <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
- </entityParameter>
</children>
</entityConsumer>
<entityParameter>
@@ -282,17 +272,17 @@
</entityField>
<entityConsumer>
<name>KeywordVisitPlanEntryStatusAppointment</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/keywordvisitplanentrystatusappointment/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>VisitrecommendationId_param</name>
diff --git a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
index 0aa7cf7d9d..2158990f7d 100644
--- a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+++ b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
@@ -1,10 +1,10 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>VisitRecommendation_entity</name>
+ <title>Visit Recommendation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/VisitRecommendation_entity/documentation.adoc</documentation>
<iconProcess>%aditoprj%/entity/VisitRecommendation_entity/iconProcess.js</iconProcess>
- <title>Visit Recommendation</title>
<grantCreate v="true" />
<initFilterProcess>%aditoprj%/entity/VisitRecommendation_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:BRIEFCASE</iconId>
@@ -85,6 +85,11 @@
<entityConsumer>
<name>KeywordVisitRecommendationPriority</name>
<documentation>%aditoprj%/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationpriority/documentation.adoc</documentation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -92,28 +97,28 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>OrganisationConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OnlyActive_param</name>
<valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/organisationconsumer/children/onlyactive_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>PersonConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -130,11 +135,6 @@
<valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/personconsumer/children/onlyactive_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
@@ -189,17 +189,17 @@
</entityProvider>
<entityConsumer>
<name>KeywordVisitRecommendationSource</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ContactIdPerson_param</name>
@@ -216,17 +216,17 @@
</entityField>
<entityConsumer>
<name>Employees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>OnlyActives_param</name>
<valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Employees</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>STREET</name>
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index b523e8b8d0..36ddaa0af5 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>WorkflowDefinition_entity</name>
+ <title>Workflow Definition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowDefinition_entity/documentation.adoc</documentation>
- <title>Workflow Definition</title>
<grantCreateProcess>%aditoprj%/entity/WorkflowDefinition_entity/grantCreateProcess.js</grantCreateProcess>
<grantDelete v="false" />
<contentTitleProcess>%aditoprj%/entity/WorkflowDefinition_entity/contentTitleProcess.js</contentTitleProcess>
@@ -77,17 +77,17 @@
<entityConsumer>
<name>Instances</name>
<selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowInstance_entity</entityName>
+ <fieldName>InstancesOfWorkflow</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>WorkflowDefinitionKey_param</name>
<valueProcess>%aditoprj%/entity/WorkflowDefinition_entity/entityfields/instances/children/workflowdefinitionkey_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowInstance_entity</entityName>
- <fieldName>InstancesOfWorkflow</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>KEY</name>
@@ -135,6 +135,11 @@
</entityParameter>
<entityConsumer>
<name>OtherVersions</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowDefinition_entity</entityName>
+ <fieldName>WorkflowVersions</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ProcessDefinitionKey_param</name>
@@ -145,11 +150,6 @@
<valueProcess>%aditoprj%/entity/WorkflowDefinition_entity/entityfields/otherversions/children/currentversion_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowDefinition_entity</entityName>
- <fieldName>WorkflowVersions</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>WorkflowVersions</name>
@@ -172,17 +172,17 @@
</entityField>
<entityConsumer>
<name>StartConfigs</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowStartConfig_entity</entityName>
+ <fieldName>StartConfig</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ProcessDefinitionKey_param</name>
<valueProcess>%aditoprj%/entity/WorkflowDefinition_entity/entityfields/startconfigs/children/processdefinitionkey_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowStartConfig_entity</entityName>
- <fieldName>StartConfig</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>Context_param</name>
@@ -196,6 +196,11 @@
</entityActionField>
<entityConsumer>
<name>Signals</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowSignal_entity</entityName>
+ <fieldName>ProcessDefinitionSignals</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ProcessDefinitionId_param</name>
@@ -206,11 +211,6 @@
<valueProcess>%aditoprj%/entity/WorkflowDefinition_entity/entityfields/signals/children/processdefinitionkey_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowSignal_entity</entityName>
- <fieldName>ProcessDefinitionSignals</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>VERSION_TITLE</name>
@@ -232,17 +232,17 @@
</entityField>
<entityConsumer>
<name>CategoryKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/WorkflowDefinition_entity/entityfields/categorykeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
index 4b33d42753..2ca484e8dd 100644
--- a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
+++ b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>WorkflowInstanceHistory_entity</name>
+ <title>History</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowInstanceHistory_entity/documentation.adoc</documentation>
- <title>History</title>
<grantCreate v="false" />
<grantUpdate v="false" />
<grantDelete v="false" />
@@ -78,17 +78,17 @@
</entityField>
<entityConsumer>
<name>ActivityTypeKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/WorkflowInstanceHistory_entity/entityfields/activitytypekeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
index baf0056902..ecdc057e39 100644
--- a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+++ b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>WorkflowInstance_entity</name>
+ <title>Workflow instance</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowInstance_entity/documentation.adoc</documentation>
- <title>Workflow instance</title>
<contentTitleProcess>%aditoprj%/entity/WorkflowInstance_entity/contentTitleProcess.js</contentTitleProcess>
<initFilterProcess>%aditoprj%/entity/WorkflowInstance_entity/initFilterProcess.js</initFilterProcess>
<titlePlural>Workflow instances</titlePlural>
@@ -80,31 +80,31 @@
</entityField>
<entityConsumer>
<name>Tasks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowTask_entity</entityName>
+ <fieldName>InstanceTasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>WorkflowInstanceId_param</name>
<valueProcess>%aditoprj%/entity/WorkflowInstance_entity/entityfields/tasks/children/workflowinstanceid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowTask_entity</entityName>
- <fieldName>InstanceTasks</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>WorkflowDefinitions</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowDefinition_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Context_param</name>
<valueProcess>%aditoprj%/entity/WorkflowInstance_entity/entityfields/workflowdefinitions/children/context_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowDefinition_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ProcessVariables_param</name>
@@ -132,6 +132,11 @@
</entityActionField>
<entityConsumer>
<name>FinishedTasks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowTask_entity</entityName>
+ <fieldName>FinishedInstanceTasks</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>WorkflowInstanceId_param</name>
@@ -142,11 +147,6 @@
<valueProcess>%aditoprj%/entity/WorkflowInstance_entity/entityfields/finishedtasks/children/includeservicetasks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowTask_entity</entityName>
- <fieldName>FinishedInstanceTasks</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ICON</name>
@@ -154,17 +154,17 @@
</entityField>
<entityConsumer>
<name>History</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowInstanceHistory_entity</entityName>
+ <fieldName>HistoryForWorkflowInstance</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ProcessInstanceId_param</name>
<valueProcess>%aditoprj%/entity/WorkflowInstance_entity/entityfields/history/children/processinstanceid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowInstanceHistory_entity</entityName>
- <fieldName>HistoryForWorkflowInstance</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>ISFINISHED</name>
@@ -175,17 +175,17 @@
<entityConsumer>
<name>Variables</name>
<stateProcess>%aditoprj%/entity/WorkflowInstance_entity/entityfields/variables/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowVariableValue_entity</entityName>
+ <fieldName>VariablesOfInstance</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>WorkflowInstanceId_param</name>
<valueProcess>%aditoprj%/entity/WorkflowInstance_entity/entityfields/variables/children/workflowinstanceid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowVariableValue_entity</entityName>
- <fieldName>VariablesOfInstance</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>DIAGRAM</name>
diff --git a/entity/WorkflowLauncher_entity/WorkflowLauncher_entity.aod b/entity/WorkflowLauncher_entity/WorkflowLauncher_entity.aod
index cb1c24289b..f33bea3edc 100644
--- a/entity/WorkflowLauncher_entity/WorkflowLauncher_entity.aod
+++ b/entity/WorkflowLauncher_entity/WorkflowLauncher_entity.aod
@@ -1,5 +1,5 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>WorkflowLauncher_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowLauncher_entity/documentation.adoc</documentation>
@@ -62,17 +62,17 @@
</entityProvider>
<entityConsumer>
<name>WorkflowDefinitions</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowDefinition_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Context_param</name>
<valueProcess>%aditoprj%/entity/WorkflowLauncher_entity/entityfields/workflowdefinitions/children/context_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowDefinition_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>Validationerrors_param</name>
diff --git a/entity/WorkflowModel_entity/WorkflowModel_entity.aod b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
index 73b8d4ebc7..674696c527 100644
--- a/entity/WorkflowModel_entity/WorkflowModel_entity.aod
+++ b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>WorkflowModel_entity</name>
+ <title>Workflow Model</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowModel_entity/documentation.adoc</documentation>
- <title>Workflow Model</title>
<contentTitleProcess>%aditoprj%/entity/WorkflowModel_entity/contentTitleProcess.js</contentTitleProcess>
<afterSave>%aditoprj%/entity/WorkflowModel_entity/afterSave.js</afterSave>
<recordContainer>jdito</recordContainer>
diff --git a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
index 1e857118e9..a64a66745a 100644
--- a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
+++ b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>WorkflowSignal_entity</name>
+ <title>Signal</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowSignal_entity/documentation.adoc</documentation>
- <title>Signal</title>
<titlePlural>Signals</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -47,6 +47,11 @@
</entityField>
<entityConsumer>
<name>Contexts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -57,25 +62,20 @@
<valueProcess>%aditoprj%/entity/WorkflowSignal_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>TriggerKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/WorkflowSignal_entity/entityfields/triggerkeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>ProcessDefinitionSignals</name>
@@ -117,17 +117,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/WorkflowSignal_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>f6162cb6-c209-4607-8d67-0d630b28feab</name>
- <tableName>WORKFLOWSIGNAL</tableName>
- <primaryKey>WORKFLOWSIGNALID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>WORKFLOWSIGNALID.value</name>
@@ -164,6 +155,15 @@
<recordfield>WORKFLOWSIGNAL.VARIABLES</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>f6162cb6-c209-4607-8d67-0d630b28feab</name>
+ <tableName>WORKFLOWSIGNAL</tableName>
+ <primaryKey>WORKFLOWSIGNALID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
index 2d30eb85c0..dde2a612a5 100644
--- a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
+++ b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>WorkflowStartConfig_entity</name>
+ <title>Usage</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowStartConfig_entity/documentation.adoc</documentation>
- <title>Usage</title>
<imageProcess>%aditoprj%/entity/WorkflowStartConfig_entity/imageProcess.js</imageProcess>
<titlePlural>Usage</titlePlural>
<recordContainer>db</recordContainer>
@@ -49,6 +49,11 @@
</entityProvider>
<entityConsumer>
<name>Contexts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -59,25 +64,20 @@
<valueProcess>%aditoprj%/entity/WorkflowStartConfig_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>TriggerKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/WorkflowStartConfig_entity/entityfields/triggerkeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -87,17 +87,8 @@
<recordContainers>
<dbRecordContainer>
<name>db</name>
- <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/WorkflowStartConfig_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>abfd68be-ace3-4db3-940c-c81bc86ad1c6</name>
- <tableName>WORKFLOWSTARTCONFIG</tableName>
- <primaryKey>WORKFLOWSTARTCONFIGID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
+ <alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>WORKFLOWSTARTCONFIGID.value</name>
@@ -128,6 +119,15 @@
<expression>%aditoprj%/entity/WorkflowStartConfig_entity/recordcontainers/db/recordfieldmappings/trigger_event.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>abfd68be-ace3-4db3-940c-c81bc86ad1c6</name>
+ <tableName>WORKFLOWSTARTCONFIG</tableName>
+ <primaryKey>WORKFLOWSTARTCONFIGID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index 5a9cabd4be..f686333ba7 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>WorkflowTask_entity</name>
+ <title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowTask_entity/documentation.adoc</documentation>
- <title>Task</title>
<grantCreate v="false" />
<grantUpdateProcess>%aditoprj%/entity/WorkflowTask_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDelete v="false" />
@@ -77,6 +77,14 @@
<entityProvider>
<name>InstanceTasks</name>
<documentation>%aditoprj%/entity/WorkflowTask_entity/entityfields/instancetasks/documentation.adoc</documentation>
+ <dependencies>
+ <entityDependency>
+ <name>5913327f-1bb4-48b8-846e-639274290cee</name>
+ <entityName>WorkflowInstance_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>OnlyFinishedTasks_param</name>
@@ -87,14 +95,6 @@
<expose v="false" />
</entityParameter>
</children>
- <dependencies>
- <entityDependency>
- <name>5913327f-1bb4-48b8-846e-639274290cee</name>
- <entityName>WorkflowInstance_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>WorkflowInstanceId_param</name>
@@ -185,13 +185,6 @@
<entityProvider>
<name>FinishedInstanceTasks</name>
<documentation>%aditoprj%/entity/WorkflowTask_entity/entityfields/finishedinstancetasks/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>OnlyFinishedTasks_param</name>
- <valueProcess>%aditoprj%/entity/WorkflowTask_entity/entityfields/finishedinstancetasks/children/onlyfinishedtasks_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>d5d39281-0183-42fa-960a-01347cddc85a</name>
@@ -200,6 +193,13 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyFinishedTasks_param</name>
+ <valueProcess>%aditoprj%/entity/WorkflowTask_entity/entityfields/finishedinstancetasks/children/onlyfinishedtasks_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>IncludeServiceTasks_param</name>
@@ -207,17 +207,17 @@
</entityParameter>
<entityConsumer>
<name>LinkedObject</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectProxy_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>Entity_param</name>
<valueProcess>%aditoprj%/entity/WorkflowTask_entity/entityfields/linkedobject/children/entity_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
</entityConsumer>
<entityActionGroup>
<name>tableActions</name>
diff --git a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
index 21b68b882b..76e08b7ad6 100644
--- a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
+++ b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
@@ -1,9 +1,9 @@
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+<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">
<name>WorkflowVariableValue_entity</name>
+ <title>Variable</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowVariableValue_entity/documentation.adoc</documentation>
- <title>Variable</title>
<titlePlural>Variables</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
--
GitLab