Skip to content
Snippets Groups Projects
Commit e4b3ec21 authored by Daniel Tran's avatar Daniel Tran Committed by Johannes Goderbauer
Browse files

#1058762 dm fix doc

parent d7ff5769
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1635 additions and 428 deletions
.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
+ 1
− 0
View file @ e4b3ec21
......@@ -4,4 +4,5 @@
<include relativeToChangelogFile="true" file="create_district.xml"/>
<include relativeToChangelogFile="true" file="create_districtresponsible.xml"/>
<include relativeToChangelogFile="true" file="create_districtResponsibleKeyword.xml"/>
<include relativeToChangelogFile="true" file="create_indizes.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
+ 12
− 12
View file @ e4b3ec21
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="d.tran" id="04265522-bc51-4a4e-b637-335942dff147">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="997b4954-3108-41e0-a339-c1045ea2e01c"/>
<column name="KEYID" value="MEMBERROLEDISTRICTRESPONSIBLE"/>
<column name="TITLE" value="District Responsible"/>
<column name="CONTAINER" value="MemberRole"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
<changeSet author="d.tran" id="d95ebf6c-1e34-4ba3-9f0b-386c5059444e">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="66d1563a-a76c-47ca-af6b-38586a2f3ce3"/>
<column name="KEYID" value="MEMROLEDISTRICTRESPONSIBLE"/>
<column name="TITLE" value="District Responsible"/>
<column name="CONTAINER" value="MemberRole"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleMemberRole.xml deleted 100644 → 0
+ 0
− 14
View file @ d7ff5769
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="d.tran" id="d95ebf6c-1e34-4ba3-9f0b-386c5059444e">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="66d1563a-a76c-47ca-af6b-38586a2f3ce3"/>
<column name="KEYID" value="MEMROLEDISTRICTRESPONSIBLE"/>
<column name="TITLE" value="District Responsible"/>
<column name="CONTAINER" value="MemberRole"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml 0 → 100644
+ 15
− 0
View file @ e4b3ec21
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="d.tran" id="7dbaa3ae-ba37-4fd1-9b63-fab48975fb87">
<createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DEPARTMENT_ATTRIBUTE_ID">
<column name="DEPARTMENT_ATTRIBUTE_ID"/>
</createIndex>
<createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DISTRICTRESPONSIBLE_DISTRICT_ID">
<column name="DISTRICT_ID"/>
</createIndex>
<createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_EMPLOYEE_CONTACT_ID">
<column name="EMPLOYEE_CONTACT_ID"/>
</createIndex>
</changeSet>
</databaseChangeLog>
aliasDefinition/Data_alias/Data_alias.aod
+ 3
− 3
View file @ e4b3ec21
......@@ -15550,7 +15550,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
......@@ -15564,7 +15564,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
......@@ -15578,7 +15578,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
......
aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+ 1540
− 326
View file @ e4b3ec21
This diff is collapsed.
entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+ 8
− 22
View file @ e4b3ec21
......@@ -2,6 +2,7 @@
<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">
<name>DistrictResponsible_entity</name>
<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>
......@@ -58,7 +59,7 @@
<dependency>
<name>dependency</name>
<entityName>District_entity</entityName>
<fieldName>Districts</fieldName>
<fieldName>ResponsibleDistricts</fieldName>
</dependency>
</entityConsumer>
<entityField>
......@@ -83,6 +84,7 @@
<entityProvider>
<name>DistrictResponsibles</name>
<lookupIdfield>DISTRICTRESPONSIBLEID</lookupIdfield>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
......@@ -139,10 +141,6 @@
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>OnlyResponsibles_param</name>
<expose v="true" />
</entityParameter>
<entityField>
<name>departmentAttributeName</name>
<title>Department</title>
......@@ -151,6 +149,7 @@
</entityField>
<entityProvider>
<name>OrganisationResponsibles</name>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>9c2fe0da-9456-44ef-ac6c-28ac234b35f7</name>
......@@ -158,28 +157,12 @@
<fieldName>DistrictResponsibles</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>7e71479b-8f39-4cd8-a31e-fac43df426d6</name>
<entityName>Salesproject_entity</entityName>
<fieldName>DistrictResponsibles</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>97a448e1-05fb-4e42-ba83-11b419034f08</name>
<entityName>Member_entity</entityName>
<fieldName>DistrictResponsibles</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>DistrictId_param</name>
<expose v="false" />
</entityParameter>
<entityParameter>
<name>OnlyResponsibles_param</name>
<expose v="false" />
</entityParameter>
</children>
</entityProvider>
<entityParameter>
......@@ -190,6 +173,10 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityParameter>
<name>CollectedDistrictIds_param</name>
<valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js</valueProcess>
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -256,7 +243,6 @@
<dbRecordFieldMapping>
<name>DEPARTMENT_ATTRIBUTE_ID.displayValue</name>
<recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
<expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/department_attribute_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
......
entity/DistrictResponsible_entity/documentation.adoc 0 → 100644
+ 17
− 0
View file @ e4b3ec21
= DistrictResponsible_entity
Overview:
Definition: Entity, which is responsible for handling the district responsibles.
Particularities: None known.
Relations to other entities:
- District_entity
- Attribute_entity
- Document_entity
- Employee_entity
- LogHistory_entity
Best practices: None known.
FAQs: None known.
\ No newline at end of file
entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
+ 1
− 1
View file @ e4b3ec21
......@@ -7,7 +7,7 @@ var orgUid = vars.get("$param.OrgUid_param");
if(orgUid)
{
var orgDistrictIds = getDistrictIdsByOrgUid(orgUid);
var orgDistrictIds = _getDistrictIdsByOrgUid(orgUid);
orgDistrictIds = JSON.stringify(orgDistrictIds);
} else {
orgDistrictIds = JSON.stringify([]);
......
entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc 0 → 100644
+ 3
− 0
View file @ e4b3ec21
= DistrictResponsible_entity - DistrictResponsibles
Provider for the district entity, used to work with district responsibles from the district entity.
\ No newline at end of file
entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc 0 → 100644
+ 3
− 0
View file @ e4b3ec21
= District_entity - OrganisationResponsibles
Provider for the organisation entity, used to display the corrensponding district responsibles in the organisation main view.
\ No newline at end of file
entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
+ 2
− 4
View file @ e4b3ec21
......@@ -4,7 +4,6 @@ import("system.vars");
import("Sql_lib");
var districtId = vars.get("$param.DistrictId_param");
//var onlyResponsibles = vars.get("$param.OnlyResponsibles_param");
var orgUid = vars.get("$param.OrgUid_param");
var cond;
......@@ -14,13 +13,13 @@ if (districtId)
}
else if(orgUid)
{
var orgDistrictIds = getDistrictIdsByOrgUid(orgUid);
var orgDistrictIds = _getDistrictIdsByOrgUid(orgUid);
cond = newWhere("DISTRICTRESPONSIBLE.DISTRICT_ID", orgDistrictIds, SqlBuilder.IN());
}
result.string(cond.toString());
function getDistrictIdsByOrgUid(pOrgUid) {
function _getDistrictIdsByOrgUid(pOrgUid) {
var districtIds = [];
var nonMatchedId = [];
......@@ -40,7 +39,6 @@ function getDistrictIdsByOrgUid(pOrgUid) {
var rowCountConfig = entities.createConfigForLoadingRows()
.entity("Organisation_entity")
.uid(pOrgUid)
//.provider()
.filter(filter);
var rowCount = entities.getRowCount(rowCountConfig);
......
entity/District_entity/District_entity.aod
+ 4
− 37
View file @ e4b3ec21
......@@ -2,10 +2,10 @@
<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">
<name>District_entity</name>
<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>
<afterUiInit>%aditoprj%/entity/District_entity/afterUiInit.js</afterUiInit>
<titlePlural></titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
......@@ -46,11 +46,7 @@
<entityField>
<name>PARENTDISTRICT_DISTRICTID</name>
<title>{$DISTRICT_PARENT_DISTRICT}</title>
<consumer>ParentDistricts</consumer>
<dropDownProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/dropDownProcess.js</dropDownProcess>
<stateProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
......@@ -83,8 +79,9 @@
<displayValueProcess>%aditoprj%/entity/District_entity/entityfields/iso3/displayValueProcess.js</displayValueProcess>
</entityField>
<entityProvider>
<name>Districts</name>
<name>ResponsibleDistricts</name>
<lookupIdfield>DISTRICTID</lookupIdfield>
<documentation>%aditoprj%/entity/District_entity/entityfields/responsibledistricts/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
......@@ -93,12 +90,6 @@
<fieldName>Districts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>d2c383ee-7b5d-4242-b598-8343c1133fdd</name>
<entityName>District_entity</entityName>
<fieldName>ParentDistricts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityConsumer>
......@@ -163,14 +154,6 @@
<element>DISTRICT_NUMBER</element>
</fields>
</entityFieldGroup>
<entityConsumer>
<name>ParentDistricts</name>
<dependency>
<name>dependency</name>
<entityName>#ENTITY</entityName>
<fieldName>Districts</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Documents</name>
<dependency>
......@@ -196,12 +179,6 @@
<entityName>LogHistory_entity</entityName>
<fieldName>LogHistoryProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>parentFilter</name>
......@@ -210,20 +187,14 @@
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/District_entity/entityfields/parentfilter/onValueChange.js</onValueChange>
</entityField>
<entityParameter>
<name>OnlyResponsibleDistricts</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>DistrictIdByOrgId_param</name>
<name>DistrictsByContactId_param</name>
<expose v="true" />
</entityParameter>
<entityField>
<name>appliedFilter</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/appliedfilter/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/District_entity/entityfields/appliedfilter/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
......@@ -315,10 +286,6 @@
<recordfield>DISTRICT.USER_NEW</recordfield>
<isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PARENTDISTRICT_DISTRICTID.displayValue</name>
<expression>%aditoprj%/entity/District_entity/recordcontainers/db/recordfieldmappings/parent_district.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>appliedFilter.value</name>
<isLookupFilter v="true" />
......
entity/District_entity/afterUiInit.js deleted 100644 → 0
+ 0
− 0
View file @ d7ff5769
entity/District_entity/documentation.adoc 0 → 100644
+ 23
− 0
View file @ e4b3ec21
= District_entity
Overview:
Definition: Entity, which is responsible for handling districts.
Purpose: Creating the ability to create e.g. sales areas or logical areas.
Particularities:
- Filters are used to implement the logic, to define a area/district. (District: Germany has the filter: Country = "Germany")
- The filters are separated into the corresponding district filter from the current tier, which is saved into the database
(e.g.: Country = Germany for the District: Germany) and the appliedFilter, which contains all the filter from the overlying
districts in a nested form (including the filter of the current tier) (e.g: District: Munich: Country: "Germany" -> State: "Bavaria"
-> City: "Munich").
Relations to other entities:
- DistrictResponsible_entity
- Document_entity
- Language_entity
- LogHistory_entity
- Organisation_entity
Best practices: None known.
FAQs: None known.
\ No newline at end of file
entity/District_entity/entityfields/logs/children/tablenames_param/valueProcess.js deleted 100644 → 0
+ 0
− 9
View file @ d7ff5769
import("system.vars");
import("system.result");
import("Context_lib");
var res = [{id: vars.get("$field.DISTRICTID"), tableNames: ["DISTRICT"]}];
res = JSON.stringify(res);//currently only strings can be passed as param
result.object(res);
\ No newline at end of file
entity/District_entity/entityfields/responsibledistricts/documentation.adoc 0 → 100644
+ 3
− 0
View file @ e4b3ec21
= District_entity - ResponsibleDistricts
Provider for the person entity, used to display the responsible districts in the person main view.
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment