Skip to content
Snippets Groups Projects
Commit 3c91eb14 authored by Martin Groppe's avatar Martin Groppe
Browse files

merged 1075590_link_ersetzung into dev_xrm_marketing

parents 6a8dbc51 09941bad
No related branches found
No related tags found
No related merge requests found
Showing
with 387 additions and 35 deletions
......@@ -4,5 +4,6 @@
<addColumn tableName="BULKMAIL">
<column name="DATE_TO_SEND" type="DATETIME"/>
</addColumn>
<renameColumn tableName="BULKMAIL" oldColumnName="SENDER" newColumnName="SENDER_EMAIL_ADDRESS "/>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
<?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="m.groppe" id="5d43aca9-3344-4b54-981d-73306123e18f">
<addColumn tableName="BULKMAILRECIPIENT">
<column name="TEST_RECIPIENT" type="SMALLINT"/>
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
......@@ -7,4 +7,6 @@
<include relativeToChangelogFile="true" file="createMailLog.xml"/>
<include relativeToChangelogFile="true" file="createMailRun.xml"/>
<include relativeToChangelogFile="true" file="createMailOpener.xml"/>
<include relativeToChangelogFile="true" file="createBulkMailTestRecipient.xml"/>
<include relativeToChangelogFile="true" file="AlterBulkmailRecipient.xml"/>
</databaseChangeLog>
\ No newline at end of file
<?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-4.1.xsd">
<changeSet author="m.groppe" id="6e4507c7-32fe-4f6b-a7c2-80d379ef364b">
<createTable tableName="BULKMAILTESTRECIPIENT">
<column name="BULKMAILTESTRECIPIENTID" type="CHAR(36)">
<constraints nullable="false" primaryKey="true"/>
</column>
<column name="BULKMAIL_ID" type="CHAR(36)"/>
<column name="CONTACT_ID" type="CHAR(36)"/>
<column name="EMAIL_ADDRESS" type="VARCHAR(255)"/>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
......@@ -8,6 +8,7 @@
<column name="OBJECT_ROWID" type="CHAR(36)"/>
<column name="OBJECT_TYPE" type="VARCHAR(63)"/>
<column name="STATUS" type="VARCHAR(100)"/>
<column name="TESTRUN" type= "smallint"/>
<column name="INTEREST_ID" type="CHAR(36)"/>
<column defaultValueComputed="NULL" name="DATE_RUN_START" type="datetime"/>
<column defaultValueComputed="NULL" name="DATE_RUN_FINISHED" type="datetime"/>
......
......@@ -9,6 +9,7 @@
</column>
<column name="URL" type="VARCHAR(512)"/>
<column name="LINKTYPE" type="VARCHAR(50)"/>
<column name="PLACEHOLDER" type = "VARCHAR(50)"/>
<column name="SCORE" type = "INTEGER"/>
<column name="USER_NEW" type="NVARCHAR(50)"/>
<column name="DATE_NEW" type="DATETIME"/>
......
......@@ -10444,27 +10444,6 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>SENDER</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title>Sender</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
<dbName></dbName>
......@@ -10549,6 +10528,34 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>TEST_RECIPIENT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>SENDER_EMAIL_ADDRESS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -10681,6 +10688,20 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>TEST_RECIPIENT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -18630,6 +18651,20 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PLACEHOLDER</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -18998,20 +19033,6 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>BCC_EMAIL</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="255" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -19130,6 +19151,20 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>TESTRUN</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -19424,6 +19459,82 @@
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>BULKMAILTESTRECIPIENT</name>
<dbName></dbName>
<idColumn>BULKMAILTESTRECIPIENTID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
<title></title>
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
<entityFieldDb>
<name>BULKMAIL_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>EMAIL_ADDRESS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="255" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>BULKMAILTESTRECIPIENTID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
</entityGroup>
</aliasDefDb>
......
......@@ -84,6 +84,12 @@
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>578dbb91-ea76-40ec-9dbd-9acf462ceba7</name>
<entityName>BulkMailTestRecipient_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityProvider>
......
import("system.logging");
import("Context_lib");
import("system.translate");
import("Util_lib");
......@@ -134,6 +135,7 @@ for (let i = 0, l = allNames.length; i < l; i++)
var nameCache = {};
var res = _buildAttributeTable(attributes, usages);
logging.log(JSON.stringify(res));
result.object(res);
//sorts the records in a way that a tree can be built and adds values
......
......@@ -152,6 +152,30 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityField>
<name>TEST_RECIPIENT</name>
<title>Test</title>
<contentType>BOOLEAN</contentType>
<valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/test_recipient/valueProcess.js</valueProcess>
</entityField>
<entityActionGroup>
<name>testRunActions</name>
<title>Test Run Actions</title>
<children>
<entityActionField>
<name>setTestRecipient</name>
<title>Use for test run</title>
<onActionProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/settestrecipient/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
</entityActionField>
<entityActionField>
<name>removeTestRecipient</name>
<title>Don't use for test run</title>
<onActionProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/removetestrecipient/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
</entityActionField>
</children>
</entityActionGroup>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -224,6 +248,10 @@
<name>PROBLEM.displayValue</name>
<expression>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/problem.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TEST_RECIPIENT.value</name>
<recordfield>BULKMAILRECIPIENT.TEST_RECIPIENT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
import("system.neon");
import("system.vars");
import("system.result");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(0);
\ No newline at end of file
import("Sql_lib");
import("system.vars");
import("system.neon");
newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", vars.get("$sys.selection"), SqlBuilder.IN())
.updateData(true, "BULKMAILRECIPIENT", ["TEST_RECIPIENT"], null, [0]);
neon.refreshAll();
\ No newline at end of file
import("Sql_lib");
import("system.vars");
import("system.neon");
newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", vars.get("$sys.selection"), SqlBuilder.IN())
.updateData(true, "BULKMAILRECIPIENT", ["TEST_RECIPIENT"], null, [1]);
neon.refreshAll();
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
<name>BulkMailTestRecipient_entity</name>
<title>Test Recipient</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titlePlural>Test Recipients</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityParameter>
<name>BulkMailId_param</name>
<expose v="true" />
<mandatory v="false" />
</entityParameter>
<entityField>
<name>BULKMAILTESTRECIPIENTID</name>
</entityField>
<entityField>
<name>BULKMAIL_ID</name>
<valueProcess>%aditoprj%/entity/BulkMailTestRecipient_entity/entityfields/bulkmail_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>EMAIL_ADDRESS</name>
<title>Email</title>
<valueProcess>%aditoprj%/entity/BulkMailTestRecipient_entity/entityfields/email_address/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CONTACT_ID</name>
<title>Contact</title>
<consumer>Contacts</consumer>
<linkedContextProcess>%aditoprj%/entity/BulkMailTestRecipient_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
</entityField>
<entityProvider>
<name>BulkMailTestRecipients</name>
<dependencies>
<entityDependency>
<name>bf4102ef-e33c-4bdc-b62d-844f466f8617</name>
<entityName>BulkMail_entity</entityName>
<fieldName>BulkMailTestRecipients</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityConsumer>
<name>Contacts</name>
<dependency>
<name>dependency</name>
<entityName>AnyContact_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>PERSON_ID</name>
</entityField>
<entityField>
<name>ORGANISATION_ID</name>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<fromClauseProcess>%aditoprj%/entity/BulkMailTestRecipient_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/BulkMailTestRecipient_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>BULKMAIL_ID.value</name>
<recordfield>BULKMAILTESTRECIPIENT.BULKMAIL_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>BULKMAILTESTRECIPIENTID.value</name>
<recordfield>BULKMAILTESTRECIPIENT.BULKMAILTESTRECIPIENTID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>BULKMAILTESTRECIPIENT.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>EMAIL_ADDRESS.value</name>
<recordfield>BULKMAILTESTRECIPIENT.EMAIL_ADDRESS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/BulkMailTestRecipient_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_ID.value</name>
<recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_ID.value</name>
<recordfield>CONTACT.ORGANISATION_ID</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
<name>e9b90ccc-0edd-4968-b6bf-966f8e0d5bc2</name>
<tableName>BULKMAILTESTRECIPIENT</tableName>
<primaryKey>BULKMAILTESTRECIPIENTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
<name>566ef9cf-6427-4f60-aa04-e514517c3324</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
</linkInformation>
</dbRecordContainer>
</recordContainers>
</entity>
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.BulkMailId_param") && vars.get("$param.BulkMailId_param"))
result.string(vars.getString("$param.BulkMailId_param"));
}
import("system.vars");
import("system.result");
import("Contact_lib");
result.string(ContactUtils.getContextByPersOrg(vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
import("system.neon");
import("system.vars");
import("system.result");
import("Communication_lib");
if (vars.get("$field.CONTACT_ID") && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
result.string(CommUtil.getStandardMail(vars.get("$field.CONTACT_ID")));
\ No newline at end of file
import("system.db");
import("system.result");
import("Sql_lib");
result.string(newWhere("BULKMAILTESTRECIPIENT.BULKMAIL_ID", "$param.BulkMailId_param").toString());
\ No newline at end of file
import("system.result");
result.string("BULKMAILTESTRECIPIENT join CONTACT on BULKMAILTESTRECIPIENT.CONTACT_ID = CONTACT.CONTACTID \
left join PERSON on CONTACT.PERSON_ID = PERSON.PERSONID \
left join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID");
\ No newline at end of file
import("Contact_lib");
import("system.result");
result.string(ContactUtils.getResolvingDisplaySubSql("BULKMAILTESTRECIPIENT.CONTACT_ID"));
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment