Skip to content
Snippets Groups Projects
Commit c8fb0235 authored by Dominik Lechner's avatar Dominik Lechner
Browse files

Merge branch 'master' into userConfiguration

parents 2c78c433 aa340880
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 392 additions and 238 deletions
.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTEUSAGE.xml
+ 2
− 0
View file @ c8fb0235
......@@ -516,6 +516,7 @@
<column name="AB_ATTRIBUTEUSAGEID" value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="MIN_COUNT" valueNumeric="1"/>
<column name="MAX_COUNT" valueNumeric="1"/>
<column name="OBJECT_TYPE" value="Person"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
......@@ -574,6 +575,7 @@
<column name="AB_ATTRIBUTEUSAGEID" value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="MIN_COUNT" valueNumeric="1"/>
<column name="MAX_COUNT" valueNumeric="1"/>
<column name="OBJECT_TYPE" value="Organisation"/>
</insert>
<insert tableName="AB_ATTRIBUTEUSAGE">
......
.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_LongNames.xml 0 → 100644
+ 67
− 0
View file @ c8fb0235
<?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="m.mansour" id="13c8eaf7-39d2-41c0-aff4-9cca30d32422">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="NAME" value="longName"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="TYPE" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4b4045ac-913c-4618-b6be-9458c2094d21"/>
<column name="AB_KEYWORD_ENTRY_ID" value="b42caac9-8f8f-46e5-9f1c-d121cdf3ad8f"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Not Qualified Contact"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="b6a9f74b-bfc0-41b5-ac97-48f059cd1051"/>
<column name="AB_KEYWORD_ENTRY_ID" value="8a2d19c9-bc32-437e-9261-78ed30110e92"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Marketing Accepted Lead"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="77370a25-7b08-4a75-b09b-ff806c184a12"/>
<column name="AB_KEYWORD_ENTRY_ID" value="46f55a58-dbe4-40ae-9306-481df9095088"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Marketing Qualified Lead"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="16fd4267-46d0-4d66-8241-ad620ba359e0"/>
<column name="AB_KEYWORD_ENTRY_ID" value="afa8cf58-07e8-4ee9-b24e-96cb6fa76aec"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Sales Accepted Lead"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="846c6387-56b0-45b5-8f4b-71f1177d7c25"/>
<column name="AB_KEYWORD_ENTRY_ID" value="c9483fb9-c295-43d2-94e0-8c949cf6dc47"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Sales Qualified Offer"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4284c1b3-c217-43b5-a06f-462626aadfdc"/>
<column name="AB_KEYWORD_ENTRY_ID" value="028af5dd-1071-4108-8685-ed7124376706"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Marketing Qualified Contact"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="945097dd-590f-4c53-bb33-5d425516495e"/>
<column name="AB_KEYWORD_ENTRY_ID" value="0e8eab64-4c79-4eed-9746-0ac6fc397620"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Offer"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="440bd4c0-9d2a-4adc-a4ee-15aa8109a265"/>
<column name="AB_KEYWORD_ENTRY_ID" value="405e2b7b-20c2-4824-a8b5-c7a533784ef3"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="CHAR_VALUE" value="Negotiation"/>
</insert>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+ 3
− 0
View file @ c8fb0235
......@@ -168,4 +168,7 @@
<include relativeToChangelogFile="true" file="Salesproject_Phase_icons.xml"/>
<include relativeToChangelogFile="true" file="Salesprojectmilestone_add_parent.xml"/>
<include relativeToChangelogFile="true" file="Salesproject_Phase_LongNames.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
+ 22
− 5
View file @ c8fb0235
......@@ -10,7 +10,7 @@
<column name="VALUE" value="SALPROJPHASENQC"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
<column name="DATE_START" valueDate="2019-06-15T01:34:58"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="ae7fe604-2fea-4aa1-be75-e990e8f31c74"/>
<column name="TYPE" value="SalesprojectState"/>
......@@ -51,7 +51,7 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T10:44:48"/>
<column name="DATE_START" valueDate="2019-05-17T08:39:38"/>
<column name="DATE_START" valueDate="2019-05-10T08:39:38"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_MILESTONEID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -66,7 +66,7 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T10:44:26"/>
<column name="DATE_START" valueDate="2019-05-22T11:51:20"/>
<column name="DATE_START" valueDate="2019-05-14T11:51:20"/>
<column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="SALESPROJECT_MILESTONEID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -81,11 +81,22 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
<column name="DATE_END" valueDate="2019-06-19T08:08:07"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="SALESPROJECT_MILESTONEID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
<column name="TYPE" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASESQO"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-06-19T08:08:07"/>
<column name="PARENT_ID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="SALESPROJECT_MILESTONEID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
<column name="TYPE" value="SalesprojectPhase"/>
<column name="VALUE" value="SALPROJPHASEMAL"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
......@@ -93,9 +104,11 @@
<column name="TYPE" value="SalesprojectState"/>
<column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T11:30:09"/>
<column name="DATE_START" valueDate="2019-05-23T10:18:10"/>
<column name="DATE_END" valueDate="2019-06-15T11:30:09"/>
<column name="DATE_START" valueDate="2019-06-01T10:18:10"/>
<column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="47999521-d6ea-4a4d-959c-e72776ba5a25"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -103,6 +116,7 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-23T10:44:26"/>
<column name="PARENT_ID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
<column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="SALESPROJECT_MILESTONEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -110,6 +124,7 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-23T10:44:48"/>
<column name="PARENT_ID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_MILESTONEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
<column name="TYPE" value="SalesprojectPhase"/>
......@@ -117,6 +132,8 @@
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-23T11:30:10"/>
<column name="DATE_END" valueDate="2019-06-01T11:30:09"/>
<column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
<column name="TYPE" value="SalesprojectPhase"/>
......
.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
+ 14
− 14
View file @ c8fb0235
......@@ -4,7 +4,7 @@
<insert tableName="TASK">
<column name="DESCRIPTION" value="Zu offenen Opportunities den Forecast anpassen"/>
<column name="MATURITY_DATE" valueDate="2019-05-24T09:34:00"/>
<column name="PRIORITY" value="TASKPRIONORMAL"/>
<column name="PRIORITY" value="TASKPRIOLOW"/>
<column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
......@@ -17,7 +17,7 @@
<insert tableName="TASK">
<column name="DESCRIPTION" value="Kunde wollte ein Angebot, hierzu die offenen Posten klären"/>
<column name="MATURITY_DATE" valueDate="2019-05-15T09:36:00"/>
<column name="PRIORITY" value="TASKPRIONORMAL"/>
<column name="PRIORITY" value="TASKPRIOMEDIUM"/>
<column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
......@@ -30,7 +30,7 @@
<insert tableName="TASK">
<column name="EDITOR_CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
<column name="MATURITY_DATE" valueDate="2019-05-24T09:38:00"/>
<column name="PRIORITY" value="TASKPRIONORMAL"/>
<column name="PRIORITY" value="TASKPRIOMEDIUM"/>
<column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
......@@ -43,7 +43,7 @@
<insert tableName="TASK">
<column name="DESCRIPTION" value="Kampagnenplanung für dieses Jahr beenden."/>
<column name="MATURITY_DATE" valueDate="2019-05-22T10:25:00"/>
<column name="PRIORITY" value="TASKPRIONORMAL"/>
<column name="PRIORITY" value="TASKPRIOHIGH"/>
<column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
......@@ -56,7 +56,7 @@
<insert tableName="TASK">
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="MATURITY_DATE" valueDate="2019-05-29T01:44:00"/>
<column name="PRIORITY" value="TASKPRIONORMAL"/>
<column name="PRIORITY" value="TASKPRIOMEDIUM"/>
<column name="PROGRESS" value="TASKPROG50"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
......@@ -69,7 +69,7 @@
<insert tableName="TASK">
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="MATURITY_DATE" valueDate="2019-05-24T01:46:00"/>
<column name="PRIORITY" value="SALPROJPHASESAL"/>
<column name="PRIORITY" value="TASKPRIONONE"/>
<column name="PROGRESS" value="TASKPROG50"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
......@@ -83,7 +83,7 @@
<column name="DESCRIPTION" value="Kunde ist sehr interessiert an unserem Produkten, weitere Produktabstimmung intern."/>
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="MATURITY_DATE" valueDate="2019-05-29T01:48:00"/>
<column name="PRIORITY" value="SALPROJPHASEMQL"/>
<column name="PRIORITY" value="TASKPRIOLOW"/>
<column name="PROGRESS" value="TASKPROG50"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
......@@ -95,7 +95,7 @@
</insert>
<insert tableName="TASK">
<column name="MATURITY_DATE" valueDate="2019-06-21T06:03:00"/>
<column name="PRIORITY" value="SALPROJPHASEMQL"/>
<column name="PRIORITY" value="TASKPRIOLOW"/>
<column name="PROGRESS" value="TASKPROG25"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
......@@ -108,7 +108,7 @@
<insert tableName="TASK">
<column name="DESCRIPTION" value="Strategieevent 2-Tage"/>
<column name="MATURITY_DATE" valueDate="2019-11-13T06:04:00"/>
<column name="PRIORITY" value="SALPROJPHASESAL"/>
<column name="PRIORITY" value="TASKPRIOHIGH"/>
<column name="PROGRESS" value="TASKPROG75"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
......@@ -121,7 +121,7 @@
<insert tableName="TASK">
<column name="DESCRIPTION" value="Winterreifen draufmachen lassen"/>
<column name="MATURITY_DATE" valueDate="2019-10-01T06:05:00"/>
<column name="PRIORITY" value="TASKPRIONORMAL"/>
<column name="PRIORITY" value="TASKPRIONONE"/>
<column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
......@@ -134,7 +134,7 @@
<insert tableName="TASK">
<column name="DESCRIPTION" value="Preisabstimmung."/>
<column name="MATURITY_DATE" valueDate="2019-04-05T09:08:00"/>
<column name="PRIORITY" value="TASKPRIONORMAL"/>
<column name="PRIORITY" value="TASKPRIOMEDIUM"/>
<column name="PROGRESS" value="TASKPROG75"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
......@@ -146,7 +146,7 @@
</insert>
<insert tableName="TASK">
<column name="MATURITY_DATE" valueDate="2019-05-30T09:21:00"/>
<column name="PRIORITY" value="SALPROJPHASEMQL"/>
<column name="PRIORITY" value="TASKPRIOHIGH"/>
<column name="PROGRESS" value="TASKPROG75"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
......@@ -158,7 +158,7 @@
</insert>
<insert tableName="TASK">
<column name="MATURITY_DATE" valueDate="2019-05-30T11:50:00"/>
<column name="PRIORITY" value="TASKPRIONORMAL"/>
<column name="PRIORITY" value="TASKPRIOLOW"/>
<column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
......@@ -172,7 +172,7 @@
<column name="DESCRIPTION" value="Es sollen die effizienten Wertschöpfungsketten der Prozessdefinitionseinheiten im primären Schritt gebündelt und sekundär analysiert und verifiziert werden."/>
<column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="MATURITY_DATE" valueDate="2019-01-20T05:00:00"/>
<column name="PRIORITY" value="SALPROJPHASEMQL"/>
<column name="PRIORITY" value="TASKPRIOHIGH"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="START_DATE" valueDate="2019-01-20T03:00:00"/>
......
entity/AddressValidation_entity/AddressValidation_entity.aod
+ 204
− 182
View file @ c8fb0235
<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>AddressValidation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/AddressValidation_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>UID</name>
<title>Address</title>
<description>UID consists of all fields as JSON. </description>
</entityField>
<entityProvider>
<name>ZipValidaton</name>
<dependencies>
<entityDependency>
<name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
<entityName>Address_entity</entityName>
<fieldName>ZipValidation</fieldName>
<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>
<expose v="true" />
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>Country_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>COUNTRY</name>
<title>Country</title>
</entityField>
<entityField>
<name>ZIP</name>
<title>Zip</title>
</entityField>
<entityField>
<name>CITY</name>
<title>City</title>
</entityField>
<entityField>
<name>DISTRICT</name>
<title>District</title>
</entityField>
<entityField>
<name>REGION</name>
<title>Region</title>
</entityField>
<entityField>
<name>STATE</name>
<title>${ADDRESS_STATE}</title>
</entityField>
<entityField>
<name>VALUE</name>
<description>Final value returned</description>
</entityField>
<entityProvider>
<name>CityValidation</name>
<dependencies>
<entityDependency>
<name>27114db7-8562-43b2-87d8-fa605bbf2319</name>
<entityName>Address_entity</entityName>
<fieldName>CityValidation</fieldName>
<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>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
<name>FullAddressValidation</name>
<dependencies>
<entityDependency>
<name>10f700b5-1ac6-4d50-bcb8-aae55714fb43</name>
<entityName>Address_entity</entityName>
<fieldName>FullAddressValidation</fieldName>
<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>
<title>Street</title>
</entityField>
<entityField>
<name>LON</name>
</entityField>
<entityField>
<name>LAT</name>
</entityField>
<entityField>
<name>CITYEXT</name>
</entityField>
<entityField>
<name>BUILDINGNO</name>
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias></jDitoRecordAlias>
<isFilterable v="true" />
<isRequireContainerFiltering v="true" />
<isSortable v="true" />
<contentProcess>%aditoprj%/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>UID.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>ZIP.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CITY.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CITYEXT.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>COUNTRY.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>DISTRICT.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>REGION.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>STATE.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>STREET.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>BUILDINGNO.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>LON.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>LAT.value</name>
</jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>AddressValidation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/AddressValidation_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>UID</name>
<title>Address</title>
<description>UID consists of all fields as JSON. </description>
</entityField>
<entityProvider>
<name>ZipValidaton</name>
<dependencies>
<entityDependency>
<name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
<entityName>Address_entity</entityName>
<fieldName>ZipValidation</fieldName>
<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>
<expose v="true" />
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>Country_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>COUNTRY</name>
<title>Country</title>
</entityField>
<entityField>
<name>ZIP</name>
<title>Zip</title>
</entityField>
<entityField>
<name>CITY</name>
<title>City</title>
</entityField>
<entityField>
<name>DISTRICT</name>
<title>District</title>
</entityField>
<entityField>
<name>REGION</name>
<title>Region</title>
</entityField>
<entityField>
<name>STATE</name>
<title>${ADDRESS_STATE}</title>
</entityField>
<entityField>
<name>VALUE</name>
<description>Final value returned</description>
</entityField>
<entityProvider>
<name>CityValidation</name>
<dependencies>
<entityDependency>
<name>27114db7-8562-43b2-87d8-fa605bbf2319</name>
<entityName>Address_entity</entityName>
<fieldName>CityValidation</fieldName>
<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>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
<name>FullAddressValidation</name>
<dependencies>
<entityDependency>
<name>10f700b5-1ac6-4d50-bcb8-aae55714fb43</name>
<entityName>Address_entity</entityName>
<fieldName>FullAddressValidation</fieldName>
<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>
<title>Street</title>
</entityField>
<entityField>
<name>LON</name>
</entityField>
<entityField>
<name>LAT</name>
</entityField>
<entityField>
<name>CITYEXT</name>
</entityField>
<entityField>
<name>BUILDINGNO</name>
</entityField>
<entityProvider>
<name>StreetValidation</name>
<dependencies>
<entityDependency>
<name>3211d147-0867-4fc1-8640-34a1b8fdcf18</name>
<entityName>Address_entity</entityName>
<fieldName>StreetValidation</fieldName>
<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>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias></jDitoRecordAlias>
<isFilterable v="true" />
<isRequireContainerFiltering v="true" />
<isSortable v="true" />
<contentProcess>%aditoprj%/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>UID.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>ZIP.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CITY.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CITYEXT.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>COUNTRY.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>DISTRICT.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>REGION.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>STATE.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>STREET.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>BUILDINGNO.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>LON.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>LAT.value</name>
</jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
entity/AddressValidation_entity/entityfields/streetvalidation/children/type_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ c8fb0235
import("WsValidation_lib");
import("system.result");
result.string(WsValidationType.get().TYPE_STREET_NOMINATIM.key);
\ No newline at end of file
entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
+ 5
− 1
View file @ c8fb0235
......@@ -10,6 +10,10 @@ var country = "";
if (vars.exists("$param.Country_param") && vars.get("$param.Country_param"))
country = vars.get("$param.Country_param");
var city = "";
if (vars.exists("$param.City_param") && vars.get("$param.City_param"))
city = vars.get("$param.City_param");
// get the value typed by the user
var filter = "";
var localFilter = vars.get("$local.filter");
......@@ -21,5 +25,5 @@ if(localFilter.filter != null) {
if (!filter && vars.exists("$param.CurrentValue_param") && vars.get("$param.CurrentValue_param"))
filter = vars.get("$param.CurrentValue_param");
var foundAddresses = WsValidationUtils.validate(filter, type, country);
var foundAddresses = WsValidationUtils.validate(filter, type, country, city);
result.object(foundAddresses);
\ No newline at end of file
entity/Address_entity/Address_entity.aod
+ 30
− 0
View file @ c8fb0235
......@@ -12,7 +12,15 @@
<entityField>
<name>ADDRESS</name>
<title>Street</title>
<consumer>StreetValidation</consumer>
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
<textInputAllowed v="true" />
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/address/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Address_entity/entityfields/address/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
</onValueChangeTypes>
</entityField>
<entityField>
<name>ADDRESSADDITION</name>
......@@ -367,6 +375,28 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>StreetValidation</name>
<dependency>
<name>dependency</name>
<entityName>AddressValidation_entity</entityName>
<fieldName>StreetValidation</fieldName>
</dependency>
<children>
<entityParameter>
<name>City_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/streetvalidation/children/city_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>Country_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/streetvalidation/children/country_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>CurrentValue_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/streetvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Address_entity/entityfields/address/displayValueProcess.js 0 → 100644
+ 5
− 0
View file @ c8fb0235
import("system.vars");
import("system.result");
// needed for instant display name change if value set by neon.setFieldValue
result.string(vars.get("$this.value"))
\ No newline at end of file
entity/Address_entity/entityfields/address/onValueChange.js 0 → 100644
+ 3
− 0
View file @ c8fb0235
import("WsValidation_lib");
WsValidationUtils.setAddressFields();
\ No newline at end of file
entity/Address_entity/entityfields/cityvalidation/children/currentvalue_param/valueProcess.js
+ 4
− 4
View file @ c8fb0235
import("system.vars");
import("system.result");
result.string(vars.get("$field.CITY"))
\ No newline at end of file
import("system.vars");
import("system.result");
result.string(vars.get("$this.value"))
\ No newline at end of file
entity/Offeritem_entity/grantCreateProcess.js → entity/Address_entity/entityfields/streetvalidation/children/city_param/valueProcess.js
+ 4
− 0
View file @ c8fb0235
import("system.vars");
import("system.result");
import("Offer_lib");
result.string(OfferUtils.isEditable(vars.get("$param.OfferStatus_param")));
\ No newline at end of file
result.string(vars.get("$field.CITY"))
\ No newline at end of file
entity/Address_entity/entityfields/streetvalidation/children/country_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ c8fb0235
import("system.result");
import("system.vars");
result.string(vars.get("$field.COUNTRY"));
\ No newline at end of file
entity/Address_entity/entityfields/streetvalidation/children/currentvalue_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ c8fb0235
import("system.vars");
import("system.result");
result.string(vars.get("$this.value"))
\ No newline at end of file
entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js
+ 4
− 4
View file @ c8fb0235
import("system.vars");
import("system.result");
result.string(vars.get("$field.ZIP"))
\ No newline at end of file
import("system.vars");
import("system.result");
result.string(vars.get("$this.value"))
\ No newline at end of file
entity/Attribute_entity/Attribute_entity.aod
+ 1
− 0
View file @ c8fb0235
......@@ -113,6 +113,7 @@
</entityParameter>
<entityConsumer>
<name>AttributeUsages</name>
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>AttributeUsage_entity</entityName>
......
entity/Attribute_entity/entityfields/attributeusages/stateProcess.js 0 → 100644
+ 10
− 0
View file @ c8fb0235
import("system.result");
import("system.neon");
import("system.vars");
import("Attribute_lib");
var state = neon.COMPONENTSTATE_EDITABLE;
if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.COMBOVALUE)
state = neon.COMPONENTSTATE_INVISIBLE;
result.string(state);
\ No newline at end of file
entity/BulkMailAddRecipients_entity/recordcontainers/jdito/onInsert.js
+ 1
− 16
View file @ c8fb0235
import("Bulkmail_lib");
import("KeywordRegistry_basic");
import("system.util");
import("system.db");
import("Sql_lib");
import("system.vars");
var contactIds = JSON.parse(vars.getString("$field.recipientContactIds"));
var bulkMailId = vars.get("$field.BULKMAIL_ID");
var columns = [
"BULKMAILRECIPIENTID",
"BULKMAIL_ID",
"CONTACT_ID",
"STATUS"
];
var inserts = [];
for (let i = 0, l = contactIds.length; i < l; i++)
{
inserts.push(["BULKMAILRECIPIENT", columns, null, [util.getNewUUID(), bulkMailId, contactIds[i], $KeywordRegistry.bulkMailRecipientStatus$pending()]]);
}
db.inserts(inserts);
BulkMailUtils.addRecipients(bulkMailId, contactIds);
entity/BulkMailRecipient_entity/entityfields/contact_id/onValidation.js
+ 1
− 12
View file @ c8fb0235
import("Contact_lib");
import("system.translate");
import("system.result");
import("system.datetime");
import("KeywordRegistry_basic");
import("Sql_lib");
import("Entity_lib");
import("Bulkmail_lib");
import("system.db");
var query = SqlCondition.begin()
.andPrepare("CONTACT.CONTACTID", ProcessHandlingUtils.getOnValidationValue())
.andSqlCondition(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail()))
.buildSql("select count(*) = 0 from CONTACT", "1=2");
var noMails = db.cell(query) != "true";
if (noMails)
if (ContactUtils.hasCommRestriction(ProcessHandlingUtils.getOnValidationValue(), $KeywordRegistry.communicationMediumCampaign$mail()))
result.string(translate.text("The contact has an advertising ban for emails!"));
\ 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