Skip to content
Snippets Groups Projects
Commit 5a9b8033 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge commit '24e7de4a' into #1035025_SALUTATION

# Conflicts:
#	entity/Address_entity/Address_entity.aod
#	entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js
#	entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
#	entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js
#	entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js
#	entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js
#	entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js
#	entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js
#	entity/Person_entity/Person_entity.aod
#	entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
parents 694b7a6e 24e7de4a
No related branches found
No related tags found
No related merge requests found
Showing
with 232 additions and 62 deletions
......@@ -1109,7 +1109,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<index v="false" />
<title></title>
<description></description>
<dependencies>
......@@ -1142,7 +1142,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<index v="false" />
<title></title>
<description></description>
<dependencies>
......@@ -1904,7 +1904,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
......@@ -2444,20 +2444,6 @@
<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="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
<dbName></dbName>
......@@ -3398,7 +3384,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
......
......@@ -19,6 +19,7 @@
<title>Entrydate</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
</entityField>
......@@ -151,7 +152,7 @@
</entityParameter>
<entityConsumer>
<name>Links</name>
<title>Verknüpfungen</title>
<title>Connections</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
......@@ -258,7 +259,7 @@
</entityField>
<entityConsumer>
<name>ModuleTrees</name>
<title>Baum</title>
<title>Tree</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
......@@ -279,16 +280,16 @@
<entityActionField>
<name>newActivity_action</name>
<fieldType>ACTION</fieldType>
<title>Neue Aktivität</title>
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
<iconId>VAADIN:PLUS</iconId>
<iconId>NEON:HISTORY</iconId>
</entityActionField>
<entityActionField>
<name>newTask_action</name>
<fieldType>ACTION</fieldType>
<title>Neue Aufgabe</title>
<title>New task</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
<iconId>VAADIN:PLUS</iconId>
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityParameter>
<name>ParentId_param</name>
......
<?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.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1">
<name>AddressType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/AddressType_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>KEYID</name>
</entityField>
<entityField>
<name>TITLE</name>
</entityField>
<entityField>
<name>AB_KEYWORD_ENTRYID</name>
</entityField>
<entityProvider>
<name>ByCategory</name>
<fieldType>DEPENDENCY_IN</fieldType>
<lookupIdfield>KEYID</lookupIdfield>
<dependencies>
<entityDependency>
<name>b6ddc934-51ac-43a5-8aa9-7239423ea14d</name>
<entityName>Address_entity</entityName>
<fieldName>KeywordAddressType</fieldName>
<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" />
<description>PARAMETER</description>
</entityParameter>
</entityFields>
<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>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>AB_KEYWORD_ENTRYID.value</name>
<recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>KEYID.value</name>
<recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TITLE.value</name>
<recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
</entity>
import("system.db");
import("system.vars");
import("system.result");
import("KeywordRegistry_basic");
import("Sql_lib");
import("Keyword_lib");
var cond = SqlCondition.begin()
.andPrepare("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.addressType());
var usageFilter = vars.get("$param.usageFilter_param");
if (usageFilter)
{
var keywordAttribute = new KeywordAttribute($KeywordRegistry.addressType(), usageFilter);
cond.andAttachPrepared(SqlCondition.begin()
.andPrepare("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID", keywordAttribute.id)
.andPrepare("AB_KEYWORD_ATTRIBUTERELATION." + keywordAttribute.dbField, "1")
.buildSql("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID in (\n\
select AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID \n\
from AB_KEYWORD_ATTRIBUTERELATION ", null, ")"));
}
cond = db.translateStatement(cond.build("1 = 2"));
result.string(cond);
\ No newline at end of file
import("system.vars");
import("system.translate");
import("system.result");
result.string(translate.text(vars.get("$field.TITLE")));
\ No newline at end of file
......@@ -42,6 +42,7 @@
<title>Country</title>
<consumer>Countries</consumer>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
......@@ -71,7 +72,6 @@
<entityProvider>
<name>OrganisationAddresses</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
......@@ -84,7 +84,7 @@
<entityParameter>
<name>ContactType_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js</valueProcess>
<expose v="true" />
<expose v="false" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
......@@ -106,7 +106,6 @@
<entityProvider>
<name>ContactAddresses</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
......@@ -119,7 +118,7 @@
<entityParameter>
<name>ContactType_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js</valueProcess>
<expose v="true" />
<expose v="false" />
<triggerRecalculation v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
......@@ -149,7 +148,6 @@
<name>OrganisationAddressesByContact</name>
<fieldType>DEPENDENCY_IN</fieldType>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
......@@ -162,7 +160,7 @@
<entityParameter>
<name>ContactType_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js</valueProcess>
<expose v="true" />
<expose v="false" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
</children>
......@@ -192,13 +190,13 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
<entityName>AddressType_entity</entityName>
<fieldName>ByCategory</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js</valueProcess>
<name>usageFilter_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/usagefilter_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
......
import("system.result");
result.object(2);
\ No newline at end of file
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
{
result.string("DE");
}
\ No newline at end of file
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.addressType());
\ No newline at end of file
import("system.logging");
import("system.vars");
import("system.result");
import("Contact_lib");
var keywordAttributeFilterName = "";
var contactType = vars.get("$param.ContactType_param");
switch (contactType) {
case Contact.TYPES.Contact:
case Contact.TYPES.Private:
keywordAttributeFilterName = "contact";
break;
case Contact.TYPES.Organisation:
keywordAttributeFilterName = "organisation";
break;
}
logging.log("contactType>>" + contactType);
logging.log("keywordAttributeFilterName>>" + keywordAttributeFilterName);
result.object(keywordAttributeFilterName);
\ No newline at end of file
import("system.result");
result.object(1);
\ 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.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.1">
<name>AnyContact_entity</name>
<description>former Relation</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
......@@ -31,7 +30,9 @@
</entityProvider>
<entityField>
<name>ADDRESS_ID</name>
<title>standard address</title>
<searchable v="false" />
<displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>LANGUAGE</name>
......@@ -56,7 +57,7 @@
<entityField>
<name>contactType</name>
<description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
See RelationUtils.getRelationTypeByPersOrg for possible values</description>
See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<contentType>NUMBER</contentType>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
......@@ -92,7 +93,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
</children>
</entityConsumer>
<entityField>
<name>ORG_NAME</name>
<name>ORGANISATION_NAME</name>
<title>Organisation name</title>
</entityField>
<entityField>
......@@ -152,6 +153,20 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<name>RELATIONSHIP</name>
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
</entityField>
<entityField>
<name>PERSON_MIDDLENAME</name>
</entityField>
<entityField>
<name>PERSON_TITLE</name>
</entityField>
<entityField>
<name>PERSON_SALUTATION</name>
</entityField>
<entityField>
<name>PERSON_FULL_NAME</name>
<title>Person</title>
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -214,7 +229,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<recordfield>CONTACT.STATUS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_NAME.value</name>
<name>ORGANISATION_NAME.value</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
......@@ -237,6 +252,18 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<name>RELATIONSHIP.value</name>
<recordfield>CONTACT.RELATIONSHIP</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_MIDDLENAME.value</name>
<recordfield>PERSON.MIDDLENAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_TITLE.value</name>
<recordfield>PERSON.TITLE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_SALUTATION.value</name>
<recordfield>PERSON.SALUTATION</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
import("system.db");
import("system.vars");
import("system.result");
import("PostalAddress_lib");
var addrId = vars.get("$field.ADDRESS_ID");
var addr = AddressUtils.getFormattedOnlineAddressById(addrId);
result.string(addr);
\ No newline at end of file
......@@ -2,4 +2,4 @@ import("system.result");
import("system.vars");
import("Contact_lib")
result.object(RelationUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
result.object(ContactUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
......@@ -7,7 +7,7 @@ import("Contact_lib");
if (vars.get("$field.contactType") == 1) // 1 == org, 2 == person, 3 == person
{
result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORG_NAME")));
result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORGANISATION_NAME")));
}
else
{
......
import("system.vars");
import("system.result");
import("Util_lib");
import("Contact_lib");
var contact = new Contact();
contact.salutation = vars.get("$field.PERSON_SALUTATION");
contact.title = vars.get("$field.PERSON_TITLE");
contact.firstname = vars.get("$field.PERSON_FIRSTNAME");
contact.middlename = vars.get("$field.PERSON_MIDDLENAME");
contact.lastname = vars.get("$field.PERSON_LASTNAME");
var renderer = new ContactTitleRenderer(contact, null);
result.string(renderer.asString());
\ No newline at end of file
import("system.result");
import("Contact_lib")
result.string(RelationUtils.getFullRelationFromString());
\ No newline at end of file
result.string(ContactUtils.getFullRelationString());
\ No newline at end of file
import("system.vars");
import("system.result");
import("Util_lib");
import("Contact_lib");
if(vars.get("$field.PERSON_FIRSTNAME")) {
result.string(vars.get("$field.PERSON_FIRSTNAME") + " " + vars.get("$field.PERSON_LASTNAME"));
} else {
result.string(vars.get("$field.ORG_NAME"));
}
var contact = new Contact();
contact.organisationName = vars.get("$field.ORGANISATION_NAME");
contact.salutation = vars.get("$field.PERSON_SALUTATION");
contact.title = vars.get("$field.PERSON_TITLE");
contact.firstname = vars.get("$field.PERSON_FIRSTNAME");
contact.middlename = vars.get("$field.PERSON_MIDDLENAME");
contact.lastname = vars.get("$field.PERSON_LASTNAME");
var renderer = new ContactTitleRenderer(contact);
result.string(renderer.asString());
\ No newline at end of file
......@@ -17,13 +17,16 @@
<entityField>
<name>CLASSIFICATION</name>
<possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>BEGIN</name>
<selectionMode>SINGLE</selectionMode>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>END</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
</entityField>
<entityFieldGroup>
<name>STARTEND</name>
......@@ -43,9 +46,11 @@
</entityField>
<entityField>
<name>REMINDER_CHECK</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>REMINDER</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CATEGORIES</name>
......@@ -54,9 +59,11 @@
<entityField>
<name>ATTENDEES</name>
<possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TRANSPARENCY</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
</entityField>
<entityActionGroup>
<name>PartStatActionGroup</name>
......@@ -100,9 +107,11 @@
</entityField>
<entityField>
<name>RRULE</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>RECURRENCEID</name>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>SAFESCOPEFIELD</name>
......
import("system.logging");
import("system.result");
import("system.vars");
logging.log("SET: -" + vars.get("$field.UID") + "-")
result.string(vars.get("$field.UID"));
\ 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