Skip to content
Snippets Groups Projects
Commit 5073fddf authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch 'cherry-pick-c708b72d' into 'stable2019.3' 

Quick entry

See merge request xrm/basic!65
parents 702d9b31 1cc60de4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 289 additions and 8 deletions
application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+ 5
− 0
View file @ 5073fddf
......@@ -34,6 +34,11 @@
<name>Activity</name>
<kind v="10077" />
</entityNode>
<entityNode>
<name>QuickEntry</name>
<kind v="10077" />
<title></title>
</entityNode>
<entityNode>
<name>Task</name>
<kind v="10077" />
......
entity/Activity_entity/Activity_entity.aod
+ 6
− 0
View file @ 5073fddf
......@@ -249,6 +249,12 @@
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>bfef6edf-e9c9-485b-afbe-8e175f6eda74</name>
<entityName>QuickEntry_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/AddressType_entity/recordcontainers/db/conditionProcess.js
+ 1
− 1
View file @ 5073fddf
......@@ -21,5 +21,5 @@ if (usageFilter)
from AB_KEYWORD_ATTRIBUTERELATION ", null, ")"));
}
cond = SqlUtils.cond.translate("1 = 2");
cond = cond.translate("1 = 2");
result.string(cond);
\ No newline at end of file
entity/Address_entity/Address_entity.aod
+ 15
− 0
View file @ 5073fddf
......@@ -441,6 +441,21 @@
<element>MASK</element>
</onValueChangeTypes>
</entityField>
<entityProvider>
<name>QuickEntryAdresses</name>
<dependencies>
<entityDependency>
<name>d677a301-2038-4ccd-baa1-5f986e290564</name>
<entityName>QuickEntry_entity</entityName>
<fieldName>Adresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
<name>ContactIds_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Address_entity/entityfields/keywordaddresstypes/children/usagefilter_param/valueProcess.js
+ 1
− 0
View file @ 5073fddf
import("system.logging");
import("system.vars");
import("system.result");
import("Contact_lib");
......
entity/Address_entity/recordcontainers/db/onDBInsert.js
+ 10
− 1
View file @ 5073fddf
import("DataPrivacy_lib");
import("system.vars");
import("StandardObject_lib");
import("Keyword_lib");
var rowdata = vars.get("$local.rowdata");
var addrType = rowdata["ADDRESS.ADDR_TYPE"];
var contacts = vars.get("$param.ContactIds_param");
if (contacts)
{
contacts = JSON.parse(contacts);
}
var typeParam = vars.get("$param.ContactType_param");
var scopeType = null
......@@ -9,7 +19,6 @@ if (typeParam === "contact")
else if (typeParam === "organisation")
scopeType = "Organisation"
var rowdata = vars.get("$local.rowdata");
new StandardObject("Address", vars.get("$local.uid"), scopeType, rowdata["ADDRESS.CONTACT_ID"])
.onObjectInsert()
......
entity/Attribute_entity/Attribute_entity.aod
+ 6
− 0
View file @ 5073fddf
......@@ -89,6 +89,12 @@
<fieldName>Departments</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>39e0acea-e141-4457-8019-b30009d5d904</name>
<entityName>Salesproject_entity</entityName>
<fieldName>ProjectTypeAttribute</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/Communication_entity/Communication_entity.aod
+ 11
− 0
View file @ 5073fddf
......@@ -238,6 +238,17 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityField>
<name>SEARCHADDR</name>
</entityField>
<entityProvider>
<name>QuickEntryCommunications</name>
<dependencies>
<entityDependency>
<name>85bc11c4-7226-4b3e-82cb-947dfb05a972</name>
<entityName>QuickEntry_entity</entityName>
<fieldName>Communications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Language_entity/Language_entity.aod
+ 6
− 0
View file @ 5073fddf
......@@ -69,6 +69,12 @@
<fieldName>KeywordLanguages</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>12f3a19a-259e-46ba-bc31-aa776c3d324c</name>
<entityName>QuickEntry_entity</entityName>
<fieldName>Languages</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/Person_entity/Person_entity.aod
+ 6
− 0
View file @ 5073fddf
......@@ -119,6 +119,12 @@
<fieldName>Contact</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>ab8c515e-f99f-48ad-869a-dd7f0d4b0ee5</name>
<entityName>QuickEntry_entity</entityName>
<fieldName>Contacts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/Person_entity/entityfields/organisation_id/valueProcess.js
+ 13
− 5
View file @ 5073fddf
import("system.neon");
import("system.vars");
import("system.result");
import("Contact_lib");
var orgContactId = vars.get("$field.ORGANISATION_CONTACTID");
var organisationIds = ContactUtils.getPersOrgIds(orgContactId)
if (organisationIds.length > 0 && organisationIds[2])
//in QuickEntry, you can't get the organisation id from the database,
//so it should be preset directly in new-mode
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.OrgId_param"))
{
result.string(organisationIds[2])
result.string(vars.get("$param.OrgId_param"));
}
else
{
var orgContactId = vars.get("$field.ORGANISATION_CONTACTID");
var organisationIds = ContactUtils.getPersOrgIds(orgContactId);
if (organisationIds.length > 0 && organisationIds[2])
result.string(organisationIds[2]);
}
entity/Person_entity/recordcontainers/db/conditionProcess.js
+ 2
− 1
View file @ 5073fddf
import("system.logging");
import("system.vars");
import("system.db");
import("system.result");
......@@ -12,6 +13,6 @@ if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedC
var excludedContacts = JSON.parse(vars.getString("$param.ExcludedContactIds_param"));
cond.andIn("CONTACT.CONTACTID", excludedContacts, undefined, true);
}
logging.log(cond.translate("1=1"))
//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
result.string(cond.translate("1 = 1"));
\ No newline at end of file
entity/QuickEntry_entity/QuickEntry_entity.aod 0 → 100644
+ 181
− 0
View file @ 5073fddf
<?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.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>QuickEntry_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Quick entry</title>
<iconId>VAADIN:BOLT</iconId>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>UID</name>
</entityField>
<entityField>
<name>ORGANISATION_NAME</name>
<title>Company</title>
<contentType>LONG_TEXT</contentType>
</entityField>
<entityConsumer>
<name>Adresses</name>
<dependency>
<name>dependency</name>
<entityName>Address_entity</entityName>
<fieldName>QuickEntryAdresses</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ContactIds_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contactids_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ContactType_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contacttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Communications</name>
<dependency>
<name>dependency</name>
<entityName>Communication_entity</entityName>
<fieldName>QuickEntryCommunications</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
<dependency>
<name>dependency</name>
<entityName>Language_entity</entityName>
<fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Salutations</name>
<dependency>
<name>dependency</name>
<entityName>Salutation_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>SalutationTitles</name>
<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>OrganisationRelated</fieldName>
</dependency>
<children>
<entityParameter>
<name>OrgId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/contacts/children/orgid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>ISOLANGUAGE</name>
<title>Language</title>
<consumer>Languages</consumer>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Activities</name>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
<fieldName>LinkedObjects</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>RowId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>Direction_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/direction_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ORGANISATION_ID</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>Salesprojects</name>
<dependency>
<name>dependency</name>
<entityName>Salesproject_entity</entityName>
<fieldName>QuickEntrySalesprojects</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>PresetTitle_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/salesprojects/children/presettitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<onInsert>%aditoprj%/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js</onInsert>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>ISOLANGUAGE.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>ORGANISATION_NAME.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>DATE_NEW.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>USER_NEW.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>ORGANISATION_ID.value</name>
</jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
entity/QuickEntry_entity/entityfields/activities/children/direction_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 5073fddf
import("system.result");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.activityDirection$incoming());
\ No newline at end of file
entity/QuickEntry_entity/entityfields/activities/children/objectid_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 5073fddf
import("system.result");
result.string("Organisation");
\ No newline at end of file
entity/QuickEntry_entity/entityfields/activities/children/rowid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 5073fddf
import("system.vars");
import("system.result");
result.string(vars.get("$field.UID"));
\ No newline at end of file
entity/QuickEntry_entity/entityfields/adresses/children/contactid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 5073fddf
import("system.vars");
import("system.result");
result.string(vars.get("$field.UID"));
\ No newline at end of file
entity/QuickEntry_entity/entityfields/adresses/children/contactids_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 5073fddf
import("system.vars");
import("system.result");
result.string(JSON.stringify(vars.get("$field.Contacts.insertedRows"), null, "\t"));
\ No newline at end of file
entity/QuickEntry_entity/entityfields/adresses/children/contacttype_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 5073fddf
import("system.result");
result.string("organisation");
\ No newline at end of file
entity/QuickEntry_entity/entityfields/communications/children/contactid_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 5073fddf
import("system.vars");
import("system.result");
result.string(vars.get("$field.UID"));
\ 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